Menu
▾
▴
[Hyperic-hq-discuss] hq r6994 - trunk/web/admin/user
|
From: <he...@hy...> - 2007-11-29 21:54:10
|
Author: heather Date: 2007-11-29 13:54:08 -0800 (Thu, 29 Nov 2007) New Revision: 6994 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=6994 Modified: trunk/web/admin/user/UserPasswordForm.jsp Log: HHQ-1260 - moved the error yellow box under the input fields for new password and confirm password Modified: trunk/web/admin/user/UserPasswordForm.jsp =================================================================== --- trunk/web/admin/user/UserPasswordForm.jsp 2007-11-29 18:39:30 UTC (rev 6993) +++ trunk/web/admin/user/UserPasswordForm.jsp 2007-11-29 21:54:08 UTC (rev 6994) @@ -29,8 +29,17 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. --%> + <c:set var="passwordMessagesPresent" value="false"/> + <logic:messagesPresent property="currentPassword"> + <c:set var="passwordMessagesPresent" value="true"/> + </logic:messagesPresent> + <logic:messagesPresent property="newPassword"> + <c:set var="passwordMessagesPresent" value="true"/> + </logic:messagesPresent> + <logic:messagesPresent property="confirmPassword"> + <c:set var="passwordMessagesPresent" value="true"/> + </logic:messagesPresent> - <tiles:importAttribute name="userId" ignore="true"/> <!-- GENERAL PROPERTIES CONTENTS --> @@ -52,34 +61,42 @@ <c:when test="${administrator eq false}"> <fmt:message key="admin.user.changePassword.EnterCurrent"/><br> <input type="password" size="31" maxlength="40" name="currentPassword" tabindex="3"><br> + <logic:messagesPresent property="confirmPassword"> + -<html:errors property="confirmPassword"/><br> + </logic:messagesPresent> </c:when> </c:choose> </c:if> <fmt:message key="admin.user.changePassword.EnterNew"/><br> <input type="password" size="31" maxlength="40" name="newPassword" tabindex="4"><br> + <c:if test="${passwordMessagesPresent}"> + <div class="ErrorField"> + <span class="ErrorFieldContent"> + <logic:messagesPresent property="newPassword"> + -<html:errors property="newPassword"/><br> + </logic:messagesPresent> + </div> + </c:if> <span class="CaptionText"> <fmt:message key="admin.user.changePassword.NoSpaces"/><br> <br> </span> <fmt:message key="admin.user.changePassword.ConfirmNew"/><br> - <input type="password" size="31" maxlength="40" name="confirmPassword" tabindex="5"> + <input type="password" size="31" maxlength="40" name="confirmPassword" tabindex="5"><br> + <c:if test="${passwordMessagesPresent}"> + <div class="ErrorField"> + <span class="ErrorFieldContent"> + <logic:messagesPresent property="confirmPassword"> + -<html:errors property="confirmPassword"/><br> + </logic:messagesPresent> + </div> + </c:if> </td> </tr> - <%-- we need to display the yellow box below if there are password - messages --%> - <c:set var="passwordMessagesPresent" value="false"/> - <logic:messagesPresent property="currentPassword"> - <c:set var="passwordMessagesPresent" value="true"/> - </logic:messagesPresent> - <logic:messagesPresent property="newPassword"> - <c:set var="passwordMessagesPresent" value="true"/> - </logic:messagesPresent> - <logic:messagesPresent property="confirmPassword"> - <c:set var="passwordMessagesPresent" value="true"/> - </logic:messagesPresent> - - <c:if test="${passwordMessagesPresent}"> + <%-- we need to display the yellow box below if there is a password + message for current password is incorrect --%> + <c:if test="${passwordMessagesPresent}"> <tr valign="top"> <td class="BlockLabel"> </td> <td class="ErrorField"> @@ -87,12 +104,6 @@ <logic:messagesPresent property="currentPassword"> -<html:errors property="currentPassword"/><br> </logic:messagesPresent> - <logic:messagesPresent property="newPassword"> - -<html:errors property="newPassword"/><br> - </logic:messagesPresent> - <logic:messagesPresent property="confirmPassword"> - -<html:errors property="confirmPassword"/><br> - </logic:messagesPresent> </span> </td> </tr> |