Changeset 1323

Show
Ignore:
Timestamp:
04/05/07 16:13:33
Author:
johnsa
Message:

user client: subscriptions that point at inaccessible calendars are labelled as such and link to a page explaining this state

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1321 r1323  
    121121  <xsl:variable name="subscriptions-initAdd" select="/bedework/urlPrefixes/subscriptions/initAdd/a/@href"/> 
    122122  <xsl:variable name="subscriptions-subscribe" select="/bedework/urlPrefixes/subscriptions/subscribe/a/@href"/> 
     123  <xsl:variable name="subscriptions-inaccessible" select="/bedework/urlPrefixes/subscriptions/inaccessible/a/@href"/> 
    123124  <!-- preferences --> 
    124125  <xsl:variable name="prefs-fetchForUpdate" select="/bedework/urlPrefixes/prefs/fetchForUpdate/a/@href"/> 
    …… 
    245246                                    /bedework/page='addSubByUri'"> 
    246247                      <xsl:apply-templates select="/bedework/subscriptions"/> 
     248                    </xsl:when> 
     249                    <xsl:when test="/bedework/page='subInaccessible'"> 
     250                      <xsl:call-template name="subInaccessible"/> 
    247251                    </xsl:when> 
    248252                    <xsl:when test="/bedework/page='calendarList' or 
    …… 
    48884892 
    48894893  <xsl:template match="subscription" mode="mySubscriptions"> 
    4890     <xsl:variable name="itemClass"> 
    4891       <xsl:choose> 
    4892         <xsl:when test="/bedework/selectionState/selectionType = 'subscription' 
    4893                         and /bedework/selectionState/subscriptions/subscription/name = name">selected</xsl:when> 
    4894         <xsl:otherwise>calendar</xsl:otherwise> 
    4895       </xsl:choose> 
    4896     </xsl:variable> 
    4897     <li class="{$itemClass}"> 
     4894    <li> 
     4895      <xsl:attribute name="class">  
     4896        <xsl:choose> 
     4897          <xsl:when test="/bedework/selectionState/selectionType = 'subscription' 
     4898                          and /bedework/selectionState/subscriptions/subscription/name = name">selected</xsl:when> 
     4899          <xsl:when test="calendarDeleted = 'true'">deleted</xsl:when> 
     4900          <xsl:otherwise>calendar</xsl:otherwise> 
     4901        </xsl:choose> 
     4902      </xsl:attribute> 
    48984903      <xsl:variable name="subName" select="name"/> 
    48994904      <xsl:if test="style != '' and style != 'default'"> 
    …… 
    49024907        <img src="{$resourcesRoot}/resources/spacer.gif" width="6" height="6" alt="subscription style" class="subStyle {$subStyle}"/> 
    49034908      </xsl:if> 
    4904       <a href="{$setSelection}&amp;subname={$subName}"> 
    4905         <xsl:value-of select="name"/> 
    4906       </a> 
     4909      <xsl:choose> 
     4910        <xsl:when test="calendarDeleted = 'true'"> 
     4911          <a href="{$subscriptions-inaccessible}" title="underlying calendar is inaccessible"> 
     4912            <xsl:value-of select="name"/> 
     4913          </a> 
     4914        </xsl:when> 
     4915        <xsl:otherwise> 
     4916          <a href="{$setSelection}&amp;subname={$subName}"> 
     4917            <xsl:value-of select="name"/> 
     4918          </a> 
     4919        </xsl:otherwise> 
     4920      </xsl:choose> 
    49074921      <xsl:if test="calendars/calendar/calendarCollection='true' and 
    49084922                    calendars/calendar/currentAccess/current-user-privilege-set/privilege/write-content"> 
    …… 
    49164930      </xsl:if> 
    49174931    </li> 
     4932  </xsl:template> 
     4933   
     4934  <xsl:template name="subInaccessible"> 
     4935    <h2 class="bwStatusConfirmed">Inaccessible</h2> 
     4936    <p> 
     4937      <strong>The underlying calendar is inaccessible.</strong><br/> 
     4938    </p> 
     4939    <p> 
     4940      Possible causes: 
     4941    </p> 
     4942    <ol> 
     4943      <li>Access control was changed such that you may no longer access the underlying calendar</li> 
     4944      <li>The underlying calendar was deleted</li> 
     4945    </ol>     
    49184946  </xsl:template> 
    49194947