Please cherry-pick:

- introduced new template message_box_mini.tpl and corresponding CSS class

Signed-off-by: Roland Häder <roland@haeder.net>

diff --git a/web/WEB-INF/templates/generic/message_box_mini.tpl b/web/WEB-INF/templates/generic/message_box_mini.tpl
new file mode 100644 (file)
index 0000000..e8e1c56
--- /dev/null
+++ b/web/WEB-INF/templates/generic/message_box_mini.tpl
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+       xmlns="http://www.w3.org/1999/xhtml"
+       xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+       xmlns:h="http://xmlns.jcp.org/jsf/html"
+       xmlns:f="http://xmlns.jcp.org/jsf/core"
+       >
+
+       <div class="message_box_mini">
+               <div class="message_header">
+                       <h:outputText value="#{msg.MESSAGE_BOX_TITLE}" />
+               </div>
+
+               <ui:fragment rendered="#{not empty message}">
+                       <ui:fragment rendered="#{not empty styleClass}">
+                               <div class="para">
+                                       <h:outputText styleClass="#{styleClass}" value="#{message}" />
+                               </div>
+                       </ui:fragment>
+
+                       <ui:fragment rendered="#{empty styleClass}">
+                               <div class="para">
+                                       <h:outputText styleClass="okay" value="#{message}" />
+                               </div>
+                       </ui:fragment>
+               </ui:fragment>
+
+               <ui:fragment rendered="#{empty message}">
+                       <div class="errors para">
+                               <h:outputText value="#{msg.MESSAGE_BOX_PARAMETER_MESSAGE_EMPTY}" />
+                       </div>
+               </ui:fragment>
+       </div>
+</ui:composition>

diff --git a/web/WEB-INF/templates/login/user/user_base.tpl b/web/WEB-INF/templates/login/user/user_base.tpl
index 8fc3f32c6ee53c7252e1e46b3861b3824f66014c..29f036f21fa7a74e167bed8ba8d621fd79a9b69e 100644 (file)
--- a/web/WEB-INF/templates/login/user/user_base.tpl
+++ b/web/WEB-INF/templates/login/user/user_base.tpl
@@ -14,7 +14,7 @@
                        <ui:include src="/WEB-INF/templates/login/user/user_menu.tpl" />
                </ui:fragment>
                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-                       <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+                       <ui:include src="/WEB-INF/templates/generic/message_box_mini.tpl">
                                <ui:param name="message" value="#{msg.USER_NOT_LOGGED_IN}" />
                                <ui:param name="styleClass" value="errors" />
                        </ui:include>

diff --git a/web/WEB-INF/templates/user/user_not_logged_in.tpl b/web/WEB-INF/templates/user/user_not_logged_in.tpl
index 5981ed05647f6c51bb230af92fbd2da8d772810b..b8a98d6b9f8567d8b7e5054d7e297d0e6509d6c6 100644 (file)
--- a/web/WEB-INF/templates/user/user_not_logged_in.tpl
+++ b/web/WEB-INF/templates/user/user_not_logged_in.tpl
@@ -5,8 +5,8 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-       <h:panelGroup styleClass="table" layout="block">
-               <div class="table_header">
+       <h:panelGroup styleClass="message_box" layout="block">
+               <div class="message_header">
                        <h:outputText value="#{msg.TABLE_HEADER_ERROR_USER_NOT_LOGGED_IN}" />
                </div>
 

diff --git a/web/resources/css/cssLayout.css b/web/resources/css/cssLayout.css
index 7be9de14fd23af788425e5c5854383f0c5a0102f..457d841aa312e2e4df3b19ede3fe988819c943f4 100644 (file)
--- a/web/resources/css/cssLayout.css
+++ b/web/resources/css/cssLayout.css
@@ -256,14 +256,21 @@ ul.footer_nav li.footer_copyright {
        color: gold;
 }
 
-.message_box {
+.message_box, .message_box_mini {
        border: 1px solid #888888;
        border-top-right-radius: 8px;
        border-bottom-left-radius: 8px;
        background-color: #f0f0fa;
+}
+
+.message_box {
        width: 400px;
 }
 
+.message_box_mini {
+       width: 160px;
+}
+
 .message_header {
        border-bottom: 1px solid #888888;
        background-image: linear-gradient(#eeeeee, #aaaaaa);