Changeset 1324

Show
Ignore:
Timestamp:
04/06/07 12:29:02
Author:
johnsa
Message:

user client: added scheduling icon for inbox / outbox, updated inbox notification

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1323 r1324  
    166166        <xsl:call-template name="headSection"/> 
    167167      </head> 
    168       <xsl:variable name="inboxNumActive" select="/bedework/inboxState/numActive"/> 
    169       <xsl:variable name="inboxChanged" select="/bedework/inboxState/changed"/> 
    170       <body onload="checkStatus({$inboxNumActive},{$inboxChanged},'{$showInbox}')"> 
    171       <xsl:choose> 
    172         <xsl:when test="/bedework/page='selectCalForEvent'"> 
    173           <xsl:call-template name="selectCalForEvent"/> 
    174         </xsl:when> 
    175         <xsl:when test="/bedework/page='rdates'"> 
    176           <xsl:call-template name="rdates"/> 
    177         </xsl:when> 
    178         <xsl:when test="/bedework/page='attendees'"> 
    179           <xsl:call-template name="attendees"/> 
    180         </xsl:when> 
    181         <xsl:when test="/bedework/page='eventAccess'"> 
    182           <xsl:call-template name="messagesAndErrors"/> 
    183           <xsl:apply-templates select="/bedework/eventAccess"/> 
    184         </xsl:when> 
    185         <xsl:otherwise> 
     168      <body> 
     169        <xsl:if test="/bedework/page!='inbox'">  
     170          <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> 
     171        </xsl:if> 
     172        <xsl:choose> 
     173          <xsl:when test="/bedework/page='selectCalForEvent'"> 
     174            <xsl:call-template name="selectCalForEvent"/> 
     175          </xsl:when> 
     176          <xsl:when test="/bedework/page='rdates'"> 
     177            <xsl:call-template name="rdates"/> 
     178          </xsl:when> 
     179          <xsl:when test="/bedework/page='attendees'"> 
     180            <xsl:call-template name="attendees"/> 
     181          </xsl:when> 
     182          <xsl:when test="/bedework/page='eventAccess'"> 
     183            <xsl:call-template name="messagesAndErrors"/> 
     184            <xsl:apply-templates select="/bedework/eventAccess"/> 
     185          </xsl:when> 
     186          <xsl:otherwise> 
    186187            <xsl:call-template name="headBar"/> 
    187188            <xsl:call-template name="messagesAndErrors"/> 
    …… 
    49344935  <xsl:template name="subInaccessible"> 
    49354936    <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>     
     4937    <div class="noEventsCell"> 
     4938      <p> 
     4939        <strong>This subscription cannot be displayed.</strong><br/> 
     4940        The underlying calendar  
     4941        is inaccessible. 
     4942      </p> 
     4943      <p> 
     4944        Possible causes: 
     4945      </p> 
     4946      <ol> 
     4947        <li>Access control was changed, and you may no longer access the underlying calendar.</li> 
     4948        <li>The underlying calendar was deleted.</li> 
     4949      </ol>     
     4950    </div> 
    49464951  </xsl:template> 
    49474952 
    …… 
    52915296    <table id="inoutbox" class="common" cellspacing="0"> 
    52925297      <tr> 
     5298        <th class="commonHeader">&#160;</th> 
    52935299        <th class="commonHeader">sent</th> 
    52945300        <th class="commonHeader">organizer</th> 
    …… 
    53005306      </tr> 
    53015307      <xsl:for-each select="events/event"> 
     5308        <xsl:sort select="dtstamp/unformatted" order="descending"/> 
    53025309        <xsl:variable name="subscriptionId" select="subscription/id"/> 
    53035310        <xsl:variable name="calPath" select="calendar/encodedPath"/> 
    …… 
    53225329          </xsl:attribute> 
    53235330          <td> 
    5324             <xsl:value-of select="dtstamp/shortdate"/><xsl:text> </xsl:text><xsl:value-of select="dtstamp/time"/> 
     5331            <a href="{$inboxItemAction}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;eventName={$eventName}&amp;recurrenceId={$recurrenceId}" title="check message"> 
     5332              <img src="{$resourcesRoot}/resources/calIconSchedule-sm.gif" width="13" height="13" border="0" alt="check message"/> 
     5333            </a> 
     5334          </td> 
     5335          <td> 
     5336            <a href="{$inboxItemAction}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;eventName={$eventName}&amp;recurrenceId={$recurrenceId}" title="check message"> 
     5337              <xsl:value-of select="dtstamp/shortdate"/><xsl:text> </xsl:text><xsl:value-of select="dtstamp/time"/> 
     5338            </a> 
    53255339          </td> 
    53265340          <td> 
    …… 
    53675381    <table id="inoutbox" class="common" cellspacing="0"> 
    53685382      <tr> 
     5383        <th class="commonHeader">&#160;</th> 
    53695384        <th class="commonHeader">sent</th> 
    53705385        <th class="commonHeader">organizer</th> 
    …… 
    53765391      </tr> 
    53775392      <xsl:for-each select="events/event"> 
     5393        <xsl:sort select="dtstamp/unformatted" order="descending"/> 
    53785394        <xsl:variable name="subscriptionId" select="subscription/id"/> 
    53795395        <xsl:variable name="calPath" select="calendar/encodedPath"/> 
    …… 
    53965412            </xsl:choose> 
    53975413          </xsl:attribute> 
     5414          <td> 
     5415            <a href="{$inboxItemAction}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;eventName={$eventName}&amp;recurrenceId={$recurrenceId}" title="check message"> 
     5416              <img src="{$resourcesRoot}/resources/calIconSchedule-sm.gif" width="13" height="13" border="0" alt="check message"/> 
     5417            </a> 
     5418          </td> 
    53985419          <td> 
    53995420            <xsl:value-of select="dtstamp/shortdate"/><xsl:text> </xsl:text><xsl:value-of select="dtstamp/time"/>