Changeset 350

Show
Ignore:
Timestamp:
04/08/06 08:52:38
Author:
johnsa
Message:

personal client: navigation bar is now persistent and nav bar display dates now draw on the generic date information rather than the calendar tree. This change should be carried over into the public client as well.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r348 r350  
    1111  padding: 0.2em 0.2em 0.2em 0.5em; 
    1212  font-size: 1.3em; 
    13   background-color: #ccc; 
     13  border-bottom: 1px solid #ccc; 
     14  /*border-top: 1px solid #ccc;*/ 
     15  background-color: #eee; 
    1416  color: black; 
    1517} 
    …… 
    6264  color: #444; 
    6365  background-color: transparent; 
     66  border: none; 
    6467} 
    6568#logoTable #schoolLinksCell a:link, 
    …… 
    206209} 
    207210#myViews li { 
     211  list-style: none; 
     212} 
     213#myViews li.selected { 
    208214  list-style-image: url(../../resources/glassFill-icon-view.gif); 
    209215} 
    …… 
    409415  padding: 0.2em; 
    410416  text-align: left; 
     417} 
     418#commonTable td.filler { 
     419  height: 200px; 
    411420} 
    412421#commonTable td.fieldval { 

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

    r349 r350  
    110110            <td id="bodyContent"> 
    111111              <xsl:call-template name="tabs"/> 
     112              <xsl:call-template name="navigation"/> 
    112113              <xsl:choose> 
    113114                <xsl:when test="/bedework/page='event'"> 
    …… 
    147148                <xsl:otherwise> 
    148149                  <!-- otherwise, show the eventsCalendar --> 
    149                   <xsl:call-template name="navigation"/> 
    150150                  <xsl:call-template name="utilBar"/> 
    151151                  <!-- main eventCalendar content --> 
    …… 
    269269      <xsl:for-each select="/bedework/views/view"> 
    270270        <xsl:variable name="viewName" select="name"/>  
    271         <li><a href="{$setSelection}?viewName={$viewName}"><xsl:value-of select="name"/></a></li> 
     271        <xsl:choose> 
     272          <xsl:when test="name=/bedework/selectionState/view/name"> 
     273            <li class="selected"><a href="{$setSelection}?viewName={$viewName}"><xsl:value-of select="name"/></a></li> 
     274          </xsl:when> 
     275          <xsl:otherwise> 
     276            <li><a href="{$setSelection}?viewName={$viewName}"><xsl:value-of select="name"/></a></li> 
     277          </xsl:otherwise> 
     278        </xsl:choose> 
    272279      </xsl:for-each> 
    273280    </ul> 
    …… 
    393400          <a href="{$setViewPeriod}?date={$nextdate}"><img src="{$resourcesRoot}/resources/std-arrow-right.gif" alt="next" width="13" height="16" class="nextImg" border="0"/></a> 
    394401          <xsl:choose> 
    395             <xsl:when test="/bedework/periodname='Day'"> 
    396               <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"/> 
    397             </xsl:when> 
    398             <xsl:when test="/bedework/periodname='Week' or /bedework/periodname=''"> 
    399               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"/> 
     402            <xsl:when test="/bedework/periodname='Year'"> 
     403              <xsl:value-of select="substring(/bedework/firstday/date,1,4)"/> 
    400404            </xsl:when> 
    401405            <xsl:when test="/bedework/periodname='Month'"> 
    402               <xsl:value-of select="/bedework/eventscalendar/year/month/longname"/>, <xsl:value-of select="/bedework/eventscalendar/year/value"/> 
     406              <xsl:value-of select="/bedework/firstday/monthname"/>, <xsl:value-of select="substring(/bedework/firstday/date,1,4)"/> 
     407            </xsl:when> 
     408            <xsl:when test="/bedework/periodname='Week'"> 
     409              Week of <xsl:value-of select="substring-after(/bedework/firstday/longdate,', ')"/> 
    403410            </xsl:when> 
    404411            <xsl:otherwise> 
    405               <xsl:value-of select="/bedework/eventscalendar/year/value"/> 
     412              <xsl:value-of select="/bedework/firstday/longdate"/> 
    406413            </xsl:otherwise> 
    407414          </xsl:choose> 
    …… 
    11611168      </xsl:if> 
    11621169      <tr> 
    1163         <td class="fieldname">&#160;</td> 
     1170        <td class="fieldname filler">&#160;</td> 
    11641171        <td class="fieldval">&#160;</td> 
    11651172      </tr>