Author: bdaw Date: 2007-05-21 09:30:40 -0400 (Mon, 21 May 2007) New Revision: 7293 Modified: trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editRole.jsp Log: JBPORTAL-1422 In 'Edit exisitng Role' 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. JBPORTAL-1419 In 'Edit exisitng Role' view label for role display name field should be to the left of the field with a colon after it. There should be some space between the label and field. Modified: trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties =================================================================== --- trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties 2007-05-21 12:17:37 UTC (rev 7292) +++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties 2007-05-21 13:30:40 UTC (rev 7293) @@ -300,7 +300,7 @@ MENU_CREATEROLE=Create new role MENU_EDITROLE=Edit existing role -MENU_EDITROLEMEMBERS=Edit role members +MENU_EDITROLEMEMBERS=Role member ROLE_TEXT_1=Use this portlet to create, edit, delete and add users to roles. ROLE_TEXT_2=These roles are used in the Management Portlet to set access rights. 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 12:17:37 UTC (rev 7292) +++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editRole.jsp 2007-05-21 13:30:40 UTC (rev 7293) @@ -7,21 +7,28 @@ <div> <h6>${n:i18n("MENU_EDITROLE")}: ${n:out("editroledisplayname")}</h6> - <form name="editRole" + <form name="<portlet:namespace/>editRole" action="<portlet:actionURL><portlet:param name="op" value="editRole"/></portlet:actionURL>" method="post"> <input type="hidden" name="roleid" value="${n:out("editroleid")}"/> <p> - <label class="portlet-form-label">${n:i18n("ROLE_DISPLAYNAME")}</label> - <br/> + <label class="portlet-form-label">${n:i18n("ROLE_DISPLAYNAME")}: </label> <input name="roledisplayname" type="text" value="${param["editroledisplayname"]}" size="21" maxlength="25"/> <n:error key="roledisplayname_error"/> </p> + </form> + <form name="<portlet:namespace/>cancelEditRole" + action="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showSummary"/></portlet:renderURL>" method="post"> + </form> + <p> + <input name="Save" class="portlet-form-button" id="Save" type="submit" + onclick="document.forms['<portlet:namespace/>editRole'].submit();" + value="${n:i18n("SaveChanges")}"/> + <input name="Cancel" class="portlet-form-button" id="Cancel" type="submit" + onclick="document.forms['<portlet:namespace/>cancelEditRole'].submit();" + value="${n:i18n("Cancel")}"/> + </p> - <p><input name="Save" type="submit" class="portlet-form-button" id="Save" - value="${n:i18n("SaveChanges")}"/> - <span class="portlet-font"><a - href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showSummary"/></portlet:renderURL>">${n:i18n("Cancel")}</a></span> - </p> - </form> </div> + +