Changeset 281

Show
Ignore:
Timestamp:
03/14/06 17:10:52
Author:
johnsa
Message:

minor updates to public demo skins

updates to Rensselaer public skin (distributed skin set) to keep in line with demo (also reflecting our local preparations to release)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/default.xsl

    r276 r281  
    583583        <td class="fieldname">Description:</td> 
    584584        <td colspan="2" class="fieldval description"> 
    585           <!--<xsl:value-of select="description"/>--> 
    586585          <xsl:call-template name="replace"> 
    587586            <xsl:with-param name="string" select="description"/> 
  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/jsToday.xsl

    r262 r281  
    3333  </xsl:template> 
    3434  <xsl:template match="event"> 
    35     <!--<xsl:variable name="strippedSummary" select='translate(translate(summary,"&apos;",""),"&#xA;"," ")'/>--> 
    3635    <xsl:variable name="aposStrippedSummary"> 
    3736      <xsl:call-template name="replace"> 
  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/print.css

    r2 r281  
    77  font-size: 10pt; 
    88} 
    9 @page { 
    10   margin:  0in; 
    11 } 
    129tr { 
    1310  page-break-inside: avoid; 
  • trunk/calendar3/skins/webpublic/rensselaer/default/default/default.xsl

    r276 r281  
    99  standalone="yes" 
    1010/> 
    11   <!-- ================================= --> 
     11  <!-- ======================================= --> 
    1212  <!--  Rensselaer PUBLIC CALENDAR STYLESHEET  --> 
    13   <!-- ================================= --> 
     13  <!-- ======================================= --> 
    1414 
    1515  <!-- DEFINE INCLUDES --> 
     
    4242  <xsl:variable name="mailEvent" select="/bedework/urlPrefixes/mailEvent"/> 
    4343  <xsl:variable name="showPage" select="/bedework/urlPrefixes/showPage"/> 
     44  <xsl:variable name="stats" select="/bedework/urlPrefixes/stats"/> 
    4445 
    4546  <!-- Other generally useful global variables --> 
     
    6263      <head> 
    6364        <title>Rensselaer Calendar of Events</title> 
     65        <meta name="robots" content="noindex,nofollow"/> 
    6466        <link rel="stylesheet" href="{$resourcesRoot}/default/default/rensselaer.css"/> 
    65         <meta name="robots" content="noindex,nofollow"/> 
     67        <link rel="stylesheet" type="text/css" href="{$resourcesRoot}/default/default/common.css" /> 
    6668        <link rel="stylesheet" type="text/css" media="print" href="{$resourcesRoot}/default/default/rensselaer-print.css" /> 
    6769        <link rel="icon" type="image/ico" href="http://www.rpi.edu/favicon.ico" /> 
     
    7981        <xsl:if test="/bedework/error"> 
    8082          <div id="errors"> 
    81             <p><xsl:apply-templates select="/bedework/error"/></p
     83            <xsl:apply-templates select="/bedework/error"/
    8284          </div> 
    8385        </xsl:if> 
    84         <!-- <xsl:call-template name="alerts"/> --> 
    8586        <xsl:call-template name="tabs"/> 
    8687        <xsl:choose> 
     
    8889            <!-- show an event --> 
    8990            <xsl:apply-templates select="/bedework/event"/> 
     91          </xsl:when> 
     92          <xsl:when test="/bedework/page='showSysStats'"> 
     93            <!-- show system stats --> 
     94            <xsl:call-template name="stats"/> 
    9095          </xsl:when> 
    9196          <xsl:when test="/bedework/page='calendars'"> 
     
    146151        <td colspan="3" id="logoCell"><a href="http://www.rpi.edu"><img src="{$resourcesRoot}/images/std-rpilogo.gif" width="282" height="55" border="0" alt="Rensselaer"/></a></td> 
    147152        <td colspan="2" id="rpiLinksCell"> 
    148           <a href="{$privateCal}">Personal Calendar</a> | 
     153          <!--<a href="{$privateCal}">Personal Calendar</a> |--> 
    149154          <a href="http://www.rpi.edu">RPI Home</a> | 
    150155          <a href="http://www.rpi.edu/rpinfo">RPInfo</a> | 
     
    250255      </xsl:otherwise> 
    251256    </xsl:choose> 
    252   </xsl:template> 
    253  
    254   <xsl:template name="alerts"> 
    255     <table id="alertsTable"> 
    256       <tr> 
    257         <td> 
    258           I'm an alert 
    259         </td> 
    260       </tr> 
    261     </table> 
    262257  </xsl:template> 
    263258 
     
    476471        <th class="fieldname">Event:</th> 
    477472        <th class="fieldval"> 
     473          <xsl:if test="status='CANCELLED'">CANCELLED: </xsl:if> 
    478474          <xsl:choose> 
    479475            <xsl:when test="link != ''"> 
     
    488484          </xsl:choose> 
    489485        </th> 
    490         <th class="iconLeft" rowspan="2"> 
     486        <!--<th class="iconLeft" rowspan="2"> 
    491487          <xsl:variable name="id" select="id"/> 
    492488          <xsl:variable name="subscriptionId" select="subscription/id"/> 
     489          <xsl:variable name="calendarId" select="calendar/id"/> 
    493490          <xsl:variable name="guid" select="guid"/> 
    494491          <xsl:variable name="recurrenceId" select="recurrenceId"/> 
    495           <a href="{$privateCal}/addEventRef.do?eventId={$id}" title="Add event to MyCalendar" target="myCalendar"> 
    496             <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon.gif" width="20" height="26" border="0" align="left" alt="Add event to MyCalendar"/> 
     492          <a href="{$privateCal}/addEventRef.do?subid={$subscriptionId}&amp;calid={$calendarId}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 
     493            <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon.gif" width="20" height="26" border="0" alt="Add event to MyCalendar"/> 
    497494          </a> 
    498         </th> 
     495        </th>--> 
    499496        <th class="iconRight" rowspan="2"> 
    500497          <xsl:variable name="id" select="id"/> 
    501498          <xsl:variable name="subscriptionId" select="subscription/id"/> 
     499          <xsl:variable name="calendarId" select="calendar/id"/> 
    502500          <xsl:variable name="guid" select="guid"/> 
    503501          <xsl:variable name="recurrenceId" select="recurrenceId"/> 
    504502          <xsl:variable name="eventIcalName" select="concat($id,'.ics')"/> 
    505           <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"> 
     503          <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"> 
    506504            <img src="{$resourcesRoot}/images/std-ical_icon.gif" width="20" height="26" border="0" alt="Download this event"/> 
    507505          </a> 
     
    543541      <tr> 
    544542        <td class="fieldname">Description:</td> 
    545         <td colspan="3" class="fieldval"> 
    546           <xsl:value-of select="description"/> 
     543        <td colspan="3" class="fieldval description"> 
     544          <xsl:call-template name="replace"> 
     545            <xsl:with-param name="string" select="description"/> 
     546            <xsl:with-param name="pattern" select="'&#xA;'"/> 
     547            <xsl:with-param name="replacement"><br/></xsl:with-param> 
     548          </xsl:call-template> 
    547549        </td> 
    548550      </tr> 
     
    580582              <br /><xsl:value-of select="sponsor/phone"/> 
    581583            </xsl:if> 
    582             <!-- <xsl:if test="sponsor/email!=''"> 
    583               <br /> 
    584               <xsl:variable name="email" select="sponsor/email"/> 
    585               <xsl:variable name="subject" select="summary"/> 
    586               <a href="mailto:{$email}?subject={$subject}"> 
    587                 <xsl:value-of select="sponsor/email"/> 
    588               </a> 
    589             </xsl:if> --> 
    590584          </td> 
    591585        </tr> 
     
    620614            <xsl:if test="/bedework/periodname='Week' or /bedework/periodname='Month' or /bedework/periodname=''"> 
    621615              <tr> 
    622                 <td colspan="6" class="dateRow"> 
     616                <td colspan="5" class="dateRow"> 
    623617                   <xsl:variable name="date" select="date"/> 
    624618                   <a href="{$setViewPeriod}?viewType=dayView&amp;date={$date}"> 
     
    631625              <xsl:variable name="id" select="id"/> 
    632626              <xsl:variable name="subscriptionId" select="subscription/id"/> 
     627              <xsl:variable name="calendarId" select="calendar/id"/> 
    633628              <xsl:variable name="guid" select="guid"/> 
    634629              <xsl:variable name="recurrenceId" select="recurrenceId"/> 
     
    657652                  <xsl:otherwise> 
    658653                    <td class="{$dateRangeStyle} right"> 
    659                       <a href="{$eventView}?subid={$subscriptionId}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     654                      <a href="{$eventView}?subid={$subscriptionId}&amp;calid={$calendarId}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    660655                      <xsl:choose> 
    661656                        <xsl:when test="start/allday = 'true' and 
     
    674669                    </td> 
    675670                    <td class="{$dateRangeStyle} center"> 
    676                       <a href="{$eventView}?subid={$subscriptionId}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">-</a> 
     671                      <a href="{$eventView}?subid={$subscriptionId}&amp;calid={$calendarId}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">-</a> 
    677672                    </td> 
    678673                    <td class="{$dateRangeStyle} left"> 
    679                       <a href="{$eventView}?subid={$subscriptionId}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     674                      <a href="{$eventView}?subid={$subscriptionId}&amp;calid={$calendarId}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    680675                      <xsl:choose> 
    681676                        <xsl:when test="end/allday = 'true' and 
     
    697692                <xsl:variable name="descriptionClass"> 
    698693                  <xsl:choose> 
    699                     <xsl:when test="priority='cancelled'">description cancelled</xsl:when> 
     694                    <xsl:when test="status='CANCELLED'">description cancelled</xsl:when> 
    700695                    <xsl:otherwise>description</xsl:otherwise> 
    701696                  </xsl:choose> 
    702697                </xsl:variable> 
    703698                <td class="{$descriptionClass}"> 
     699                  <xsl:if test="status='CANCELLED'"><strong>CANCELLED: </strong></xsl:if> 
    704700                  <xsl:choose> 
    705701                    <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'"> 
    706                       <a href="{$eventView}?subid={$subscriptionId}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    707                         <strong><xsl:value-of select="summary"/>: </strong> 
     702                      <a href="{$eventView}?subid={$subscriptionId}&amp;calid={$calendarId}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     703                        <strong> 
     704                          <xsl:value-of select="summary"/>: 
     705                        </strong> 
    708706                        <xsl:value-of select="description"/>&#160; 
    709707                        <em> 
     
    726724                    </xsl:when> 
    727725                    <xsl:otherwise> 
    728                       <a href="{$eventView}?subid={$subscriptionId}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
     726                      <a href="{$eventView}?subid={$subscriptionId}&amp;calid={$calendarId}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"> 
    729727                        <xsl:value-of select="summary"/>, <xsl:value-of select="location/address"/> 
    730728                      </a> 
     
    732730                  </xsl:choose> 
    733731                </td> 
    734                 <td class="smallIconLeft"> 
    735                   <variable name="confId" select="/bedework/confirmationid"/> 
    736                   <a href="{$privateCal}/addEventRef.do?eventId={$id}" title="Add event to MyCalendar" target="myCalendar"> 
     732                <td class="icons"> 
     733                  <!--<variable name="confId" select="/bedework/confirmationid"/> 
     734                  <a href="{$privateCal}/addEventRef.do?subid={$subscriptionId}&amp;calid={$calendarId}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 
    737735                    <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon-small.gif" width="12" height="16" border="0" align="left" alt="Add event to MyCalendar"/> 
    738                   </a> 
    739                 </td> 
    740                 <td class="smallIconRight"> 
     736                  </a>--> 
    741737                  <xsl:variable name="eventIcalName" select="concat($id,'.ics')"/> 
    742                   <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"> 
     738                  <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"> 
    743739                    <img src="{$resourcesRoot}/images/std-ical_icon_small.gif" width="12" height="16" border="0" alt="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"/> 
    744740                  </a> 
     
    820816    <xsl:param name="dayPos"/> 
    821817    <xsl:variable name="subscriptionId" select="subscription/id"/> 
     818    <xsl:variable name="calendarId" select="calendar/id"/> 
    822819    <xsl:variable name="guid" select="guid"/> 
    823820    <xsl:variable name="recurrenceId" select="recurrenceId"/> 
     
    825822      <xsl:choose> 
    826823        <!-- Special styles for the month grid --> 
    827         <xsl:when test="status='cancelled'">eventCancelled</xsl:when> 
     824        <xsl:when test="status='CANCELLED'">eventCancelled</xsl:when> 
    828825        <xsl:when test="calendar/name='Holidays'">holiday</xsl:when> 
    829826        <!-- Alternating colors for all standard events --> 
     
    833830    </xsl:variable> 
    834831    <li> 
    835       <a href="{$eventView}?subid={$subscriptionId}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" class="{$eventClass}"> 
     832      <a href="{$eventView}?subid={$subscriptionId}&amp;calid={$calendarId}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" class="{$eventClass}"> 
     833        <xsl:if test="status='CANCELLED'">CANCELLED: </xsl:if> 
    836834        <xsl:value-of select="summary"/> 
    837835        <xsl:variable name="eventTipClass"> 
     
    842840        </xsl:variable> 
    843841        <span class="{$eventTipClass}"> 
     842          <xsl:if test="status='CANCELLED'"><span class="eventTipStatus">CANCELLED</span></xsl:if> 
    844843          <strong><xsl:value-of select="summary"/></strong><br/> 
    845844          Time: 
     
    974973  </xsl:template> 
    975974 
     975  <!--+++++++++++++++ System Stats ++++++++++++++++++++--> 
     976  <xsl:template name="stats"> 
     977    <div id="stats"> 
     978      <h2>System Statistics</h2> 
     979 
     980      <p> 
     981        Stats collection: 
     982      </p> 
     983      <ul> 
     984        <li> 
     985          <a href="{$stats}&amp;enable=yes">enable</a> | 
     986          <a href="{$stats}&amp;disable=yes">disable</a> 
     987        </li> 
     988        <li><a href="{$stats}&amp;fetch=yes">fetch statistics</a></li> 
     989        <li><a href="{$stats}&amp;dump=yes">dump stats to log</a></li> 
     990      </ul> 
     991      <table id="statsTable" cellpadding="0"> 
     992        <xsl:for-each select="/bedework/sysStats/*"> 
     993          <xsl:choose> 
     994            <xsl:when test="name(.) = 'header'"> 
     995              <tr> 
     996                <th colspan="2"> 
     997                  <xsl:value-of select="."/> 
     998                </th> 
     999              </tr> 
     1000            </xsl:when> 
     1001            <xsl:otherwise> 
     1002              <tr> 
     1003                <td class="label"> 
     1004                  <xsl:value-of select="label"/> 
     1005                </td> 
     1006                <td class="value"> 
     1007                  <xsl:value-of select="value"/> 
     1008                </td> 
     1009              </tr> 
     1010            </xsl:otherwise> 
     1011          </xsl:choose> 
     1012        </xsl:for-each> 
     1013      </table> 
     1014    </div> 
     1015  </xsl:template> 
     1016 
     1017  <!--==== UTILITY TEMPLATES ====--> 
     1018 
     1019  <!-- search and replace template taken from 
     1020       http://www.biglist.com/lists/xsl-list/archives/200211/msg00337.html --> 
     1021  <xsl:template name="replace"> 
     1022    <xsl:param name="string" select="''"/> 
     1023    <xsl:param name="pattern" select="''"/> 
     1024    <xsl:param name="replacement" select="''"/> 
     1025    <xsl:choose> 
     1026      <xsl:when test="$pattern != '' and $string != '' and contains($string, $pattern)"> 
     1027        <xsl:value-of select="substring-before($string, $pattern)"/> 
     1028        <xsl:copy-of select="$replacement"/> 
     1029        <xsl:call-template name="replace"> 
     1030          <xsl:with-param name="string" select="substring-after($string, $pattern)"/> 
     1031          <xsl:with-param name="pattern" select="$pattern"/> 
     1032          <xsl:with-param name="replacement" select="$replacement"/> 
     1033        </xsl:call-template> 
     1034      </xsl:when> 
     1035      <xsl:otherwise> 
     1036        <xsl:value-of select="$string"/> 
     1037      </xsl:otherwise> 
     1038    </xsl:choose> 
     1039  </xsl:template> 
     1040 
    9761041  <!--==== FOOTER ====--> 
    9771042 
     
    9951060        </td> 
    9961061        <td class="rightCell"> 
    997           <!--<form name="skinSelectForm" method="get" action="{$setup}"> 
    998             skin selector: 
    999             <select name="skinNameSticky" onChange="submit()"> 
    1000               <option>select a skin</option> 
    1001               <option value="default">Demo</option> 
    1002               <option value="washington">Washington</option> 
    1003               <option value="rensselaer">Rensselaer</option> 
    1004             </select> 
    1005           </form>--> 
     1062          &#160; 
    10061063        </td> 
    10071064      </tr> 
  • trunk/calendar3/skins/webpublic/rensselaer/default/default/errors.xsl

    r154 r281  
    44    <xsl:choose> 
    55      <xsl:when test="id='edu.rpi.sss.util.error.exc'"> 
    6           An exception occurred: <xsl:value-of select="param"/> 
     6          An exception occurred:<br/> 
     7          <em><xsl:value-of select="param"/></em> 
    78      </xsl:when> 
    8       <xsl:when test="id='org.bedework.error.nosuchevent'"> 
    9           Event <xsl:value-of select="param"/> does not exist. 
     9      <xsl:when test="id='org.bedework.client.error.nosuchevent'"> 
     10          Event does not exist:<br/><em><xsl:value-of select="param"/></em> 
    1011      </xsl:when> 
    11       <xsl:when test="id='org.bedework.error.baddates'"> 
    12           Improperly formatted date(s): <xsl:value-of select="param"/> 
     12      <xsl:when test="id='org.bedework.client.error.baddate'"> 
     13          The date you have entered is out of range. 
    1314      </xsl:when> 
    14       <xsl:when test="id='org.bedework.error.noaccess'"> 
    15           You have insufficient access <xsl:value-of select="param"/> 
     15      <xsl:when test="id='org.bedework.client.error.noaccess'"> 
     16          You have insufficient access to make that request 
    1617      </xsl:when> 
    17       <xsl:when test="id='org.bedework.error.notitle'"> 
    18           Please supply a title for your event (required)
     18      <xsl:when test="id='org.bedework.client.error.missingsubscriptionid'"> 
     19          The request cannot be processed: missing subscription ID
    1920      </xsl:when> 
    20       <xsl:when test="id='org.bedework.error.location.referenced'"> 
    21           Location is in use.  It cannot be deleted while referenced by an event. 
     21      <xsl:when test="id='org.bedework.client.error.unknowncalendar'"> 
     22          Unknown calendar 
     23      </xsl:when> 
     24      <xsl:when test="id='org.bedework.client.error.unknownview'"> 
     25          Unknown view 
    2226      </xsl:when> 
    2327      <xsl:otherwise> 
  • trunk/calendar3/skins/webpublic/rensselaer/default/default/jsToday.xsl

    r108 r281  
    44  <!-- usage: call the javascript feed from an html file by embedding the 
    55       following script tag: 
    6        <script src="http://yourservername/cal/setView.do?viewType=todayView&skinName=jsToday&contentType=text/javascript&contentName=bedework.js" type="text/javascript"></script> 
     6       <script src="http://yourservername/cal/setViewPeriod.do?viewType=todayView&skinName=jsToday&contentType=text/javascript&contentName=bedework.js" type="text/javascript"></script> 
    77 
    88       e.g. 
    9        <script src="http://localhost:8080/cal/setView.do?viewType=todayView&skinName=jsToday&contentType=text/javascript&contentName=bedework.js" type="text/javascript"></script> 
     9       <script src="http://localhost:8080/cal/setViewPeriod.do?viewType=todayView&skinName=jsToday&contentType=text/javascript&contentName=bedework.js" type="text/javascript"></script> 
     10 
     11       You should uncomment the code below that reads "Today's Events" and throw 
     12       away the following line.  You should modify this stylesheet if you intend 
     13       to display more than a single day's events. 
    1014  --> 
    1115  <xsl:variable name="urlprefix" select="/bedework/urlprefix"/> 
     
    2832  </xsl:template> 
    2933  <xsl:template match="event"> 
    30     <xsl:variable name="strippedSummary" select='translate(translate(summary,"&apos;","&#180;"),"&#xA;"," ")'/> 
     34    <xsl:variable name="aposStrippedSummary"> 
     35      <xsl:call-template name="replace"> 
     36        <xsl:with-param name="string" select="summary"/> 
     37        <xsl:with-param name="pattern" select='"&apos;"'/> 
     38        <xsl:with-param name="replacement" select='"\&apos;"'/> 
     39      </xsl:call-template> 
     40    </xsl:variable> 
     41    <xsl:variable name="strippedSummary" select='translate($aposStrippedSummary,"&#xA;"," ")'/> 
    3142    <xsl:text disable-output-escaping="yes">document.writeln('&lt;li&gt;');</xsl:text> 
    32     <xsl:text disable-output-escaping="yes">document.writeln('    &lt;a href="</xsl:text><xsl:value-of select="$urlprefix"/><xsl:text disable-output-escaping="yes">/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;skinName=default" target="_top"&gt;</xsl:text><xsl:value-of select="$strippedSummary" disable-output-escaping="yes"/><xsl:text disable-output-escaping="yes">&lt;/a&gt;');</xsl:text> 
     43    <xsl:text disable-output-escaping="yes">document.writeln('    &lt;a href="</xsl:text><xsl:value-of select="$urlprefix"/><xsl:text disable-output-escaping="yes">/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;calid=</xsl:text><xsl:value-of select="calendar/id"/><xsl:text disable-output-escaping="yes">&amp;skinName=default" target="_top"&gt;</xsl:text><xsl:value-of select="$strippedSummary" disable-output-escaping="yes"/><xsl:text disable-output-escaping="yes">&lt;/a&gt;');</xsl:text> 
    3344    <xsl:text disable-output-escaping="yes">document.writeln('&lt;/li&gt;');</xsl:text> 
    3445  </xsl:template> 
     46  <xsl:template name="replace"> 
     47    <xsl:param name="string" select="''"/> 
     48    <xsl:param name="pattern" select="''"/> 
     49    <xsl:param name="replacement" select="''"/> 
     50    <xsl:choose> 
     51      <xsl:when test="$pattern != '' and $string != '' and contains($string, $pattern)"> 
     52        <xsl:value-of select="substring-before($string, $pattern)"/> 
     53        <xsl:copy-of select="$replacement"/> 
     54        <xsl:call-template name="replace"> 
     55          <xsl:with-param name="string" select="substring-after($string, $pattern)"/> 
     56          <xsl:with-param name="pattern" select="$pattern"/> 
     57          <xsl:with-param name="replacement" select="$replacement"/> 
     58        </xsl:call-template> 
     59      </xsl:when> 
     60      <xsl:otherwise> 
     61        <xsl:value-of select="$string"/> 
     62      </xsl:otherwise> 
     63    </xsl:choose> 
     64  </xsl:template> 
    3565</xsl:stylesheet> 
  • trunk/calendar3/skins/webpublic/rensselaer/default/default/print.css

    r2 r281  
    77  font-size: 10pt; 
    88} 
    9 @page { 
    10   margin:  0in; 
    11 } 
    129tr { 
    1310  page-break-inside: avoid; 
  • trunk/calendar3/skins/webpublic/rensselaer/default/default/rensselaer.css

    r277 r281  
    666666  text-decoration : none; 
    667667} 
    668 #listTable td.smallIconLeft
     668#listTable td.icons
    669669  color: black; 
    670670  background-color: #ddd; 
    671 
    672 #listTable td.smallIconRight { 
    673   color: black; 
    674   background-color: #ddd; 
    675   padding-left: 0; 
     671  white-space: nowrap; 
     672
     673#listTable td.icons img.addref { 
     674  margin-right: 0.5em; 
    676675} 
    677676#calPageTable ul.calendarTree li { 
  • trunk/calendar3/skins/webpublic/rensselaer/default/default/rss.xsl

    r108 r281  
    2525    <item> 
    2626      <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> 
    27       <link><xsl:value-of select="/bedework/urlprefix"/>/eventView.do?subid=<xsl:value-of select="subscription/id"/>&amp;guid=<xsl:value-of select="guid"/>&amp;recurrenceId=<xsl:value-of select="recurrenceId"/></link> 
     27      <link><xsl:value-of select="/bedework/urlprefix"/>/eventView.do?subid=<xsl:value-of select="subscription/id"/>&amp;calid=<xsl:value-of select="calendar/id"/>&amp;guid=<xsl:value-of select="guid"/>&amp;recurrenceId=<xsl:value-of select="recurrenceId"/></link> 
    2828      <pubDate><xsl:value-of select="substring(start/dayname,1,3)"/>, 
    2929               <xsl:value-of select="start/twodigitday"/><xsl:text> </xsl:text>