[Bedework-commit] r374 - trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default

[svnadmin at bedework.org]

Author: johnsa
Date: 2006-04-13 16:57:23 -0400 (Thu, 13 Apr 2006)
New Revision: 374

Modified:
   trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
   trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/ical.xsl
   trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/vcal.xsl
Log:
fixed event download feature in single event view

Modified: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl	2006-04-13 20:41:28 UTC (rev 373)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl	2006-04-13 20:57:23 UTC (rev 374)
@@ -1098,8 +1098,8 @@
           <xsl:if test="end/time != ''"><span class="time"><xsl:value-of select="end/time"/></span></xsl:if>
         </td>
         <th class="icon" rowspan="2">
-          <xsl:variable name="icalName" select="concat($guid,'.ics')"/>
-          <a href="{$eventView}?subid={$subscriptionId}&amp;&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$icalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
+          <xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/>
+          <a href="{$export}?subid={$subscriptionId}&amp;calid={$calendarId}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
             <img src="{$resourcesRoot}/resources/std-ical-icon.gif" width="20" height="26" border="0" align="left" alt="Download this event"/>
           </a><!-- <br />
           [<a href="">help</a>] -->

Modified: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/ical.xsl
===================================================================
--- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/ical.xsl	2006-04-13 20:41:28 UTC (rev 373)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/ical.xsl	2006-04-13 20:57:23 UTC (rev 374)
@@ -8,30 +8,8 @@
 />
 
 <xsl:strip-space elements="*"/>
-  <!-- ================= -->
-  <!--  iCAL STYLESHEET  -->
-  <!-- ================= -->
-
-  <!-- MAIN TEMPLATE -->
-  <xsl:template match="/"><xsl:apply-templates select="/ucalendar/event"/></xsl:template>
-
-  <!--==== SINGLE EVENT ====-->
-  <xsl:template match="event">BEGIN:VCALENDAR
-BEGIN:VEVENT
-ORGANIZER:<xsl:value-of select="sponsor/name"/>
-MAILTO:<xsl:value-of select="sponsor/email"/>
-DTSTART:<xsl:value-of select="start/fourdigityear"/><xsl:value-of select="start/twodigitmonth"/><xsl:value-of select="start/twodigitday"/>T<xsl:value-of select="start/twodigithour24"/><xsl:value-of select="start/twodigitminute"/>00
-DTEND:<xsl:value-of select="end/fourdigityear"/><xsl:value-of select="end/twodigitmonth"/><xsl:value-of select="end/twodigitday"/>T<xsl:choose><xsl:when test="start/time='' and end/time=''">235959</xsl:when><xsl:when test="(end/longdate = start/longdate) and (end/twodigithour24 &lt; start/twodigithour24)"><xsl:value-of select="start/twodigithour24"/><xsl:value-of select="end/twodigitminute"/>00</xsl:when><xsl:otherwise><xsl:value-of select="end/twodigithour24"/><xsl:value-of select="end/twodigitminute"/>00</xsl:otherwise></xsl:choose>
-LOCATION:<xsl:value-of select="location/address"/>
-TRANSP:OPAQUE
-SEQUENCE:0
-UID:<xsl:value-of select="startdate"/><xsl:value-of select="starttime"/>_<xsl:value-of select="id"/>@<xsl:value-of select="/ucalendar/urlprefix"/>
-DESCRIPTION:<xsl:value-of select="normalize-space(description)"/><xsl:if test="cost!=''">\nCost: <xsl:value-of select="cost"/></xsl:if><xsl:if test="sponsor/name!=''">\nSponsor: <xsl:value-of select="sponsor/name"/></xsl:if><xsl:if test="sponsor/phone!=''">\nSponsor phone: <xsl:value-of select="sponsor/phone"/></xsl:if>\n
-SUMMARY:<xsl:value-of select="summary"/>
-PRIORITY:5
-CLASS:PUBLIC
-END:VEVENT
-END:VCALENDAR
-
-  </xsl:template>
+<!-- ================= -->
+<!--  iCAL STYLESHEET  -->
+<!-- ================= -->
+<xsl:template match="/"><xsl:value-of select="/bedework/vcalendar"/></xsl:template>
 </xsl:stylesheet>

Modified: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/vcal.xsl
===================================================================
--- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/vcal.xsl	2006-04-13 20:41:28 UTC (rev 373)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/vcal.xsl	2006-04-13 20:57:23 UTC (rev 374)
@@ -8,34 +8,8 @@
 />
 
 <xsl:strip-space elements="*"/>
-  <!-- ================= -->
-  <!--  test vCAL STYLESHEET  -->
-  <!-- to produce vCal document -->
-  <!-- ================= -->
-
-  <!-- MAIN TEMPLATE -->
-  <xsl:template match="/">
-    <xsl:apply-templates select="/ucalendar/event"/>
-  </xsl:template>
-
-  <!--==== SINGLE EVENT ====-->
-  <xsl:template match="event">
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-ORGANIZER:<xsl:value-of select="sponsor/name"/>
-MAILTO:<xsl:value-of select="sponsor/email"/>
-DTSTART:<xsl:value-of select="start/fourdigityear"/><xsl:value-of select="start/twodigitmonth"/><xsl:value-of select="start/twodigitday"/>T<xsl:value-of select="start/twodigithour24"/><xsl:value-of select="start/twodigitminute"/>00
-DTEND:<xsl:value-of select="end/fourdigityear"/><xsl:value-of select="end/twodigitmonth"/><xsl:value-of select="end/twodigitday"/>T<xsl:choose><xsl:when test="start/time='' and end/time=''">235959</xsl:when><xsl:when test="(end/longdate = start/longdate) and (end/twodigithour24 &lt; start/twodigithour24)"><xsl:value-of select="start/twodigithour24"/><xsl:value-of select="end/twodigitminute"/>00</xsl:when><xsl:otherwise><xsl:value-of select="end/twodigithour24"/><xsl:value-of select="end/twodigitminute"/>00</xsl:otherwise></xsl:choose>
-LOCATION:<xsl:value-of select="location/address"/>
-TRANSP:OPAQUE
-SEQUENCE:0
-UID:<xsl:value-of select="startdate"/><xsl:value-of select="starttime"/>_<xsl:value-of select="id"/>@<xsl:value-of select="/ucalendar/urlprefix"/>
-DESCRIPTION:<xsl:value-of select="normalize-space(description)"/><xsl:if test="cost!=''">\nCost: <xsl:value-of select="cost"/></xsl:if><xsl:if test="sponsor/name!=''">\nSponsor: <xsl:value-of select="sponsor/name"/></xsl:if><xsl:if test="sponsor/phone!=''">\nSponsor phone: <xsl:value-of select="sponsor/phone"/></xsl:if>\n
-SUMMARY:<xsl:value-of select="summary"/>
-PRIORITY:5
-CLASS:PUBLIC
-END:VEVENT
-END:VCALENDAR
-
-  </xsl:template>
+<!-- ================= -->
+<!--  vCAL STYLESHEET  -->
+<!-- ================= -->
+<xsl:template match="/"><xsl:value-of select="/bedework/vcalendar"/></xsl:template>
 </xsl:stylesheet>