[Bedework-commit] r572 - in trunk/calendar3/deployment:
webadmin/webapp/resources/default/default
webpublic/webapp/resources/demoskins/default/default
webuser/webapp/resources/demoskins/default/default
svnadmin at bedework.org
svnadmin at bedework.org
Mon Jun 12 15:45:22 EDT 2006
Author: johnsa
Date: 2006-06-12 15:45:21 -0400 (Mon, 12 Jun 2006)
New Revision: 572
Modified:
trunk/calendar3/deployment/webadmin/webapp/resources/default/default/default.xsl
trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/default.xsl
trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/jsToday.xsl
trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/soe.xsl
trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/videocal.xsl
trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
Log:
personal client: correct subscription selection to select by subscription rather than calendar
added copyright statement to root xsl docs
Modified: trunk/calendar3/deployment/webadmin/webapp/resources/default/default/default.xsl
===================================================================
--- trunk/calendar3/deployment/webadmin/webapp/resources/default/default/default.xsl 2006-06-09 21:06:43 UTC (rev 571)
+++ trunk/calendar3/deployment/webadmin/webapp/resources/default/default/default.xsl 2006-06-12 19:45:21 UTC (rev 572)
@@ -8,10 +8,36 @@
doctype-system="http://www.w3.org/TR/html4/strict.dtd"
standalone="yes"
omit-xml-declaration="yes"/>
- <!-- ======================================== -->
+
+ <!-- ======================================== -->
<!-- BEDEWORK ADMIN CLIENT STYLESHEET -->
<!-- ========================================= -->
+ <!-- **********************************************************************
+ Copyright 2006 Rensselaer Polytechnic Institute. All worldwide rights reserved.
+
+ Redistribution and use of this distribution in source and binary forms,
+ with or without modification, are permitted provided that:
+ The above copyright notice and this permission notice appear in all
+ copies and supporting documentation;
+
+ The name, identifiers, and trademarks of Rensselaer Polytechnic
+ Institute are not used in advertising or publicity without the
+ express prior written permission of Rensselaer Polytechnic Institute;
+
+ DISCLAIMER: The software is distributed" AS IS" without any express or
+ implied warranty, including but not limited to, any implied warranties
+ of merchantability or fitness for a particular purpose or any warrant)'
+ of non-infringement of any current or pending patent rights. The authors
+ of the software make no representations about the suitability of this
+ software for any particular purpose. The entire risk as to the quality
+ and performance of the software is with the user. Should the software
+ prove defective, the user assumes the cost of all necessary servicing,
+ repair or correction. In particular, neither Rensselaer Polytechnic
+ Institute, nor the authors of the software are liable for any indirect,
+ special, consequential, or incidental damages related to the software,
+ to the maximum extent the law permits. -->
+
<!-- DEFINE INCLUDES -->
<xsl:include href="errors.xsl"/>
<xsl:include href="messages.xsl"/>
Modified: trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/default.xsl 2006-06-09 21:06:43 UTC (rev 571)
+++ trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/default.xsl 2006-06-12 19:45:21 UTC (rev 572)
@@ -22,7 +22,31 @@
http://www.bedework.org/bedework/update.do?artcenterkey=24
=============================================================== -->
+<!-- **********************************************************************
+ Copyright 2006 Rensselaer Polytechnic Institute. All worldwide rights reserved.
+ Redistribution and use of this distribution in source and binary forms,
+ with or without modification, are permitted provided that:
+ The above copyright notice and this permission notice appear in all
+ copies and supporting documentation;
+
+ The name, identifiers, and trademarks of Rensselaer Polytechnic
+ Institute are not used in advertising or publicity without the
+ express prior written permission of Rensselaer Polytechnic Institute;
+
+ DISCLAIMER: The software is distributed" AS IS" without any express or
+ implied warranty, including but not limited to, any implied warranties
+ of merchantability or fitness for a particular purpose or any warrant)'
+ of non-infringement of any current or pending patent rights. The authors
+ of the software make no representations about the suitability of this
+ software for any particular purpose. The entire risk as to the quality
+ and performance of the software is with the user. Should the software
+ prove defective, the user assumes the cost of all necessary servicing,
+ repair or correction. In particular, neither Rensselaer Polytechnic
+ Institute, nor the authors of the software are liable for any indirect,
+ special, consequential, or incidental damages related to the software,
+ to the maximum extent the law permits. -->
+
<!-- ================================= -->
<!-- DEMO PUBLIC CALENDAR STYLESHEET -->
<!-- ================================= -->
Modified: trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/jsToday.xsl
===================================================================
--- trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/jsToday.xsl 2006-06-09 21:06:43 UTC (rev 571)
+++ trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/jsToday.xsl 2006-06-12 19:45:21 UTC (rev 572)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output method="html" omit-xml-declaration="yes" indent="no" media-type="text/javascript" standalone="yes"/>
+
<!-- usage: call the javascript feed from an html file by embedding the
following script tag:
<script src="http://yourservername/cal/setViewPeriod.do?viewType=todayView&skinName=jsToday&contentType=text/javascript&contentName=bedework.js" type="text/javascript"></script>
@@ -12,6 +13,32 @@
away the following line. You should modify this stylesheet if you intend
to display more than a single day's events.
-->
+
+ <!-- **********************************************************************
+ Copyright 2006 Rensselaer Polytechnic Institute. All worldwide rights reserved.
+
+ Redistribution and use of this distribution in source and binary forms,
+ with or without modification, are permitted provided that:
+ The above copyright notice and this permission notice appear in all
+ copies and supporting documentation;
+
+ The name, identifiers, and trademarks of Rensselaer Polytechnic
+ Institute are not used in advertising or publicity without the
+ express prior written permission of Rensselaer Polytechnic Institute;
+
+ DISCLAIMER: The software is distributed" AS IS" without any express or
+ implied warranty, including but not limited to, any implied warranties
+ of merchantability or fitness for a particular purpose or any warrant)'
+ of non-infringement of any current or pending patent rights. The authors
+ of the software make no representations about the suitability of this
+ software for any particular purpose. The entire risk as to the quality
+ and performance of the software is with the user. Should the software
+ prove defective, the user assumes the cost of all necessary servicing,
+ repair or correction. In particular, neither Rensselaer Polytechnic
+ Institute, nor the authors of the software are liable for any indirect,
+ special, consequential, or incidental damages related to the software,
+ to the maximum extent the law permits. -->
+
<xsl:variable name="urlprefix" select="/bedework/urlprefix"/>
<xsl:template match="/">
<xsl:text disable-output-escaping="yes">document.writeln('<h3>');</xsl:text>
Modified: trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/soe.xsl
===================================================================
--- trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/soe.xsl 2006-06-09 21:06:43 UTC (rev 571)
+++ trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/soe.xsl 2006-06-12 19:45:21 UTC (rev 572)
@@ -34,6 +34,31 @@
=============================================================== -->
+<!-- **********************************************************************
+ Copyright 2006 Rensselaer Polytechnic Institute. All worldwide rights reserved.
+
+ Redistribution and use of this distribution in source and binary forms,
+ with or without modification, are permitted provided that:
+ The above copyright notice and this permission notice appear in all
+ copies and supporting documentation;
+
+ The name, identifiers, and trademarks of Rensselaer Polytechnic
+ Institute are not used in advertising or publicity without the
+ express prior written permission of Rensselaer Polytechnic Institute;
+
+ DISCLAIMER: The software is distributed" AS IS" without any express or
+ implied warranty, including but not limited to, any implied warranties
+ of merchantability or fitness for a particular purpose or any warrant)'
+ of non-infringement of any current or pending patent rights. The authors
+ of the software make no representations about the suitability of this
+ software for any particular purpose. The entire risk as to the quality
+ and performance of the software is with the user. Should the software
+ prove defective, the user assumes the cost of all necessary servicing,
+ repair or correction. In particular, neither Rensselaer Polytechnic
+ Institute, nor the authors of the software are liable for any indirect,
+ special, consequential, or incidental damages related to the software,
+ to the maximum extent the law permits. -->
+
<!-- ================================= -->
<!-- DEMO PUBLIC CALENDAR STYLESHEET -->
<!-- ================================= -->
Modified: trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/videocal.xsl
===================================================================
--- trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/videocal.xsl 2006-06-09 21:06:43 UTC (rev 571)
+++ trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/videocal.xsl 2006-06-12 19:45:21 UTC (rev 572)
@@ -4,30 +4,56 @@
<!-- ======================= -->
<!-- VIDEO FEED STYLESHEET -->
<!-- ======================= -->
-
+
<!-- Run your browser full screen at 800 x 600 and feed this to video.
There are better approaches to this, but it's an interesting example. -->
-
+
+
+ <!-- **********************************************************************
+ Copyright 2006 Rensselaer Polytechnic Institute. All worldwide rights reserved.
+
+ Redistribution and use of this distribution in source and binary forms,
+ with or without modification, are permitted provided that:
+ The above copyright notice and this permission notice appear in all
+ copies and supporting documentation;
+
+ The name, identifiers, and trademarks of Rensselaer Polytechnic
+ Institute are not used in advertising or publicity without the
+ express prior written permission of Rensselaer Polytechnic Institute;
+
+ DISCLAIMER: The software is distributed" AS IS" without any express or
+ implied warranty, including but not limited to, any implied warranties
+ of merchantability or fitness for a particular purpose or any warrant)'
+ of non-infringement of any current or pending patent rights. The authors
+ of the software make no representations about the suitability of this
+ software for any particular purpose. The entire risk as to the quality
+ and performance of the software is with the user. Should the software
+ prove defective, the user assumes the cost of all necessary servicing,
+ repair or correction. In particular, neither Rensselaer Polytechnic
+ Institute, nor the authors of the software are liable for any indirect,
+ special, consequential, or incidental damages related to the software,
+ to the maximum extent the law permits. -->
+
<!-- DEFINE GLOBAL CONSTANTS -->
<xsl:variable name="appRoot" select="/bedework/approot"/>
<xsl:variable name="urlPrefix" select="/bedework/urlprefix"/>
<xsl:variable name="prevDate" select="/bedework/previousdate"/>
<xsl:variable name="nextDate" select="/bedework/nextdate"/>
<xsl:variable name="curDate" select="/bedework/currentdate/date"/>
-
+
<!-- Duration of each slide in seconds; set this to your preference -->
<xsl:variable name="slideDuration">10</xsl:variable>
-
- <!-- Number of consecutive days to iterate over; set this to your preference -->
+
+ <!-- Number of consecutive days to iterate over; set this to your preference -->
<xsl:variable name="dayCount">5</xsl:variable>
-
- <!-- Skin name -->
+
+ <!-- Skin name -->
<xsl:variable name="skinName">videocal</xsl:variable>
-
+
<!-- Position of the current day to be displayed -->
<xsl:variable name="day">
<xsl:choose>
- <xsl:when test="/bedework/appvar[key='day']">
+ <xsl:when test="/bedework/appvar[key='day']">
<xsl:choose>
<xsl:when test="/bedework/appvar[key='day']/value > $dayCount">1</xsl:when>
<xsl:otherwise>
@@ -38,17 +64,17 @@
<xsl:otherwise>1</xsl:otherwise>
</xsl:choose>
</xsl:variable>
-
+
<!-- Position of the next day (add 1)-->
<xsl:variable name="nextDay" select="number($day)+1"/>
-
+
<!-- Event count for the current day -->
<xsl:variable name="eventCount" select="count(/bedework/eventscalendar/year/month/week/day[date=$curDate]/event)"/>
-
+
<!-- Position of the current event being displayed -->
<xsl:variable name="event">
<xsl:choose>
- <xsl:when test="/bedework/appvar[key='event']">
+ <xsl:when test="/bedework/appvar[key='event']">
<xsl:choose>
<xsl:when test="/bedework/appvar[key='event']/value > $eventCount">1</xsl:when>
<xsl:otherwise>
@@ -59,10 +85,10 @@
<xsl:otherwise>1</xsl:otherwise>
</xsl:choose>
</xsl:variable>
-
+
<!-- Position of the next event (add 1)-->
<xsl:variable name="nextEvent" select="number($event)+1"/>
-
+
<!-- MAIN TEMPLATE -->
<xsl:template match="/">
<html lang="en">
@@ -77,7 +103,7 @@
today = now.getFullYear().toString();
if (now.getMonth() < 9) {
today += "0";
- }
+ }
today += (now.getMonth() + 1).toString();
today += now.getDate().toString();
return today;
@@ -91,9 +117,9 @@
</xsl:when>
<xsl:when test="($nextDay > $dayCount) and ($nextEvent > $eventCount)">
<!-- passed the last day, and all events have been displayed,
- so start over: go to today, set day=1 and *event=0* to allow
+ so start over: go to today, set day=1 and *event=0* to allow
for the title slide "calPlug" -->
- <meta http-equiv="refresh" content="{$slideDuration};url={$urlPrefix}/setViewPeriod.do?viewType=todayView&setappvar=event(0)&setappvar=day(1)&skinNameSticky={$skinName}&setappvar=summaryMode(details)"/>
+ <meta http-equiv="refresh" content="{$slideDuration};url={$urlPrefix}/setViewPeriod.do?viewType=todayView&setappvar=event(0)&setappvar=day(1)&skinNameSticky={$skinName}&setappvar=summaryMode(details)"/>
</xsl:when>
<xsl:when test="$nextEvent > $eventCount">
<!-- passed the last event for the day; go to the next day and set event=1 -->
@@ -101,7 +127,7 @@
</xsl:when>
<xsl:otherwise>
<!-- otherwise, go to the next event on the same day -->
- <meta http-equiv="refresh" content="{$slideDuration};url={$urlPrefix}/setup.do?viewType=dayView&setappvar=event({$nextEvent})&setappvar=day({$day})&skinNameSticky={$skinName}&setappvar=summaryMode(details)"/>
+ <meta http-equiv="refresh" content="{$slideDuration};url={$urlPrefix}/setup.do?viewType=dayView&setappvar=event({$nextEvent})&setappvar=day({$day})&skinNameSticky={$skinName}&setappvar=summaryMode(details)"/>
</xsl:otherwise>
</xsl:choose>
</head>
@@ -121,21 +147,21 @@
BEDEWORK CALENDAR OF EVENTS
</h2>
<h2 id="dayTitle">
- <xsl:value-of select="/bedework/firstday/longdate"/><!--
+ <xsl:value-of select="/bedework/firstday/longdate"/><!--
<br/>Events: <xsl:value-of select="$event"/> of <xsl:value-of select="$eventCount"/>
<br/>Days: <xsl:value-of select="$day"/> of <xsl:value-of select="$dayCount"/> -->
- </h2>
+ </h2>
<xsl:apply-templates select="/bedework/eventscalendar/year/month/week/day[date=$curDate]/event[position()=$event]"/>
</xsl:otherwise>
- </xsl:choose>
+ </xsl:choose>
<!-- remove the following two divs if used for video -->
<div id="getBack">
(<a href="setup.do?skinNameSticky=default">restore normal calendar</a>)
</div>
<div id="info">
- This stylesheet will rotate through five days of events at ten
+ This stylesheet will rotate through five days of events at ten
second intervals. It is intended as a video feed running full screen
- at 800x600px. It's settings
+ at 800x600px. It's settings
can be set from the top of
the videocal.xsl stylesheet.
</div>
@@ -163,10 +189,10 @@
<xsl:value-of select="start/time"/>
</xsl:otherwise>
</xsl:choose>
- -
+ -
<xsl:if test="end/longdate != start/longdate">
<xsl:value-of select="end/shortdate"/>
- <xsl:text> </xsl:text>
+ <xsl:text> </xsl:text>
</xsl:if>
<xsl:value-of select="end/time"/>
</div>
Modified: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl 2006-06-09 21:06:43 UTC (rev 571)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl 2006-06-12 19:45:21 UTC (rev 572)
@@ -333,7 +333,8 @@
<xsl:template name="sideBar">
<h3>
- <img alt="manage views" src="{$resourcesRoot}/resources/glassFill-icon-menuButton.gif" width="12" height="11" border="0"/> views
+ <!--<img alt="manage views" src="{$resourcesRoot}/resources/glassFill-icon-menuButton.gif" width="12" height="11" border="0"/>-->
+ views
</h3>
<ul id="myViews">
<xsl:choose>
@@ -3315,19 +3316,19 @@
<xsl:template match="subscription" mode="mySubscriptions">
<xsl:variable name="itemClass">
<xsl:choose>
- <xsl:when test="/bedework/selectionState/selectionType = 'calendar'
- and calendars/calendar/path = /bedework/selectionState/subscriptions/subscription/calendar/path">selected</xsl:when>
+ <xsl:when test="/bedework/selectionState/selectionType = 'subscription'
+ and /bedework/selectionState/subscriptions/subscription/name = name">selected</xsl:when>
<xsl:otherwise>calendar</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<li class="{$itemClass}">
- <xsl:variable name="subUri" select="uri"/>
+ <xsl:variable name="subName" select="name"/>
<xsl:if test="style != '' and style != 'default'">
<!-- the spacer gif approach allows us to avoid some IE misbehavior -->
<xsl:variable name="subStyle" select="style"/>
<img src="{$resourcesRoot}/resources/spacer.gif" width="6" height="6" alt="subscription style" class="subStyle {$subStyle}"/>
</xsl:if>
- <a href="{$setSelection}?calUrl={$subUri}">
+ <a href="{$setSelection}?subname={$subName}">
<xsl:value-of select="name"/>
</a>
<xsl:if test="calendars/calendar/calendarCollection='true' and
More information about the Bedework-commit
mailing list