Flash-DIVs immer ausgeben & Flash-Kategorie fett

diff --git a/css/kivitendo/main.css b/css/kivitendo/main.css
index c3c64dc76f4e3e4afeb2abce50fede8999e4314c..0420034c745cc377e41326d24263835cde201775 100644 (file)
--- a/css/kivitendo/main.css
+++ b/css/kivitendo/main.css
@@ -361,3 +361,7 @@ label {
        margin-bottom: 5px;
        padding: 5px;
 }
        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 328eac77fe2ac41f8779885a7a3f16d305e80f11..fb88e57c915de87e4ab8b28b38b6af57111c5ba8 100644 (file)
--- a/css/lx-office-erp/main.css
+++ b/css/lx-office-erp/main.css
@@ -377,6 +377,10 @@ label {
   padding: 5px;
 }
 
   padding: 5px;
 }
 

+.flash_title {
+  font-weight: bold;
+}
+

 .jqmWindow {
   display: none;
 
 .jqmWindow {
   display: none;
 

diff --git a/templates/webpages/common/flash.html b/templates/webpages/common/flash.html
index 03bf3b405c8a840ddc98676e0f59d57f03a982aa..cb592edc36896fa6a01258aea4fe8231c4779d97 100644 (file)
--- a/templates/webpages/common/flash.html
+++ b/templates/webpages/common/flash.html
@@ -1,22 +1,16 @@
 [%- USE HTML -%][%- USE LxERP %][%- USE T8 %]
 [%- 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 %]
    [% 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 %]
 [%- 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 %]