Cleanups:

- added id for menu include (maybe more follow? or I revert all these?)
- removed no longer used i18n strings
- user_menu is no longer included in page template, only in user_base.xhtml

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 b48fa82ac0c12eb0dd9d2a8018ba3cafd2285722..37d27da80d13092c0f271b831ac1e6678f6d978d 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -213,7 +213,6 @@ LOGIN_NO_PASSWORD_MESSAGE=Sie haben kein Passwort eingegeben.
 LOGIN_NO_USER_NAME_MESSAGE=Sie haben keinen Benutzernamen eingegeben.
 USER_NOT_LOGGED_IN=Sie sind nicht angemeldet.
 LOGIN_OWN_PROFILE_INVISIBLE=Ihr Profil ist auf "durchsichtig" gestellt.
-ERROR_USER_INSTANCE_NOT_SET=Fehler: Benutzer-Instanz nicht gesetzt.
 LOGIN_ADDRESSBOOK_NOT_SET=Fehler: Adressbuch-Instanz nicht gesetzt.
 LINK_GUEST_LOGIN_LOST_PASSWORD=Passwort vergessen?
 LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD=Passwort wiederherstellen

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index f78cb0ce98a83215a74acbde86a3ef7f11a098dc..447ee6d86136f5581526731b006370da909fe525 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -508,7 +508,6 @@ GUEST_RESEND_LINK_ENTER_EMAIL_ADDRESS=Please enter email address you have used o
 GUEST_RESEND_CONFIRMATION_LINK_NOTICE=The old confirmation link won't work after this. Please always use the one from newer email.
 RESEND_CONFIRMATION_LINK_LEGEND=Enter email address:
 RESEND_CONFIRMATION_LINK_LEGEND_TITLE=Please enter your email address you have used on registration.
-LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS_TITLE=Change your email address. This requires another confirmation and can be undone.
 LOGIN_ENTER_CURRENT_PASSWORD_CONFIRM=Current password:
 LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND_TITLE=Please enter your current password for confirmation of the change.
 LOGIN_EDIT_USER_DATA_TITLE=What do you want to change?
@@ -524,7 +523,6 @@ SELECTION_NOTICE_USER_PROFILE_MODE_PUBLIC=If you choose "All" the whole Internet
 LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND=Your current password for confirmation:
 LOGIN_USER_CHANGE_PERSONAL_DATA_TITLE=Change personal data:
 LINK_LOGIN_USER_CHANGE_PASSWORD_TITLE=Change here your password, if you want another one.
-LINK_LOGIN_USER_CHANGE_EMAIL_ADDRESS=Change your email address
 LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD=Restore your password
 PAGE_TITLE_INDEX_CONFIRM_ACCOUNT=Confirm registration
 CONTENT_TITLE_INDEX_CONFIRM_ACCOUNT=Confirm user registration:

diff --git a/web/WEB-INF/templates.dist/login_page.xhtml b/web/WEB-INF/templates.dist/login_page.xhtml
index 7d99bc174053ea7e3a0307512f0d9e066186bed8..da995d40f3d7929a8f6838d8219c3c4783772745 100644 (file)
--- a/web/WEB-INF/templates.dist/login_page.xhtml
+++ b/web/WEB-INF/templates.dist/login_page.xhtml
@@ -9,10 +9,6 @@
        <ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
                <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_FOO}</ui:define>
 
-               <ui:define name="menu">
-                       <ui:include src="/WEB-INF/templates/login/user/user_menu.tpl" />
-               </ui:define>
-
                <ui:define name="content_header">
                        #{msg.SUB_TITLE_LOGIN_FOO}
                </ui:define>

diff --git a/web/WEB-INF/templates/login/user/user_base.tpl b/web/WEB-INF/templates/login/user/user_base.tpl
index 0b87c3252187aade2ed9f7fa5b5db4eb40b16850..bae64259efeec1674c8d7cee314cdc06f279f55d 100644 (file)
--- a/web/WEB-INF/templates/login/user/user_base.tpl
+++ b/web/WEB-INF/templates/login/user/user_base.tpl
@@ -9,7 +9,7 @@
 
        <ui:define name="menu">
                <ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-                       <ui:include src="/WEB-INF/templates/login/user/user_menu.tpl" />
+                       <ui:include id="menu" src="/WEB-INF/templates/login/user/user_menu.tpl" />
                </ui:fragment>
                <ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
                        <h:outputText styleClass="errors" value="#{msg.USER_NOT_LOGGED_IN}" />