Changeset 1003

Show
Ignore:
Timestamp:
09/13/06 14:07:35
Author:
johnsa
Message:

added inbox and outbox status to UI in personal client

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1002 r1003  
    381381    <!-- special calendars: inbox, outbox, and trash --> 
    382382    <ul class="calendarTree"> 
    383       <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar/calendar[calType &gt; 1]" mode="myCalendars"/> 
     383      <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar/calendar[calType &gt; 1]" mode="mySpecialCalendars"/> 
    384384    </ul> 
    385385 
    …… 
    24202420 
    24212421  <xsl:template match="calendar" mode="myCalendars"> 
    2422     <!-- supress Inbox and Outbox for the moment --> 
    2423     <!--<xsl:if test="(name != 'Inbox') and (name != 'Outbox') and (name != 'Deleted')">--> 
     2422    <xsl:variable name="id" select="id"/> 
     2423    <li> 
     2424      <xsl:attribute name="class"> 
     2425        <xsl:choose> 
     2426          <xsl:when test="/bedework/selectionState/selectionType = 'calendar' 
     2427                          and path = /bedework/selectionState/subscriptions/subscription/calendar/path">selected</xsl:when> 
     2428          <xsl:when test="name='Trash'">trash</xsl:when> 
     2429          <xsl:when test="calendarCollection='false'">folder</xsl:when> 
     2430          <xsl:otherwise>calendar</xsl:otherwise> 
     2431        </xsl:choose> 
     2432      </xsl:attribute> 
     2433      <xsl:variable name="calPath" select="path"/> 
     2434      <a href="{$setSelection}&amp;calUrl={$calPath}"> 
     2435        <xsl:value-of select="name"/> 
     2436      </a> 
     2437      <xsl:if test="calendar"> 
     2438        <ul> 
     2439          <xsl:apply-templates select="calendar" mode="myCalendars"/> 
     2440        </ul> 
     2441      </xsl:if> 
     2442      <xsl:if test="calendarCollection='true'"> 
     2443        <!-- set the start date for adding an event to the first day of the 
     2444             given period, the hour of "now", and give a duration of 60 minutes --> 
     2445        <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> 
     2446        <!-- skip setting duration for now; this should be set in the user's prefs--> 
     2447        <!-- <a href="{$initEvent}&amp;startdate={$startDate}&amp;newCalPath={$calPath}&amp;minutes=60" class="calendarAdd" title="add event"> --> 
     2448        <a href="{$initEvent}&amp;startdate={$startDate}&amp;newCalPath={$calPath}" class="calendarAdd" title="add event"> 
     2449          <img src="{$resourcesRoot}/resources/addEvent-forCals-icon.gif" width="9" height="12" border="0" alt="add event"/> 
     2450        </a> 
     2451      </xsl:if> 
     2452    </li> 
     2453  </xsl:template> 
     2454 
     2455  <xsl:template match="calendar" mode="mySpecialCalendars"> 
     2456    <!-- Inbox, Outbox, Trash, etc. --> 
    24242457    <xsl:if test="name != 'Deleted'"> 
    24252458      <xsl:variable name="id" select="id"/> 
    …… 
    24362469        <xsl:variable name="calPath" select="path"/> 
    24372470        <a href="{$setSelection}&amp;calUrl={$calPath}"> 
    2438           <xsl:value-of select="name"/> 
     2471          <xsl:choose> 
     2472            <xsl:when test="name='Inbox' and /bedework/inbox/numActive != '0'"> 
     2473              <strong> 
     2474                <xsl:value-of select="name"/> 
     2475                <xsl:value-of select="/bedework/inbox/numActive"/> 
     2476              </strong> 
     2477            </xsl:when> 
     2478            <xsl:when test="name='Outbox' and /bedework/outbox/numActive != '0'"> 
     2479              <strong> 
     2480                <xsl:value-of select="name"/> 
     2481                <xsl:value-of select="/bedework/inbox/numActive"/> 
     2482              </strong> 
     2483            </xsl:when> 
     2484            <xsl:otherwise> 
     2485              <xsl:value-of select="name"/> 
     2486            </xsl:otherwise> 
     2487          </xsl:choose> 
    24392488        </a> 
    24402489        <xsl:if test="calendar"> 
    …… 
    24422491            <xsl:apply-templates select="calendar" mode="myCalendars"/> 
    24432492          </ul> 
    2444         </xsl:if> 
    2445         <xsl:if test="calendarCollection='true'"> 
    2446           <!-- set the start date for adding an event to the first day of the 
    2447                given period, the hour of "now", and give a duration of 60 minutes --> 
    2448           <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> 
    2449           <!-- skip setting duration for now; this should be set in the user's prefs--> 
    2450           <!-- <a href="{$initEvent}&amp;startdate={$startDate}&amp;newCalPath={$calPath}&amp;minutes=60" class="calendarAdd" title="add event"> --> 
    2451           <a href="{$initEvent}&amp;startdate={$startDate}&amp;newCalPath={$calPath}" class="calendarAdd" title="add event"> 
    2452             <img src="{$resourcesRoot}/resources/addEvent-forCals-icon.gif" width="9" height="12" border="0" alt="add event"/> 
    2453           </a> 
    24542493        </xsl:if> 
    24552494      </li>