Changeset 1116

Show
Ignore:
Timestamp:
12/01/06 17:10:27
Author:
johnsa
Message:

beginning to address recurrences in user client

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1115 r1116  
    12971297            </a> | 
    12981298            <xsl:choose> 
    1299               <xsl:when test="isAnnotation"> 
     1299              <xsl:when test="recurring='true'"> 
    13001300                <xsl:choose> 
    1301                   <xsl:when test="recurring=true"> 
     1301                  <xsl:when test="recurrenceId != ''"> 
    13021302                    Remove: 
    13031303                    <a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}"> 
    13041304                      <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 
    13051305                      all 
    1306                     </a> | 
     1306                    </a> 
    13071307                    <a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    13081308                      <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 
    …… 
    13191319              </xsl:when> 
    13201320              <xsl:when test="currentAccess/current-user-privilege-set/privilege/write-content"> 
    1321                 <xsl:choose> 
    1322                   <xsl:when test="recurring=true"> 
     1321                <xsl:choose> 
     1322                  <xsl:when test="recurring='true'"> 
    13231323                    Edit: 
    13241324                    <a href="{$editEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}"> 
    13251325                      <img src="{$resourcesRoot}/resources/std-ical_iconEditDkGray.gif" width="12" height="16" border="0" alt="edit"/> 
    13261326                      master event 
    1327                     </a> | 
     1327                    </a> 
    13281328                    <a href="{$editEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    13291329                      <img src="{$resourcesRoot}/resources/std-ical_iconEditDkGray.gif" width="12" height="16" border="0" alt="edit"/> 
    …… 
    13491349               | 
    13501350              <xsl:choose> 
    1351                 <xsl:when test="recurring=true"> 
     1351                <xsl:when test="recurring='true'"> 
    13521352                  <a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}"> 
    13531353                    <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 
    …… 
    13651365          </div> 
    13661366          <xsl:choose> 
    1367             <xsl:when test="recurring=true"> 
     1367            <xsl:when test="recurring='true'"> 
    13681368              Recurring Event 
    13691369            </xsl:when>