From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Thu, 7 Mar 2013 10:25:04 +0000 (+0100)
Subject: Flash-DIVs immer ausgeben & Flash-Kategorie fett
X-Git-Tag: release-3.1.0beta1~551
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=de66b95fa834d44d84b8d6e48b1ffbbd607d07e0;p=kivitendo-erp.git

Flash-DIVs immer ausgeben & Flash-Kategorie fett
---

diff --git a/css/kivitendo/main.css b/css/kivitendo/main.css
index c3c64dc76..0420034c7 100644
--- a/css/kivitendo/main.css
+++ b/css/kivitendo/main.css
@@ -361,3 +361,7 @@ label {
 	margin-bottom: 5px;
 	padding: 5px;
 }
+
+.flash_title {
+  font-weight: bold;
+}
diff --git a/css/lx-office-erp/main.css b/css/lx-office-erp/main.css
index 328eac77f..fb88e57c9 100644
--- a/css/lx-office-erp/main.css
+++ b/css/lx-office-erp/main.css
@@ -377,6 +377,10 @@ label {
   padding: 5px;
 }
 
+.flash_title {
+  font-weight: bold;
+}
+
 .jqmWindow {
   display: none;
 
diff --git a/templates/webpages/common/flash.html b/templates/webpages/common/flash.html
index 03bf3b405..cb592edc3 100644
--- a/templates/webpages/common/flash.html
+++ b/templates/webpages/common/flash.html
@@ -1,22 +1,16 @@
 [%- USE HTML -%][%- USE LxERP %][%- USE T8 %]
-[%- IF FLASH %]
- [%- BLOCK output %]
-  <div class="flash_message_[% type %]">
-    <a href='#' style='float:right' onclick='$($(this).closest("div")).remove()'><img src='image/close.png' border='0' alt='[% 'Close Flash' | $T8 %]'></a>
-   [%- title %]:
+[%- BLOCK output %]
+ <div id="flash_[% type %]" class="flash_message_[% type %]"[% IF !messages || !messages.size %] style="display: none"[% END %]>
+  <a href='#' style='float:right' onclick='$(this).closest("div").find(".flash_content").empty(); $(this).closest("div").hide()'><img src='image/close.png' border='0' alt='[% 'Close Flash' | $T8 %]'></a>
+  <span class="flash_title">[%- title %]:</span>
+  <span id="flash_[% type %]_content" class="flash_content">
    [% FOREACH message = messages %]
     [%- HTML.escape(message) %]
     [%- UNLESS loop.last %]<br>[% END %]
    [%- END %]
-  </div>
- [%- END %]
- [%- IF FLASH.error && FLASH.error.size %]
-  [%- PROCESS output title=LxERP.t8('Error') type='error' messages = FLASH.error %]
- [%- END %]
- [%- IF FLASH.warning && FLASH.warning.size %]
-  [%- PROCESS output title=LxERP.t8('Warning') type='warning' messages = FLASH.warning %]
- [%- END %]
- [%- IF FLASH.info && FLASH.info.size %]
-  [%- PROCESS output title=LxERP.t8('Information') type='info' messages = FLASH.info %]
- [%- END %]
+  </span>
+ </div>
 [%- END %]
+[%- PROCESS output title=LxERP.t8('Error')       type='error'   messages = FLASH.error %]
+[%- PROCESS output title=LxERP.t8('Warning')     type='warning' messages = FLASH.warning %]
+[%- PROCESS output title=LxERP.t8('Information') type='info'    messages = FLASH.info %]