From 645890a33e3ca85ccc15667eabb69fe9de29dcc2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 29 Aug 2016 14:47:53 +0200
Subject: [PATCH] Please cherry-pick: - introduced new template
 message_box_mini.tpl and corresponding CSS class
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@haeder.net>
---
 .../templates/generic/message_box_mini.tpl    | 34 +++++++++++++++++++
 .../templates/login/user/user_base.tpl        |  2 +-
 .../templates/user/user_not_logged_in.tpl     |  4 +--
 web/resources/css/cssLayout.css               |  9 ++++-
 4 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 web/WEB-INF/templates/generic/message_box_mini.tpl

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
index 00000000..e8e1c560
--- /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 8fc3f32c..29f036f2 100644
--- 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 5981ed05..b8a98d6b 100644
--- 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 7be9de14..457d841a 100644
--- 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);
-- 
2.39.5