[TASK] Move change password code field to top of form

Refs #77

(cherry picked from commit 82ed044)

Author: derhansen

Resources/Private/Templates/Password/Edit.html

@@ -32,14 +32,6 @@ <h3><f:translate key="validationErrorHeader" /> </h3>
 			<f:form action="update" name="changePassword" object="{changePassword}" method="post">
 				<f:form.hidden property="changeHmac" />
 				<fieldset>
-					<f:if condition="{settings.requireCurrentPassword.enabled} == 1">
-						<div>
-							<label for="currentPassword">
-								<f:translate key="currentPassword" />
-							</label>
-							<f:form.password id="currentPassword" property="currentPassword" />
-						</div>
-					</f:if>
 					<f:if condition="{settings.requireChangePasswordCode.enabled} == 1">
 						<div>
 							<label for="changePasswordCode">
@@ -49,6 +41,14 @@ <h3><f:translate key="validationErrorHeader" /> </h3>
 							<f:link.action action="sendChangePasswordCode"><f:translate key="link.sendChangePasswordCode" /></f:link.action>
 						</div>
 					</f:if>
+					<f:if condition="{settings.requireCurrentPassword.enabled} == 1">
+						<div>
+							<label for="currentPassword">
+								<f:translate key="currentPassword" />
+							</label>
+							<f:form.password id="currentPassword" property="currentPassword" />
+						</div>
+					</f:if>
 					<div>
 						<label for="password1">
 							<f:translate key="password" />