Changeset 1246

Show
Ignore:
Timestamp:
01/22/07 02:05:59
Author:
johnsa
Message:

user and admin clients:

- keep edit master/instance links on

overridden recurrence instances

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/deployment/webadmin/webapp/resources/default/default/default.xsl

    r1245 r1246  
    749749          <td> 
    750750            <xsl:value-of select="description"/> 
    751             <xsl:if test="recurring = 'true'"> 
     751            <xsl:if test="recurring = 'true' or recurrenceId != ''"> 
    752752              <div class="recurrenceEditLinks"> 
    753753                Recurring event. 
  • trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

    r1245 r1246  
    10111011    <xsl:if test="currentAccess/current-user-privilege-set/privilege/write-content"> 
    10121012      <xsl:choose> 
    1013         <xsl:when test="recurring='true'"> 
     1013        <xsl:when test="recurring='true' or recurrenceId != ''"> 
    10141014          Edit: 
    10151015          <a href="{$editEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}" title="edit master (recurring event)">master</a>, 
     
    10271027    <xsl:if test="not(currentAccess/current-user-privilege-set/privilege/write-content)"> 
    10281028      <xsl:choose> 
    1029         <xsl:when test="recurring='true'"> 
     1029        <xsl:when test="recurring='true' or recurrenceId != ''"> 
    10301030          Link: 
    10311031          <a href="{$addEventRef}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}" title="add master event reference to a calendar">master</a>, 
     
    10491049    </xsl:if> 
    10501050    <xsl:choose> 
    1051       <xsl:when test="recurring='true'"> 
     1051      <xsl:when test="recurring='true' or recurrenceId != ''"> 
    10521052        Delete: 
    10531053        <a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}" title="delete master (recurring event)">all</a>, 
     
    12291229            </xsl:choose><br/> 
    12301230          Type: 
    1231           <xsl:if test="recurring='true'"> 
     1231          <xsl:if test="recurring='true' or recurrenceId != ''"> 
    12321232            recurring 
    12331233          </xsl:if> 
     
    13561356              | 
    13571357              <xsl:choose> 
    1358                 <xsl:when test="recurring='true'"> 
     1358                <xsl:when test="recurring='true' or recurrenceId != ''"> 
    13591359                  <img src="{$resourcesRoot}/resources/std-ical_iconEditDkGray.gif" width="12" height="16" border="0" alt="edit master"/> 
    13601360                  Edit: 
     
    13721372              | 
    13731373              <xsl:choose> 
    1374                 <xsl:when test="recurring='true'"> 
     1374                <xsl:when test="recurring='true' or recurrenceId != ''"> 
    13751375                  <img src="{$resourcesRoot}/resources/std-ical_iconLinkDkGray.gif" width="12" height="16" border="0" alt="add event reference"/> 
    13761376                  Link: 
     
    13951395            | 
    13961396            <xsl:choose> 
    1397               <xsl:when test="recurring='true'"> 
     1397              <xsl:when test="recurring='true' or recurrenceId != ''"> 
    13981398                <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 
    13991399                Delete: 
     
    14091409          </div> 
    14101410          <!-- Display type of event --> 
    1411           <xsl:if test="recurring='true'"> 
     1411          <xsl:if test="recurring='true' or recurrenceId != ''"> 
    14121412            Recurring 
    14131413          </xsl:if> 
     
    18101810            <th colspan="2" class="commonHeader"> 
    18111811              <div id="eventActions"> 
    1812                 <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    1813                   <img src="{$resourcesRoot}/resources/glassFill-icon-viewGray.gif" width="13" height="13" border="0" alt="view"/> 
    1814                   View 
    1815                 </a> 
    1816                   | 
    1817                   <xsl:choose> 
    1818                     <xsl:when test="recurring='true'"> 
     1812                <xsl:if test="not(recurringEntity = 'true' and recurrenceId = '')"> 
     1813                  <!-- don't display if a master recurring event (because the master can't be viewed) --> 
     1814                  <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     1815                    <img src="{$resourcesRoot}/resources/glassFill-icon-viewGray.gif" width="13" height="13" border="0" alt="view"/> 
     1816                    View 
     1817                  </a> 
     1818                    | 
     1819                </xsl:if> 
     1820                <xsl:choose> 
     1821                  <xsl:when test="recurringEntity='true' or recurrenceId != ''"> 
     1822                    <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 
     1823                    Delete: 
     1824                    <a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}" title="delete master (recurring event)">all</a>,<a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="delete instance (recurring event)">instance</a> 
     1825                  </xsl:when> 
     1826                  <xsl:otherwise> 
     1827                    <a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="delete event"> 
    18191828                      <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 
    1820                       Delete: 
    1821                       <a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}" title="delete master (recurring event)">all</a>,<a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="delete instance (recurring event)">instance</a> 
    1822                     </xsl:when> 
    1823                     <xsl:otherwise> 
    1824                       <a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="delete event"> 
    1825                         <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 
    1826                         Delete 
    1827                       </a> 
    1828                     </xsl:otherwise> 
    1829                   </xsl:choose> 
     1829                      Delete 
     1830                    </a> 
     1831                  </xsl:otherwise> 
     1832                </xsl:choose> 
    18301833              </div> 
    18311834              Personal Event