Changeset 276

Show
Ignore:
Timestamp:
03/13/06 13:12:17
Author:
johnsa
Message:

Added a new today button (though am not yet using it).

Updated "manage subscriptions" in personal client; added some icons for this purpose.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/blue.css

    r265 r276  
    132132  color: #eee; 
    133133} 
    134 #tabsTable .centerCell { 
    135   text-align: right; 
    136   background : url(../../images/demo/std-tab-space.gif); 
    137   font-size: 0.8em; 
    138   white-space: nowrap; 
    139   width: 100%; 
    140   padding-right: 0.5em; 
    141 } 
    142134#tabsTable .centerCell  a { 
    143135  text-decoration: none; 

  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/common.css

    r271 r276  
    55  color: #ff9; 
    66  font-weight: bold; 
     7} 
     8#tabsTable .centerCell { 
     9  text-align: left; 
     10  background : url(../../images/demo/std-tab-space.gif); 
     11  font-size: 0.8em; 
     12  white-space: nowrap; 
     13  width: 100%; 
     14  padding: 0 1em; 
    715} 
    816#calendarOfEventsTitle { 

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

    r271 r276  
    270270            </td> 
    271271            <td class="centerCell"> 
    272               &#160; 
     272              &#160;<!--<img src="{$resourcesRoot}/images/std-button-today.gif" width="46" height="17" border="0" alt="TODAY"/>--> 
    273273            </td> 
    274274            <td class="rightCell"> 
    …… 
    294294            </td> 
    295295            <td class="centerCell"> 
    296                 &#160; 
     296              &#160;<!--<img src="{$resourcesRoot}/images/std-button-today.gif" width="46" height="17" border="0" alt="TODAY"/>--> 
    297297            </td> 
    298298            <td class="rightCell"> 

  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/green.css

    r265 r276  
    132132  color: #eee; 
    133133} 
    134 #tabsTable .centerCell { 
    135   text-align: right; 
    136   background : url(../../images/demo/std-tab-space.gif); 
    137   font-size: 0.8em; 
    138   white-space: nowrap; 
    139   width: 100%; 
    140   padding-right: 0.5em; 
    141 } 
    142134#tabsTable .centerCell  a { 
    143135  text-decoration: none; 

  • trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/red.css

    r265 r276  
    132132  color: #eee; 
    133133} 
    134 #tabsTable .centerCell { 
    135   text-align: right; 
    136   background : url(../../images/demo/std-tab-space.gif); 
    137   font-size: 0.8em; 
    138   white-space: nowrap; 
    139   width: 100%; 
    140   padding-right: 0.5em; 
    141 } 
    142134#tabsTable .centerCell  a { 
    143135  text-decoration: none; 

  • trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css

    r267 r276  
    171171  padding-bottom: 0.5em; 
    172172} 
    173 #bodyBlock td#bodyContent {   
     173#bodyBlock td#bodyContent { 
    174174  border-right: 2px solid #333; 
    175175  border-bottom: 2px solid #aaa; 
    …… 
    408408  border-right : thin dashed #999; 
    409409} 
    410 #calPageTable h2 { 
    411   font-size: 1.2em; 
     410 
     411#calPageTable ul.calendarTree li { 
     412  font-weight: bold; 
     413} 
     414#calPageTable ul.calendarTree li ul li { 
     415  font-weight: normal; 
     416} 
     417#calPageTable ul.calendarTree li.folder { 
     418  list-style-image: url(../../images/demo/catIcon.gif); 
     419  padding-top: 0.25em; 
     420  padding-bottom: 0.25em; 
     421} 
     422#calPageTable ul.calendarTree li.calendar { 
     423  list-style-image: url(../../images/demo/calIcon-sm.gif); 
    412424} 
    413425#calPageTable td.infoCell { 
    …… 
    416428  text-align: center; 
    417429  padding: 4px; 
    418 } 
    419 #calPageTable li { 
    420   list-style-type : none; 
    421 } 
    422 #calPageTable li input[type="checkbox"] { 
    423   margin-right: 0.5em; 
    424430} 
    425431#dayCalendarTable { 

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

    r267 r276  
    9595              <xsl:when test="/bedework/appvar[key='sidebar']/value='closed'"> 
    9696                <td id="sideBarClosed"> 
    97                   <img src="{$resourcesRoot}/images/demo/space.gif" width="1" height="1" border="0" alt="*"/> 
     97                  <img src="{$resourcesRoot}/images/demo/spacer.gif" width="1" height="1" border="0" alt="*"/> 
    9898                </td> 
    9999              </xsl:when> 
    …… 
    943943  <!--==== CALENDAR LISTING / MANAGE SUBSCRIPTIONS ====--> 
    944944  <xsl:template match="calendars"> 
    945     <xsl:variable name="topLevelCalCount" select="count(/bedework/calendars/calendar)"/> 
    946     <form name="subscriptionForm" method="post" action="{$subscribe}" id="subscriptions"> 
    947       <input type="hidden" name="confirmationid" value="{$confId}"/> 
    948       <table id="calPageTable" border="0" cellpadding="0" cellspacing="0"> 
    949         <tr> 
    950           <th colspan="2"> 
    951             Calendar Subscriptions 
    952           </th> 
    953         </tr> 
    954         <tr> 
    955           <td colspan="2" class="infoCell"> 
    956             Subscribe to these calendars by checking the boxes, then click the Submit button &#62;&#62;&#160; 
    957             <input name="submit" type="submit" value="Submit"/> 
    958           </td> 
    959         </tr> 
    960         <tr> 
    961           <td class="leftCell"> 
    962             <xsl:apply-templates select="calendar[position() &lt;= floor($topLevelCalCount div 2)]" mode="fullList"/> 
    963           </td> 
    964           <td> 
    965             <xsl:apply-templates select="calendar[position() &gt; floor($topLevelCalCount div 2)]" mode="fullList"/> 
    966           </td> 
    967         </tr> 
    968       </table> 
    969     </form> 
    970   </xsl:template> 
    971  
    972   <xsl:template match="calendar" mode="fullList"> 
     945    <xsl:variable name="publicCalCount" select="count(calendar[name='public']/calendar)"/> 
     946    <table id="calPageTable" border="0" cellpadding="0" cellspacing="0"> 
     947      <tr> 
     948        <th colspan="2"> 
     949          Calendar Subscriptions 
     950        </th> 
     951      </tr> 
     952      <tr> 
     953        <td colspan="2" class="infoCell"> 
     954          Add and remove subscriptions to public calendars 
     955        </td> 
     956      </tr> 
     957      <tr> 
     958        <td class="leftCell"> 
     959          <ul class="calendarTree"> 
     960            <xsl:apply-templates select="calendar[name='public']/calendar[position() &lt;= ceiling($publicCalCount div 2)]" mode="calTree"/> 
     961          </ul> 
     962        </td> 
     963        <td> 
     964          <ul class="calendarTree"> 
     965            <xsl:apply-templates select="calendar[name='public']/calendar[position() &gt; ceiling($publicCalCount div 2)]" mode="calTree"/> 
     966          </ul> 
     967        </td> 
     968      </tr> 
     969    </table> 
     970  </xsl:template> 
     971 
     972  <xsl:template match="calendar" mode="calTree"> 
     973   <xsl:variable name="itemClass"> 
     974      <xsl:choose> 
     975        <xsl:when test="calendarCollection='false'">folder</xsl:when> 
     976        <xsl:otherwise>calendar</xsl:otherwise> 
     977      </xsl:choose> 
     978    </xsl:variable> 
    973979    <xsl:variable name="id" select="id"/> 
    974     <h2> 
    975       <xsl:copy-of select="form/checkbox/*" /> 
    976       <xsl:value-of select="title"/> 
    977     </h2> 
    978     <ul> 
    979       <xsl:for-each select="calendar"> 
    980         <li> 
    981           <xsl:copy-of select="form/checkbox/*" /> 
    982           <xsl:value-of select="title"/> 
    983         </li> 
    984       </xsl:for-each> 
    985     </ul> 
     980    <xsl:variable name="name" select="name"/> 
     981    <li class="{$itemClass}"> 
     982      <a href="{$subscribe}?calid={$id}&amp;name={$name}"><xsl:value-of select="name"/></a> 
     983      <xsl:if test="calendar"> 
     984        <ul> 
     985          <xsl:apply-templates select="calendar" mode="calTree"/> 
     986        </ul> 
     987      </xsl:if> 
     988    </li> 
    986989  </xsl:template> 
    987990 

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

    r154 r276  
    283283          </xsl:choose> 
    284284        </td> 
     285        <td class="todayButton"> 
     286          <a href="{$setViewPeriod}?viewType=todayView&amp;date={$curdate}"> 
     287            <img src="{$resourcesRoot}/images/std-button-today-off.gif" width="54" height="22" border="0" alt="Go to Today" align="left"/> 
     288          </a> 
     289        </td> 
    285290        <td align="right" class="gotoForm"> 
    286291          <form name="calForm" method="get" action="{$setViewPeriod}"> 
    …… 
    341346            </table> 
    342347          </form> 
    343         </td> 
    344         <td class="todayButton"> 
    345           <a href="{$setViewPeriod}?viewType=todayView&amp;date={$curdate}"> 
    346             <img src="{$resourcesRoot}/images/std-button-today-off.gif" width="54" height="22" border="0" alt="Go to Today" align="left"/> 
    347           </a> 
    348348        </td> 
    349349        <td class="rightCell">