Author: bdaw Date: 2007-05-21 09:50:47 -0400 (Mon, 21 May 2007) New Revision: 7295 Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editListRoleMembers.jsp trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editRole.jsp Log: JBPORTAL-1424 In 'Members' view the cancel link should be a button styled similarly to the "Save Changes" button, with a slight amount of spacing between the two buttons. The label "Edit role members" above the box to type a user to search for is a bit misleading. This label should be changed to "Role member". Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editListRoleMembers.jsp =================================================================== --- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editListRoleMembers.jsp 2007-05-21 13:44:21 UTC (rev 7294) +++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editListRoleMembers.jsp 2007-05-21 13:50:47 UTC (rev 7295) @@ -54,6 +54,7 @@ <br/> <form + name="<portlet:namespace/>editListRoleMembers" action="<portlet:actionURL><portlet:param name="op" value="showListEditRoleMembers"/></portlet:actionURL>" method="post"> <font class="portlet-form-label">${n:i18n("MENU_EDITROLEMEMBERS")}</font><br/> @@ -72,9 +73,17 @@ <option value="100">100</option> </select> <br/> - <input name="Find" type="submit" class="portlet-form-button" id="Find" - value="${n:i18n("Search")}"/> - <span class="portlet-font"><a - href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showSummary"/></portlet:renderURL>">${n:i18n("Cancel")}</a></span> </form> - +<form + name="<portlet:namespace/>cancelEditListRoleMembers" + action="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showSummary"/></portlet:renderURL>" + method="post"/> +<p> +<input name="Find" class="portlet-form-button" id="Save" type="submit" + onclick="document.forms['<portlet:namespace/>editListRoleMembers'].submit();" + value="${n:i18n("Search")}"/> +&nbsp; +<input name="Cancel" class="portlet-form-button" id="Cancel" type="submit" + onclick="document.forms['<portlet:namespace/>cancelEditListRoleMembers'].submit();" + value="${n:i18n("Cancel")}"/> +</p> \ No newline at end of file Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editRole.jsp =================================================================== --- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editRole.jsp 2007-05-21 13:44:21 UTC (rev 7294) +++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editRole.jsp 2007-05-21 13:50:47 UTC (rev 7295) @@ -24,11 +24,11 @@ <input name="Save" class="portlet-form-button" id="Save" type="submit" onclick="document.forms['<portlet:namespace/>editRole'].submit();" value="${n:i18n("SaveChanges")}"/> + &nbsp; <input name="Cancel" class="portlet-form-button" id="Cancel" type="submit" onclick="document.forms['<portlet:namespace/>cancelEditRole'].submit();" value="${n:i18n("Cancel")}"/> </p> - </div>