Author: bdaw Date: 2007-05-21 10:25:58 -0400 (Mon, 21 May 2007) New Revision: 7296 Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.jsp trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/registerUser.jsp Log: JBPORTAL-1427 There should be a cancel button to allow you to exit without creating a user. Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.jsp =================================================================== --- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.jsp 2007-05-21 13:50:47 UTC (rev 7295) +++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.jsp 2007-05-21 14:25:58 UTC (rev 7296) @@ -7,7 +7,7 @@ <p><span class="requiredfield">*</span>&nbsp;${n:i18n("REQUIRED")}</p> <hr/> <table width="100%" cellpadding="0" cellspacing="10" border="0" class="pn-normal"> - <form name="register" + <form name="<portlet:namespace/>register" action="<portlet:actionURL><portlet:param name="op" value="userRegister"/></portlet:actionURL>" method="post"> <tr> <td colspan="3" nowrap><h4>${n:i18n("REGISTER_BASICINFO")}</h4></td> @@ -46,25 +46,40 @@ <td class="portlet-form-label" nowrap>${n:i18n("REGISTER_PASSWORDAGAIN")}<span class="requiredfield">*</span></td> <td colspan="2"><input type="password" name="pass2" size="30" maxlength="20"> - <n:error key="pass2_error"/> + <n:error key="pass2_error"/> </td> </tr> - <tr> - <td class="portlet-form-label" nowrap>${n:i18n("REGISTER_QUESTION")}</td> + <tr> + <td class="portlet-form-label" nowrap>${n:i18n("REGISTER_QUESTION")}</td> - <td class="pn-normal" colspan="2"><input type="text" name="question" value="" size="30" maxlength="100"> - </td> - </tr> - <tr> - <td class="portlet-form-label" nowrap>${n:i18n("REGISTER_ANSWER")}</td> - <td class="pn-normal" colspan="2"><input type="text" name="answer" value="" size="30" maxlength="100"> - </td> - </tr> - <tr> + <td class="pn-normal" colspan="2"><input type="text" name="question" value="" size="30" maxlength="100"> + </td> + </tr> + <tr> + <td class="portlet-form-label" nowrap>${n:i18n("REGISTER_ANSWER")}</td> + <td class="pn-normal" colspan="2"><input type="text" name="answer" value="" size="30" maxlength="100"> + </td> + </tr> + <%--<tr> <td colspan="3" class="bottombuttonbar"> <input name="register" type="submit" class="portlet-form-button" value="${n:i18n("REGISTER_NEWUSER")}"/> </td> - </tr> + </tr>--%> </form> + <form + name="<portlet:namespace/>cancel" + method="post" + action="<portlet:renderURL windowState="normal"/>"/> + <tr> + <td colspan="3" class="bottombuttonbar"> + <input name="Save" class="portlet-form-button" id="register" type="submit" + onclick="document.forms['<portlet:namespace/>register'].submit();" + value="${n:i18n("REGISTER_NEWUSER")}"/> + &nbsp; + <input name="Cancel" class="portlet-form-button" id="Cancel" type="submit" + onclick="document.forms['<portlet:namespace/>cancel'].submit();" + value="${n:i18n("Cancel")}"/> + </td> + </tr> </table> \ No newline at end of file Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/registerUser.jsp =================================================================== --- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/registerUser.jsp 2007-05-21 13:50:47 UTC (rev 7295) +++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/registerUser.jsp 2007-05-21 14:25:58 UTC (rev 7296) @@ -13,7 +13,7 @@ <p><span class="requiredfield">*</span>&nbsp;${n:i18n("REQUIRED")}</p> <hr/> <table width="100%" cellpadding="0" cellspacing="10" border="0" class="pn-normal"> - <form name="register" + <form name="<portlet:namespace/>register" action="<portlet:actionURL><portlet:param name="op" value="userRegister"/></portlet:actionURL>" method="post"> <tr> <td colspan="3" nowrap><h4>${n:i18n("REGISTER_BASICINFO")}</h4></td> @@ -56,10 +56,26 @@ </td> </tr> <tr> - <td colspan="3" class="bottombuttonbar"> + <%--<td colspan="3" class="bottombuttonbar"> <input name="register" type="submit" class="portlet-form-button" value="${n:i18n("REGISTER_NEWUSER")}"/> - </td> + </td>--%> </tr> </form> + <form + name="<portlet:namespace/>cancel" + method="post" + action="<portlet:renderURL windowState="normal"/>"/> + <tr> + <td colspan="3" class="bottombuttonbar"> + <input name="Save" class="portlet-form-button" id="register" type="submit" + onclick="document.forms['<portlet:namespace/>register'].submit();" + value="${n:i18n("REGISTER_NEWUSER")}"/> + &nbsp; + <input name="Cancel" class="portlet-form-button" id="Cancel" type="submit" + onclick="document.forms['<portlet:namespace/>cancel'].submit();" + value="${n:i18n("Cancel")}"/> + </td> + </tr> + </table> \ No newline at end of file