Changeset 81

Show
Ignore:
Timestamp:
02/03/06 16:36:50
Author:
johnsa
Message:

updated ical download in public stylsheet to work with new export action
modified ical and vcal skins to use new export data

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/deployment/webadmin/webapp/resources/default/default/default.xsl

    r67 r81  
    19031903  <xsl:template name="modSyspars"> 
    19041904    <h2>Modify System Parameters</h2> 
    1905     <p>Do not change unless you know what you're doing.  Changes to these 
    1906        parameters have wide impact on the system.</p> 
     1905    <p> 
     1906      Do not change unless you know what you're doing.<br/> 
     1907      Changes to these parameters have wide impact on the system. 
     1908    </p> 
    19071909    <form name="systemParamsForm" action="{$system-update}" method="post"> 
    19081910      <table class="eventFormTable"> 

  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/default.xsl

    r77 r81  
    5656  <xsl:variable name="eventView" select="/ucalendar/urlPrefixes/eventView"/> 
    5757  <xsl:variable name="addEventRef" select="/ucalendar/urlPrefixes/addEventRef"/> 
     58  <xsl:variable name="export" select="/ucalendar/urlPrefixes/export"/> 
    5859  <xsl:variable name="mailEvent" select="/ucalendar/urlPrefixes/mailEvent"/> 
    5960  <xsl:variable name="showPage" select="/ucalendar/urlPrefixes/showPage"/> 
    …… 
    206207          </a> 
    207208          <xsl:variable name="eventIcalName" select="concat($id,'.ics')"/> 
    208           <a href="{$eventView}?subid={$subscriptionId}&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"> 
     209          <a href="{$export}?subid={$subscriptionId}&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"> 
    209210            <img src="{$resourcesRoot}/images/demo/std-ical_icon.gif" width="20" height="26" border="0" alt="Download this event"/> 
    210211          </a> 
    …… 
    760761          <xsl:variable name="icalName" 
    761762                        select="concat('ucal',$curdate,/ucalendar/periodname,$calcategory,'.ics')"/> 
    762           <a class="rss" href="{$setup}?nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$icalName}" title="Download all events in current view as iCal - for multiple events, save to disk and import">iCal</a> 
     763          <a class="rss" href="{$export}?nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$icalName}" title="Download all events in current view as iCal - for multiple events, save to disk and import">iCal</a> 
    763764        </td> 
    764765      </tr> 

  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/ical.xsl

    r2 r81  
    1212<!--  iCAL STYLESHEET  --> 
    1313<!-- ================= --> 
    14 <xsl:template match="/">BEGIN:VCALENDAR<xsl:apply-templates select="/ucalendar//event"/>END:VCALENDAR</xsl:template> 
    15 <xsl:template match="event"> 
    16 BEGIN:VEVENT 
    17 ORGANIZER:<xsl:value-of select="sponsor/name"/> 
    18 MAILTO:<xsl:value-of select="sponsor/email"/> 
    19 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 
    20 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> 
    21 LOCATION:<xsl:value-of select="location/address"/> 
    22 TRANSP:OPAQUE 
    23 SEQUENCE:0 
    24 UID:<xsl:value-of select="startdate"/><xsl:value-of select="starttime"/>_<xsl:value-of select="id"/>@<xsl:value-of select="/ucalendar/urlprefix"/> 
    25 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 
    26 SUMMARY:<xsl:value-of select="summary"/> 
    27 PRIORITY:5 
    28 CLASS:PUBLIC 
    29 CATEGORIES:<xsl:choose><xsl:when test="/ucalendar/title!=''">edu.rpi.maincalendar.<xsl:value-of select="/ucalendar/title"/></xsl:when><xsl:otherwise>edu.rpi.maincalendar</xsl:otherwise></xsl:choose> 
    30 END:VEVENT 
    31 </xsl:template> 
     14<xsl:template match="/"><xsl:value-of select="/ucalendar/vcalendar"/></xsl:template> 
    3215</xsl:stylesheet> 

  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/vcal.xsl

    r2 r81  
    1212<!--  vCAL STYLESHEET  --> 
    1313<!-- ================= --> 
    14 <xsl:template match="/">BEGIN:VCALENDAR<xsl:apply-templates select="/ucalendar//event"/>END:VCALENDAR</xsl:template> 
    15 <xsl:template match="event"> 
    16 BEGIN:VEVENT 
    17 ORGANIZER:<xsl:value-of select="sponsor/name"/> 
    18 MAILTO:<xsl:value-of select="sponsor/email"/> 
    19 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 
    20 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> 
    21 LOCATION:<xsl:value-of select="location/address"/> 
    22 TRANSP:OPAQUE 
    23 SEQUENCE:0 
    24 UID:<xsl:value-of select="startdate"/><xsl:value-of select="starttime"/>_<xsl:value-of select="id"/>@<xsl:value-of select="/ucalendar/urlprefix"/> 
    25 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 
    26 SUMMARY:<xsl:value-of select="summary"/> 
    27 PRIORITY:5 
    28 CLASS:PUBLIC 
    29 CATEGORIES:<xsl:choose><xsl:when test="/ucalendar/title!=''">edu.rpi.maincalendar.<xsl:value-of select="/ucalendar/title"/></xsl:when><xsl:otherwise>edu.rpi.maincalendar</xsl:otherwise></xsl:choose> 
    30 END:VEVENT 
    31 </xsl:template> 
     14<xsl:template match="/"><xsl:value-of select="/ucalendar/vcalendar"/></xsl:template> 
    3215</xsl:stylesheet> 

  • trunk/calendar3/webclient/war/docs/exportData.jsp

    r79 r81  
    1313 
    1414<logic:present name="calForm" property="vcal" > 
    15 <vcalendar>![CDATA[<bean:write name="calForm" property="vcal" />]]</vcalendar> 
     15<vcalendar><![CDATA[<bean:write name="calForm" property="vcal" /> 
     16]]> 
     17</vcalendar> 
    1618</logic:present> 
    1719 

  • trunk/calendar3/webclient/war/docs/header.jsp

    r76 r81  
    148148    <delLocation><genurl:rewrite action="delLocation.do"/></delLocation> 
    149149    <subscribe><genurl:rewrite action="subscribe.do"/></subscribe> 
     150    <export><genurl:rewrite action="export.do"/></export> 
    150151 
    151152    <initEventAlarm><genurl:rewrite action="initEventAlarm.do"/></initEventAlarm>