From 7cab1167dc9c310bdc3fd8b7b751237155c57561 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 5 Mar 2016 22:02:47 +0100
Subject: [PATCH] Continued with "change personal data": - added generic
 template message_box.tpl - added generic page login_data_saved.xhtml - added
 missing navigation rules from login_change_foo.xhtml ->
 login_data_saved.xhtml - added some new language strings - added CSS classes
 for message box template - changing email address requires you to enter twice
 your new email address (displaying old is missing)

---
 nbproject/faces-config.NavData                | 12 ++---
 .../localization/bundle_de_DE.properties      |  5 ++
 .../localization/bundle_en_US.properties      |  5 ++
 web/WEB-INF/faces-config.xml                  | 51 +++++++++++++------
 web/WEB-INF/templates/generic/message_box.tpl | 26 ++++++++++
 web/login/login_change_email_address.xhtml    |  4 +-
 web/login/login_data_saved.xhtml              | 28 ++++++++++
 web/resources/css/cssLayout.css               | 12 +++++
 8 files changed, 120 insertions(+), 23 deletions(-)
 create mode 100644 web/WEB-INF/templates/generic/message_box.tpl
 create mode 100644 web/login/login_data_saved.xhtml

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
index 882010c1..9699a575 100644
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -17,13 +17,13 @@
     </Scope>
     <Scope Scope="Project">
         <Node id="login/login_shared_addressbooks.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="login/login_change_password.xhtml" x="1650" y="150" zoom="true"/>
         <Node id="privacy.xhtml" x="150" y="300" zoom="true"/>
+        <Node id="login/login_change_password.xhtml" x="1650" y="150" zoom="true"/>
         <Node id="login/login_start_sharing_addressbook.xhtml" x="900" y="450" zoom="true"/>
         <Node id="user/register.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="login/login_add_addressbook.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="user/resend_link.xhtml" x="400" y="750" zoom="true"/>
         <Node id="login/login_index.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="user/resend_link.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="login/login_add_addressbook.xhtml" x="1900" y="150" zoom="true"/>
         <Node id="login/login_own_addressbooks.xhtml" x="150" y="150" zoom="true"/>
         <Node id="admin/admin_logout.xhtml" x="150" y="900" zoom="true"/>
         <Node id="terms.xhtml" x="900" y="150" zoom="true"/>
@@ -31,19 +31,19 @@
         <Node id="bye.xhtml" x="650" y="750" zoom="true"/>
         <Node id="index.xhtml" x="650" y="450" zoom="true"/>
         <Node id="user/register_done.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="login/login_change_personal_data.xhtml" x="150" y="600" zoom="true"/>
         <Node id="user/user_profile.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="login/login_change_personal_data.xhtml" x="150" y="600" zoom="true"/>
         <Node id="imprint.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="*" x="650" y="150" zoom="true"/>
         <Node id="user/show_addressbook.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="*" x="650" y="150" zoom="true"/>
         <Node id="user/login_error.xhtml" x="1150" y="450" zoom="true"/>
         <Node id="login/login_other_addressbooks.xhtml" x="650" y="600" zoom="true"/>
         <Node id="user/show_addressbook_entries.xhtml" x="1650" y="300" zoom="true"/>
         <Node id="admin/admin_index.xhtml" x="650" y="300" zoom="true"/>
         <Node id="login/login_change_email_address.xhtml" x="150" y="1050" zoom="true"/>
         <Node id="user/lost_passwd.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="user/login.xhtml" x="400" y="450" zoom="true"/>
         <Node id="login/login_list_sharing_addressbooks.xhtml" x="1400" y="150" zoom="true"/>
+        <Node id="user/login.xhtml" x="400" y="450" zoom="true"/>
         <Node id="login/login_edit_user_data.xhtml" x="150" y="750" zoom="true"/>
     </Scope>
     <Scope Scope="All Faces Configurations">
diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 69786442..7b1a26b4 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -286,3 +286,8 @@ BUTTON_CHANGE_PERSONAL_DATA=Persoenliche Daten aendern
 #TODO: Please fix German umlaut!
 LOGIN_CHANGE_PERSONAL_DATA_TITLE=Persoenliche Daten aendern:
 ERROR_CURRENT_PASSWORD_MISMATCHING=Ihr eingegebenes Passwort entspricht nicht dem aktuell gespeicherten Passwort.
+MESSAGE_BOX_TITLE=Hinweis:
+MESSAGE_BOX_PARAMETER_MESSAGE_EMPTY=Fehler: Parameter "message" nicht gesetzt.
+LOGIN_MESSAGE_DATA_SAVED=Daten wurden gespeichert.
+PAGE_TITLE_LOGIN_DATA_SAVED=Ihre Daten wurden gespeichert
+CONTENT_TITLE_LOGIN_DATA_SAVED=Daten wurden gespeichert:
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index da62220a..7c3c6e57 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -271,3 +271,8 @@ LOGIN_ENTER_CURRENT_PASSWORD_CONFIRM=Current password:
 BUTTON_CHANGE_PERSONAL_DATA=Change personal data
 LOGIN_CHANGE_PERSONAL_DATA_TITLE=Change personal data:
 ERROR_CURRENT_PASSWORD_MISMATCHING=Your entered password doesn't match the currently stored one.
+MESSAGE_BOX_TITLE=Notice:
+MESSAGE_BOX_PARAMETER_MESSAGE_EMPTY=Error: Parameter "message" not set.
+LOGIN_MESSAGE_DATA_SAVED=Data has been saved.
+PAGE_TITLE_LOGIN_DATA_SAVED=Your data has been saved
+CONTENT_TITLE_LOGIN_DATA_SAVED=Data has been saved:
diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index d5b62294..470ae276 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -173,19 +173,40 @@
 			<to-view-id>/user/show_addressbook.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
-    <navigation-rule>
-        <from-view-id>/login/login_edit_user_data.xhtml</from-view-id>
-        <navigation-case>
-            <from-outcome>login_change_email_address</from-outcome>
-            <to-view-id>/login/login_change_email_address.xhtml</to-view-id>
-        </navigation-case>
-        <navigation-case>
-            <from-outcome>login_change_password</from-outcome>
-            <to-view-id>/login/login_change_password.xhtml</to-view-id>
-        </navigation-case>
-        <navigation-case>
-            <from-outcome>login_change_personal_data</from-outcome>
-            <to-view-id>/login/login_change_personal_data.xhtml</to-view-id>
-        </navigation-case>
-    </navigation-rule>
+	<navigation-rule>
+		<from-view-id>/login/login_edit_user_data.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>login_change_email_address</from-outcome>
+			<to-view-id>/login/login_change_email_address.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>login_change_password</from-outcome>
+			<to-view-id>/login/login_change_password.xhtml</to-view-id>
+		</navigation-case>
+		<navigation-case>
+			<from-outcome>login_change_personal_data</from-outcome>
+			<to-view-id>/login/login_change_personal_data.xhtml</to-view-id>
+		</navigation-case>
+	</navigation-rule>
+	<navigation-rule>
+		<from-view-id>/login/login_change_password.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>login_data_saved</from-outcome>
+			<to-view-id>/login/login_data_saved.xhtml</to-view-id>
+		</navigation-case>
+	</navigation-rule>
+	<navigation-rule>
+		<from-view-id>/login/login_change_email_address.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>login_data_saved</from-outcome>
+			<to-view-id>/login/login_data_saved.xhtml</to-view-id>
+		</navigation-case>
+	</navigation-rule>
+	<navigation-rule>
+		<from-view-id>/login/login_change_personal_data.xhtml</from-view-id>
+		<navigation-case>
+			<from-outcome>login_data_saved</from-outcome>
+			<to-view-id>/login/login_data_saved.xhtml</to-view-id>
+		</navigation-case>
+	</navigation-rule>
 </faces-config>
diff --git a/web/WEB-INF/templates/generic/message_box.tpl b/web/WEB-INF/templates/generic/message_box.tpl
new file mode 100644
index 00000000..4b8ecb64
--- /dev/null
+++ b/web/WEB-INF/templates/generic/message_box.tpl
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	  xmlns:ui="http://java.sun.com/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:f="http://xmlns.jcp.org/jsf/core"
+	  >
+
+	<div class="message_box">
+		<div class="message_header">
+			#{msg.MESSAGE_BOX_TITLE}
+		</div>
+
+		<ui:fragment id="output_message" rendered="#{not empty message}">
+			<div class="okay para">
+				#{message}
+			</div>
+		</ui:fragment>
+
+		<ui:fragment id="output_message" rendered="#{empty message}">
+			<div class="errors para">
+				#{msg.MESSAGE_BOX_PARAMETER_MESSAGE_EMPTY}
+			</div>
+		</ui:fragment>
+	</div>
+</html>
diff --git a/web/login/login_change_email_address.xhtml b/web/login/login_change_email_address.xhtml
index 1dbb0f27..7550822b 100644
--- a/web/login/login_change_email_address.xhtml
+++ b/web/login/login_change_email_address.xhtml
@@ -31,7 +31,7 @@
 
 								<div class="table_row">
 									<div class="table_left">
-										<h:outputLabel for="emailAddress1" value="#{msg.GUEST_REGISTRATION_ENTER_EMAIL1}" />
+										<h:outputLabel for="emailAddress1" value="#{msg.LOGIN_CHANGE_EMAIL_ENTER_EMAIL1}" />
 									</div>
 
 									<div class="table_right">
@@ -43,7 +43,7 @@
 
 								<div class="table_row">
 									<div class="table_left">
-										<h:outputLabel for="emailAddress2" value="#{msg.GUEST_REGISTRATION_ENTER_EMAIL2}" />
+										<h:outputLabel for="emailAddress2" value="#{msg.LOGIN_CHANGE_EMAIL_ENTER_EMAIL2}" />
 									</div>
 
 									<div class="table_right">
diff --git a/web/login/login_data_saved.xhtml b/web/login/login_data_saved.xhtml
new file mode 100644
index 00000000..d4fa96b4
--- /dev/null
+++ b/web/login/login_data_saved.xhtml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	  xmlns:ui="http://java.sun.com/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:f="http://xmlns.jcp.org/jsf/core"
+	  >
+
+	<ui:composition template="/WEB-INF/templates/login/login_base.tpl">
+		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_DATA_SAVED}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_LOGIN_DATA_SAVED}
+		</ui:define>
+
+		<ui:define name="content">
+			<ui:fragment rendered="#{loginController.isUserLoggedIn()}">
+				<ui:include id="message_box" src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
+				</ui:include>
+			</ui:fragment>
+
+			<ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
+				<ui:include id="login_only" class="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+			</ui:fragment>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/resources/css/cssLayout.css b/web/resources/css/cssLayout.css
index eb81f7e8..00129ea3 100644
--- a/web/resources/css/cssLayout.css
+++ b/web/resources/css/cssLayout.css
@@ -173,3 +173,15 @@ ul.footer_nav li.footer_copyright {
 .warnings {
 	color: gold;
 }
+
+.message_box {
+	width: 400px;
+}
+
+.message_header {
+	background-color: #036fab;
+}
+
+.okay {
+	color: #00aa00;
+}
-- 
2.39.5