Changeset 9

Show
Ignore:
Timestamp:
01/22/06 17:08:22
Author:
johnsa
Message:

simplified authUser xml, and added prefs to user listing

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r8 r9  
    9595  <xsl:variable name="authuser-showUpdateList" select="/bedeworkadmin/urlPrefixes/authuser/showUpdateList/a/@href"/> 
    9696  <xsl:variable name="authuser-initUpdate" select="/bedeworkadmin/urlPrefixes/authuser/initUpdate/a/@href"/> 
    97   <xsl:variable name="authuser-fetchForUpdate" select="/bedeworkadmin/urlPrefixes/authuser/fetchForUpdate/a/@href"/> 
     97  <xsl:variable name="authuser-fetchForUpdate" select="/bedeworkadmin/urlPrefixes/authuser/fetchForUpdate/a/@href"/><!-- used --> 
    9898  <xsl:variable name="authuser-update" select="/bedeworkadmin/urlPrefixes/authuser/update/a/@href"/> 
    9999  <xsl:variable name="admingroup-showModForm" select="/bedeworkadmin/urlPrefixes/admingroup/showModForm/a/@href"/> 
    …… 
    18281828  <xsl:template name="authUserList"> 
    18291829    <h2>Modify Users</h2> 
    1830     <p>Click on the user that you would like to update:</p> 
    18311830 
    18321831    <table id="commonListTable"> 
    18331832      <tr> 
    1834         <th>Userid</th> 
     1833        <th>UserId</th> 
    18351834        <th>Roles</th> 
     1835        <th colspan="2">update:</th>         
    18361836      </tr> 
    18371837 
    18381838      <xsl:for-each select="bedeworkadmin/authUsers/authUser"> 
    1839         <tr> 
    1840           <td> 
    1841             <xsl:copy-of select="account/*"/> 
     1839        <xsl:sort select="account" order="ascending" case-order="upper-first"/> 
     1840        <tr> 
     1841          <td> 
     1842            <xsl:value-of select="account"/> 
    18421843          </td> 
    18431844          <td> 
    …… 
    18511852              alert; <xsl:text> </xsl:text> 
    18521853            </xsl:if> 
     1854          </td> 
     1855          <td> 
     1856            <xsl:variable name="account" select="account"/> 
     1857            <a href="{$authuser-fetchForUpdate}&amp;editAuthUserId={$account}"> 
     1858              roles 
     1859            </a> 
     1860          </td>           
     1861          <td> 
     1862            <a href=""> 
     1863              preferences 
     1864            </a> 
    18531865          </td> 
    18541866        </tr> 

  • trunk/calendar3/webadmin/war/docs/authuser/authUserList.jsp

    r2 r9  
    1515  <logic:iterate id="authUser" name="peForm" property="authUsers" > 
    1616    <authUser> 
    17       <bean:define id="account" name="authUser" property="user.account"/> 
    18       <% rpitemp="/authuser/fetchForUpdate.do?editAuthUserId=" + account;  %> 
    19       <account> 
    20         <genurl:link page="<%=rpitemp%>"> 
    21           <bean:write name="authUser" property="user.account" /> 
    22         </genurl:link> 
    23       </account> 
     17      <account><bean:write name="authUser" property="user.account" /></account> 
    2418      <superUser><bean:write name="authUser" property="superUser"/></superUser> 
    2519      <alertUser><bean:write name="authUser" property="alertUser"/></alertUser>