From: Roland Häder <roland@mxchange.org>
Date: Wed, 19 Apr 2017 12:24:14 +0000 (+0200)
Subject: Cleanups:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e1d319bfa7b6de08e7c2c1762239bf03d32a0b98;p=pizzaservice-war.git

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_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 251cad2a..c72724a3 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -479,7 +479,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?
@@ -495,7 +494,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/login/user/user_base.tpl b/web/WEB-INF/templates/login/user/user_base.tpl
index 6b88de4d..8eacaf24 100644
--- 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()}">