X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=web%2Flogin%2Flogin_change_password.xhtml;h=b2e72e11967da8ab181b065ec716688d76b4ed6a;hb=7e60c526b271393336bb22586feb10ac7f827151;hp=cae10f202f43d29647e6d6eec8bb1b343db35555;hpb=615ecfad5e478a993462d878a6a032da7c587eb0;p=jjobs-war.git

diff --git a/web/login/login_change_password.xhtml b/web/login/login_change_password.xhtml
index cae10f20..b2e72e11 100644
--- a/web/login/login_change_password.xhtml
+++ b/web/login/login_change_password.xhtml
@@ -17,30 +17,14 @@
 			<ui:fragment rendered="#{loginController.isUserLoggedIn()}">
 				<div class="table">
 					<div class="table_header">
-						#{msg.LOGIN_EDIT_PERSONAL_DATA_TITLE}
+						#{msg.LOGIN_CHANGE_PASSWORD_TITLE}
 					</div>
 
 					<h:form id="login_form">
-						<div class="table_header2">
-							#{msg.LOGIN_CHANGE_PASSWORD_TITLE}
-						</div>
-
 						<div class="para">
 							<fieldset id="change_password">
 								<legend title="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND_TITLE}">#{msg.LOGIN_CHANGE_PASSWORD_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>
-
 								<div class="table_row">
 									<div class="table_left">
 										<h:outputLabel for="password1" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD1}" />
@@ -67,16 +51,18 @@
 							</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}" />
-							<h:commandButton class="submit" type="submit" id="change_password" value="#{msg.BUTTON_CHANGE_PASSWORD}" action="#{loginController.changePassword()}" />
+							<h:commandButton class="submit" type="submit" id="change_password" value="#{msg.BUTTON_CHANGE_PASSWORD}" action="#{userController.changePassword()}" />
 						</div>
 					</h:form>
 				</div>
 			</ui:fragment>
 
 			<ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-				<ui:include id="login_only" class="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
 			</ui:fragment>
 		</ui:define>
 	</ui:composition>