Changeset 129

Show
Ignore:
Timestamp:
02/09/06 15:42:36
Author:
johnsa
Message:

stylesheet changes to improve naviagtional elements
modified toggle buttons

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r127 r129  
    7878    <html lang="en"> 
    7979      <head> 
    80         <title>Calendar of Events</title> 
     80        <title>Bedework Events Calendar</title> 
    8181        <xsl:choose> 
    8282          <xsl:when test="/bedework/appvar[key='style']/value='red'"> 
    …… 
    260260            </td> 
    261261            <td class="centerCell"> 
    262               <xsl:choose> 
    263                 <xsl:when test="/bedework/periodname='Day'"> 
    264                   <img src="{$resourcesRoot}/images/std-button-listview-off.gif" width="46" height="20" border="0" alt="toggle list/calendar view"/> 
    265                 </xsl:when> 
    266                 <xsl:when test="/bedework/periodname='Year'"> 
    267                   <img src="{$resourcesRoot}/images/std-button-calview-off.gif" width="46" height="20" border="0" alt="toggle list/calendar view"/> 
    268                 </xsl:when> 
    269                 <xsl:when test="/bedework/periodname='Month'"> 
    270                   <xsl:choose> 
    271                     <xsl:when test="/bedework/appvar[key='monthViewMode']/value='list'"> 
    272                       <a href="{$setup}?setappvar=monthViewMode(cal)" title="toggle list/calendar view"> 
    273                         <img src="{$resourcesRoot}/images/std-button-calview.gif" width="46" height="20" border="0" alt="toggle list/calendar view"/> 
    274                       </a> 
    275                     </xsl:when> 
    276                     <xsl:otherwise> 
    277                       <a href="{$setup}?setappvar=monthViewMode(list)" title="toggle list/calendar view"> 
    278                         <img src="{$resourcesRoot}/images/std-button-listview.gif" width="46" height="20" border="0" alt="toggle list/calendar view"/> 
    279                       </a> 
    280                     </xsl:otherwise> 
    281                   </xsl:choose> 
    282                 </xsl:when> 
    283                 <xsl:otherwise> 
    284                   <xsl:choose> 
    285                     <xsl:when test="/bedework/appvar[key='weekViewMode']/value='list'"> 
    286                       <a href="{$setup}?setappvar=weekViewMode(cal)" title="toggle list/calendar view"> 
    287                         <img src="{$resourcesRoot}/images/std-button-calview.gif" width="46" height="20" border="0" alt="toggle list/calendar view"/> 
    288                       </a> 
    289                     </xsl:when> 
    290                     <xsl:otherwise> 
    291                       <a href="{$setup}?setappvar=weekViewMode(list)" title="toggle list/calendar view"> 
    292                         <img src="{$resourcesRoot}/images/std-button-listview.gif" width="46" height="20" border="0" alt="toggle list/calendar view"/> 
    293                       </a> 
    294                     </xsl:otherwise> 
    295                   </xsl:choose> 
    296                 </xsl:otherwise> 
    297               </xsl:choose> 
    298               <xsl:choose> 
    299                 <xsl:when test="/bedework/periodname='Year' or 
    300                                 (/bedework/periodname='Month' and 
    301                                 (/bedework/appvar[key='monthViewMode']/value='cal' or 
    302                                  count(/bedework/appvar[key='monthViewMode'])=0)) or 
    303                                 (/bedework/periodname='Week' and 
    304                                 (/bedework/appvar[key='weekViewMode']/value='cal' or 
    305                                  count(/bedework/appvar[key='weekViewMode'])=0))"> 
    306                   <xsl:choose> 
    307                     <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'"> 
    308                       <img src="{$resourcesRoot}/images/std-button-summary-off.gif" width="67" height="20" border="0" alt="only summaries of events supported in this view"/> 
    309                     </xsl:when> 
    310                     <xsl:otherwise> 
    311                       <img src="{$resourcesRoot}/images/std-button-details-off.gif" width="67" height="20" border="0" alt="only summaries of events supported in this view"/> 
    312                     </xsl:otherwise> 
    313                   </xsl:choose> 
    314                 </xsl:when> 
    315                 <xsl:otherwise> 
    316                   <xsl:choose> 
    317                     <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'"> 
    318                       <a href="{$setup}?setappvar=summaryMode(summary)" title="toggle summary/detailed view"> 
    319                         <img src="{$resourcesRoot}/images/std-button-summary.gif" width="67" height="20" border="0" alt="toggle summary/detailed view"/> 
    320                       </a> 
    321                     </xsl:when> 
    322                     <xsl:otherwise> 
    323                       <a href="{$setup}?setappvar=summaryMode(details)" title="toggle summary/detailed view"> 
    324                         <img src="{$resourcesRoot}/images/std-button-details.gif" width="67" height="20" border="0" alt="toggle summary/detailed view"/> 
    325                       </a> 
    326                     </xsl:otherwise> 
    327                   </xsl:choose> 
    328                 </xsl:otherwise> 
    329               </xsl:choose> 
     262              &#160; 
    330263            </td> 
    331264            <td class="rightCell"> 
    332               <a href="setup.do"><img src="{$resourcesRoot}/images/std-button-refresh.gif" width="69" height="20" border="0" alt="refresh view"/></a> 
     265              &#160; 
    333266            </td> 
    334267          </tr> 
    …… 
    351284            </td> 
    352285            <td class="centerCell"> 
    353                 &#160;<!--login--> 
     286                &#160; 
    354287            </td> 
    355288            <td class="rightCell"> 
    …… 
    468401         <td class="leftCell"> 
    469402           <xsl:choose> 
    470              <xsl:when test="/bedework/selectionType = 'calendar'"> 
     403             <xsl:when test="/bedework/selectionState/selectionType = 'calendar'"> 
    471404               Calendar: 
    472405               <span class="link">[<a href="{$setSelection}">default view</a>]</span> 
    473406             </xsl:when> 
    474              <xsl:when test="/bedework/selectionType = 'search'"> 
     407             <xsl:when test="/bedework/selectionState/selectionType = 'search'"> 
    475408               Current search: <xsl:value-of select="/bedework/search"/> 
    476409               <span class="link">[<a href="{$setSelection}">default view</a>]</span> 
    477410             </xsl:when> 
    478              <xsl:when test="/bedework/selectionType = 'subscription'"> 
     411             <xsl:when test="/bedework/selectionState/selectionType = 'subscription'"> 
    479412               Subscription: (not implemented yet) 
    480413               <span class="link">[<a href="{$setSelection}">default view</a>]</span> 
    481414             </xsl:when> 
    482              <xsl:when test="/bedework/selectionType = 'filter'"> 
     415             <xsl:when test="/bedework/selectionState/selectionType = 'filter'"> 
    483416               Filter: (not implemented yet) 
    484417               <span class="link">[<a href="{$setSelection}">default view</a>]</span> 
    …… 
    501434                </select> 
    502435              </form> 
    503               <span class="calLinks"><a href="{$setSelection}">default view</a> | <a href="{$fetchPublicCalendars}">calendar list</a></span> 
     436              <span class="calLinks"><a href="{$setSelection}">default view</a> | <a href="{$fetchPublicCalendars}">available calendars</a></span> 
    504437             </xsl:otherwise> 
    505438           </xsl:choose> 
    506439         </td> 
    507          <td class="rightCell"><!--<form name="searchForm" method="get" action="{$setSelection}">Search: <input type="text" name="searchString" size="30" value=""/><input type="submit" value="go"/></form>--></td> 
     440         <td class="rightCell"> 
     441            <xsl:choose> 
     442              <xsl:when test="/bedework/periodname='Day'"> 
     443                <img src="{$resourcesRoot}/images/std-button-listview-off.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/> 
     444              </xsl:when> 
     445              <xsl:when test="/bedework/periodname='Year'"> 
     446                <img src="{$resourcesRoot}/images/std-button-calview-off.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/> 
     447              </xsl:when> 
     448              <xsl:when test="/bedework/periodname='Month'"> 
     449                <xsl:choose> 
     450                  <xsl:when test="/bedework/appvar[key='monthViewMode']/value='list'"> 
     451                    <a href="{$setup}?setappvar=monthViewMode(cal)" title="toggle list/calendar view"> 
     452                      <img src="{$resourcesRoot}/images/std-button-calview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/> 
     453                    </a> 
     454                  </xsl:when> 
     455                  <xsl:otherwise> 
     456                    <a href="{$setup}?setappvar=monthViewMode(list)" title="toggle list/calendar view"> 
     457                      <img src="{$resourcesRoot}/images/std-button-listview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/> 
     458                    </a> 
     459                  </xsl:otherwise> 
     460                </xsl:choose> 
     461              </xsl:when> 
     462              <xsl:otherwise> 
     463                <xsl:choose> 
     464                  <xsl:when test="/bedework/appvar[key='weekViewMode']/value='list'"> 
     465                    <a href="{$setup}?setappvar=weekViewMode(cal)" title="toggle list/calendar view"> 
     466                      <img src="{$resourcesRoot}/images/std-button-calview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/> 
     467                    </a> 
     468                  </xsl:when> 
     469                  <xsl:otherwise> 
     470                    <a href="{$setup}?setappvar=weekViewMode(list)" title="toggle list/calendar view"> 
     471                      <img src="{$resourcesRoot}/images/std-button-listview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/> 
     472                    </a> 
     473                  </xsl:otherwise> 
     474                </xsl:choose> 
     475              </xsl:otherwise> 
     476            </xsl:choose> 
     477            <xsl:choose> 
     478              <xsl:when test="/bedework/periodname='Year' or 
     479                              (/bedework/periodname='Month' and 
     480                              (/bedework/appvar[key='monthViewMode']/value='cal' or 
     481                               count(/bedework/appvar[key='monthViewMode'])=0)) or 
     482                              (/bedework/periodname='Week' and 
     483                              (/bedework/appvar[key='weekViewMode']/value='cal' or 
     484                               count(/bedework/appvar[key='weekViewMode'])=0))"> 
     485                <xsl:choose> 
     486                  <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'"> 
     487                    <img src="{$resourcesRoot}/images/std-button-summary-off.gif" width="67" height="21" border="0" alt="only summaries of events supported in this view"/> 
     488                  </xsl:when> 
     489                  <xsl:otherwise> 
     490                    <img src="{$resourcesRoot}/images/std-button-details-off.gif" width="67" height="21" border="0" alt="only summaries of events supported in this view"/> 
     491                  </xsl:otherwise> 
     492                </xsl:choose> 
     493              </xsl:when> 
     494              <xsl:otherwise> 
     495                <xsl:choose> 
     496                  <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'"> 
     497                    <a href="{$setup}?setappvar=summaryMode(summary)" title="toggle summary/detailed view"> 
     498                      <img src="{$resourcesRoot}/images/std-button-summary.gif" width="67" height="21" border="0" alt="toggle summary/detailed view"/> 
     499                    </a> 
     500                  </xsl:when> 
     501                  <xsl:otherwise> 
     502                    <a href="{$setup}?setappvar=summaryMode(details)" title="toggle summary/detailed view"> 
     503                      <img src="{$resourcesRoot}/images/std-button-details.gif" width="67" height="21" border="0" alt="toggle summary/detailed view"/> 
     504                    </a> 
     505                  </xsl:otherwise> 
     506                </xsl:choose> 
     507              </xsl:otherwise> 
     508            </xsl:choose> 
     509            <a href="setup.do"><img src="{$resourcesRoot}/images/std-button-refresh.gif" width="69" height="21" border="0" alt="refresh view"/></a> 
     510          </td> 
    508511       </tr> 
    509512    </table> 
    …… 
    10231026            </select> 
    10241027          </form> 
     1028          <form name="skinSelectForm" method="get" action="{$setup}"> 
     1029            skin examples: 
     1030            <select name="skinName" onchange="submit()"> 
     1031              <option>select a skin</option> 
     1032              <option value="rss">rss feed</option> 
     1033              <option value="jsToday">javascript feed</option> 
     1034              <option value="videocal">video feed</option> 
     1035              <option value="default">reset to calendar default</option> 
     1036            </select> 
     1037          </form> 
    10251038          <form name="skinSelectForm" method="get" action=""> 
    1026             skin examples: 
    1027             <select name="skinNameSticky" onchange="window.location = this.value"> 
     1039            production examples: 
     1040            <select name="sitePicker" onchange="window.location = this.value"> 
    10281041              <option>select a calendar</option> 
    10291042              <option value="http://events.rpi.edu">Rensselaer</option> 

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

    r108 r129  
    88       e.g. 
    99       <script src="http://localhost:8080/cal/setView.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"/> 
    1216  <xsl:template match="/"> 
    1317    <xsl:text disable-output-escaping="yes">document.writeln('&lt;h3&gt;');</xsl:text> 
    14       <xsl:text disable-output-escaping="yes">document.writeln("Today's Events");</xsl:text> 
     18      <!--<xsl:text disable-output-escaping="yes">document.writeln("Today's Events");</xsl:text>--> 
     19      <xsl:text disable-output-escaping="yes">document.writeln("This Period's Events");</xsl:text> 
    1520    <xsl:text disable-output-escaping="yes">document.writeln('&lt;/h3&gt;');</xsl:text> 
    1621    <xsl:text disable-output-escaping="yes">document.writeln('&lt;ul class="eventFeed"&gt;');</xsl:text> 

  • trunk/calendar3/skins/webpublic/rensselaer/default/default/default.xsl

    r124 r129  
    6565        <meta name="robots" content="noindex,nofollow"/> 
    6666        <link rel="stylesheet" type="text/css" media="print" href="{$resourcesRoot}/default/default/rensselaer-print.css" /> 
    67         <link rel="icon" type="image/ico" href="http://www.rpi.edu/x/favicon.ico" /> 
     67        <link rel="icon" type="image/ico" href="http://www.rpi.edu/favicon.ico" /> 
    6868        <script language="JavaScript"> 
    6969          // launches new browser window with print-friendly version of page when 
    …… 
    144144    <table width="100%" border="0" cellpadding="0" cellspacing="0" id="logoTable"> 
    145145      <tr> 
    146         <td colspan="3" id="logoCell"><a href="http://www.rpi.edu"><img src="{$resourcesRoot}/images/rensselaer/std-rpilogo.gif" width="282" height="55" border="0" alt="Rensselaer"/></a></td> 
     146        <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> 
    147147        <td colspan="2" id="rpiLinksCell"> 
    148148          <a href="{$privateCal}">Personal Calendar</a> | 
    …… 
    158158    <table width="100%" border="0" cellpadding="0" cellspacing="0"> 
    159159      <tr> 
    160         <td width="50%"><img alt="" src="{$resourcesRoot}/images/rensselaer/metacal-topBorder.gif" width="100%" height="23" border="0"/></td> 
    161         <td><img src="{$resourcesRoot}/images/rensselaer/metacal-topTitle.gif" width="373" height="23" border="0" alt="Rensselaer Polytechnic Institute Events Calendar"/></td> 
    162         <td width="50%"><img alt="" src="{$resourcesRoot}/images/rensselaer/metacal-topBorder.gif" width="100%" height="23" border="0"/></td> 
     160        <td width="50%"><img alt="" src="{$resourcesRoot}/images/metacal-topBorder.gif" width="100%" height="23" border="0"/></td> 
     161        <td><img src="{$resourcesRoot}/images/metacal-topTitle.gif" width="373" height="23" border="0" alt="Rensselaer Polytechnic Institute Events Calendar"/></td> 
     162        <td width="50%"><img alt="" src="{$resourcesRoot}/images/metacal-topBorder.gif" width="100%" height="23" border="0"/></td> 
    163163      </tr> 
    164164    </table> 
    …… 
    176176              <xsl:choose> 
    177177                <xsl:when test="/bedework/periodname='Day'"> 
    178                   <a href="{$setViewPeriod}?viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/rensselaer/std-tab-day-on.gif" width="91" height="20" border="0" alt="DAY"/></a> 
     178                  <a href="{$setViewPeriod}?viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-day-on.gif" width="91" height="20" border="0" alt="DAY"/></a> 
    179179                </xsl:when> 
    180180                <xsl:otherwise> 
    181                   <a href="{$setViewPeriod}?viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/rensselaer/std-tab-day-off.gif" width="91" height="20" border="0" alt="DAY"/></a> 
     181                  <a href="{$setViewPeriod}?viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-day-off.gif" width="91" height="20" border="0" alt="DAY"/></a> 
    182182                </xsl:otherwise> 
    183183              </xsl:choose> 
    …… 
    186186              <xsl:choose> 
    187187                <xsl:when test="/bedework/periodname='Week' or /bedework/periodname=''"> 
    188                   <a href="{$setViewPeriod}?viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/rensselaer/std-tab-week-on.gif" width="92" height="20" border="0" alt="WEEK"/></a> 
     188                  <a href="{$setViewPeriod}?viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-week-on.gif" width="92" height="20" border="0" alt="WEEK"/></a> 
    189189                 </xsl:when> 
    190190                <xsl:otherwise> 
    191                   <a href="{$setViewPeriod}?viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/rensselaer/std-tab-week-off.gif" width="92" height="20" border="0" alt="WEEK"/></a> 
     191                  <a href="{$setViewPeriod}?viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-week-off.gif" width="92" height="20" border="0" alt="WEEK"/></a> 
    192192                 </xsl:otherwise> 
    193193              </xsl:choose> 
    …… 
    196196              <xsl:choose> 
    197197                <xsl:when test="/bedework/periodname='Month'"> 
    198                   <a href="{$setViewPeriod}?viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/rensselaer/std-tab-month-on.gif" width="90" height="20" border="0" alt="MONTH"/></a> 
     198                  <a href="{$setViewPeriod}?viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-month-on.gif" width="90" height="20" border="0" alt="MONTH"/></a> 
    199199                </xsl:when> 
    200200                <xsl:otherwise> 
    201                   <a href="{$setViewPeriod}?viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/rensselaer/std-tab-month-off.gif" width="90" height="20" border="0" alt="MONTH"/></a> 
     201                  <a href="{$setViewPeriod}?viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-month-off.gif" width="90" height="20" border="0" alt="MONTH"/></a> 
    202202                </xsl:otherwise> 
    203203              </xsl:choose> 
    …… 
    206206              <xsl:choose> 
    207207                <xsl:when test="/bedework/periodname='Year'"> 
    208                   <a href="{$setViewPeriod}?viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/rensselaer/std-tab-year-on.gif" width="92" height="20" border="0" alt="YEAR"/></a> 
     208                  <a href="{$setViewPeriod}?viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-year-on.gif" width="92" height="20" border="0" alt="YEAR"/></a> 
    209209                </xsl:when> 
    210210                <xsl:otherwise> 
    211                   <a href="{$setViewPeriod}?viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/rensselaer/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/></a> 
     211                  <a href="{$setViewPeriod}?viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/></a> 
    212212                </xsl:otherwise> 
    213213              </xsl:choose> 
    214214            </td> 
    215215            <td class="centerCell"> 
    216                 &#160;<!-- <a href="http://www.rpi.edu/dept/cct/apps/pubeventsxml/calendarfeatures.html">login</a> --> 
    217                 <!-- <span id="featureHighlight">switch view &#8594;</span> --> 
    218             </td> 
    219             <td class="rssPrint"> 
    220               <a href="javascript:window.print()" title="print this view"> 
    221                 <img alt="print this view" src="{$resourcesRoot}/images/rensselaer/std-print-icon.gif" width="20" height="14" border="0"/> print 
     216                &#160; 
     217            </td> 
     218            <td class="rightCell"> 
     219             <a href="javascript:window.print()" title="print this view"> 
     220                <img alt="print this view" src="{$resourcesRoot}/images/std-print-icon.gif" width="20" height="14" border="0"/> print 
    222221              </a> 
    223222              <a class="rss" href="http://helpdesk.rpi.edu/update.do?artcenterkey=255" title="RSS feed">RSS</a> 
    224             </td> 
    225             <td> 
    226               <xsl:choose> 
    227                 <xsl:when test="/bedework/periodname='Day'"> 
    228                   <img src="{$resourcesRoot}/images/rensselaer/std-button-listview-off.gif" width="46" height="20" border="0" alt="toggle list/calendar view"/> 
    229                 </xsl:when> 
    230                 <xsl:when test="/bedework/periodname='Year'"> 
    231                   <img src="{$resourcesRoot}/images/rensselaer/std-button-calview-off.gif" width="46" height="20" border="0" alt="toggle list/calendar view"/> 
    232                 </xsl:when> 
    233                 <xsl:when test="/bedework/periodname='Month'"> 
    234                   <xsl:choose> 
    235                     <xsl:when test="/bedework/appvar[key='monthViewMode']/value='list'"> 
    236                       <a href="{$setup}?setappvar=monthViewMode(cal)" title="toggle list/calendar view"> 
    237                         <img src="{$resourcesRoot}/images/rensselaer/std-button-calview.gif" width="46" height="20" border="0" alt="toggle list/calendar view"/> 
    238                       </a> 
    239                     </xsl:when> 
    240                     <xsl:otherwise> 
    241                       <a href="{$setup}?setappvar=monthViewMode(list)" title="toggle list/calendar view"> 
    242                         <img src="{$resourcesRoot}/images/rensselaer/std-button-listview.gif" width="46" height="20" border="0" alt="toggle list/calendar view"/> 
    243                       </a> 
    244                     </xsl:otherwise> 
    245                   </xsl:choose> 
    246                 </xsl:when> 
    247                 <xsl:otherwise> 
    248                   <xsl:choose> 
    249                     <xsl:when test="/bedework/appvar[key='weekViewMode']/value='list'"> 
    250                       <a href="{$setup}?setappvar=weekViewMode(cal)" title="toggle list/calendar view"> 
    251                         <img src="{$resourcesRoot}/images/rensselaer/std-button-calview.gif" width="46" height="20" border="0" alt="toggle list/calendar view"/> 
    252                       </a> 
    253                     </xsl:when> 
    254                     <xsl:otherwise> 
    255                       <a href="{$setup}?setappvar=weekViewMode(list)" title="toggle list/calendar view"> 
    256                         <img src="{$resourcesRoot}/images/rensselaer/std-button-listview.gif" width="46" height="20" border="0" alt="toggle list/calendar view"/> 
    257                       </a> 
    258                     </xsl:otherwise> 
    259                   </xsl:choose> 
    260                 </xsl:otherwise> 
    261               </xsl:choose> 
    262             </td> 
    263             <td> 
    264               <xsl:choose> 
    265                 <xsl:when test="/bedework/periodname='Year' or 
    266                                 (/bedework/periodname='Month' and 
    267                                 (/bedework/appvar[key='monthViewMode']/value='cal' or 
    268                                  count(/bedework/appvar[key='monthViewMode'])=0)) or 
    269                                 (/bedework/periodname='Week' and 
    270                                 (/bedework/appvar[key='weekViewMode']/value='cal' or 
    271                                  count(/bedework/appvar[key='weekViewMode'])=0))"> 
    272                   <xsl:choose> 
    273                     <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'"> 
    274                       <img src="{$resourcesRoot}/images/rensselaer/std-button-summary-off.gif" width="67" height="20" border="0" alt="only summaries of events supported in this view"/> 
    275                     </xsl:when> 
    276                     <xsl:otherwise> 
    277                       <img src="{$resourcesRoot}/images/rensselaer/std-button-details-off.gif" width="67" height="20" border="0" alt="only summaries of events supported in this view"/> 
    278                     </xsl:otherwise> 
    279                   </xsl:choose> 
    280                 </xsl:when> 
    281                 <xsl:otherwise> 
    282                   <xsl:choose> 
    283                     <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'"> 
    284                       <a href="{$setup}?setappvar=summaryMode(summary)" title="toggle summary/detailed view"> 
    285                         <img src="{$resourcesRoot}/images/rensselaer/std-button-summary.gif" width="67" height="20" border="0" alt="toggle summary/detailed view"/> 
    286                       </a> 
    287                     </xsl:when> 
    288                     <xsl:otherwise> 
    289                       <a href="{$setup}?setappvar=summaryMode(details)" title="toggle summary/detailed view"> 
    290                         <img src="{$resourcesRoot}/images/rensselaer/std-button-details.gif" width="67" height="20" border="0" alt="toggle summary/detailed view"/> 
    291                       </a> 
    292                     </xsl:otherwise> 
    293                   </xsl:choose> 
    294                 </xsl:otherwise> 
    295               </xsl:choose> 
    296             </td> 
    297             <td class="rightCell"> 
    298               <a href="setup.do"><img src="{$resourcesRoot}/images/demo/std-button-refresh.gif" width="69" height="20" border="0" alt="refresh view"/></a> 
    299223            </td> 
    300224          </tr> 
    …… 
    305229          <tr> 
    306230            <td> 
    307               <a href="{$setViewPeriod}?viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/rensselaer/std-tab-day-off.gif" width="91" height="20" border="0" alt="DAY"/></a> 
     231              <a href="{$setViewPeriod}?viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-day-off.gif" width="91" height="20" border="0" alt="DAY"/></a> 
    308232            </td> 
    309233            <td> 
    310               <a href="{$setViewPeriod}?viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/rensselaer/std-tab-week-off.gif" width="92" height="20" border="0" alt="WEEK"/></a> 
     234              <a href="{$setViewPeriod}?viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-week-off.gif" width="92" height="20" border="0" alt="WEEK"/></a> 
    311235            </td> 
    312236            <td> 
    313               <a href="{$setViewPeriod}?viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/rensselaer/std-tab-month-off.gif" width="90" height="20" border="0" alt="MONTH"/></a> 
     237              <a href="{$setViewPeriod}?viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-month-off.gif" width="90" height="20" border="0" alt="MONTH"/></a> 
    314238            </td> 
    315239            <td> 
    316               <a href="{$setViewPeriod}?viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/rensselaer/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/></a> 
     240              <a href="{$setViewPeriod}?viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/></a> 
    317241            </td> 
    318242            <td class="centerCell"> 
    319                 &#160;<!--<a href="http://www.rpi.edu/dept/cct/apps/pubeventsxml/calendarfeatures.html">login</a>--> 
     243                &#160; 
    320244            </td> 
    321245            <td class="rightCell"> 
    …… 
    342266      <tr> 
    343267        <td class="leftCell"> 
    344           <a href="{$setViewPeriod}?date={$prevdate}"><img src="{$resourcesRoot}/images/rensselaer/std-arrow-left.gif" alt="previous" width="13" height="16" class="prevImg" border="0"/></a> 
    345           <a href="{$setViewPeriod}?date={$nextdate}"><img src="{$resourcesRoot}/images/rensselaer/std-arrow-right.gif" alt="next" width="13" height="16" class="nextImg" border="0"/></a> 
     268          <a href="{$setViewPeriod}?date={$prevdate}"><img src="{$resourcesRoot}/images/std-arrow-left.gif" alt="previous" width="13" height="16" class="prevImg" border="0"/></a> 
     269          <a href="{$setViewPeriod}?date={$nextdate}"><img src="{$resourcesRoot}/images/std-arrow-right.gif" alt="next" width="13" height="16" class="nextImg" border="0"/></a> 
    346270          <xsl:choose> 
    347271            <xsl:when test="/bedework/periodname='Day'"> 
    …… 
    420344        <td class="todayButton"> 
    421345          <a href="{$setViewPeriod}?viewType=todayView&amp;date={$curdate}"> 
    422             <img src="{$resourcesRoot}/images/rensselaer/std-button-today-off.gif" width="54" height="22" border="0" alt="Go to Today" align="left"/> 
     346            <img src="{$resourcesRoot}/images/std-button-today-off.gif" width="54" height="22" border="0" alt="Go to Today" align="left"/> 
    423347          </a> 
    424348        </td> 
    …… 
    434358         <td class="leftCell"> 
    435359           <xsl:choose> 
    436              <xsl:when test="/bedework/selectionType = 'calendar'"> 
     360             <xsl:when test="/bedework/selectionState/selectionType = 'calendar'"> 
    437361               Calendar: 
    438362               <span class="link">[<a href="{$setSelection}">default view</a>]</span> 
    439363             </xsl:when> 
    440              <xsl:when test="/bedework/selectionType = 'search'"> 
     364             <xsl:when test="/bedework/selectionState/selectionType = 'search'"> 
    441365               Current search: <xsl:value-of select="/bedework/search"/> 
    442366               <span class="link">[<a href="{$setSelection}">default view</a>]</span> 
    443367             </xsl:when> 
    444              <xsl:when test="/bedework/selectionType = 'subscription'"> 
     368             <xsl:when test="/bedework/selectionState/selectionType = 'subscription'"> 
    445369               Subscription: (not implemented yet) 
    446370               <span class="link">[<a href="{$setSelection}">default view</a>]</span> 
    447371             </xsl:when> 
    448              <xsl:when test="/bedework/selectionType = 'filter'"> 
     372             <xsl:when test="/bedework/selectionState/selectionType = 'filter'"> 
    449373               Filter: (not implemented yet) 
    450374               <span class="link">[<a href="{$setSelection}">default view</a>]</span> 
    …… 
    457381                    <xsl:variable name="name" select="name"/> 
    458382                    <xsl:choose> 
    459                       <xsl:when test="name=/bedework/name"> 
     383                      <xsl:when test="name=/bedework/selectionState/view/name"> 
    460384                        <option value="{$name}" selected="selected"><xsl:value-of select="name"/></option> 
    461385                      </xsl:when> 
    …… 
    467391                </select> 
    468392              </form> 
    469               <span class="calLinks"><a href="{$setSelection}">default view</a> | <a href="{$fetchPublicCalendars}">calendar list</a></span> 
     393              <span class="calLinks"><a href="{$setSelection}">default view</a> | <a href="{$fetchPublicCalendars}">available calendars</a></span> 
    470394             </xsl:otherwise> 
    471395           </xsl:choose> 
    472396         </td> 
    473          <td class="rightCell"><!--<form name="searchForm" method="get" action="{$setSelection}">Search: <input type="text" name="searchString" size="30" value=""/><input type="submit" value="go"/></form>--></td> 
     397         <td class="rightCell"> 
     398            <xsl:choose> 
     399              <xsl:when test="/bedework/periodname='Day'"> 
     400                <img src="{$resourcesRoot}/images/std-button-listview-off.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/> 
     401              </xsl:when> 
     402              <xsl:when test="/bedework/periodname='Year'"> 
     403                <img src="{$resourcesRoot}/images/std-button-calview-off.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/> 
     404              </xsl:when> 
     405              <xsl:when test="/bedework/periodname='Month'"> 
     406                <xsl:choose> 
     407                  <xsl:when test="/bedework/appvar[key='monthViewMode']/value='list'"> 
     408                    <a href="{$setup}?setappvar=monthViewMode(cal)" title="toggle list/calendar view"> 
     409                      <img src="{$resourcesRoot}/images/std-button-calview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/> 
     410                    </a> 
     411                  </xsl:when> 
     412                  <xsl:otherwise> 
     413                    <a href="{$setup}?setappvar=monthViewMode(list)" title="toggle list/calendar view"> 
     414                      <img src="{$resourcesRoot}/images/std-button-listview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/> 
     415                    </a> 
     416                  </xsl:otherwise> 
     417                </xsl:choose> 
     418              </xsl:when> 
     419              <xsl:otherwise> 
     420                <xsl:choose> 
     421                  <xsl:when test="/bedework/appvar[key='weekViewMode']/value='list'"> 
     422                    <a href="{$setup}?setappvar=weekViewMode(cal)" title="toggle list/calendar view"> 
     423                      <img src="{$resourcesRoot}/images/std-button-calview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/> 
     424                    </a> 
     425                  </xsl:when> 
     426                  <xsl:otherwise> 
     427                    <a href="{$setup}?setappvar=weekViewMode(list)" title="toggle list/calendar view"> 
     428                      <img src="{$resourcesRoot}/images/std-button-listview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/> 
     429                    </a> 
     430                  </xsl:otherwise> 
     431                </xsl:choose> 
     432              </xsl:otherwise> 
     433            </xsl:choose> 
     434            <xsl:choose> 
     435              <xsl:when test="/bedework/periodname='Year' or 
     436                              (/bedework/periodname='Month' and 
     437                              (/bedework/appvar[key='monthViewMode']/value='cal' or 
     438                               count(/bedework/appvar[key='monthViewMode'])=0)) or 
     439                              (/bedework/periodname='Week' and 
     440                              (/bedework/appvar[key='weekViewMode']/value='cal' or 
     441                               count(/bedework/appvar[key='weekViewMode'])=0))"> 
     442                <xsl:choose> 
     443                  <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'"> 
     444                    <img src="{$resourcesRoot}/images/std-button-summary-off.gif" width="67" height="21" border="0" alt="only summaries of events supported in this view"/> 
     445                  </xsl:when> 
     446                  <xsl:otherwise> 
     447                    <img src="{$resourcesRoot}/images/std-button-details-off.gif" width="67" height="21" border="0" alt="only summaries of events supported in this view"/> 
     448                  </xsl:otherwise> 
     449                </xsl:choose> 
     450              </xsl:when> 
     451              <xsl:otherwise> 
     452                <xsl:choose> 
     453                  <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'"> 
     454                    <a href="{$setup}?setappvar=summaryMode(summary)" title="toggle summary/detailed view"> 
     455                      <img src="{$resourcesRoot}/images/std-button-summary.gif" width="67" height="21" border="0" alt="toggle summary/detailed view"/> 
     456                    </a> 
     457                  </xsl:when> 
     458                  <xsl:otherwise> 
     459                    <a href="{$setup}?setappvar=summaryMode(details)" title="toggle summary/detailed view"> 
     460                      <img src="{$resourcesRoot}/images/std-button-details.gif" width="67" height="21" border="0" alt="toggle summary/detailed view"/> 
     461                    </a> 
     462                  </xsl:otherwise> 
     463                </xsl:choose> 
     464              </xsl:otherwise> 
     465            </xsl:choose> 
     466            <a href="setup.do"><img src="{$resourcesRoot}/images/std-button-refresh.gif" width="69" height="21" border="0" alt="refresh view"/></a> 
     467          </td> 
    474468       </tr> 
    475469    </table> 
    …… 
    500494          <xsl:variable name="recurrenceId" select="recurrenceId"/> 
    501495          <a href="{$privateCal}/addEventRef.do?eventId={$id}" title="Add event to MyCalendar" target="myCalendar"> 
    502             <img class="addref" src="{$resourcesRoot}/images/rensselaer/add2mycal-icon.gif" width="20" height="26" border="0" align="left" alt="Add event to MyCalendar"/> 
     496            <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon.gif" width="20" height="26" border="0" align="left" alt="Add event to MyCalendar"/> 
    503497          </a> 
    504498        </th> 
    …… 
    510504          <xsl:variable name="eventIcalName" select="concat($id,'.ics')"/> 
    511505          <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"> 
    512             <img src="{$resourcesRoot}/images/rensselaer/std-ical_icon.gif" width="20" height="26" border="0" alt="Download this event"/> 
     506            <img src="{$resourcesRoot}/images/std-ical_icon.gif" width="20" height="26" border="0" alt="Download this event"/> 
    513507          </a> 
    514508        </th> 
    …… 
    738732                  <variable name="confId" select="/bedework/confirmationid"/> 
    739733                  <a href="{$privateCal}/addEventRef.do?eventId={$id}" title="Add event to MyCalendar" target="myCalendar"> 
    740                     <img class="addref" src="{$resourcesRoot}/images/rensselaer/add2mycal-icon-small.gif" width="12" height="16" border="0" align="left" alt="Add event to MyCalendar"/> 
     734                    <img class="addref" src="{$resourcesRoot}/images/add2mycal-icon-small.gif" width="12" height="16" border="0" align="left" alt="Add event to MyCalendar"/> 
    741735                  </a> 
    742736                </td> 
    …… 
    744738                  <xsl:variable name="eventIcalName" select="concat($id,'.ics')"/> 
    745739                  <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"> 
    746                     <img src="{$resourcesRoot}/images/rensselaer/std-ical_icon_small.gif" width="12" height="16" border="0" alt="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"/> 
     740                    <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"/> 
    747741                  </a> 
    748742                </td>