Changeset 351

Show
Ignore:
Timestamp:
04/08/06 09:27:20
Author:
johnsa
Message:

added functionality to calendar selection in personal client; some minor color chages, too.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r350 r351  
    200200  background-color: #333; 
    201201} 
     202#bodyBlock td#sideBar a:link, 
     203#bodyBlock td#sideBara:active, 
     204#bodyBlock td#sideBar a:visited { 
     205  text-decoration: none; 
     206} 
     207#bodyBlock td#sideBar a:hover { 
     208  color: black; 
     209  background-color: #ff3; 
     210} 
    202211#sideBarOpenCloseIcon { 
    203212  float: left; 
    …… 
    213222#myViews li.selected { 
    214223  list-style-image: url(../../resources/glassFill-icon-view.gif); 
     224  font-weight: bold; 
    215225} 
    216226#bodyBlock td#bodyContent { 
    …… 
    889899.calendarTree li { 
    890900  padding-top: 0.25em; 
    891   /*font-weight: bold;*/ 
    892901} 
    893902.calendarTree li.folder { 
    …… 
    899908.calendarTree li.trash { 
    900909  list-style-image: url(../../resources/trashIcon.gif); 
     910} 
     911.calendarTree li.selected { 
     912  list-style-image: url(../../resources/glassFill-icon-view.gif); 
     913  font-weight: bold; 
    901914} 
    902915.calendarTree a:link, 

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

    r350 r351  
    267267    </h3> 
    268268    <ul id="myViews"> 
    269       <xsl:for-each select="/bedework/views/view"> 
    270         <xsl:variable name="viewName" select="name"/>  
    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> 
    279       </xsl:for-each> 
     269      <xsl:choose> 
     270        <xsl:when test="/bedework/views/view"> 
     271          <xsl:for-each select="/bedework/views/view"> 
     272            <xsl:variable name="viewName" select="name"/>  
     273            <xsl:choose> 
     274              <xsl:when test="/bedework/selectionState/selectionType = 'view'  
     275                              and name=/bedework/selectionState/view/name"> 
     276                <li class="selected"><a href="{$setSelection}?viewName={$viewName}"><xsl:value-of select="name"/></a></li> 
     277              </xsl:when> 
     278              <xsl:otherwise> 
     279                <li><a href="{$setSelection}?viewName={$viewName}"><xsl:value-of select="name"/></a></li> 
     280              </xsl:otherwise> 
     281            </xsl:choose> 
     282          </xsl:for-each> 
     283        </xsl:when> 
     284        <xsl:otherwise> 
     285          <li class="none">no subscriptions</li> 
     286        </xsl:otherwise> 
     287      </xsl:choose> 
    280288    </ul> 
    281289 
    …… 
    506514       <tr> 
    507515         <td class="leftCell"> 
    508            <xsl:variable name="date" select="/bedework/firstday/date"/> 
    509            <a href="{$initEvent}?date={$date}" title="add event"> 
    510               <img src="{$resourcesRoot}/resources/add2mycal-icon-small.gif" width="12" height="16" border="0" alt="add event"/> 
    511               add event 
    512            </a> 
     516           <xsl:choose> 
     517             <xsl:when test="/bedework/periodname = 'day'"> 
     518               <xsl:variable name="date" select="/bedework/firstday/date"/> 
     519               <a href="{$initEvent}?date={$date}" title="add event"> 
     520                  <img src="{$resourcesRoot}/resources/add2mycal-icon-small.gif" width="12" height="16" border="0" alt="add event"/> 
     521                  add event 
     522               </a> 
     523             </xsl:when> 
     524             <xsl:otherwise> 
     525               <a href="{$initEvent}" title="add event"> 
     526                  <img src="{$resourcesRoot}/resources/add2mycal-icon-small.gif" width="12" height="16" border="0" alt="add event"/> 
     527                  add event 
     528               </a> 
     529             </xsl:otherwise> 
     530           </xsl:choose> 
    513531           <a href="{$initUpload}" title="upload event"> 
    514532              <img src="{$resourcesRoot}/resources/std-icalUpload-icon-small.gif" width="12" height="16" border="0" alt="upload event"/> 
    …… 
    18541872      <xsl:variable name="itemClass"> 
    18551873        <xsl:choose> 
     1874          <xsl:when test="/bedework/selectionState/selectionType = 'calendar'  
     1875                          and name = /bedework/selectionState/subscriptions/subscription/calendar/name">selected</xsl:when> 
    18561876          <xsl:when test="name='Trash'">trash</xsl:when> 
    18571877          <xsl:when test="calendarCollection='false'">folder</xsl:when> 
    …… 
    18601880      </xsl:variable> 
    18611881      <li class="{$itemClass}"> 
    1862         <!--<a href="{$subscriptions-initAdd}&amp;calId={$id}">--> 
     1882        <xsl:variable name="url" select="path"/> 
     1883        <a href="{$setSelection}?calUrl={$url}"> 
    18631884          <xsl:value-of select="name"/> 
    1864         <!--</a>--> 
     1885        </a> 
    18651886        <xsl:if test="calendar"> 
    18661887          <ul> 

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

    r289 r351  
    1515} 
    1616.dynCalendar_header{ 
    17   background-color: #00a; 
     17  background-color: #233979; 
    1818  color: white; 
    19         font-size: 14px; 
     19        font-size: 12px; 
    2020        font-weight: bold; 
    2121  height: 15px; 
    2222} 
    2323.dynCalendar_header a { 
    24   background-color: #00a; 
    25   color: white;   
    26 } 
    27 .dynCalendar_header a { 
    28   background-color: #00a; 
    29   color: white; 
     24  background-color: inherit; 
     25  color: #eee;   
    3026} 
    3127.dynCalendar_dayname {