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

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 33571d361f6c2488405d554a1260dc4c83b0bb53..fa62ad347ee953a1206dbe8e26bf9d5a08ba6f6e 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -280,7 +280,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 1df34b92026cb6c75bd407aa56a2203fa36ccbb4..59bc76f07909d46d373b96f2228feb90bce3a21d 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -267,6 +267,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 (file)
index 0000000..b218c72
--- /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 8c40bab53ae452f3e32129f84fd602202537f7de..2c9a84b3e8bb455a3950dc66d5fce03e0f7e9525 100644 (file)
--- 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 cae10f202f43d29647e6d6eec8bb1b343db35555..972690067b507efcbf4b738bb6ad058faca64c2b 100644 (file)
--- 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 714844f5e7265f965fa13c6cd5ff33fac9a57892..784772c93dceddc08d770e5fae1033b7ee6916fe 100644 (file)
--- 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}" />