Changeset 410

Show
Ignore:
Timestamp:
04/21/06 12:36:31
Author:
johnsa
Message:

added full navigation to free/busy view in personal client user interface; restored calId for add & edit event when selecting calendars.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r404 r410  
    236236  color: black; 
    237237  font-size: 0.9em; 
     238  border-bottom: 1px solid #999; 
    238239} 
    239240#utilBarTable .leftCell { 
    …… 
    696697  padding: 0em; 
    697698  border-top: 1px solid #666; 
     699  border-bottom: 2px solid #aaa; 
     700  border-left: 2px solid #aaa; 
     701  border-right: 2px solid #aaa; 
    698702} 
    699703#yearCalendarTable td { 
    …… 
    706710#yearCalendarTable table.yearViewMonthTable { 
    707711  margin: 0em  1em 0.5em 1em; 
    708   border: 1px solid #666; 
     712  border: 1px solid #ddd; 
    709713} 
    710714#yearCalendarTable table.yearViewMonthTable td { 
    …… 
    715719#yearCalendarTable table.yearViewMonthTable th { 
    716720  font-weight: bold; 
    717   background-color: #f5f5f5; 
     721  background-color: #eee; 
    718722  color: black; 
    719723  padding: 0.2em; 
    …… 
    722726  font-weight: bold; 
    723727  text-align: center; 
    724   background-color: #d1cbb3; 
     728  background-color: #2B4795; 
    725729  color: #eee; 
    726730  white-space: nowrap; 
    …… 
    730734  font-weight: bold; 
    731735  font-size: 0.8em; 
    732   background-color: #f5f5f5; 
     736  background-color: #eee; 
    733737  color: black; 
    734738} 
    …… 
    736740  text-decoration: none; 
    737741  background-color: inherit; 
    738   border: 1px solid #d1cbb3; 
     742  padding: 1px; 
    739743  color: black; 
    740744} 
    …… 
    742746  text-decoration: none; 
    743747  background-color: inherit; 
    744   border: 1px solid #f5f5f5; 
     748  padding: 1px; 
    745749  color: black; 
    746750} 
    …… 
    748752  text-decoration: none; 
    749753  background-color: inherit; 
    750   color: black; 
     754  padding: 1px; 
     755  color: #eee; 
    751756} 
    752757#yearCalendarTable  table.yearViewMonthTable td a:hover  { 
    …… 
    755760  color: black; 
    756761  border: 1px solid black; 
     762  padding: 0; 
    757763} 
    758764#listTable { 
    …… 
    9961002  background-color: transparent; 
    9971003  display: block; 
    998   padding: 10px; 
     1004  padding: 6px 10px; 
    9991005  text-decoration: none; 
    10001006} 
    …… 
    10031009  background-color: transparent; 
    10041010  display: block; 
    1005   padding: 10px; 
     1011  padding: 6px 10px; 
    10061012  text-decoration: none; 
    10071013} 

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

    r405 r410  
    160160                </xsl:when> 
    161161                <xsl:when test="/bedework/page='freeBusy'"> 
     162                  <xsl:call-template name="utilBar"/> 
    162163                  <xsl:apply-templates select="/bedework/freebusy"/> 
    163164                </xsl:when> 
    …… 
    337338    <h3>options</h3> 
    338339    <ul id="sideBarMenu"> 
    339       <li><a href="{$freeBusy-fetch}">Show Free/Busy</a></li> 
    340340      <li><a href="{$manageLocations}">Manage Locations</a></li> 
    341341      <li>Preferences</li> 
    …… 
    345345  <xsl:template name="tabs"> 
    346346    <xsl:choose> 
    347       <xsl:when test="/bedework/page='eventscalendar'"> 
     347      <xsl:when test="/bedework/page='eventscalendar' or /bedework/page='freeBusy'"> 
     348        <xsl:variable name="navAction"> 
     349          <xsl:choose> 
     350            <xsl:when test="/bedework/page='freeBusy'"><xsl:value-of select="$freeBusy-fetch"/></xsl:when> 
     351            <xsl:otherwise><xsl:value-of select="$setViewPeriod"/>?b=de</xsl:otherwise> 
     352          </xsl:choose> 
     353        </xsl:variable> 
    348354        <table border="0" cellpadding="0" cellspacing="0" id="tabsTable"> 
    349355          <tr> 
    …… 
    351357              <xsl:choose> 
    352358                <xsl:when test="/bedework/periodname='Day'"> 
    353                   <a href="{$setViewPeriod}?viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-day-on.gif" width="91" height="20" border="0" alt="DAY"/></a> 
     359                  <a href="{$navAction}&amp;viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-day-on.gif" width="91" height="20" border="0" alt="DAY"/></a> 
    354360                </xsl:when> 
    355361                <xsl:otherwise> 
    356                   <a href="{$setViewPeriod}?viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-day-off.gif" width="91" height="20" border="0" alt="DAY"/></a> 
     362                  <a href="{$navAction}&amp;viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-day-off.gif" width="91" height="20" border="0" alt="DAY"/></a> 
    357363                </xsl:otherwise> 
    358364              </xsl:choose> 
    …… 
    361367              <xsl:choose> 
    362368                <xsl:when test="/bedework/periodname='Week' or /bedework/periodname=''"> 
    363                   <a href="{$setViewPeriod}?viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-week-on.gif" width="92" height="20" border="0" alt="WEEK"/></a> 
     369                  <a href="{$navAction}&amp;viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-week-on.gif" width="92" height="20" border="0" alt="WEEK"/></a> 
    364370                 </xsl:when> 
    365371                <xsl:otherwise> 
    366                   <a href="{$setViewPeriod}?viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-week-off.gif" width="92" height="20" border="0" alt="WEEK"/></a> 
     372                  <a href="{$navAction}&amp;viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-week-off.gif" width="92" height="20" border="0" alt="WEEK"/></a> 
    367373                 </xsl:otherwise> 
    368374              </xsl:choose> 
    …… 
    371377              <xsl:choose> 
    372378                <xsl:when test="/bedework/periodname='Month'"> 
    373                   <a href="{$setViewPeriod}?viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-month-on.gif" width="90" height="20" border="0" alt="MONTH"/></a> 
     379                  <a href="{$navAction}&amp;viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-month-on.gif" width="90" height="20" border="0" alt="MONTH"/></a> 
    374380                </xsl:when> 
    375381                <xsl:otherwise> 
    376                   <a href="{$setViewPeriod}?viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-month-off.gif" width="90" height="20" border="0" alt="MONTH"/></a> 
     382                  <a href="{$navAction}&amp;viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-month-off.gif" width="90" height="20" border="0" alt="MONTH"/></a> 
    377383                </xsl:otherwise> 
    378384              </xsl:choose> 
    …… 
    380386            <td> 
    381387              <xsl:choose> 
     388                <!-- don't allow switching to year for free busy view, so only use setViewPeriod action --> 
    382389                <xsl:when test="/bedework/periodname='Year'"> 
    383390                  <a href="{$setViewPeriod}?viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-year-on.gif" width="92" height="20" border="0" alt="YEAR"/></a> 
    …… 
    389396            </td> 
    390397            <td class="rightCell"> 
    391               welcome 
     398              logged in as 
    392399              <xsl:text> </xsl:text> 
    393400              <strong><xsl:value-of select="/bedework/userid"/></strong> 
    …… 
    427434 
    428435  <xsl:template name="navigation"> 
     436    <xsl:variable name="navAction"> 
     437      <xsl:choose> 
     438        <xsl:when test="/bedework/page='freeBusy'"><xsl:value-of select="$freeBusy-fetch"/></xsl:when> 
     439        <xsl:otherwise><xsl:value-of select="$setViewPeriod"/>?b=de</xsl:otherwise> 
     440      </xsl:choose> 
     441    </xsl:variable> 
    429442    <table border="0" cellpadding="0" cellspacing="0" id="navigationBarTable"> 
    430443      <tr> 
    431444        <td class="leftCell"> 
    432           <a href="{$setViewPeriod}?date={$prevdate}"><img src="{$resourcesRoot}/resources/std-arrow-left.gif" alt="previous" width="13" height="16" class="prevImg" border="0"/></a> 
    433           <a href="{$setViewPeriod}?date={$nextdate}"><img src="{$resourcesRoot}/resources/std-arrow-right.gif" alt="next" width="13" height="16" class="nextImg" border="0"/></a> 
     445          <a href="{$navAction}&amp;date={$prevdate}"><img src="{$resourcesRoot}/resources/std-arrow-left.gif" alt="previous" width="13" height="16" class="prevImg" border="0"/></a> 
     446          <a href="{$navAction}&amp;date={$nextdate}"><img src="{$resourcesRoot}/resources/std-arrow-right.gif" alt="next" width="13" height="16" class="nextImg" border="0"/></a> 
    434447          <xsl:choose> 
    435448            <xsl:when test="/bedework/periodname='Year'"> 
    …… 
    448461        </td> 
    449462        <td class="todayButton"> 
    450           <a href="{$setViewPeriod}?viewType=todayView&amp;date={$curdate}"> 
     463          <a href="{$navAction}&amp;viewType=todayView&amp;date={$curdate}"> 
    451464            <img src="{$resourcesRoot}/resources/std-button-today-off.gif" width="54" height="22" border="0" alt="Go to Today" align="left"/> 
    452465          </a> 
    453466        </td> 
    454467        <td align="right" class="gotoForm"> 
    455           <form name="calForm" method="get" action="{$setViewPeriod}"> 
     468          <form name="calForm" method="get" action="{$navAction}"> 
    456469             <table border="0" cellpadding="0" cellspacing="0"> 
    457470              <tr> 
    …… 
    540553         </td> 
    541554         <td class="rightCell"> 
     555 
     556           <!-- show free / busy --> 
    542557           <xsl:choose> 
    543             <xsl:when test="/bedework/periodname='Day'"> 
    544               <img src="{$resourcesRoot}/resources/std-button-listview-off.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/> 
    545             </xsl:when> 
    546             <xsl:when test="/bedework/periodname='Year'"> 
    547               <img src="{$resourcesRoot}/resources/std-button-calview-off.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/> 
    548             </xsl:when> 
    549             <xsl:when test="/bedework/periodname='Month'"> 
    550               <xsl:choose> 
    551                 <xsl:when test="/bedework/appvar[key='monthViewMode']/value='list'"> 
    552                   <a href="{$setup}?setappvar=monthViewMode(cal)" title="toggle list/calendar view"> 
    553                     <img src="{$resourcesRoot}/resources/std-button-calview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/> 
    554                   </a> 
    555                 </xsl:when> 
    556                 <xsl:otherwise> 
    557                   <a href="{$setup}?setappvar=monthViewMode(list)" title="toggle list/calendar view"> 
    558                     <img src="{$resourcesRoot}/resources/std-button-listview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/> 
    559                   </a> 
    560                 </xsl:otherwise> 
    561               </xsl:choose> 
    562             </xsl:when> 
    563             <xsl:otherwise> 
    564               <xsl:choose> 
    565                 <xsl:when test="/bedework/appvar[key='weekViewMode']/value='list'"> 
    566                   <a href="{$setup}?setappvar=weekViewMode(cal)" title="toggle list/calendar view"> 
    567                     <img src="{$resourcesRoot}/resources/std-button-calview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/> 
    568                   </a> 
    569                 </xsl:when> 
    570                 <xsl:otherwise> 
    571                   <a href="{$setup}?setappvar=weekViewMode(list)" title="toggle list/calendar view"> 
    572                     <img src="{$resourcesRoot}/resources/std-button-listview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/> 
    573                   </a> 
    574                 </xsl:otherwise> 
    575               </xsl:choose> 
    576             </xsl:otherwise> 
    577           </xsl:choose> 
     558             <xsl:when test="/bedework/periodname!='Year'"> 
     559               <xsl:choose> 
     560                 <xsl:when test="/bedework/page='freeBusy'"> 
     561                   <a href="{$setViewPeriod}?date={$curdate}"><img src="{$resourcesRoot}/resources/std-button-events.gif" width="70" height="21" border="0" alt="show events"/></a> 
     562                 </xsl:when> 
     563                 <xsl:otherwise> 
     564                   <a href="{$freeBusy-fetch}&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-button-freebusy.gif" width="70" height="21" border="0" alt="show free/busy"/></a> 
     565                 </xsl:otherwise> 
     566               </xsl:choose> 
     567             </xsl:when> 
     568             <xsl:otherwise> 
     569               <img src="{$resourcesRoot}/resources/std-button-freebusy-off.gif" width="70" height="21" border="0" alt="show free/busy"/> 
     570             </xsl:otherwise> 
     571           </xsl:choose> 
     572 
     573           <!-- toggle list / calendar view --> 
    578574           <xsl:choose> 
    579               <xsl:when test="/bedework/periodname='Year' or 
     575             <xsl:when test="/bedework/periodname='Day'"> 
     576               <img src="{$resourcesRoot}/resources/std-button-listview-off.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/> 
     577             </xsl:when> 
     578             <xsl:when test="/bedework/periodname='Year'"> 
     579               <img src="{$resourcesRoot}/resources/std-button-calview-off.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/> 
     580             </xsl:when> 
     581             <xsl:when test="/bedework/periodname='Month'"> 
     582               <xsl:choose> 
     583                 <xsl:when test="/bedework/appvar[key='monthViewMode']/value='list'"> 
     584                   <a href="{$setup}?setappvar=monthViewMode(cal)" title="toggle list/calendar view"> 
     585                     <img src="{$resourcesRoot}/resources/std-button-calview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/> 
     586                   </a> 
     587                 </xsl:when> 
     588                 <xsl:otherwise> 
     589                   <a href="{$setup}?setappvar=monthViewMode(list)" title="toggle list/calendar view"> 
     590                     <img src="{$resourcesRoot}/resources/std-button-listview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/> 
     591                   </a> 
     592                 </xsl:otherwise> 
     593               </xsl:choose> 
     594             </xsl:when> 
     595             <xsl:otherwise> 
     596               <xsl:choose> 
     597                 <xsl:when test="/bedework/appvar[key='weekViewMode']/value='list'"> 
     598                   <a href="{$setup}?setappvar=weekViewMode(cal)" title="toggle list/calendar view"> 
     599                     <img src="{$resourcesRoot}/resources/std-button-calview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/> 
     600                   </a> 
     601                 </xsl:when> 
     602                 <xsl:otherwise> 
     603                   <a href="{$setup}?setappvar=weekViewMode(list)" title="toggle list/calendar view"> 
     604                     <img src="{$resourcesRoot}/resources/std-button-listview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/> 
     605                   </a> 
     606                 </xsl:otherwise> 
     607               </xsl:choose> 
     608             </xsl:otherwise> 
     609           </xsl:choose> 
     610 
     611           <!-- summary / detailed mode toggle --> 
     612           <xsl:choose> 
     613             <xsl:when test="/bedework/periodname='Year' or 
    580614                              (/bedework/periodname='Month' and 
    581615                              (/bedework/appvar[key='monthViewMode']/value='cal' or 
    …… 
    584618                              (/bedework/appvar[key='weekViewMode']/value='cal' or 
    585619                               not(/bedework/appvar[key='weekViewMode'])))"> 
    586                 <xsl:choose> 
    587                   <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'"> 
    588                     <img src="{$resourcesRoot}/resources/std-button-summary-off.gif" width="62" height="21" border="0" alt="only summaries of events supported in this view"/> 
    589                   </xsl:when> 
    590                   <xsl:otherwise> 
    591                     <img src="{$resourcesRoot}/resources/std-button-details-off.gif" width="62" height="21" border="0" alt="only summaries of events supported in this view"/> 
    592                   </xsl:otherwise> 
    593                 </xsl:choose> 
    594               </xsl:when> 
    595               <xsl:otherwise> 
    596                 <xsl:choose> 
    597                   <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'"> 
    598                     <a href="{$setup}?setappvar=summaryMode(summary)" title="toggle summary/detailed view"> 
    599                       <img src="{$resourcesRoot}/resources/std-button-summary.gif" width="62" height="21" border="0" alt="toggle summary/detailed view"/> 
    600                     </a> 
    601                   </xsl:when> 
    602                   <xsl:otherwise> 
    603                     <a href="{$setup}?setappvar=summaryMode(details)" title="toggle summary/detailed view"> 
    604                       <img src="{$resourcesRoot}/resources/std-button-details.gif" width="62" height="21" border="0" alt="toggle summary/detailed view"/> 
    605                     </a> 
    606                   </xsl:otherwise> 
    607                 </xsl:choose> 
    608               </xsl:otherwise> 
    609             </xsl:choose> 
    610             <a href="setup.do"><img src="{$resourcesRoot}/resources/std-button-refresh.gif" width="70" height="21" border="0" alt="refresh view"/></a> 
     620               <xsl:choose> 
     621                 <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'"> 
     622                   <img src="{$resourcesRoot}/resources/std-button-summary-off.gif" width="62" height="21" border="0" alt="only summaries of events supported in this view"/> 
     623                 </xsl:when> 
     624                 <xsl:otherwise> 
     625                   <img src="{$resourcesRoot}/resources/std-button-details-off.gif" width="62" height="21" border="0" alt="only summaries of events supported in this view"/> 
     626                 </xsl:otherwise> 
     627               </xsl:choose> 
     628             </xsl:when> 
     629             <xsl:otherwise> 
     630               <xsl:choose> 
     631                 <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'"> 
     632                   <a href="{$setup}?setappvar=summaryMode(summary)" title="toggle summary/detailed view"> 
     633                     <img src="{$resourcesRoot}/resources/std-button-summary.gif" width="62" height="21" border="0" alt="toggle summary/detailed view"/> 
     634                   </a> 
     635                 </xsl:when> 
     636                 <xsl:otherwise> 
     637                   <a href="{$setup}?setappvar=summaryMode(details)" title="toggle summary/detailed view"> 
     638                     <img src="{$resourcesRoot}/resources/std-button-details.gif" width="62" height="21" border="0" alt="toggle summary/detailed view"/> 
     639                   </a> 
     640                 </xsl:otherwise> 
     641               </xsl:choose> 
     642             </xsl:otherwise> 
     643           </xsl:choose> 
     644 
     645           <!-- refresh button --> 
     646           <a href="setup.do"><img src="{$resourcesRoot}/resources/std-button-refresh.gif" width="70" height="21" border="0" alt="refresh view"/></a> 
    611647         </td> 
    612648       </tr> 
    …… 
    12881324              </option> 
    12891325              <!--<xsl:copy-of select="/bedework/formElements/form/calendar/select/*"/>--> 
    1290               <!-- Based on subscription names, actually.  the following calendar select box is temporary.  Should be 
     1326              <!-- The following calendar select box is temporary.  Should be 
    12911327                   replaced with the xml from the line above. --> 
    1292               <xsl:for-each select="/bedework/mySubscriptions/subscription"> 
    1293                 <xsl:variable name="subname" select="name"/> 
    1294                 <option value="{$subname}"><xsl:value-of select="name"/></option> 
     1328              <xsl:for-each select="/bedework/myCalendars//calendar[calendarCollection='true']"> 
     1329                <xsl:variable name="id" select="id"/> 
     1330                <option value="{$id}"><xsl:value-of select="name"/></option> 
    12951331              </xsl:for-each> 
    12961332            </select> 
    …… 
    16631699              </option> 
    16641700              <!--<xsl:copy-of select="/bedework/formElements/form/calendar/select/*"/>--> 
    1665               <!-- Based on subscription names, actually.  the following calendar select box is temporary.  Should be 
     1701              <!-- The following calendar select box is temporary.  Should be 
    16661702                   replaced with the xml from the line above. --> 
    1667               <xsl:for-each select="/bedework/mySubscriptions/subscription"> 
    1668                 <xsl:variable name="subname" select="name"/> 
    1669                 <option value="{$subname}"><xsl:value-of select="name"/></option> 
     1703              <xsl:for-each select="/bedework/myCalendars//calendar[calendarCollection='true']"> 
     1704                <xsl:variable name="id" select="id"/> 
     1705                <option value="{$id}"><xsl:value-of select="name"/></option> 
    16701706              </xsl:for-each> 
    16711707            </select>