Changeset 1349

Show
Ignore:
Timestamp:
04/18/07 12:34:14
Author:
johnsa
Message:

web clients: some stylesheet cleanup, addition of subscription styles to public list view

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1348 r1349  
    43174317 
    43184318    <xsl:variable name="viewName" select="/bedeworkadmin/views/view/name"/> 
    4319     <p>The following view will be removed. <em>Be forewarned: removing views from a 
    4320     production system can cause the public interface to throw errors while the 
    4321     cache is updated.  To avoid this, plan on restarting the server when removing 
    4322     views from a production system.</em> 
     4319    <p>The following view will be removed. <em>Be forewarned: if caching is  
     4320    enabled, removing views from a 
     4321    production system can cause the public interface to throw errors until the 
     4322    cache is flushed (a few minutes).</em> 
    43234323    </p>  
    43244324     

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

    r1313 r1349  
    1313 
    1414              DEMONSTRATION CALENDAR STYLESHEET 
     15               
     16                  MainCampus Calendar Suite 
    1517 
    1618     This stylesheet is devoid of school branding.  It is a good 
    …… 
    720722        <th class="icalIcon" rowspan="2"> 
    721723          <div id="eventIcons"> 
    722             <a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 
    723               <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon.gif" width="20" height="26" border="0" alt="Add event to MyCalendar"/> 
    724             add to my calendar</a> 
     724            <xsl:if test="recurrenceId = ''"> 
     725              <!-- hide this for a 3.3.1 bug: can't add a reference to a recurring event at this time --> 
     726              <a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 
     727                <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon.gif" width="20" height="26" border="0" alt="Add event to MyCalendar"/> 
     728              add to my calendar</a> 
     729            </xsl:if> 
    725730            <xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/> 
    726731            <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"> 
    …… 
    953958                  </xsl:choose> 
    954959                </xsl:variable> 
    955                 <td class="{$descriptionClass}"> 
     960                <!-- Subscription styles. 
     961                     These are set in the add/modify subscription forms in the admin client; 
     962                     if present, these override the background-color set by eventClass. The 
     963                     subscription styles should not be used for cancelled events (tentative is ok). --> 
     964                <xsl:variable name="subscriptionClass"> 
     965                  <xsl:if test="status != 'CANCELLED' and 
     966                                subscription/subStyle != '' and 
     967                                subscription/subStyle != 'default'"><xsl:value-of select="subscription/subStyle"/></xsl:if> 
     968                </xsl:variable> 
     969                <td class="{$descriptionClass} {$subscriptionClass}"> 
    956970                  <xsl:if test="status='CANCELLED'"><strong>CANCELLED: </strong></xsl:if> 
    957971                  <xsl:choose> 
    …… 
    9911005                </td> 
    9921006                <td class="icons"> 
    993                   <a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 
    994                     <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon-small.gif" width="12" height="16" border="0" alt="Add event to MyCalendar"/> 
    995                   </a> 
     1007                  <xsl:if test="recurrenceId = ''"> 
     1008                    <!-- hide this for a 3.3.1 bug: can't add a reference to a recurring event at this time --> 
     1009                    <a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 
     1010                      <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon-small.gif" width="12" height="16" border="0" alt="Add event to MyCalendar"/> 
     1011                    </a> 
     1012                  </xsl:if> 
    9961013                  <xsl:variable name="eventIcalName" select="concat($id,'.ics')"/> 
    9971014                  <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"> 

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

    r1313 r1349  
    1313 
    1414        DEMONSTRATION "DEPARTMENTAL" CALENDAR STYLESHEET 
     15         
     16                  SoEDepartmental Calendar Suite 
    1517 
    1618     This stylesheet is for the "soe" (School of Engineering) 
    …… 
    722724        <th class="icalIcon" rowspan="2"> 
    723725          <div id="eventIcons"> 
    724             <a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 
    725               <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon.gif" width="20" height="26" border="0" alt="Add event to MyCalendar"/> 
    726             add to my calendar</a> 
     726            <xsl:if test="recurrenceId = ''"> 
     727              <!-- hide this for a 3.3.1 bug: can't add a reference to a recurring event at this time --> 
     728              <a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 
     729                <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon.gif" width="20" height="26" border="0" alt="Add event to MyCalendar"/> 
     730              add to my calendar</a> 
     731            </xsl:if> 
    727732            <xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/> 
    728733            <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"> 
    …… 
    955960                  </xsl:choose> 
    956961                </xsl:variable> 
    957                 <td class="{$descriptionClass}"> 
     962                <!-- Subscription styles. 
     963                     These are set in the add/modify subscription forms in the admin client; 
     964                     if present, these override the background-color set by eventClass. The 
     965                     subscription styles should not be used for cancelled events (tentative is ok). --> 
     966                <xsl:variable name="subscriptionClass"> 
     967                  <xsl:if test="status != 'CANCELLED' and 
     968                                subscription/subStyle != '' and 
     969                                subscription/subStyle != 'default'"><xsl:value-of select="subscription/subStyle"/></xsl:if> 
     970                </xsl:variable> 
     971                <td class="{$descriptionClass} {$subscriptionClass}"> 
    958972                  <xsl:if test="status='CANCELLED'"><strong>CANCELLED: </strong></xsl:if> 
    959973                  <xsl:choose> 
    …… 
    9931007                </td> 
    9941008                <td class="icons"> 
    995                   <a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 
    996                     <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon-small.gif" width="12" height="16" border="0" alt="Add event to MyCalendar"/> 
    997                   </a> 
     1009                  <xsl:if test="recurrenceId = ''"> 
     1010                    <!-- hide this for a 3.3.1 bug: can't add a reference to a recurring event at this time --> 
     1011                    <a href="{$privateCal}/event/addEventRef.do?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="Add event to MyCalendar" target="myCalendar"> 
     1012                      <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon-small.gif" width="12" height="16" border="0" alt="Add event to MyCalendar"/> 
     1013                    </a> 
     1014                  </xsl:if> 
    9981015                  <xsl:variable name="eventIcalName" select="concat($id,'.ics')"/> 
    9991016                  <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">