From e5714a4cd1939d682ebb52dc08e81753df638ae6 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 4 Mar 2016 21:32:12 +0100
Subject: [PATCH] Introduced new template + renamed language constant + form
 field: - introduced login_enter_current_password.tpl to reduce redundant
 template code - changed language string to reflect it's purpose (current
 password) - renamed form field "password" to "currentPassword" to reflect
 it's purpose, too

---
 .../localization/bundle_de_DE.properties      |  2 +-
 .../localization/bundle_en_US.properties      |  2 +-
 .../login/login_enter_current_password.tpl    | 24 +++++++++++++++++++
 web/login/login_change_email_address.xhtml    | 17 +------------
 web/login/login_change_password.xhtml         |  2 +-
 web/login/login_change_personal_data.xhtml    | 19 ++-------------
 6 files changed, 30 insertions(+), 36 deletions(-)
 create mode 100644 web/WEB-INF/templates/login/login_enter_current_password.tpl

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 2eef9897..473217eb 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -251,7 +251,7 @@ LINK_LOGIN_CHANGE_PASSWORD=Ihr Passwort aendern
 LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND=Bitte derzeitiges Passwort zur Bestaetigung eingeben:
 #TODO: Please fix German umlaut!
 LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND_TITLE=Bitte geben Sie ihr derzeitiges Passwort zur Bestaetigung der Aenderungen ein.
-LOGIN_ENTER_PASSWORD_CONFIRM=Derzeitiges Passwort:
+LOGIN_ENTER_CURRENT_PASSWORD_CONFIRM=Derzeitiges Passwort:
 #TODO: Please fix German umlaut!
 BUTTON_CHANGE_PERSONAL_DATA=Persoenliche Daten aendern
 #TODO: Please fix German umlaut!
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index e72150f7..032df0c2 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -237,6 +237,6 @@ LINK_LOGIN_CHANGE_EMAIL_ADDRESS=Change your email address
 LINK_LOGIN_CHANGE_PASSWORD=Change your password
 LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND=Your current password for confirmation:
 LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND_TITLE=Please enter your current password for confirmation of the change.
-LOGIN_ENTER_PASSWORD_CONFIRM=Current password:
+LOGIN_ENTER_CURRENT_PASSWORD_CONFIRM=Current password:
 BUTTON_CHANGE_PERSONAL_DATA=Change personal data
 LOGIN_CHANGE_PERSONAL_DATA_TITLE=Change personal data:
diff --git a/web/WEB-INF/templates/login/login_enter_current_password.tpl b/web/WEB-INF/templates/login/login_enter_current_password.tpl
new file mode 100644
index 00000000..b218c729
--- /dev/null
+++ b/web/WEB-INF/templates/login/login_enter_current_password.tpl
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://java.sun.com/jsf/facelets">
+
+	<div class="para">
+		<fieldset id="current_password">
+			<legend title="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND_TITLE}">#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND}</legend>
+			<div class="table_row">
+				<div class="table_left">
+					<h:outputLabel for="currentPassword" value="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRM}" />
+				</div>
+
+				<div class="table_right">
+					<h:inputSecret class="input" id="currentPassword" size="10" maxlength="255" value="#{loginController.currentPassword}" required="true" />
+				</div>
+
+				<div class="clear"></div>
+			</div>
+		</fieldset>
+	</div>
+</ui:composition>
diff --git a/web/login/login_change_email_address.xhtml b/web/login/login_change_email_address.xhtml
index 8c40bab5..2c9a84b3 100644
--- a/web/login/login_change_email_address.xhtml
+++ b/web/login/login_change_email_address.xhtml
@@ -55,22 +55,7 @@
 							</fieldset>
 						</div>
 
-						<div class="para">
-							<fieldset id="current_password">
-								<legend title="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND_TITLE}">#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND}</legend>
-								<div class="table_row">
-									<div class="table_left">
-										<h:outputLabel for="password" value="#{msg.LOGIN_ENTER_PASSWORD_CONFIRM}" />
-									</div>
-
-									<div class="table_right">
-										<h:inputSecret class="input" id="password" size="10" maxlength="255" value="#{loginController.currentPassword}" required="true" />
-									</div>
-
-									<div class="clear"></div>
-								</div>
-							</fieldset>
-						</div>
+						<ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
 
 						<div class="table_footer">
 							<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
diff --git a/web/login/login_change_password.xhtml b/web/login/login_change_password.xhtml
index cae10f20..97269006 100644
--- a/web/login/login_change_password.xhtml
+++ b/web/login/login_change_password.xhtml
@@ -31,7 +31,7 @@
 
 								<div class="table_row">
 									<div class="table_left">
-										<h:outputLabel for="password" value="#{msg.LOGIN_ENTER_PASSWORD_CONFIRM}" />
+										<h:outputLabel for="password" value="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRM}" />
 									</div>
 
 									<div class="table_right">
diff --git a/web/login/login_change_personal_data.xhtml b/web/login/login_change_personal_data.xhtml
index 714844f5..784772c9 100644
--- a/web/login/login_change_personal_data.xhtml
+++ b/web/login/login_change_personal_data.xhtml
@@ -23,24 +23,9 @@
 					<h:form id="login_change_personal_form">
 						<ui:include src="/WEB-INF/templates/generic/form_personal_data.tpl" />
 
-						<ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
+						<ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
 
-						<div class="para">
-							<fieldset id="current_password">
-								<legend title="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND_TITLE}">#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND}</legend>
-								<div class="table_row">
-									<div class="table_left">
-										<h:outputLabel for="password" value="#{msg.LOGIN_ENTER_PASSWORD_CONFIRM}" />
-									</div>
-
-									<div class="table_right">
-										<h:inputSecret class="input" id="password" size="10" maxlength="255" value="#{loginController.currentPassword}" required="true" />
-									</div>
-
-									<div class="clear"></div>
-								</div>
-							</fieldset>
-						</div>
+						<ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
 
 						<div class="table_footer">
 							<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-- 
2.39.5