From befb1fe5502015181930471b3abb27465203257b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 19 Apr 2017 14:24:14 +0200
Subject: [PATCH] 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
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 src/java/org/mxchange/localization/bundle_en_US.properties | 2 --
 web/WEB-INF/templates.dist/login_page.xhtml                | 4 ++++
 web/WEB-INF/templates/login/user/user_base.tpl             | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index ea61ed59..cb70030b 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -477,7 +477,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?
@@ -493,7 +492,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 a47f1bf5..f9126cf0 100644
--- a/web/WEB-INF/templates.dist/login_page.xhtml
+++ b/web/WEB-INF/templates.dist/login_page.xhtml
@@ -7,9 +7,13 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
+<<<<<<< HEAD
 		<ui:define name="login_title">
 			<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_FOO}" />
 		</ui:define>
+=======
+		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_FOO}</ui:define>
+>>>>>>> 1b276cd... Cleanups:
 
 		<ui:define name="content_header">
 			<h:outputText value="#{msg.SUB_TITLE_USER_LOGIN_FOO}" />
diff --git a/web/WEB-INF/templates/login/user/user_base.tpl b/web/WEB-INF/templates/login/user/user_base.tpl
index 29f036f2..12ea9db4 100644
--- a/web/WEB-INF/templates/login/user/user_base.tpl
+++ b/web/WEB-INF/templates/login/user/user_base.tpl
@@ -11,8 +11,9 @@
 
 	<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()}">
 			<ui:include src="/WEB-INF/templates/generic/message_box_mini.tpl">
 				<ui:param name="message" value="#{msg.USER_NOT_LOGGED_IN}" />
-- 
2.39.5