Changeset 1718

Show
Ignore:
Timestamp:
01/29/08 12:35:04
Author:
johnsa
Message:

user client: use encoded subscription names for building links

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • releases/bedework-3.4.1/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

    r1715 r1718  
    1515 
    1616  <!-- ********************************************************************** 
    17     Copyright 2007 Rensselaer Polytechnic Institute. All worldwide rights reserved. 
     17    Copyright 2008 Rensselaer Polytechnic Institute. All worldwide rights reserved. 
    1818 
    1919    Redistribution and use of this distribution in source and binary forms, 
    …… 
    10961096                 currently too confusing since the current user may be able to add events to the 
    10971097                 other calendar, making the ownership test a bad test --> 
    1098       <xsl:variable name="subname" select="subscription/name"/> 
     1098      <xsl:variable name="subname" select="subscription/encodedName"/> 
    10991099      <a href="{$subscriptions-fetchForUpdate}&amp;subname={$subname}" title="manage/view subscription"> 
    11001100        Subscription 
    …… 
    14991499                 other calendar, making the ownership test a bad test --> 
    15001500              | 
    1501               <xsl:variable name="subname" select="subscription/name"/> 
     1501              <xsl:variable name="subname" select="subscription/encodedName"/> 
    15021502              <a href="{$subscriptions-fetchForUpdate}&amp;subname={$subname}" title="manage/view subscription"> 
    15031503                <img src="{$resourcesRoot}/resources/std-ical_iconSubsDkGray.gif" width="12" height="16" border="0" alt="manage/view subscription"/> 
    …… 
    51155115        <tr> 
    51165116          <td> 
    5117             <xsl:variable name="subname" select="name"/> 
     5117            <xsl:variable name="subname" select="encodedName"/> 
    51185118            <a href="{$subscriptions-fetchForUpdate}&amp;subname={$subname}"> 
    51195119              <xsl:value-of select="name"/> 
    …… 
    51675167        </xsl:choose> 
    51685168      </xsl:attribute> 
    5169       <xsl:variable name="subName" select="name"/> 
     5169      <xsl:variable name="subname" select="encodedName"/> 
    51705170      <xsl:if test="style != '' and style != 'default'"> 
    51715171        <!-- the spacer gif approach allows us to avoid some IE misbehavior --> 
    …… 
    51805180        </xsl:when> 
    51815181        <xsl:otherwise> 
    5182           <a href="{$setSelection}&amp;subname={$subName}"> 
     5182          <a href="{$setSelection}&amp;subname={$subname}"> 
    51835183            <xsl:value-of select="name"/> 
    51845184          </a> 
    51855185        </xsl:otherwise> 
    51865186      </xsl:choose> 
    5187       <xsl:if test="calendars/calendar/calendarCollection='true' and 
    5188                     calendars/calendar/currentAccess/current-user-privilege-set/privilege/write-content"> 
    5189         <!-- set the start date for adding an event to the first day of the 
    5190              given period, the hour of "now", and give a duration of 60 minutes --> 
    5191         <xsl:variable name="calPath" select="calendars/calendar/encodedPath"/> 
    5192         <xsl:variable name="startDate"><xsl:value-of select="/bedework/firstday/date"/>T<xsl:value-of select="substring(/bedework/now/time,1,2)"/>0000</xsl:variable> 
    5193         <a href="{$initEvent}&amp;startdate={$startDate}&amp;newCalPath={$calPath}&amp;minutes=60" class="calendarAdd" title="add event"> 
    5194           <img src="{$resourcesRoot}/resources/addEvent-forCals-icon.gif" width="9" height="12" border="0" alt="add event"/> 
    5195         </a> 
    5196       </xsl:if> 
    51975187    </li> 
    51985188  </xsl:template>