Changeset 385

Show
Ignore:
Timestamp:
04/19/06 14:12:02
Author:
johnsa
Message:

updates to calendar acl display

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

    r383 r385  
    21772177      </xsl:otherwise> 
    21782178    </xsl:choose> 
     2179    <xsl:variable name="id" select="id"/> 
    21792180    <form name="modCalForm" action="{$calendar-update}"> 
    21802181      <table class="common"> 
    21812182        <tr> 
    21822183          <th class="commonHeader" colspan="2"> 
     2184            <div id="eventActions"> 
     2185              key: <xsl:value-of select="id"/> 
     2186            </div> 
    21832187            <xsl:value-of select="path"/> 
    21842188          </th> 
    …… 
    22622266        </tr> 
    22632267        <tr> 
    2264           <td class="fieldName">Owner:</td> 
    2265           <td><xsl:value-of select="name(acl/ace[principal/property/owner]/grant/*)"/></td> 
    2266         </tr> 
    2267         <xsl:if test="acl/ace/principal/href"> 
     2268          <th>Owner:</th> 
     2269          <!-- NOTE: we are currently getting the acl information from the 
     2270               calendar listing NOT from the current calendar (which does not 
     2271               have the means of producing it out of the action form just now. 
     2272               We'll fix this soon. --> 
     2273          <td> 
     2274            <xsl:value-of select="name(/bedework/calendars//calendar[id=$id]/acl/ace[principal/property/owner]/grant/*)"/> 
     2275          </td> 
     2276        </tr> 
     2277        <xsl:if test="/bedework/calendars//calendar[id=$id]/acl/ace/principal/href"> 
    22682278          <tr> 
    2269             <td class="fieldName">Users:</td> 
     2279            <th>Users:</th> 
    22702280            <td> 
    2271               <xsl:for-each select="acl/ace[principal/href]"> 
     2281              <xsl:for-each select="/bedework/calendars//calendar[id=$id]/acl/ace[principal/href]"> 
    22722282                <xsl:value-of select="principal/href"/> (<xsl:value-of select="name(grant/*)"/>)<br/> 
    22732283              </xsl:for-each> 
    …… 
    22772287      </table> 
    22782288      <form name="calendarShareForm" action="{$setAccess}" id="shareForm"> 
    2279         <xsl:variable name="id" select="id"/> 
    22802289        <input type="hidden" name="calId" value="{$id}"/> 
    22812290        <p>