[Bedework-commit] bedework r1324 - in
trunk/deployment/webuser/webapp/resources/demoskins:
default/default resources
svnadmin at bedework.org
svnadmin at bedework.org
Fri Apr 6 12:29:03 EDT 2007
Author: johnsa
Date: 2007-04-06 12:29:02 -0400 (Fri, 06 Apr 2007)
New Revision: 1324
Added:
trunk/deployment/webuser/webapp/resources/demoskins/resources/calIconSchedule-sm.gif
Modified:
trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
Log:
user client: added scheduling icon for inbox / outbox, updated inbox notification
Modified: trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl 2007-04-05 20:13:33 UTC (rev 1323)
+++ trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl 2007-04-06 16:29:02 UTC (rev 1324)
@@ -165,24 +165,25 @@
<head>
<xsl:call-template name="headSection"/>
</head>
- <xsl:variable name="inboxNumActive" select="/bedework/inboxState/numActive"/>
- <xsl:variable name="inboxChanged" select="/bedework/inboxState/changed"/>
- <body onload="checkStatus({$inboxNumActive},{$inboxChanged},'{$showInbox}')">
- <xsl:choose>
- <xsl:when test="/bedework/page='selectCalForEvent'">
- <xsl:call-template name="selectCalForEvent"/>
- </xsl:when>
- <xsl:when test="/bedework/page='rdates'">
- <xsl:call-template name="rdates"/>
- </xsl:when>
- <xsl:when test="/bedework/page='attendees'">
- <xsl:call-template name="attendees"/>
- </xsl:when>
- <xsl:when test="/bedework/page='eventAccess'">
- <xsl:call-template name="messagesAndErrors"/>
- <xsl:apply-templates select="/bedework/eventAccess"/>
- </xsl:when>
- <xsl:otherwise>
+ <body>
+ <xsl:if test="/bedework/page!='inbox'">
+ <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>
+ </xsl:if>
+ <xsl:choose>
+ <xsl:when test="/bedework/page='selectCalForEvent'">
+ <xsl:call-template name="selectCalForEvent"/>
+ </xsl:when>
+ <xsl:when test="/bedework/page='rdates'">
+ <xsl:call-template name="rdates"/>
+ </xsl:when>
+ <xsl:when test="/bedework/page='attendees'">
+ <xsl:call-template name="attendees"/>
+ </xsl:when>
+ <xsl:when test="/bedework/page='eventAccess'">
+ <xsl:call-template name="messagesAndErrors"/>
+ <xsl:apply-templates select="/bedework/eventAccess"/>
+ </xsl:when>
+ <xsl:otherwise>
<xsl:call-template name="headBar"/>
<xsl:call-template name="messagesAndErrors"/>
<table id="bodyBlock" cellspacing="0">
@@ -4933,16 +4934,20 @@
<xsl:template name="subInaccessible">
<h2 class="bwStatusConfirmed">Inaccessible</h2>
- <p>
- <strong>The underlying calendar is inaccessible.</strong><br/>
- </p>
- <p>
- Possible causes:
- </p>
- <ol>
- <li>Access control was changed such that you may no longer access the underlying calendar</li>
- <li>The underlying calendar was deleted</li>
- </ol>
+ <div class="noEventsCell">
+ <p>
+ <strong>This subscription cannot be displayed.</strong><br/>
+ The underlying calendar
+ is inaccessible.
+ </p>
+ <p>
+ Possible causes:
+ </p>
+ <ol>
+ <li>Access control was changed, and you may no longer access the underlying calendar.</li>
+ <li>The underlying calendar was deleted.</li>
+ </ol>
+ </div>
</xsl:template>
<!--==== ALARM OPTIONS ====-->
@@ -5290,6 +5295,7 @@
<h2 class="common">Inbox</h2>
<table id="inoutbox" class="common" cellspacing="0">
<tr>
+ <th class="commonHeader"> </th>
<th class="commonHeader">sent</th>
<th class="commonHeader">organizer</th>
<th class="commonHeader">title</th>
@@ -5299,6 +5305,7 @@
<th class="commonHeader">status</th>
</tr>
<xsl:for-each select="events/event">
+ <xsl:sort select="dtstamp/unformatted" order="descending"/>
<xsl:variable name="subscriptionId" select="subscription/id"/>
<xsl:variable name="calPath" select="calendar/encodedPath"/>
<xsl:variable name="eventName" select="name"/>
@@ -5321,9 +5328,16 @@
</xsl:choose>
</xsl:attribute>
<td>
- <xsl:value-of select="dtstamp/shortdate"/><xsl:text> </xsl:text><xsl:value-of select="dtstamp/time"/>
+ <a href="{$inboxItemAction}&subid={$subscriptionId}&calPath={$calPath}&eventName={$eventName}&recurrenceId={$recurrenceId}" title="check message">
+ <img src="{$resourcesRoot}/resources/calIconSchedule-sm.gif" width="13" height="13" border="0" alt="check message"/>
+ </a>
</td>
<td>
+ <a href="{$inboxItemAction}&subid={$subscriptionId}&calPath={$calPath}&eventName={$eventName}&recurrenceId={$recurrenceId}" title="check message">
+ <xsl:value-of select="dtstamp/shortdate"/><xsl:text> </xsl:text><xsl:value-of select="dtstamp/time"/>
+ </a>
+ </td>
+ <td>
<xsl:if test="organizer">
<xsl:variable name="organizerUri" select="organizer/organizerUri"/>
<xsl:choose>
@@ -5366,6 +5380,7 @@
<h2 class="common">Outbox</h2>
<table id="inoutbox" class="common" cellspacing="0">
<tr>
+ <th class="commonHeader"> </th>
<th class="commonHeader">sent</th>
<th class="commonHeader">organizer</th>
<th class="commonHeader">title</th>
@@ -5375,6 +5390,7 @@
<th class="commonHeader">status</th>
</tr>
<xsl:for-each select="events/event">
+ <xsl:sort select="dtstamp/unformatted" order="descending"/>
<xsl:variable name="subscriptionId" select="subscription/id"/>
<xsl:variable name="calPath" select="calendar/encodedPath"/>
<xsl:variable name="eventName" select="name"/>
@@ -5396,6 +5412,11 @@
</xsl:choose>
</xsl:attribute>
<td>
+ <a href="{$inboxItemAction}&subid={$subscriptionId}&calPath={$calPath}&eventName={$eventName}&recurrenceId={$recurrenceId}" title="check message">
+ <img src="{$resourcesRoot}/resources/calIconSchedule-sm.gif" width="13" height="13" border="0" alt="check message"/>
+ </a>
+ </td>
+ <td>
<xsl:value-of select="dtstamp/shortdate"/><xsl:text> </xsl:text><xsl:value-of select="dtstamp/time"/>
</td>
<td>
Added: trunk/deployment/webuser/webapp/resources/demoskins/resources/calIconSchedule-sm.gif
===================================================================
(Binary files differ)
Property changes on: trunk/deployment/webuser/webapp/resources/demoskins/resources/calIconSchedule-sm.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the Bedework-commit
mailing list