Changeset 353

Show
Ignore:
Timestamp:
04/08/06 10:02:17
Author:
johnsa
Message:

added calendar to event display; began some stylistic updates to public calendar in preparation for a graphical overhaul.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r342 r353  
    3333  color: #444; 
    3434  background-color: transparent; 
     35  border: none; 
    3536} 
    3637#logoTable #schoolLinksCell a:link, 

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

    r276 r353  
     1/* Generic selectors*/ 
     2h2 { 
     3  margin: 0em; 
     4  padding: 0.2em 0.2em 0.2em 0.5em; 
     5  font-size: 1.3em; 
     6  border-bottom: 1px solid #ccc; 
     7  border-left: 2px solid #aaa; 
     8  border-right: 2px solid #aaa; 
     9  background-color: #eee; 
     10  color: black; 
     11} 
     12h2 a:link, 
     13h2 a:active, 
     14h2 a:visited, 
     15h2 a:hover { 
     16  color: black; 
     17  background-color: inherit; 
     18  text-decoration: none; 
     19} 
     20/* Header IDs and classes */ 
    121#errors { 
    222  margin: 0; 
    …… 
    1333  width: 100%; 
    1434  padding: 0 1em; 
    15 } 
    16 #calendarOfEventsTitle { 
    17   font-family: Arial, sans-serif; 
    18   font-size: 8pt; 
    19   font-weight: bold; 
    20   letter-spacing: 3px; 
    21   background-color: #ddd; 
    22   color: #555; 
    23   text-align: center; 
    24   border-top: 1px solid black; 
    25   border-right: 1px solid black; 
    26   border-bottom: 2px solid black; 
    27   border-left: 1px solid black; 
    2835} 
    2936#stats { 

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

    r343 r353  
    103103        </xsl:if> 
    104104        <xsl:call-template name="tabs"/> 
     105        <xsl:call-template name="navigation"/> 
    105106        <xsl:choose> 
    106107          <xsl:when test="/bedework/page='event'"> 
    …… 
    118119          <xsl:otherwise> 
    119120            <!-- otherwise, show the eventsCalendar --> 
    120             <xsl:call-template name="navigation"/> 
    121121            <xsl:if test="/bedework/periodname!='Year'"> 
    122122              <xsl:call-template name="searchBar"/> 
    …… 
    180180      </tr> 
    181181    </table> 
    182     <div id="calendarOfEventsTitle"> 
    183       CALENDAR of EVENTS 
    184     </div> 
    185182    <table width="100%" border="0" cellpadding="0" cellspacing="0" id="dateBarTable"> 
    186183      <tr> 
    …… 
    312309          <a id="nextViewPeriod" href="{$setViewPeriod}?date={$nextdate}"><img src="{$resourcesRoot}/images/std-arrow-right.gif" alt="next" width="13" height="16" class="nextImg" border="0"/></a> 
    313310          <xsl:choose> 
    314             <xsl:when test="/bedework/periodname='Day'"> 
    315               <xsl:value-of select="substring(/bedework/eventscalendar/year/month/week/day/name,1,3)"/>, <xsl:value-of select="/bedework/eventscalendar/year/month/shortname"/>&#160;<xsl:value-of select="/bedework/eventscalendar/year/month/week/day/value"/>, <xsl:value-of select="/bedework/eventscalendar/year/value"/> 
    316             </xsl:when> 
    317             <xsl:when test="/bedework/periodname='Week' or /bedework/periodname=''"> 
    318               Week of <xsl:value-of select="/bedework/eventscalendar/year/month/shortname"/>&#160;<xsl:value-of select="/bedework/eventscalendar/year/month/week/day/value"/>, <xsl:value-of select="/bedework/eventscalendar/year/value"/> 
     311            <xsl:when test="/bedework/periodname='Year'"> 
     312              <xsl:value-of select="substring(/bedework/firstday/date,1,4)"/> 
    319313            </xsl:when> 
    320314            <xsl:when test="/bedework/periodname='Month'"> 
    321               <xsl:value-of select="/bedework/eventscalendar/year/month/longname"/>, <xsl:value-of select="/bedework/eventscalendar/year/value"/> 
     315              <xsl:value-of select="/bedework/firstday/monthname"/>, <xsl:value-of select="substring(/bedework/firstday/date,1,4)"/> 
     316            </xsl:when> 
     317            <xsl:when test="/bedework/periodname='Week'"> 
     318              Week of <xsl:value-of select="substring-after(/bedework/firstday/longdate,', ')"/> 
    322319            </xsl:when> 
    323320            <xsl:otherwise> 
    324               <xsl:value-of select="/bedework/eventscalendar/year/value"/> 
     321              <xsl:value-of select="/bedework/firstday/longdate"/> 
    325322            </xsl:otherwise> 
    326323          </xsl:choose> 
    …… 
    515512  <!--==== SINGLE EVENT ====--> 
    516513  <xsl:template match="event"> 
     514    <h2> 
     515      <xsl:if test="status='CANCELLED'">CANCELLED: </xsl:if> 
     516      <xsl:choose> 
     517        <xsl:when test="link != ''"> 
     518          <xsl:variable name="link" select="link"/> 
     519          <a href="{$link}"> 
     520            <xsl:value-of select="summary"/> 
     521          </a> 
     522        </xsl:when> 
     523        <xsl:otherwise> 
     524          <xsl:value-of select="summary"/> 
     525        </xsl:otherwise> 
     526      </xsl:choose> 
     527    </h2> 
    517528    <table id="eventTable" cellpadding="0" cellspacing="0"> 
    518529      <tr> 
    519         <th class="fieldname">Event:</th> 
    520         <th class="fieldval"> 
    521           <xsl:if test="status='CANCELLED'">CANCELLED: </xsl:if> 
    522           <xsl:choose> 
    523             <xsl:when test="link != ''"> 
    524               <xsl:variable name="link" select="link"/> 
    525               <a href="{$link}"> 
    526                 <xsl:value-of select="summary"/> 
    527               </a> 
    528             </xsl:when> 
    529             <xsl:otherwise> 
    530               <xsl:value-of select="summary"/> 
    531             </xsl:otherwise> 
    532           </xsl:choose> 
    533         </th> 
     530        <td class="fieldname">When:</td> 
     531        <td class="fieldval"> 
     532          <!-- was using abbrev dayname: substring(start/dayname,1,3) --> 
     533          <xsl:value-of select="start/dayname"/>, <xsl:value-of select="start/longdate"/><xsl:text> </xsl:text> 
     534          <xsl:if test="start/allday = 'false'"> 
     535            <span class="time"><xsl:value-of select="start/time"/></span> 
     536          </xsl:if> 
     537          <xsl:if test="end/allday = 'false' or end/longdate != start/longdate"> - </xsl:if> 
     538          <xsl:if test="end/longdate != start/longdate"><xsl:value-of select="substring(end/dayname,1,3)"/>, <xsl:value-of select="end/longdate"/><xsl:text> </xsl:text></xsl:if> 
     539          <xsl:if test="end/allday = 'false'"><span class="time"><xsl:value-of select="end/time"/></span></xsl:if> 
     540          <xsl:if test="start/allday = 'true'"><span class="time"><em>(all day)</em></span></xsl:if> 
     541        </td> 
    534542        <th class="icalIcon" rowspan="2"> 
    535543          <xsl:variable name="id" select="id"/> 
    …… 
    548556      </tr> 
    549557      <tr> 
    550         <td class="fieldname">When:</td> 
     558        <td class="fieldname">Where:</td> 
    551559        <td class="fieldval"> 
    552           <!-- was using abbrev dayname: substring(start/dayname,1,3) --> 
    553           <xsl:value-of select="start/dayname"/>, <xsl:value-of select="start/longdate"/><xsl:text> </xsl:text> 
    554           <xsl:if test="start/allday = 'false'"> 
    555             <span class="time"><xsl:value-of select="start/time"/></span> 
    556           </xsl:if> 
    557           <xsl:if test="end/allday = 'false' or end/longdate != start/longdate"> - </xsl:if> 
    558           <xsl:if test="end/longdate != start/longdate"><xsl:value-of select="substring(end/dayname,1,3)"/>, <xsl:value-of select="end/longdate"/><xsl:text> </xsl:text></xsl:if> 
    559           <xsl:if test="end/allday = 'false'"><span class="time"><xsl:value-of select="end/time"/></span></xsl:if> 
    560           <xsl:if test="start/allday = 'true'"><span class="time"><em>(all day)</em></span></xsl:if> 
    561         </td> 
    562       </tr> 
    563       <tr> 
    564         <td class="fieldname">Where:</td> 
    565         <td colspan="2" class="fieldval"> 
    566560          <xsl:choose> 
    567561            <xsl:when test="location/link=''"> 
    …… 
    636630        </tr> 
    637631      </xsl:if> 
     632      <tr> 
     633        <td class="fieldname">Calendar:</td> 
     634        <td colspan="2" class="fieldval"> 
     635          <xsl:value-of select="calendar/name"/> 
     636        </td> 
     637      </tr> 
    638638    </table> 
    639639  </xsl:template> 
    …… 
    10991099      <tr> 
    11001100        <td class="leftCell"> 
    1101           Based on the <a href="http://www.bedework.org/">Bedework Calendar</a> 
     1101          Based on the <a href="http://www.bedework.org/">Bedework Calendar</a> | 
     1102          <a href="?noxslt=yes">show XML</a> | 
     1103          <a href="?refreshXslt=yes">refresh XSLT</a> 
    11021104        </td> 
    11031105        <td class="rightCell"> 

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

    r342 r353  
    3333  color: #444; 
    3434  background-color: transparent; 
     35  border: none; 
    3536} 
    3637#logoTable #schoolLinksCell a:link, 

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

    r342 r353  
    3333  color: #444; 
    3434  background-color: transparent; 
     35  border: none; 
    3536} 
    3637#logoTable #schoolLinksCell a:link, 

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

    r351 r353  
    11851185        </tr> 
    11861186      </xsl:if> 
     1187      <tr> 
     1188        <td class="fieldname">Calendar:</td> 
     1189        <td colspan="2" class="fieldval"> 
     1190          <xsl:value-of select="calendar/name"/> 
     1191        </td> 
     1192      </tr> 
    11871193      <tr> 
    11881194        <td class="fieldname filler">&#160;</td>