Changeset 2173

Show
Ignore:
Timestamp:
05/14/09 17:25:59
Author:
johnsa
Message:

remove remaining references to subscriptionId from xsl
admin client: set list of xprops to retain on publish
submissions client: clean up some form elements

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/deployment/resources/javascript/bedework/bedeworkXProperties.js

    r2172 r2173  
    4040var bwXPropertySubmitComment = "X-BEDEWORK-SUBMIT-COMMENT"; 
    4141var bwXPropertySubmitStatus = "X-BEDEWORK-SUBMIT-STATUS"; 
    42 var bwXPropertySubmitterEmail = "X-BEDEWORK-SUBMITTER-EMAIL"; 
    4342var bwXPropertySubmitterEmail = "X-BEDEWORK-SUBMITTER-EMAIL"; 
    4443var bwXPropertySubmissionClaimant = "X-BEDEWORK-SUBMISSION-CLAIMANT"; 

  • trunk/deployment/webadmin/portlet/resources/default/default/default.xsl

    r1979 r2173  
    976976 
    977977      <xsl:for-each select="/bedework/events/event"> 
    978         <xsl:variable name="subscriptionId" select="subscription/id"/> 
    979978        <xsl:variable name="calPath" select="calendar/encodedPath"/> 
    980979        <xsl:variable name="guid" select="guid"/> 
    …… 
    984983            <xsl:choose> 
    985984              <xsl:when test="$pending = 'true'"> 
    986                 <a href="{$event-fetchForUpdatePending}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     985                <a href="{$event-fetchForUpdatePending}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    987986                  <xsl:choose> 
    988987                    <xsl:when test="summary != ''"> 
    …… 
    996995              </xsl:when> 
    997996              <xsl:otherwise> 
    998                 <a href="{$event-fetchForUpdate}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     997                <a href="{$event-fetchForUpdate}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    999998                  <xsl:choose> 
    1000999                    <xsl:when test="summary != ''"> 
    …… 
    10371036                Recurring event. 
    10381037                Edit: 
    1039                 <a href="{$event-fetchForUpdate}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}"> 
     1038                <a href="{$event-fetchForUpdate}&amp;calPath={$calPath}&amp;guid={$guid}"> 
    10401039                  master 
    10411040                </a> | 
    1042                 <a href="{$event-fetchForUpdate}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     1041                <a href="{$event-fetchForUpdate}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    10431042                  instance 
    10441043                </a> 
    …… 
    10521051 
    10531052  <xsl:template match="formElements" mode="modEvent"> 
    1054     <xsl:variable name="subscriptionId" select="subscriptionId"/> 
    10551053    <xsl:variable name="calPathEncoded" select="form/calendar/encodedPath"/> 
    10561054    <xsl:variable name="calPath" select="form/calendar/path"/> 
    …… 
    14951493                     so provide access to master event --> 
    14961494                <em>This event is a recurrence instance.</em><br/> 
    1497                 <a href="{$event-fetchForUpdate}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}" title="edit master (recurring event)">edit master event</a> 
     1495                <a href="{$event-fetchForUpdate}&amp;calPath={$calPath}&amp;guid={$guid}" title="edit master (recurring event)">edit master event</a> 
    14981496              </xsl:when> 
    14991497              <xsl:otherwise> 
    …… 
    64226420      </xsl:if> 
    64236421      <xsl:for-each select="/bedework/searchResults/searchResult"> 
    6424         <xsl:variable name="subscriptionId" select="event/subscription/id"/> 
    64256422        <xsl:variable name="calPath" select="event/calendar/encodedPath"/> 
    64266423        <xsl:variable name="guid" select="event/guid"/> 
    …… 
    64346431          </td> 
    64356432          <td> 
    6436             <a href="{$event-fetchForDisplay}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     6433            <a href="{$event-fetchForDisplay}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    64376434              <xsl:value-of select="event/summary"/> 
    64386435            </a> 

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

    r2172 r2173  
    988988    <xsl:variable name="recurrenceId" select="recurrenceId"/> 
    989989    <tr> 
    990       <xsl:if test="not(xproperties/X-BEDEWORK-SUBMISSION-CLAIMANT)"> 
     990      <xsl:if test="$pending = 'true' and not(xproperties/X-BEDEWORK-SUBMISSION-CLAIMANT)"> 
    991991        <xsl:attribute name="class">highlight</xsl:attribute> 
    992992      </xsl:if> 
    …… 
    26802680              <input type="submit" name="updateSubmitEvent" value="Update Event"/> 
    26812681              <input type="submit" name="publishEvent" value="Publish Event"> 
    2682                 <xsl:attribute name="onclick">doPublishEvent('<xsl:value-of select="form/calendar/all/select/option/@value"/>','<xsl:value-of select="$eventTitle"/>','<xsl:value-of select="$eventUrlPrefix"/>');</xsl:attribute> 
     2682                <xsl:attribute name="onclick">doPublishEvent('<xsl:value-of select="form/calendar/all/select/option/@value"/>','<xsl:value-of select="$eventTitle"/>','<xsl:value-of select="$eventUrlPrefix"/>',this.form);</xsl:attribute> 
    26832683              </input> 
    26842684              <input type="submit" name="cancelled" value="Cancel"/> 

  • trunk/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js

    r2172 r2173  
    717717} 
    718718 
    719 function doPublishEvent(publishingCal,eventTitle,eventUrlPrefix) { 
     719function doPublishEvent(publishingCal,eventTitle,eventUrlPrefix,formObj) { 
    720720  // User has submitted the event when there is only a single publishing calendar. 
    721721  // Update the newCalPath to reflect the publishing calendar: 
    …… 
    733733  sntext = document.getElementById("sntext"); 
    734734  sntext.value = "Your event has been approved and is now published.\n\nEVENT DETAILS\n-------------\n\nTitle: " + eventTitle + "\nURL: " + eventUrlPrefix + "&" + publishingCal; 
     735 
     736  // Send the names of xproperties we wish to retain after we publish. 
     737  // Those not listed will be thrown away 
     738  // but must first be passed to the backend for use 
     739  // (e.g. the email address of the submitter). 
     740  var xpropPreserve = [bwXPropertyAlias, bwXPropertyImage, bwXPropertySubmittedBy]; 
     741 
     742  for (var i = 0; i < xpropPreserve.length; i++) { 
     743    var xpropPreserveField = document.createElement("input"); 
     744    xpropPreserveField.type = "hidden"; // change type prior to appending to DOM 
     745    formObj.appendChild(xpropPreserveField); 
     746    xpropPreserveField.name = "xprop-preserve"; 
     747    xpropPreserveField.value = xpropPreserve[i]; 
     748  } 
    735749} 
    736750 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/PDA/default.xsl

    r2057 r2173  
    202202  <!--==== SINGLE EVENT ====--> 
    203203  <xsl:template match="event"> 
    204     <xsl:variable name="subscriptionId" select="subscription/id"/> 
    205204    <xsl:variable name="calPath" select="calendar/encodedPath"/> 
    206205    <xsl:variable name="guid" select="guid"/> 
    …… 
    357356        <th class="icalIcon" rowspan="2"> 
    358357          <div id="eventIcons"> 
    359             <!--<a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 
     358            <!--<a href="{$privateCal}/event/addEventRef.do?calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 
    360359              <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon.gif" width="20" height="26" border="0" alt="Add event to MyCalendar"/> 
    361360            add to my calendar</a>--> 
    362361            <!--<xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/> 
    363             <a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&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"> 
     362            <a href="{$export}&amp;calPath={$calPath}&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"> 
    364363              <img src="{$resourcesRoot}/images/std-ical_icon.gif" width="20" height="26" border="0" alt="Download this event"/> 
    365364             download</a>--> 
    …… 
    493492            <xsl:for-each select="event"> 
    494493              <xsl:variable name="id" select="id"/> 
    495               <xsl:variable name="subscriptionId" select="subscription/id"/> 
    496494              <xsl:variable name="calPath" select="calendar/encodedPath"/> 
    497495              <xsl:variable name="guid" select="guid"/> 
    …… 
    551549                  <xsl:choose> 
    552550                    <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'"> 
    553                       <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     551                      <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    554552                        <strong> 
    555553                          <xsl:value-of select="summary"/>: 
    …… 
    576574                    </xsl:when> 
    577575                    <xsl:otherwise> 
    578                       <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     576                      <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    579577                        <xsl:value-of select="summary"/> 
    580578                      </a> 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/js-list.xsl

    r1741 r2173  
    7474    <!-- finally, produce the javascript --> 
    7575    <xsl:text disable-output-escaping="yes">document.writeln('&lt;li&gt;');</xsl:text> 
    76     <xsl:text disable-output-escaping="yes">document.writeln('    &lt;a href="</xsl:text><xsl:value-of select="$urlprefix"/><xsl:text disable-output-escaping="yes">/event/eventView.do?subid=</xsl:text><xsl:value-of select="subscription/id"/><xsl:text disable-output-escaping="yes">&amp;guid=</xsl:text><xsl:value-of select="guid"/><xsl:text disable-output-escaping="yes">&amp;recurrenceId=</xsl:text><xsl:value-of select="recurrenceId"/><xsl:text disable-output-escaping="yes">&amp;calPath=</xsl:text><xsl:value-of select="calendar/encodedPath"/><xsl:text disable-output-escaping="yes">&amp;skinName=default" target="_top"</xsl:text><xsl:if test="status = 'CANCELLED'"> class="cancelled" </xsl:if><xsl:text disable-output-escaping="yes">&gt;</xsl:text><xsl:if test="status = 'CANCELLED'">CANCELLED: </xsl:if><xsl:value-of select="$strippedSummary" disable-output-escaping="yes"/><xsl:text disable-output-escaping="yes">&lt;/a&gt;');</xsl:text> 
     76    <xsl:text disable-output-escaping="yes">document.writeln('    &lt;a href="</xsl:text><xsl:value-of select="$urlprefix"/><xsl:text disable-output-escaping="yes">/event/eventView.do?guid=</xsl:text><xsl:value-of select="guid"/><xsl:text disable-output-escaping="yes">&amp;recurrenceId=</xsl:text><xsl:value-of select="recurrenceId"/><xsl:text disable-output-escaping="yes">&amp;calPath=</xsl:text><xsl:value-of select="calendar/encodedPath"/><xsl:text disable-output-escaping="yes">&amp;skinName=default" target="_top"</xsl:text><xsl:if test="status = 'CANCELLED'"> class="cancelled" </xsl:if><xsl:text disable-output-escaping="yes">&gt;</xsl:text><xsl:if test="status = 'CANCELLED'">CANCELLED: </xsl:if><xsl:value-of select="$strippedSummary" disable-output-escaping="yes"/><xsl:text disable-output-escaping="yes">&lt;/a&gt;');</xsl:text> 
    7777    <xsl:text disable-output-escaping="yes">document.writeln('&lt;/li&gt;');</xsl:text> 
    7878  </xsl:template> 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/jsToday.xsl

    r1741 r2173  
    7474    <!-- finally, produce the javascript --> 
    7575    <xsl:text disable-output-escaping="yes">document.writeln('&lt;li&gt;');</xsl:text> 
    76     <xsl:text disable-output-escaping="yes">document.writeln('    &lt;a href="</xsl:text><xsl:value-of select="$urlprefix"/><xsl:text disable-output-escaping="yes">/event/eventView.do?subid=</xsl:text><xsl:value-of select="subscription/id"/><xsl:text disable-output-escaping="yes">&amp;guid=</xsl:text><xsl:value-of select="guid"/><xsl:text disable-output-escaping="yes">&amp;recurrenceId=</xsl:text><xsl:value-of select="recurrenceId"/><xsl:text disable-output-escaping="yes">&amp;calPath=</xsl:text><xsl:value-of select="calendar/encodedPath"/><xsl:text disable-output-escaping="yes">&amp;skinName=default" target="_top"</xsl:text><xsl:if test="status = 'CANCELLED'"> class="cancelled" </xsl:if><xsl:text disable-output-escaping="yes">&gt;</xsl:text><xsl:if test="status = 'CANCELLED'">CANCELLED: </xsl:if><xsl:value-of select="$strippedSummary" disable-output-escaping="yes"/><xsl:text disable-output-escaping="yes">&lt;/a&gt;');</xsl:text> 
     76    <xsl:text disable-output-escaping="yes">document.writeln('    &lt;a href="</xsl:text><xsl:value-of select="$urlprefix"/><xsl:text disable-output-escaping="yes">/event/eventView.do?guid=</xsl:text><xsl:value-of select="guid"/><xsl:text disable-output-escaping="yes">&amp;recurrenceId=</xsl:text><xsl:value-of select="recurrenceId"/><xsl:text disable-output-escaping="yes">&amp;calPath=</xsl:text><xsl:value-of select="calendar/encodedPath"/><xsl:text disable-output-escaping="yes">&amp;skinName=default" target="_top"</xsl:text><xsl:if test="status = 'CANCELLED'"> class="cancelled" </xsl:if><xsl:text disable-output-escaping="yes">&gt;</xsl:text><xsl:if test="status = 'CANCELLED'">CANCELLED: </xsl:if><xsl:value-of select="$strippedSummary" disable-output-escaping="yes"/><xsl:text disable-output-escaping="yes">&lt;/a&gt;');</xsl:text> 
    7777    <xsl:text disable-output-escaping="yes">document.writeln('&lt;/li&gt;');</xsl:text> 
    7878  </xsl:template> 
    79    
     79 
    8080  <xsl:template name="replace"> 
    8181    <xsl:param name="string" select="''"/> 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/json-list-src.xsl

    r2136 r2173  
    55       Bedework v3.4.x, Arlen Johnson 
    66 
    7        Purpose: produces an array of javascript objects representing events.  
     7       Purpose: produces an array of javascript objects representing events. 
    88 
    99       Usage: call the JSON feed from an html file by embedding a script tag. 
    1010       Examples: 
    11         
     11 
    1212       The next four days (max days = 31): 
    1313       <script src="http://localhost:8080/cal/main/listEvents.do?days=4&skinName=json-list-src" type="text/javascript"></script> 
    14         
     14 
    1515       A range of dates: 
    1616       <script src="http://localhost:8080/cal/main/listEvents.do?start=2008-10-03&end=2008-11-02&skinName=json-list-src" type="text/javascript"></script> 
    …… 
    1818       The next ten days limited by category (you can append as many categories as you like): 
    1919       <script src="http://localhost:8080/cal/main/listEvents.do?days=10&cat=Concerts&skinName=json-list-src" type="text/javascript"></script> 
    20         
    21        Filters: Arbitrary filters can be sent to this stylesheet using the query  
    22        parameter "setappvar=filter(somekey:somevalue)".  Group (creator) and  
    23        location filters are included here, but you can add more under line 82.  
    24         
     20 
     21       Filters: Arbitrary filters can be sent to this stylesheet using the query 
     22       parameter "setappvar=filter(somekey:somevalue)".  Group (creator) and 
     23       location filters are included here, but you can add more under line 82. 
     24 
    2525       The next ten days filtered by a group (creator): 
    2626       <script src="http://localhost:8080/cal/main/listEvents.do?days=10&setappvar=filter(creator:agrp_Library)&skinName=json-list-src" type="text/javascript"></script> 
    27         
    28        Object name: The json object name can be passed by adding  
    29        "setappvar=objName(myobjname)" to the query string, allowing multiple  
    30        json object calls on the same html page.  If objName is not supplied,  
     27 
     28       Object name: The json object name can be passed by adding 
     29       "setappvar=objName(myobjname)" to the query string, allowing multiple 
     30       json object calls on the same html page.  If objName is not supplied, 
    3131       the default name is "bwObject".  e.g.: 
    3232       <script src="http://localhost:8080/cal/main/listEvents.do?days=4&setappvar(objName=myobj)&skinName=json-list-src" type="text/javascript"></script> 
    …… 
    6262       by all stylesheets: --> 
    6363  <xsl:include href="../../../bedework-common/default/default/util.xsl"/> 
    64    
     64 
    6565  <xsl:variable name="urlprefix" select="/bedework/urlprefix"/> 
    6666  <xsl:variable name="eventView" select="/bedework/urlPrefixes/event/eventView"/> 
    …… 
    136136                'recurrenceId' : '<xsl:value-of select="recurrenceId"/>', 
    137137                'link' : '<xsl:value-of select='link'/>', 
    138                 'eventlink' : '<xsl:value-of select="$urlprefix"/><xsl:value-of select="$eventView"/>&amp;subid=<xsl:value-of select="subscription/id"/>&amp;calPath=<xsl:value-of select="calendar/encodedPath"/>&amp;guid=<xsl:call-template name="url-encode"><xsl:with-param name="str" select="guid"/></xsl:call-template>&amp;recurrenceId=<xsl:value-of select="recurrenceId"/>', // link of this event 
     138                'eventlink' : '<xsl:value-of select="$urlprefix"/><xsl:value-of select="$eventView"/>&amp;calPath=<xsl:value-of select="calendar/encodedPath"/>&amp;guid=<xsl:call-template name="url-encode"><xsl:with-param name="str" select="guid"/></xsl:call-template>&amp;recurrenceId=<xsl:value-of select="recurrenceId"/>', // link of this event 
    139139                'status' : '<xsl:value-of select='status'/>', 
    140140                'start' : { 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/rss-list.xsl

    r1737 r2173  
    9090    <item> 
    9191      <title><xsl:if test="status = 'CANCELLED'">CANCELLED: </xsl:if><xsl:value-of select="summary"/> - <xsl:value-of select="substring(start/dayname,1,3)"/>, <xsl:value-of select="start/longdate"/></title> 
    92       <link><xsl:value-of select="/bedework/urlprefix"/>/event/eventView.do?subid=<xsl:value-of select="subscription/id"/>&amp;calPath=<xsl:value-of select="calendar/encodedPath"/>&amp;guid=<xsl:value-of select="guid"/>&amp;recurrenceId=<xsl:value-of select="recurrenceId"/></link> 
     92      <link><xsl:value-of select="/bedework/urlprefix"/>/event/eventView.do?calPath=<xsl:value-of select="calendar/encodedPath"/>&amp;guid=<xsl:value-of select="guid"/>&amp;recurrenceId=<xsl:value-of select="recurrenceId"/></link> 
    9393      <pubDate><!-- takes the form: 11 Jan 2008 17:00:00 UT (note - do not output dayname - we only provide dayname in local time). 
    9494        --><xsl:value-of select="substring(start/utcdate,7,2)"/><xsl:text> </xsl:text><!-- 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/rss.xsl

    r1716 r2173  
    7979    <item> 
    8080      <title><xsl:if test="status = 'CANCELLED'">CANCELLED: </xsl:if><xsl:value-of select="summary"/> - <xsl:value-of select="substring(start/dayname,1,3)"/>, <xsl:value-of select="start/longdate"/></title> 
    81       <link><xsl:value-of select="/bedework/urlprefix"/>/event/eventView.do?subid=<xsl:value-of select="subscription/id"/>&amp;calPath=<xsl:value-of select="calendar/encodedPath"/>&amp;guid=<xsl:value-of select="guid"/>&amp;recurrenceId=<xsl:value-of select="recurrenceId"/></link> 
     81      <link><xsl:value-of select="/bedework/urlprefix"/>/event/eventView.do?calPath=<xsl:value-of select="calendar/encodedPath"/>&amp;guid=<xsl:value-of select="guid"/>&amp;recurrenceId=<xsl:value-of select="recurrenceId"/></link> 
    8282      <pubDate><xsl:value-of select="substring(start/dayname,1,3)"/>,<xsl:text> </xsl:text><!-- 
    8383               --><xsl:value-of select="start/twodigitday"/><xsl:text> </xsl:text><!-- 

  • trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/rss-list.xsl

    r1737 r2173  
    9090    <item> 
    9191      <title><xsl:if test="status = 'CANCELLED'">CANCELLED: </xsl:if><xsl:value-of select="summary"/> - <xsl:value-of select="substring(start/dayname,1,3)"/>, <xsl:value-of select="start/longdate"/></title> 
    92       <link><xsl:value-of select="/bedework/urlprefix"/>/event/eventView.do?subid=<xsl:value-of select="subscription/id"/>&amp;calPath=<xsl:value-of select="calendar/encodedPath"/>&amp;guid=<xsl:value-of select="guid"/>&amp;recurrenceId=<xsl:value-of select="recurrenceId"/></link> 
     92      <link><xsl:value-of select="/bedework/urlprefix"/>/event/eventView.do?calPath=<xsl:value-of select="calendar/encodedPath"/>&amp;guid=<xsl:value-of select="guid"/>&amp;recurrenceId=<xsl:value-of select="recurrenceId"/></link> 
    9393      <pubDate><!-- takes the form: 11 Jan 2008 17:00:00 UT (note - do not output dayname - we only provide dayname in local time). 
    9494        --><xsl:value-of select="substring(start/utcdate,7,2)"/><xsl:text> </xsl:text><!-- 

  • trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/rss.xsl

    r1716 r2173  
    6565    <item> 
    6666      <title><xsl:value-of select="summary"/> - <xsl:value-of select="substring(start/monthname,1,3)"/><xsl:text> </xsl:text><xsl:value-of select="start/day"/></title> 
    67       <link><xsl:value-of select="/bedework/urlprefix"/>/eventView.do?subid=<xsl:value-of select="subscription/id"/>&amp;calPath=<xsl:value-of select="calendar/encodedPath"/>&amp;guid=<xsl:value-of select="guid"/>&amp;recurrenceId=<xsl:value-of select="recurrenceId"/></link> 
     67      <link><xsl:value-of select="/bedework/urlprefix"/>/eventView.do?calPath=<xsl:value-of select="calendar/encodedPath"/>&amp;guid=<xsl:value-of select="guid"/>&amp;recurrenceId=<xsl:value-of select="recurrenceId"/></link> 
    6868      <pubDate><xsl:value-of select="substring(start/dayname,1,3)"/>, 
    6969               <xsl:value-of select="start/twodigitday"/><xsl:text> </xsl:text> 

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

    r2172 r2173  
    11521152          <!-- note: don't remove the #160 from the textarea or browsers will see it as a closed tag when empty --> 
    11531153           <textarea name="commentNotes" cols="60" rows="4"><!-- 
    1154            --><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text"/>&#160;<!-- 
     1154           --><xsl:value-of select="normalize-space(form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text)"/><!-- 
     1155           --><xsl:if test="normalize-space(form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text) = ''">&#160;</xsl:if><!-- 
    11551156           --></textarea> 
    11561157          </p> 

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

    r2160 r2173  
    10931093            <xsl:for-each select="event[not(entityType=2)]"> 
    10941094              <xsl:variable name="id" select="id"/> 
    1095               <xsl:variable name="subscriptionId" select="subscription/id"/> 
    10961095              <xsl:variable name="calPath" select="calendar/encodedPath"/> 
    10971096              <xsl:variable name="guid"><xsl:call-template name="url-encode"><xsl:with-param name="str" select="guid"/></xsl:call-template></xsl:variable> 
    …… 
    11221121                                  start/time = end/time"> 
    11231122                    <td class="{$dateRangeStyle} center" colspan="3"> 
    1124                       <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     1123                      <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    11251124                        <xsl:value-of select="start/time"/> 
    11261125                      </a> 
    …… 
    11291128                  <xsl:otherwise> 
    11301129                    <td class="{$dateRangeStyle} right"> 
    1131                       <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     1130                      <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    11321131                      <xsl:choose> 
    11331132                        <xsl:when test="start/allday = 'true' and 
    …… 
    11461145                    </td> 
    11471146                    <td class="{$dateRangeStyle} center"> 
    1148                       <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">-</a> 
     1147                      <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">-</a> 
    11491148                    </td> 
    11501149                    <td class="{$dateRangeStyle} left"> 
    1151                       <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     1150                      <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    11521151                      <xsl:choose> 
    11531152                        <xsl:when test="end/allday = 'true' and 
    …… 
    11791178                  <xsl:choose> 
    11801179                    <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'"> 
    1181                       <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     1180                      <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    11821181                        <xsl:choose> 
    11831182                          <xsl:when test="summary = ''"> 
    …… 
    12101209                    </xsl:when> 
    12111210                    <xsl:otherwise> 
    1212                       <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     1211                      <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    12131212                        <xsl:choose> 
    12141213                          <xsl:when test="summary = ''"> 
    …… 
    12291228                <td class="smallIcon"> 
    12301229                  <xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/> 
    1231                   <a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"> 
     1230                  <a href="{$export}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"> 
    12321231                    <img src="{$resourcesRoot}/resources/std-ical_icon_small.gif" width="12" height="16" border="0" alt="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"/> 
    12331232                  </a> 
    …… 
    12431242 
    12441243  <xsl:template name="eventLinks"> 
    1245     <xsl:variable name="subscriptionId" select="subscription/id"/> 
    12461244    <xsl:variable name="calPath" select="calendar/encodedPath"/> 
    12471245    <xsl:variable name="guid"><xsl:call-template name="url-encode"><xsl:with-param name="str" select="guid"/></xsl:call-template></xsl:variable> 
    …… 
    12511249        <xsl:when test="recurring='true' or recurrenceId != ''"> 
    12521250          Edit: 
    1253           <a href="{$editEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}" title="edit master (recurring event)">master</a>, 
    1254           <a href="{$editEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="edit instance (recurring event)">instance</a> 
     1251          <a href="{$editEvent}&amp;calPath={$calPath}&amp;guid={$guid}" title="edit master (recurring event)">master</a>, 
     1252          <a href="{$editEvent}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="edit instance (recurring event)">instance</a> 
    12551253          <br/> 
    12561254        </xsl:when> 
    12571255        <xsl:otherwise> 
    1258           <a href="{$editEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}" title="edit event"> 
     1256          <a href="{$editEvent}&amp;calPath={$calPath}&amp;guid={$guid}" title="edit event"> 
    12591257            Edit 
    12601258          </a> 
    …… 
    12681266        <xsl:when test="recurring='true' or recurrenceId != ''"> 
    12691267          Link: 
    1270           <a href="{$addEventRef}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}" title="add master event reference to a calendar">master</a>, 
    1271           <a href="{$addEventRef}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="add event reference to a calendar">instance</a> 
     1268          <a href="{$addEventRef}&amp;calPath={$calPath}&amp;guid={$guid}" title="add master event reference to a calendar">master</a>, 
     1269          <a href="{$addEventRef}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="add event reference to a calendar">instance</a> 
    12721270          <br/> 
    12731271        </xsl:when> 
    12741272        <xsl:otherwise> 
    1275           <a href="{$addEventRef}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}" title="add event reference to a calendar"> 
     1273          <a href="{$addEventRef}&amp;calPath={$calPath}&amp;guid={$guid}" title="add event reference to a calendar"> 
    12761274            Link 
    12771275          </a> 
    …… 
    12941292        <xsl:when test="recurring='true' or recurrenceId != ''"> 
    12951293          Delete: 
    1296           <a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}" title="delete master (recurring event)">all</a>, 
    1297           <a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="delete instance (recurring event)">instance</a> 
     1294          <a href="{$delEvent}&amp;calPath={$calPath}&amp;guid={$guid}" title="delete master (recurring event)">all</a>, 
     1295          <a href="{$delEvent}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="delete instance (recurring event)">instance</a> 
    12981296        </xsl:when> 
    12991297        <xsl:otherwise> 
    1300           <a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="delete event"> 
     1298          <a href="{$delEvent}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="delete event"> 
    13011299            Delete 
    13021300          </a> 
    …… 
    13251323            <xsl:for-each select="event"> 
    13261324              <xsl:variable name="id" select="id"/> 
    1327               <xsl:variable name="subscriptionId" select="subscription/id"/> 
    13281325              <xsl:variable name="calPath" select="calendar/encodedPath"/> 
    13291326              <xsl:variable name="guid" select="guid"/> 
    …… 
    13401337                <xsl:if test="status='TENTATIVE'"><em>TENTATIVE: </em></xsl:if> 
    13411338 
    1342                 <a class="title" href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     1339                <a class="title" href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    13431340                  <xsl:value-of select="summary"/> 
    13441341                </a><xsl:if test="location/address != ''">, <xsl:value-of select="location/address"/></xsl:if> 
    …… 
    13511348                <xsl:text> </xsl:text> 
    13521349                <xsl:variable name="eventIcalName" select="concat($id,'.ics')"/> 
    1353                 <a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"> 
     1350                <a href="{$export}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"> 
    13541351                  <img src="{$resourcesRoot}/resources/std-ical_icon_small.gif" width="12" height="16" border="0" alt="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"/> 
    13551352                </a> 
    …… 
    15161513  <xsl:template match="event" mode="calendarLayout"> 
    15171514    <xsl:param name="dayPos"/> 
    1518     <xsl:variable name="subscriptionId" select="subscription/id"/> 
    15191515    <xsl:variable name="calPath" select="calendar/encodedPath"/> 
    15201516    <xsl:variable name="guid"><xsl:call-template name="url-encode"><xsl:with-param name="str" select="guid"/></xsl:call-template></xsl:variable> 
    …… 
    15471543         not be used for cancelled events (tentative is ok). --> 
    15481544    <li> 
    1549       <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" 
     1545      <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" 
    15501546        class="{$eventRootClass} {$eventClass}"> 
    15511547        <xsl:if test="status != 'CANCELLED' and $calendarColor != ''"> 
    …… 
    17241720 
    17251721  <xsl:template match="event" mode="tasks"> 
    1726     <xsl:variable name="subscriptionId" select="subscription/id"/> 
    17271722    <xsl:variable name="calPath" select="calendar/encodedPath"/> 
    17281723    <xsl:variable name="guid"><xsl:call-template name="url-encode"><xsl:with-param name="str" select="guid"/></xsl:call-template></xsl:variable> 
    …… 
    17301725 
    17311726    <li> 
    1732       <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     1727      <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    17331728        <xsl:choose> 
    17341729          <xsl:when test="summary = ''"> 
    …… 
    17511746  <!--==== SINGLE EVENT ====--> 
    17521747  <xsl:template match="event"> 
    1753     <xsl:variable name="subscriptionId" select="subscription/id"/> 
    17541748    <xsl:variable name="calPath" select="calendar/encodedPath"/> 
    17551749    <xsl:variable name="guid"><xsl:call-template name="url-encode"><xsl:with-param name="str" select="guid"/></xsl:call-template></xsl:variable> 
    …… 
    17851779            <!-- download --> 
    17861780            <xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/> 
    1787             <a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"> 
     1781            <a href="{$export}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"> 
    17881782              <img src="{$resourcesRoot}/resources/std-icalDownload-icon-small.gif" width="12" height="16" border="0" alt="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"/> 
    17891783              Download 
    …… 
    17951789                  <img src="{$resourcesRoot}/resources/std-ical_iconEditDkGray.gif" width="12" height="16" border="0" alt="edit master"/> 
    17961790                  Edit: 
    1797                   <a href="{$editEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}" title="edit master (recurring event)">master</a>,<a href="{$editEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="edit instance (recurring event)">instance</a> 
     1791                  <a href="{$editEvent}&amp;calPath={$calPath}&amp;guid={$guid}" title="edit master (recurring event)">master</a>,<a href="{$editEvent}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="edit instance (recurring event)">instance</a> 
    17981792                </xsl:when> 
    17991793                <xsl:otherwise> 
    1800                   <a href="{$editEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}" title="edit event"> 
     1794                  <a href="{$editEvent}&amp;calPath={$calPath}&amp;guid={$guid}" title="edit event"> 
    18011795                    <img src="{$resourcesRoot}/resources/std-ical_iconEditDkGray.gif" width="12" height="16" border="0" alt="edit"/> 
    18021796                    Edit 
    …… 
    18101804                <img src="{$resourcesRoot}/resources/std-ical_iconEditDkGray.gif" width="12" height="16" border="0" alt="edit master"/> 
    18111805                Copy: 
    1812                 <a href="{$editEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;copy=true" title="copy master (recurring event)">master</a>,<a href="{$editEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;copy=true" title="copy instance (recurring event)">instance</a> 
     1806                <a href="{$editEvent}&amp;calPath={$calPath}&amp;guid={$guid}&amp;copy=true" title="copy master (recurring event)">master</a>,<a href="{$editEvent}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;copy=true" title="copy instance (recurring event)">instance</a> 
    18131807              </xsl:when> 
    18141808              <xsl:otherwise> 
    1815                 <a href="{$editEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;copy=true" title="copy event"> 
     1809                <a href="{$editEvent}&amp;calPath={$calPath}&amp;guid={$guid}&amp;copy=true" title="copy event"> 
    18161810                  <img src="{$resourcesRoot}/resources/std-ical_iconEditDkGray.gif" width="12" height="16" border="0" alt="edit"/> 
    18171811                  Copy 
    …… 
    18261820                  <img src="{$resourcesRoot}/resources/std-ical_iconLinkDkGray.gif" width="12" height="16" border="0" alt="add event reference"/> 
    18271821                  Link: 
    1828                   <a href="{$addEventRef}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}" title="add master event reference to a calendar">master</a>,<a href="{$addEventRef}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="add event reference to a calendar">instance</a> 
     1822                  <a href="{$addEventRef}&amp;calPath={$calPath}&amp;guid={$guid}" title="add master event reference to a calendar">master</a>,<a href="{$addEventRef}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="add event reference to a calendar">instance</a> 
    18291823                </xsl:when> 
    18301824                <xsl:otherwise> 
    1831                   <a href="{$addEventRef}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}" title="add event reference to a calendar"> 
     1825                  <a href="{$addEventRef}&amp;calPath={$calPath}&amp;guid={$guid}" title="add event reference to a calendar"> 
    18321826                    <img src="{$resourcesRoot}/resources/std-ical_iconLinkDkGray.gif" width="12" height="16" border="0" alt="add event reference"/> 
    18331827                    Link 
    …… 
    18531847                  <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 
    18541848                  Delete: 
    1855                   <a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}" title="delete master (recurring event)">all</a>,<a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="delete instance (recurring event)">instance</a> 
     1849                  <a href="{$delEvent}&amp;calPath={$calPath}&amp;guid={$guid}" title="delete master (recurring event)">all</a>,<a href="{$delEvent}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="delete instance (recurring event)">instance</a> 
    18561850                </xsl:when> 
    18571851                <xsl:otherwise> 
    1858                   <a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="delete event"> 
     1852                  <a href="{$delEvent}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="delete event"> 
    18591853                    <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 
    18601854                    Delete 
    …… 
    20342028        <!--<th class="icon" rowspan="2"> 
    20352029          <xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/> 
    2036           <a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"> 
     2030          <a href="{$export}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"> 
    20372031            <img src="{$resourcesRoot}/resources/std-ical-icon.gif" width="20" height="26" border="0" align="left" alt="Download this event"/> 
    20382032          </a> 
    …… 
    23402334  <!--==== ADD and EDIT EVENT FORM ====--> 
    23412335  <xsl:template match="formElements" mode="eventForm"> 
    2342     <xsl:variable name="subscriptionId" select="subscriptionId"/> 
    23432336    <xsl:variable name="calPathEncoded" select="form/calendar/encodedPath"/> 
    23442337    <xsl:variable name="calPath" select="form/calendar/path"/> 
    …… 
    23552348                <xsl:if test="not(form/recurringEntity = 'true' and recurrenceId = '')"> 
    23562349                  <!-- don't display if a master recurring event (because the master can't be viewed) --> 
    2357                   <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     2350                  <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    23582351                    <img src="{$resourcesRoot}/resources/glassFill-icon-viewGray.gif" width="13" height="13" border="0" alt="view"/> 
    23592352                    View 
    …… 
    23652358                    <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 
    23662359                    Delete: 
    2367                     <a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}" title="delete master (recurring event)">all</a>, 
    2368                     <a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="delete instance (recurring event)">instance</a> 
     2360                    <a href="{$delEvent}&amp;calPath={$calPath}&amp;guid={$guid}" title="delete master (recurring event)">all</a>, 
     2361                    <a href="{$delEvent}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="delete instance (recurring event)">instance</a> 
    23692362                  </xsl:when> 
    23702363                  <xsl:otherwise> 
    2371                     <a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="delete event"> 
     2364                    <a href="{$delEvent}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="delete event"> 
    23722365                      <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 
    23732366                      Delete 
    …… 
    30893082               so provide access to master event --> 
    30903083          <em>This event is a recurrence instance.</em><br/> 
    3091           <a href="{$editEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}" title="edit master (recurring event)">edit master event</a> 
     3084          <a href="{$editEvent}&amp;calPath={$calPath}&amp;guid={$guid}" title="edit master (recurring event)">edit master event</a> 
    30923085        </xsl:when> 
    30933086        <xsl:otherwise> 
    …… 
    41844177    change it without modifying bedework.js --> 
    41854178    <form name="eventForm" method="post" action="{$event-addEventRefComplete}" id="standardForm"  enctype="multipart/form-data"> 
    4186       <xsl:variable name="subscriptionId" select="subscription/id"/> 
    41874179      <xsl:variable name="calPath" select="calendar/path"/> 
    41884180      <xsl:variable name="guid"><xsl:call-template name="url-encode"><xsl:with-param name="str" select="guid"/></xsl:call-template></xsl:variable> 
    41894181      <xsl:variable name="recurrenceId" select="recurrenceId"/> 
    4190       <input type="hidden" name="subid" value="{$subscriptionId}"/> 
    41914182      <input type="hidden" name="calPath" value="{$calPath}"/> 
    41924183      <input type="hidden" name="guid" value="{$guid}"/> 
    …… 
    63756366        <xsl:sort select="lastmod" order="descending"/> 
    63766367        <xsl:variable name="guid"><xsl:call-template name="url-encode"><xsl:with-param name="str" select="guid"/></xsl:call-template></xsl:variable> 
    6377         <xsl:variable name="subscriptionId" select="subscription/id"/> 
    63786368        <xsl:variable name="calPath" select="calendar/encodedPath"/> 
    63796369        <xsl:variable name="eventName" select="name"/> 
    …… 
    63996389          </xsl:attribute> 
    64006390          <td> 
    6401             <a href="{$inboxItemAction}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;eventName={$eventName}&amp;recurrenceId={$recurrenceId}" title="check message"> 
     6391            <a href="{$inboxItemAction}&amp;calPath={$calPath}&amp;eventName={$eventName}&amp;recurrenceId={$recurrenceId}" title="check message"> 
    64026392              <img src="{$resourcesRoot}/resources/calIconSchedule-sm.gif" width="13" height="13" border="0" alt="check message"/> 
    64036393            </a> 
    64046394          </td> 
    64056395          <td> 
    6406             <a href="{$inboxItemAction}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;eventName={$eventName}&amp;recurrenceId={$recurrenceId}" title="check message"> 
     6396            <a href="{$inboxItemAction}&amp;calPath={$calPath}&amp;eventName={$eventName}&amp;recurrenceId={$recurrenceId}" title="check message"> 
    64076397              <!--<xsl:value-of select="dtstamp/shortdate"/><xsl:text> </xsl:text><xsl:value-of select="dtstamp/time"/>--> 
    64086398              <!--<xsl:value-of select="lastmod"/>--> 
    …… 
    64606450          </td> 
    64616451          <td> 
    6462             <a href="{$inboxItemAction}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;eventName={$eventName}&amp;recurrenceId={$recurrenceId}" title="check message"> 
     6452            <a href="{$inboxItemAction}&amp;calPath={$calPath}&amp;eventName={$eventName}&amp;recurrenceId={$recurrenceId}" title="check message"> 
    64636453              <xsl:value-of select="title"/> 
    64646454            </a> 
    …… 
    64686458          <td><xsl:apply-templates select="scheduleMethod"/></td> 
    64696459          <!--<td> 
    6470             <a href="{$inboxItemAction}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;eventName={$eventName}&amp;recurrenceId={$recurrenceId}" title="check message"> 
     6460            <a href="{$inboxItemAction}&amp;calPath={$calPath}&amp;eventName={$eventName}&amp;recurrenceId={$recurrenceId}" title="check message"> 
    64716461              <xsl:choose> 
    64726462                <xsl:when test="scheduleState=0"><em>unprocessed</em></xsl:when> 
    …… 
    64776467          <td> 
    64786468            <xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/> 
    6479             <a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;&amp;eventName={$eventName}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;contentName={$eventIcalName}" title="download"> 
     6469            <a href="{$export}&amp;calPath={$calPath}&amp;&amp;eventName={$eventName}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;contentName={$eventIcalName}" title="download"> 
    64806470              <img src="{$resourcesRoot}/resources/std-ical_icon_small.gif" width="12" height="16" border="0" alt="download"/> 
    64816471            </a> 
    64826472          </td> 
    64836473          <td> 
    6484             <a href="{$delInboxEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;&amp;eventName={$eventName}&amp;recurrenceId={$recurrenceId}" title="delete"> 
     6474            <a href="{$delInboxEvent}&amp;calPath={$calPath}&amp;&amp;eventName={$eventName}&amp;recurrenceId={$recurrenceId}" title="delete"> 
    64856475              <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 
    64866476            </a> 
    …… 
    65096499        <xsl:sort select="lastmod" order="descending"/> 
    65106500        <xsl:variable name="guid"><xsl:call-template name="url-encode"><xsl:with-param name="str" select="guid"/></xsl:call-template></xsl:variable> 
    6511         <xsl:variable name="subscriptionId" select="subscription/id"/> 
    65126501        <xsl:variable name="calPath" select="calendar/encodedPath"/> 
    65136502        <xsl:variable name="eventName" select="name"/> 
    …… 
    65306519          </xsl:attribute> 
    65316520          <td> 
    6532             <a href="{$inboxItemAction}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;eventName={$eventName}&amp;recurrenceId={$recurrenceId}" title="check message"> 
     6521            <a href="{$inboxItemAction}&amp;calPath={$calPath}&amp;eventName={$eventName}&amp;recurrenceId={$recurrenceId}" title="check message"> 
    65336522              <img src="{$resourcesRoot}/resources/calIconSchedule-sm.gif" width="13" height="13" border="0" alt="check message"/> 
    65346523            </a> 
    65356524          </td> 
    65366525          <td> 
    6537             <a href="{$inboxItemAction}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;eventName={$eventName}&amp;recurrenceId={$recurrenceId}" title="check message"> 
     6526            <a href="{$inboxItemAction}&amp;calPath={$calPath}&amp;eventName={$eventName}&amp;recurrenceId={$recurrenceId}" title="check message"> 
    65386527              <!-- <xsl:value-of select="dtstamp/shortdate"/><xsl:text> </xsl:text><xsl:value-of select="dtstamp/time"/>--> 
    65396528              <!--<xsl:value-of select="lastmod"/>--> 
    …… 
    65646553          </td> 
    65656554          <td> 
    6566             <a href="{$inboxItemAction}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;eventName={$eventName}&amp;recurrenceId={$recurrenceId}"> 
     6555            <a href="{$inboxItemAction}&amp;calPath={$calPath}&amp;eventName={$eventName}&amp;recurrenceId={$recurrenceId}"> 
    65676556              <xsl:value-of select="title"/> 
    65686557            </a> 
    …… 
    65726561          <td><xsl:apply-templates select="scheduleMethod"/></td> 
    65736562          <td> 
    6574             <a href="{$inboxItemAction}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;eventName={$eventName}&amp;recurrenceId={$recurrenceId}"> 
     6563            <a href="{$inboxItemAction}&amp;calPath={$calPath}&amp;eventName={$eventName}&amp;recurrenceId={$recurrenceId}"> 
    65756564              <xsl:choose> 
    65766565                <xsl:when test="scheduleState=0"><em>unprocessed</em></xsl:when> 
    …… 
    65816570          <td> 
    65826571            <xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/> 
    6583             <a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;contentName={$eventIcalName}" title="download"> 
     6572            <a href="{$export}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;contentName={$eventIcalName}" title="download"> 
    65846573              <img src="{$resourcesRoot}/resources/std-ical_icon_small.gif" width="12" height="16" border="0" alt="download"/> 
    65856574            </a> 
    65866575          </td> 
    65876576          <td> 
    6588             <a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="delete"> 
     6577            <a href="{$delEvent}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="delete"> 
    65896578              <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/> 
    65906579            </a> 
    …… 
    66106599 
    66116600  <xsl:template match="formElements" mode="attendeeRespond"> 
    6612     <xsl:variable name="subscriptionId" select="subscriptionId"/> 
    66136601    <xsl:variable name="calPathEncoded" select="form/calendar/encodedPath"/> 
    66146602    <xsl:variable name="calPath" select="form/calendar/path"/> 
    …… 
    70076995            <xsl:choose> 
    70086996              <xsl:when test="scheduleMethod='8'"> 
    7009                 <input name="delete" type="button" value="Delete" onclick="document.location.replace('{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}')"/> 
     6997                <input name="delete" type="button" value="Delete" onclick="document.location.replace('{$delEvent}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}')"/> 
    70106998              </xsl:when> 
    70116999              <xsl:otherwise> 
    …… 
    71477135 
    71487136  <xsl:template match="event" mode="attendeeReply"> 
    7149     <xsl:variable name="subscriptionId" select="subscription/id"/> 
    71507137    <xsl:variable name="calPath" select="calendar/encodedPath"/> 
    71517138    <xsl:variable name="guid"><xsl:call-template name="url-encode"><xsl:with-param name="str" select="guid"/></xsl:call-template></xsl:variable> 
    …… 
    73397326          <!--<th class="icon" rowspan="2"> 
    73407327            <xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/> 
    7341             <a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"> 
     7328            <a href="{$export}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"> 
    73427329              <img src="{$resourcesRoot}/resources/std-ical-icon.gif" width="20" height="26" border="0" align="left" alt="Download this event"/> 
    73437330            </a> 
    …… 
    73937380    change it without modifying bedework.js --> 
    73947381    <form name="eventForm" method="post" action="{$event-addEventRefComplete}" id="standardForm"  enctype="multipart/form-data"> 
    7395       <xsl:variable name="subscriptionId" select="subscription/id"/> 
    73967382      <xsl:variable name="calPath" select="calendar/path"/> 
    73977383      <xsl:variable name="guid"><xsl:call-template name="url-encode"><xsl:with-param name="str" select="guid"/></xsl:call-template></xsl:variable> 
    73987384      <xsl:variable name="recurrenceId" select="recurrenceId"/> 
    7399       <input type="hidden" name="subid" value="{$subscriptionId}"/> 
    74007385      <input type="hidden" name="calPath" value="{$calPath}"/> 
    74017386      <input type="hidden" name="guid" value="{$guid}"/> 
    …… 
    80798064      </xsl:if> 
    80808065      <xsl:for-each select="/bedework/searchResults/searchResult"> 
    8081         <xsl:variable name="subscriptionId" select="event/subscription/id"/> 
    80828066        <xsl:variable name="calPath" select="event/calendar/encodedPath"/> 
    80838067        <xsl:variable name="guid" select="event/guid"/> 
    …… 
    80918075          </td> 
    80928076          <td> 
    8093             <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     8077            <a href="{$eventView}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    80948078              <xsl:choose> 
    80958079                <xsl:when test="event/summary = ''"> 

  • trunk/deployment/webuser/webapp/resources/demoskins/default/default/rss-list.xsl

    r1737 r2173  
    9090    <item> 
    9191      <title><xsl:if test="status = 'CANCELLED'">CANCELLED: </xsl:if><xsl:value-of select="summary"/> - <xsl:value-of select="substring(start/dayname,1,3)"/>, <xsl:value-of select="start/longdate"/></title> 
    92       <link><xsl:value-of select="/bedework/urlprefix"/>/event/eventView.do?subid=<xsl:value-of select="subscription/id"/>&amp;calPath=<xsl:value-of select="calendar/encodedPath"/>&amp;guid=<xsl:value-of select="guid"/>&amp;recurrenceId=<xsl:value-of select="recurrenceId"/></link> 
     92      <link><xsl:value-of select="/bedework/urlprefix"/>/event/eventView.do?calPath=<xsl:value-of select="calendar/encodedPath"/>&amp;guid=<xsl:value-of select="guid"/>&amp;recurrenceId=<xsl:value-of select="recurrenceId"/></link> 
    9393      <pubDate><!-- takes the form: 11 Jan 2008 17:00:00 UT (note - do not output dayname - we only provide dayname in local time). 
    9494        --><xsl:value-of select="substring(start/utcdate,7,2)"/><xsl:text> </xsl:text><!-- 

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

    r1766 r2173  
    6565    <item> 
    6666      <title><xsl:value-of select="summary"/> - <xsl:value-of select="substring(start/monthname,1,3)"/><xsl:text> </xsl:text><xsl:value-of select="start/day"/></title> 
    67       <link><xsl:value-of select="/bedework/urlprefix"/>/eventView.do?subid=<xsl:value-of select="subscription/id"/>&amp;calPath=<xsl:value-of select="calendar/encodedPath"/>&amp;guid=<xsl:value-of select="guid"/>&amp;recurrenceId=<xsl:value-of select="recurrenceId"/></link> 
     67      <link><xsl:value-of select="/bedework/urlprefix"/>/eventView.do?calPath=<xsl:value-of select="calendar/encodedPath"/>&amp;guid=<xsl:value-of select="guid"/>&amp;recurrenceId=<xsl:value-of select="recurrenceId"/></link> 
    6868      <pubDate><xsl:value-of select="substring(start/dayname,1,3)"/>, 
    6969               <xsl:value-of select="start/twodigitday"/><xsl:text> </xsl:text>