Changeset 1380

Show
Ignore:
Timestamp:
05/02/07 17:01:23
Author:
douglm
Message:

Change path so includes work on the mac

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1378 r1380  
    4040 
    4141  <!-- DEFINE INCLUDES --> 
    42   <xsl:include href="/bedework-common/default/default/errors.xsl"/> 
    43   <xsl:include href="/bedework-common/default/default/messages.xsl"/> 
     42  <xsl:include href="../../../bedework-common/default/default/errors.xsl"/> 
     43  <xsl:include href="../../../bedework-common/default/default/messages.xsl"/> 
    4444 
    4545  <!-- DEFINE GLOBAL CONSTANTS --> 
    …… 
    167167      </head> 
    168168      <body> 
    169         <xsl:if test="/bedework/page!='inbox'">  
     169        <xsl:if test="/bedework/page!='inbox'"> 
    170170          <xsl:attribute name="onload">checkStatus(<xsl:value-of select="/bedework/inboxState/numActive"/>,<xsl:value-of select="/bedework/inboxState/changed"/>,'<xsl:value-of select="$showInbox"/>')</xsl:attribute> 
    171171        </xsl:if> 
    …… 
    33503350                    </a> 
    33513351                  </td> 
    3352                   <td>                                                                                                                                                                   
     3352                  <td> 
    33533353                    <a href="{$recipientUri}"> 
    33543354                      <xsl:value-of select="."/> 
    …… 
    34403440               displayMinimizeAction="true" resizable="false" 
    34413441               constrainToContainer="true"> 
    3442         You may share your free busy with a user or group  
    3443         by <a href="{$calendar-fetch}">setting  
    3444         access to "read freebusy" on calendars</a> you wish to share.   
    3445         To share all your free busy, grant  
     3442        You may share your free busy with a user or group 
     3443        by <a href="{$calendar-fetch}">setting 
     3444        access to "read freebusy" on calendars</a> you wish to share. 
     3445        To share all your free busy, grant 
    34463446        "read freebusy" access on your root folder. 
    34473447      </div> 
    …… 
    34553455      </span> 
    34563456      <div id="helpShareFreeBusy" class="helpBox invisible"> 
    3457           You may share your free busy with a user or group  
    3458           by setting access to "read freebusy" on calendars you wish to share.   
    3459           To share all your free busy, grant  
     3457          You may share your free busy with a user or group 
     3458          by setting access to "read freebusy" on calendars you wish to share. 
     3459          To share all your free busy, grant 
    34603460          "read freebusy" access on your root folder. 
    34613461      </div> 
    …… 
    49054905  <xsl:template match="subscription" mode="mySubscriptions"> 
    49064906    <li> 
    4907       <xsl:attribute name="class">  
     4907      <xsl:attribute name="class"> 
    49084908        <xsl:choose> 
    49094909          <xsl:when test="/bedework/selectionState/selectionType = 'subscription' 
    …… 
    49434943    </li> 
    49444944  </xsl:template> 
    4945    
     4945 
    49464946  <xsl:template name="subInaccessible"> 
    49474947    <h2 class="bwStatusConfirmed">Inaccessible</h2> 
    …… 
    49494949      <p> 
    49504950        <strong>This subscription cannot be displayed.</strong><br/> 
    4951         The underlying calendar  
     4951        The underlying calendar 
    49524952        is inaccessible. 
    49534953      </p> 
    …… 
    49584958        <li>Access control was changed, and you may no longer access the underlying calendar.</li> 
    49594959        <li>The underlying calendar was deleted.</li> 
    4960       </ol>     
     4960      </ol> 
    49614961    </div> 
    49624962  </xsl:template> 
    …… 
    53895389          <td> 
    53905390            <xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/> 
    5391             <a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="download"> 
     5391            <a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;&amp;eventName={$eventName}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="download"> 
    53925392              <img src="{$resourcesRoot}/resources/std-ical_icon_small.gif" width="12" height="16" border="0" alt="download"/> 
    53935393            </a> 
    53945394          </td> 
    53955395          <td> 
    5396             <a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="delete"> 
     5396            <a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;&amp;eventName={$eventName}&amp;recurrenceId={$recurrenceId}" title="delete"> 
    53975397              <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 
    53985398            </a>