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 c9d3382665b8c2668d597b89ca7b6f51b25316e6..c9ed444dff0dc6cffacbf340e3fb9e3fd0133a95 100644 (file)
--- 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 5360151b37bdf48bfd3e69358f1237aadbf64877..9bf4873b8c41af975c26da8b3a6aa2dbcadd758c 100644 (file)
--- 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 9ae0129e02670e029b982468939b77bae7f449ff..5f18036a3458d4765d95984d7a109ca216f7e454 100644 (file)
--- 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 9cd0fa174683e6a6eae59f4032a0cba82375b0e5..60403707f5a3aeab9bc5246f613289d089519024 100644 (file)
--- 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 4c09e33d6a7dcb66230e509052519c1cfdcc3445..c5ab81add1a35567772133e4d12382185c4a584f 100644 (file)
--- 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 aca87c517106b81321568e70275dcd1240b4104c..d16ac9fff26d23b75c05148e8f988bf9d27c4042 100644 (file)
--- 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 9024b1e7c90afd932340c252be170b8799c22e55..3cadc9eefbc76cab554b7beb5d71e86ca9f464f9 100644 (file)
--- 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 d1f4df9be24f5cb7824833a3ad5edb549f1e639d..ee1a6ac46fa15cefa8b962f27a8ad38ebe1250e9 100644 (file)
--- 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 cd12e5a00c7eeca163e5076b3eb08705ad16b9d3..35ffa1eb576e765268070bb9ebc98473e9681627 100644 (file)
--- 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 53961c3b670a764bdf02dd9baa9b168c5ef5e839..3c81b0a64b7db1456f5299b4119071be0221f1fa 100644 (file)
--- 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 97baad7735e5ea69c2bfc149f43b1f11e65d8fc5..8374947d5f7081c37d7cfe2267808815b38ba7b1 100644 (file)
--- 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 433586c8bcce876203b5e8b28d044fee65a2bb36..3eb5b69521efdd115761271179de69a8718520ce 100644 (file)
--- 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 99839087ba82cf409cacdbb24ecab30606f659e6..1c177b65f2a632d831f225292df20cd6e445a05f 100644 (file)
--- 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}