From 6492721cb10ee4a8853b0803e373ff6d61d05503 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Fri, 22 Jul 2016 17:35:08 +0200
Subject: [PATCH] renamed (not finished; please cherry-pick)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland HÃ¤der <roland@mxchange.org>
---
 web/user/login_change_password.xhtml | 65 +++++++++++++---------------
 1 file changed, 30 insertions(+), 35 deletions(-)
diff --git a/web/user/login_change_password.xhtml b/web/user/login_change_password.xhtml
index dc24e90b..b275c222 100644
--- a/web/user/login_change_password.xhtml
+++ b/web/user/login_change_password.xhtml
@@ -2,10 +2,10 @@
 <html
 	lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
 	xmlns="http://www.w3.org/1999/xhtml"
-	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	  xmlns:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  >
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	>
 
 	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
 		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_CHANGE_PASSWORD}</ui:define>
@@ -34,47 +34,42 @@
 											<h:outputLabel for="userPassword" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD}" />
 										</div>
 
-					<h:form id="login_form">
-						<div class="para">
-							<fieldset id="change_password">
-								<legend title="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND_TITLE}">
-									<h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND}" />
-								</legend>
-
-								<div class="table_row">
-									<div class="table_left">
-										<h:outputLabel for="userPassword" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD}" />
-									</div>
+										<div class="table_right">
+											<h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userLoginController.userPassword}" required="true" />
+										</div>
 
-									<div class="table_right">
-										<h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userLoginController.userPassword}" required="true" />
+										<div class="clear"></div>
 									</div>
 
-									<div class="clear"></div>
-								</div>
+									<div class="table_row">
+										<div class="table_left">
+											<h:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT}" />
+										</div>
 
-								<div class="table_row">
-									<div class="table_left">
-										<h:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT}" />
-									</div>
+										<div class="table_right">
+											<h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userLoginController.userPasswordRepeat}" required="true" />
+										</div>
 
-									<div class="table_right">
-										<h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userLoginController.userPasswordRepeat}" required="true" />
+										<div class="clear"></div>
 									</div>
+								</fieldset>
+							</div>
 
-									<div class="clear"></div>
-								</div>
-							</fieldset>
-						</div>
+							<div class="table_footer">
+								<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+								<h:commandButton styleClass="submit" type="submit" id="change_password" value="#{msg.BUTTON_CHANGE_PASSWORD}" action="#{userController.doChangePassword()}" />
+							</div>
+						</h:form>
+					</div>
 
-						<ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
+					<ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
 
-				<h:outputText styleClass="errors" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
-			</ui:fragment>
+					<h:outputText styleClass="errors" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
+				</ui:fragment>
 
-			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-				<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
-			</ui:fragment>
+				<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+					<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
+				</ui:fragment>
 		</ui:define>
 	</ui:composition>
 </html>
-- 
2.39.5

