Changeset 8

Show
Ignore:
Timestamp:
01/22/06 11:25:24
Author:
johnsa
Message:

simplified main administrator's menu and made updates to modAuthUser cancel forward in struts-config.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/deployment/webadmin/webapp/resources/en_US/default/default.xsl

    r6 r8  
    316316          <li> 
    317317            <a href="{$authuser-initUpdate}" > 
    318               List authorised users 
     318              Manage authorised users 
    319319            </a> 
    320320          </li> 
    …… 
    322322        <xsl:if test="/bedeworkadmin/userInfo/adminGroupMaintOk='true'"> 
    323323          <li> 
    324             Admin Groups: 
    325             <a href="{$admingroup-initAdd}"> 
    326               Add 
    327             </a> | 
    328324            <a href="{$admingroup-initUpdate}"> 
    329               Edit / Delete 
     325              Manage administrative groups 
    330326            </a> 
    331327          </li> 
    332328        </xsl:if> 
    333329        <li> 
    334           <a href="{$admingroup-switch}" > 
    335             Choose group... 
     330          <a href="{$admingroup-switch}"> 
     331            Choose/change group... 
    336332          </a> 
    337333        </li> 
    …… 
    18311827  <!--+++++++++++++++ Authuser ++++++++++++++++++++--> 
    18321828  <xsl:template name="authUserList"> 
    1833  
     1829    <h2>Modify Users</h2> 
    18341830    <p>Click on the user that you would like to update:</p> 
    18351831 
    …… 
    18621858 
    18631859  <xsl:template name="modAuthUser"> 
    1864  
     1860    <h2>Update User</h2> 
    18651861    <xsl:variable name="modAuthUserAction" select="/bedeworkadmin/formElements/form/@action"/> 
    18661862    <form action="{$modAuthUserAction}" method="post"> 
    …… 
    19461942      <br /> 
    19471943 
    1948       <input type="submit" name="modAuthUser" value="Update"/> 
     1944      <input type="submit" name="modAuthUser" value="Update" class="padRight"/> 
    19491945      <input type="reset" value="Reset"/> 
     1946      <input type="submit" name="cancelled" value="Cancel"/> 
    19501947    </form> 
    19511948  </xsl:template> 
    …… 
    19531950 
    19541951  <!--+++++++++++++++ Admin Groups ++++++++++++++++++++--> 
    1955  
    19561952  <xsl:template name="listAdminGroups"> 
     1953    <h2>Modify Groups</h2> 
    19571954    <form name="adminGroupMembersForm" method="post" action="{$admingroup-initUpdate}"> 
    19581955      <xsl:choose> 
    …… 
    19741971    <p>Click on the group name to modify the group owner or description.<br/> 
    19751972    Click "add/remove members" to modify group membership.</p> 
    1976  
     1973    <p> 
     1974      <strong> 
     1975        <a href="{$admingroup-initAdd}">Add a new group</a> 
     1976      </strong> 
     1977    </p> 
    19771978    <table id="commonListTable"> 
    19781979      <tr> 
    …… 
    20352036 
    20362037  <xsl:template name="modAdminGroup"> 
    2037  
     2038    <xsl:choose> 
     2039      <xsl:when test="/bedeworkadmin/creating = 'true'"> 
     2040        <h2>Add Group</h2> 
     2041      </xsl:when> 
     2042      <xsl:otherwise> 
     2043        <h2>Modify Group</h2> 
     2044      </xsl:otherwise> 
     2045    </xsl:choose> 
    20382046    <form name="peForm" method="post" action="{$admingroup-update}"> 
    20392047      <table id="adminGroupFormTable"> 

  • trunk/calendar3/webadmin/war/WEB-INF/struts-config.xml

    r4 r8  
    747747               scope="session" 
    748748               validate="false"> 
     749      <forward name="cancelled" path="/authuser/showUpdateList.rdo" redirect="true" /> 
    749750      <forward name="continue" path="/authuser/getAuthUsers.do" redirect="true" /> 
    750751      <forward name="retry" path="/authuser/showModForm.rdo" />