From: Roland Haeder <roland@mxchange.org>
Date: Fri, 16 Oct 2015 12:44:26 +0000 (+0200)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8c48af54dc903a729b824dd09ab6e92dfb053d28;p=jfinancials-war.git

Continued:
- added title for guest area in login_show_addressbook.xhtml (maybe be moved to user)
- fixed guest_title setting
- added missing i18n string
Signed-off-by:Roland Häder <roland@mxchange.org>
---

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index c9d33826..c9ed444d 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -246,3 +246,4 @@ SHARED_ADDRESSBOOK_TITLE=Welches Adressbuch freigegeben wurde
 SHAREE_USER_NAME_TITLE=Mit wem Sie Ihr Adressbuch teilen
 ADDRESSBOOK_OWNER=Besitzer:
 ADDRESSBOOK_STATUS=Status:
+PAGE_TITLE_INDEX_SHOW_ADDRESSBOOK=\u00d6ffentlicher Teil des Adressbuchs anzeigen
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 5360151b..9bf4873b 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -246,3 +246,4 @@ SHARED_ADDRESSBOOK_TITLE=Which address book is being shared
 SHAREE_USER_NAME_TITLE=With who you shared your address book
 ADDRESSBOOK_OWNER=Owner:
 ADDRESSBOOK_STATUS=Status:
+PAGE_TITLE_INDEX_SHOW_ADDRESSBOOK=Show public part of address book
diff --git a/web/imprint.xhtml b/web/imprint.xhtml
index 9ae0129e..5f18036a 100644
--- a/web/imprint.xhtml
+++ b/web/imprint.xhtml
@@ -8,7 +8,7 @@
 	  >
 
 	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-		<ui:define name="title">#{msg.PAGE_TITLE_INDEX_IMPRINT}</ui:define>
+		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_IMPRINT}</ui:define>
 
 		<ui:define name="content_header">
 			#{msg.CONTENT_TITLE_INDEX_IMPRINT}
diff --git a/web/index.xhtml b/web/index.xhtml
index 9cd0fa17..60403707 100644
--- a/web/index.xhtml
+++ b/web/index.xhtml
@@ -8,7 +8,7 @@
 	  >
 
 	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-		<ui:define name="title">#{msg.PAGE_TITLE_INDEX_WELCOME}</ui:define>
+		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_WELCOME}</ui:define>
 
 		<ui:define name="content_header">
 			#{msg.CONTENT_TITLE_INDEX_WELCOME}
diff --git a/web/login/login_show_addressbook.xhtml b/web/login/login_show_addressbook.xhtml
index 4c09e33d..c5ab81ad 100644
--- a/web/login/login_show_addressbook.xhtml
+++ b/web/login/login_show_addressbook.xhtml
@@ -15,6 +15,7 @@
 
 	<ui:composition template="/WEB-INF/templates/#{loginController.templateType}/#{loginController.templateType}_base.tpl">
 		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_SHOW_ADDRESSBOOK}</ui:define>
+		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_SHOW_ADDRESSBOOK}</ui:define>
 
 		<ui:define name="content_header">
 			#{msg.CONTENT_TITLE_LOGIN_SHOW_ADDRESSBOOK}
diff --git a/web/login/login_start_sharing_addressbook.xhtml b/web/login/login_start_sharing_addressbook.xhtml
index aca87c51..d16ac9ff 100644
--- a/web/login/login_start_sharing_addressbook.xhtml
+++ b/web/login/login_start_sharing_addressbook.xhtml
@@ -6,13 +6,6 @@
 	  xmlns:f="http://xmlns.jcp.org/jsf/core"
 	  >
 
-	<f:metadata>
-		<f:viewParam id="addressbookId" name="addressbook_id" value="#{addressbookController.addressbookId}" required="true" requiredMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_MISSING}" converterMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_INVALID}" validatorMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_NOT_FOUND}">
-			<f:convertNumber for="addressbookId" type="number" minIntegerDigits="1" maxIntegerDigits="20" />
-			<f:validator for="addressbookId" validatorId="AddressbookIdValidator" />
-		</f:viewParam>
-	</f:metadata>
-
 	<ui:composition template="/WEB-INF/templates/login/login_base.tpl">
 		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_START_SHARING_ADDRESSBOOK}</ui:define>
 
diff --git a/web/privacy.xhtml b/web/privacy.xhtml
index 9024b1e7..3cadc9ee 100644
--- a/web/privacy.xhtml
+++ b/web/privacy.xhtml
@@ -8,7 +8,7 @@
 	  >
 
 	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-		<ui:define name="title">#{msg.PAGE_TITLE_INDEX_PRIVACY}</ui:define>
+		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_PRIVACY}</ui:define>
 
 		<ui:define name="content_header">
 			#{msg.CONTENT_TITLE_INDEX_PRIVACY}
diff --git a/web/terms.xhtml b/web/terms.xhtml
index d1f4df9b..ee1a6ac4 100644
--- a/web/terms.xhtml
+++ b/web/terms.xhtml
@@ -8,7 +8,7 @@
 	  >
 
 	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-		<ui:define name="title">#{msg.PAGE_TITLE_INDEX_TERMS}</ui:define>
+		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_TERMS}</ui:define>
 
 		<ui:define name="content_header">
 			#{msg.CONTENT_TITLE_INDEX_TERMS}
diff --git a/web/user/login.xhtml b/web/user/login.xhtml
index cd12e5a0..35ffa1eb 100644
--- a/web/user/login.xhtml
+++ b/web/user/login.xhtml
@@ -8,7 +8,7 @@
 	  >
 
 	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl" id="user_login">
-		<ui:define name="title">#{msg.PAGE_TITLE_USER_LOGIN}</ui:define>
+		<ui:define name="guest_title">#{msg.PAGE_TITLE_USER_LOGIN}</ui:define>
 
 		<ui:define name="content_header">
 			#{msg.CONTENT_TITLE_USER_LOGIN}
diff --git a/web/user/login_error.xhtml b/web/user/login_error.xhtml
index 53961c3b..3c81b0a6 100644
--- a/web/user/login_error.xhtml
+++ b/web/user/login_error.xhtml
@@ -8,7 +8,7 @@
 	  >
 
 	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl" id="login_error">
-		<ui:define name="title">#{msg.PAGE_TITLE_USER_LOGIN_ERROR}</ui:define>
+		<ui:define name="guest_title">#{msg.PAGE_TITLE_USER_LOGIN_ERROR}</ui:define>
 
 		<ui:define name="content_header">
 			#{msg.CONTENT_TITLE_USER_LOGIN_ERROR}
diff --git a/web/user/lost_passwd.xhtml b/web/user/lost_passwd.xhtml
index 97baad77..8374947d 100644
--- a/web/user/lost_passwd.xhtml
+++ b/web/user/lost_passwd.xhtml
@@ -8,7 +8,7 @@
 	  >
 
 	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-		<ui:define name="title">#{msg.PAGE_TITLE_USER_LOST_PASSWORD}</ui:define>
+		<ui:define name="guest_title">#{msg.PAGE_TITLE_USER_LOST_PASSWORD}</ui:define>
 
 		<ui:define name="content_header">
 			#{msg.CONTENT_TITLE_USER_LOST_PASSWORD}
diff --git a/web/user/register.xhtml b/web/user/register.xhtml
index 433586c8..3eb5b695 100644
--- a/web/user/register.xhtml
+++ b/web/user/register.xhtml
@@ -8,7 +8,7 @@
 	  >
 
 	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-		<ui:define name="title">#{msg.PAGE_TITLE_USER_REGISTER}</ui:define>
+		<ui:define name="guest_title">#{msg.PAGE_TITLE_USER_REGISTER}</ui:define>
 
 		<ui:define name="content_header">
 			#{msg.CONTENT_TITLE_USER_REGISTER}
diff --git a/web/user/register_done.xhtml b/web/user/register_done.xhtml
index 99839087..1c177b65 100644
--- a/web/user/register_done.xhtml
+++ b/web/user/register_done.xhtml
@@ -8,7 +8,7 @@
 	  >
 
 	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-		<ui:define name="title">#{msg.PAGE_TITLE_USER_REGISTER_DONE}</ui:define>
+		<ui:define name="guest_title">#{msg.PAGE_TITLE_USER_REGISTER_DONE}</ui:define>
 
 		<ui:define name="content_header">
 			#{msg.CONTENT_TITLE_USER_REGISTER_DONE}