Changeset 38

Show
Ignore:
Timestamp:
01/25/06 14:55:05
Author:
johnsa
Message:

added user and group icons; fixed up listing of admin group members; add and remove members interface updated

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r22 r38  
    359359  margin: 1em 0; 
    360360} 
     361#adminGroupFormTable td, 
     362#adminGroupFormTable th { 
     363  vertical-align: top; 
     364} 
     365#adminGroupFormTable td.fieldName { 
     366  color: black; 
     367  background-color: #eee; 
     368} 
    361369p.note { 
    362370  margin: 0; 

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

    r37 r38  
    20992099      </tr> 
    21002100      <xsl:for-each select="/bedeworkadmin/groups/group"> 
     2101        <xsl:sort select="name" order="ascending" case-order="upper-first"/> 
    21012102        <xsl:variable name="groupName" select="name"/> 
    21022103        <tr> 
    …… 
    21112112          <xsl:if test="/bedeworkadmin/groups/showMembers='true'"> 
    21122113            <td> 
    2113               <xsl:for-each select="members/member"> 
     2114              <xsl:for-each select="members/member/account"> 
    21142115                  <xsl:value-of select="."/>&#160; 
    21152116              </xsl:for-each> 
    …… 
    21362137 
    21372138      <xsl:for-each select="group"> 
     2139        <xsl:sort select="name" order="ascending" case-order="upper-first"/> 
    21382140        <tr> 
    21392141          <td> 
    …… 
    22282230  <xsl:template name="modAdminGroupMembers"> 
    22292231    <h2>Update Group Membership</h2> 
    2230     <p>Enter a userid and click "add" or "remove" to change group membership.</p> 
     2232    <p>Enter a userid (for user or group) and click "add" to update group membership. 
     2233    Click the trash icon to remove a user from the group.</p> 
     2234 
    22312235    <form name="adminGroupMembersForm" method="post" action="{$admingroup-updateMembers}"> 
     2236      <p>Add member: 
     2237        <input type="text" name="updGroupMember" size="15"/> 
     2238        <input type="radio" value="user" name="kind" checked="checked"/>user 
     2239        <input type="radio" value="group" name="kind"/>group 
     2240        <input type="submit" name="addGroupMember" value="Add"/> 
     2241      </p> 
     2242    </form> 
     2243 
    22322244      <table id="adminGroupFormTable"> 
    22332245        <tr> 
    …… 
    22442256          </td> 
    22452257          <td> 
    2246             <xsl:for-each select="/bedeworkadmin/adminGroup/members/member"> 
    2247               <xsl:value-of select="."/>&#160; 
    2248             </xsl:for-each> 
    2249           </td> 
    2250         </tr> 
    2251         <tr> 
    2252           <td class="fieldName"> 
    2253             Add/remove member: 
    2254           </td> 
    2255           <td> 
    2256             <input type="text" name="updGroupMember" size="15"/> 
    2257             <input type="submit" name="addGroupMember" value="Add"/> 
    2258             <input type="submit" name="removeGroupMember" value="Remove"/> 
     2258            <table id="memberAccountList"> 
     2259              <xsl:for-each select="/bedeworkadmin/adminGroup/members/member"> 
     2260                <xsl:sort select="account" order="ascending" case-order="upper-first"/> 
     2261                <tr> 
     2262                  <td> 
     2263                    <xsl:choose> 
     2264                      <xsl:when test="kind='0'"><img src="{$resourcesRoot}/resources/userIcon.gif" width="13" height="13" border="0" alt="user"/></xsl:when> 
     2265                      <xsl:when test="kind='1'"><img src="{$resourcesRoot}/resources/groupIcon.gif" width="13" height="13" border="0" alt="group"/></xsl:when> 
     2266                      <xsl:when test="kind='3'"></xsl:when> 
     2267                      <xsl:otherwise></xsl:otherwise> 
     2268                    </xsl:choose> 
     2269                  </td> 
     2270                  <td> 
     2271                    <xsl:value-of select="account"/> 
     2272                  </td> 
     2273                  <td> 
     2274                    <xsl:variable name="acct" select="account"/> 
     2275                    <a href="{$admingroup-updateMembers}&amp;removeGroupMember={$acct}" title="remove"> 
     2276                      <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="remove"/> 
     2277                    </a> 
     2278                  </td> 
     2279                </tr> 
     2280              </xsl:for-each> 
     2281            </table> 
    22592282          </td> 
    22602283        </tr> 
    22612284      </table> 
     2285      <p> 
     2286        <img src="{$resourcesRoot}/resources/userIcon.gif" width="13" height="13" border="0" alt="user"/> user, 
     2287        <img src="{$resourcesRoot}/resources/groupIcon.gif" width="13" height="13" border="0" alt="group"/> group 
     2288      </p> 
    22622289      <p><input type="button" name="return" onclick="javascript:location.replace('{$admingroup-initUpdate}')" value="Return to Admin Group listing"/></p> 
    2263     </form> 
     2290 
    22642291  </xsl:template> 
    22652292 

  • trunk/calendar3/webadmin/war/docs/admingroup/adminGroupList.jsp

    r37 r38  
    1919            <logic:iterate name="adminGroup" property="groupMembers" 
    2020                           id="member" > 
    21               <member><bean:write name="member" property="account" /></member> 
     21              <member> 
     22                <account><bean:write name="member" property="account" /></account> 
     23                <kind><bean:write name="member" property="kind" /></kind> 
     24              </member> 
    2225            </logic:iterate> 
    2326          </logic:present> 

  • trunk/calendar3/webadmin/war/docs/admingroup/displayAdminGroupCommon.jsp

    r37 r38  
    1111      <logic:iterate name="peForm" property="updAdminGroup.groupMembers" 
    1212                     id="member" > 
    13         <member><bean:write name="member" property="account" /></member> 
     13        <member> 
     14          <account><bean:write name="member" property="account" /></account> 
     15          <kind><bean:write name="member" property="kind" /></kind> 
     16        </member> 
    1417      </logic:iterate> 
    1518    </logic:present> 

  • trunk/calendar3/webadmin/war/docs/admingroup/modAdminGroupMembers.jsp

    r2 r38  
    1515      <logic:iterate name="peForm" property="updAdminGroup.groupMembers" 
    1616                     id="member" > 
    17         <member><bean:write name="member" property="account" /></member> 
     17        <member> 
     18          <account><bean:write name="member" property="account" /></account> 
     19          <kind><bean:write name="member" property="kind" /></kind> 
     20        </member> 
    1821      </logic:iterate> 
    1922    </logic:present>