Changeset 1240

Show
Ignore:
Timestamp:
01/19/07 13:48:44
Author:
johnsa
Message:

web clients:

- more work on rdates forms
- "deleted" calendar made visible
- swap free/busy colors
- update free/busy access form to use

common access control form

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/deployment/webadmin/webapp/resources/default/default/default.xsl

    r1239 r1240  
    228228          </xsl:when> 
    229229          <xsl:when test="/bedeworkadmin/page='rdates'"> 
    230             <xsl:call-template name="messagesAndErrors"/> 
    231230            <xsl:call-template name="rdates"/> 
    232231          </xsl:when> 
    …… 
    21042103            </div> 
    21052104 
     2105            <xsl:call-template name="messagesAndErrors"/> 
     2106 
    21062107            <table cellspacing="0" id="rdatesTable"> 
    21072108              <tr> 

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

    r1229 r1240  
    14111411#freeBusy td.free, 
    14121412#freeBusyKey td.free { 
     1413  color: #ddd; 
     1414  background-color: #ddd; 
     1415} 
     1416#freeBusy td.busy, 
     1417#freeBusyKey td.busy { 
    14131418  color: #A3BAEA; 
    14141419  background-color: #A3BAEA; 
    1415 } 
    1416 #freeBusy td.busy, 
    1417 #freeBusyKey td.busy { 
    1418   color: #ddd; 
    1419   background-color: #ddd; 
    14201420} 
    14211421#freeBusy td.tentative, 
    …… 
    14311431} 
    14321432#freeBusy td.free a { 
    1433   color: #A3BAEA; 
     1433  color: #ddd; 
    14341434  background-color: transparent; 
    14351435  display: block; 
    …… 
    14491449} 
    14501450#freeBusy td.busy a { 
    1451   color: #ddd; 
     1451  color: #A3BAEA; 
    14521452  background-color: transparent; 
    14531453  display: block; 

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

    r1239 r1240  
    8181  <xsl:variable name="event-selectCalForEvent" select="/bedework/urlPrefixes/event/selectCalForEvent/a/@href"/> 
    8282  <xsl:variable name="event-showRdates" select="/bedework/urlPrefixes/event/showRdates"/> 
     83  <xsl:variable name="event-showExdates" select="/bedework/urlPrefixes/event/showExdates"/> 
    8384  <xsl:variable name="event-setRdate" select="/bedework/urlPrefixes/event/setRdate"/> 
    8485  <xsl:variable name="event-attendeesForEvent" select="/bedework/urlPrefixes/event/attendeesForEvent/a/@href"/> 
    …… 
    172173        </xsl:when> 
    173174        <xsl:when test="/bedework/page='rdates'"> 
    174           <xsl:call-template name="messagesAndErrors"/> 
    175175          <xsl:call-template name="rdates"/> 
    176176        </xsl:when> 
    177177        <xsl:when test="/bedework/page='attendees'"> 
    178           <xsl:call-template name="messagesAndErrors"/> 
    179178          <xsl:call-template name="attendees"/> 
    180179        </xsl:when> 
    …… 
    491490    <!-- special calendars: inbox, outbox, and trash --> 
    492491    <ul class="calendarTree"> 
    493       <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar/calendar[calType &gt; 1]" mode="mySpecialCalendars"/> 
     492      <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar/calendar[calType = 5]" mode="mySpecialCalendars"/> <!-- inbox --> 
     493      <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar/calendar[calType = 6]" mode="mySpecialCalendars"/> <!-- outbox --> 
     494      <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar/calendar[calType = 2]" mode="mySpecialCalendars"/> <!-- trash --> 
     495      <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar/calendar[calType = 3]" mode="mySpecialCalendars"/> <!-- deleted --> 
    494496    </ul> 
    495497 
    …… 
    27472749            <div id="recurrenceDatesButton"> 
    27482750              <input type="button" value="add/remove recurrence dates" onclick="launchSizedWindow('{$event-showRdates}','560','400')"/> 
     2751               <input type="button" value="view/remove exception dates" onclick="launchSizedWindow('{$event-showExdates}','560','400')"/> 
    27492752            </div> 
    27502753          </div> 
    …… 
    30173020            </div> 
    30183021 
     3022            <xsl:call-template name="messagesAndErrors"/> 
     3023 
    30193024            <table cellspacing="0" id="rdatesTable"> 
    30203025              <tr> 
    …… 
    30353040                    <xsl:variable name="datetime"><xsl:value-of select="unformatted"/></xsl:variable> 
    30363041                    <xsl:variable name="tzid" select="timezone/id"/> 
    3037                     <xsl:variable name="dateOnly"><xsl:if test="dateOnly = 'true'">&amp;dateOnly=true</xsl:if></xsl:variable> 
     3042                    <xsl:variable name="dateOnly"><xsl:if test="allday = 'true'">&amp;dateOnly=true</xsl:if></xsl:variable> 
    30383043                    <xsl:variable name="floating"><xsl:if test="floating = 'true'">&amp;floating=true</xsl:if></xsl:variable> 
    30393044                    <xsl:variable name="storeUTC"><xsl:if test="utc = 'true'">&amp;storeUTC=true</xsl:if></xsl:variable> 
    …… 
    30873092            </tr> 
    30883093          </table> 
     3094 
     3095          <xsl:call-template name="messagesAndErrors"/> 
     3096 
    30893097          <xsl:if test="/bedework/attendees/attendee"> 
    30903098            <table id="attendees" class="widget" cellspacing="0"> 
    …… 
    32843292 
    32853293    <div id="sharingBox"> 
    3286       <h3>Sharing</h3> 
    3287       <table class="common"> 
    3288         <tr> 
    3289           <th class="commonHeader" colspan="2">Current access:</th> 
    3290         </tr> 
    3291         <tr> 
    3292           <th>Users:</th> 
    3293           <td> 
    3294             <xsl:choose> 
    3295               <xsl:when test="/bedework/myCalendars/calendars/calendar/acl/ace/principal/href"> 
    3296                 <xsl:for-each select="/bedework/myCalendars/calendars/calendar/acl/ace[principal/href]"> 
    3297                   <xsl:value-of select="principal/href"/> (<xsl:value-of select="name(grant/*)"/>)<br/> 
    3298                 </xsl:for-each> 
    3299               </xsl:when> 
    3300               <xsl:otherwise> 
    3301                 free/busy not shared 
    3302               </xsl:otherwise> 
    3303             </xsl:choose> 
    3304           </td> 
    3305         </tr> 
    3306       </table> 
     3294      <xsl:variable name="calPathEncoded" select="/bedework/myCalendars/calendars/calendar/encodedPath"/> 
     3295      <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar/acl" mode="currentAccess"> 
     3296        <xsl:with-param name="action" select="$freeBusy-setAccess"/> 
     3297        <xsl:with-param name="calPathEncoded" select="$calPathEncoded"/> 
     3298      </xsl:apply-templates> 
    33073299      <form name="calendarShareForm" action="{$freeBusy-setAccess}" id="shareForm"> 
    33083300        <xsl:variable name="calPath" select="/bedework/myCalendars/calendars/calendar/path"/> 
    33093301        <input type="hidden" name="calPath" value="{$calPath}"/> 
     3302        <input type="hidden" value="F" name="how"/> 
    33103303        <p> 
    33113304          Share my free/busy with:<br/> 
    33123305          <input type="text" name="who" size="20"/> 
    33133306          <input type="radio" value="user" name="whoType" checked="checked"/> user 
    3314           <input type="radio" value="group" name="whoType"/> group 
    3315         </p> 
    3316         <p> 
    3317           Access rights:<br/> 
    3318           <input type="radio" value="F" name="how" checked="checked"/> view my free/busy<br/> 
    3319           <input type="radio" value="d" name="how"/> default (reset access) 
     3307          <input type="radio" value="group" name="whoType"/> group<br/> 
     3308          <em>note: this will set a user or group's access to 
     3309              "read-free-busy" and any 
     3310              existing access control will be replaced.</em> 
    33203311        </p> 
    33213312        <input type="submit" name="submit" value="Submit"/> 
    …… 
    35933584 
    35943585  <xsl:template match="calendar" mode="mySpecialCalendars"> 
    3595     <!-- Inbox, Outbox, Trash, etc. --> 
    3596     <xsl:if test="name != 'Deleted'"> 
    3597       <xsl:variable name="id" select="id"/> 
    3598       <li> 
    3599         <xsl:attribute name="class"> 
    3600           <xsl:choose> 
    3601             <xsl:when test="/bedework/selectionState/selectionType = 'calendar' 
    3602                             and path = /bedework/selectionState/subscriptions/subscription/calendar/path">selected</xsl:when> 
    3603             <xsl:when test="name='Trash'">trash</xsl:when> 
    3604             <xsl:when test="calendarCollection='false'">folder</xsl:when> 
    3605             <xsl:otherwise>calendar</xsl:otherwise> 
    3606           </xsl:choose> 
    3607         </xsl:attribute> 
    3608         <xsl:variable name="calPath" select="path"/> 
    3609           <xsl:choose> 
    3610             <xsl:when test="name='Inbox' and /bedework/inboxState/numActive != '0'"> 
    3611               <strong> 
    3612                 <a href="{$showInbox}"> 
    3613                   <xsl:value-of select="name"/> 
    3614                 </a> 
    3615                 <xsl:text> </xsl:text> 
    3616                 (<xsl:value-of select="/bedework/inboxState/numActive"/>) 
    3617               </strong> 
    3618             </xsl:when> 
    3619             <xsl:when test="name='Outbox' and /bedework/outbox/numActive != '0'"> 
    3620               <strong> 
    3621                 <a href="{$showOutbox}"> 
    3622                   <xsl:value-of select="name"/> 
    3623                 </a> 
    3624                 <xsl:text> </xsl:text> 
    3625                 (<xsl:value-of select="/bedework/outboxState/numActive"/>) 
    3626               </strong> 
    3627             </xsl:when> 
    3628             <xsl:otherwise> 
    3629               <a href="{$setSelection}&amp;calUrl={$calPath}"> 
     3586    <!-- Trash = 2, Deleted = 3, Busy = 4, Inbox = 5, Outbox = 6  --> 
     3587    <xsl:variable name="id" select="id"/> 
     3588    <li> 
     3589      <xsl:attribute name="class"> 
     3590        <xsl:choose> 
     3591          <xsl:when test="/bedework/selectionState/selectionType = 'calendar' 
     3592                          and path = /bedework/selectionState/subscriptions/subscription/calendar/path">selected</xsl:when> 
     3593          <xsl:when test="calType='2' or calType='3'">trash</xsl:when> 
     3594          <xsl:when test="calendarCollection='false'">folder</xsl:when> 
     3595          <xsl:otherwise>calendar</xsl:otherwise> 
     3596        </xsl:choose> 
     3597      </xsl:attribute> 
     3598      <xsl:variable name="calPath" select="path"/> 
     3599        <xsl:choose> 
     3600          <xsl:when test="calType='5' and /bedework/inboxState/numActive != '0'"> 
     3601            <strong> 
     3602              <a href="{$showInbox}"> 
    36303603                <xsl:value-of select="name"/> 
    36313604              </a> 
    3632             </xsl:otherwise> 
    3633           </xsl:choose> 
    3634         <xsl:if test="calendar"> 
    3635           <ul> 
    3636             <xsl:apply-templates select="calendar" mode="myCalendars"/> 
    3637           </ul> 
    3638         </xsl:if> 
    3639       </li> 
    3640     </xsl:if> 
     3605              <xsl:text> </xsl:text> 
     3606              (<xsl:value-of select="/bedework/inboxState/numActive"/>) 
     3607            </strong> 
     3608          </xsl:when> 
     3609          <xsl:when test="calType='6' and /bedework/outbox/numActive != '0'"> 
     3610            <strong> 
     3611              <a href="{$showOutbox}"> 
     3612                <xsl:value-of select="name"/> 
     3613              </a> 
     3614              <xsl:text> </xsl:text> 
     3615              (<xsl:value-of select="/bedework/outboxState/numActive"/>) 
     3616            </strong> 
     3617          </xsl:when> 
     3618          <xsl:otherwise> 
     3619            <a href="{$setSelection}&amp;calUrl={$calPath}"> 
     3620              <xsl:attribute name="title"> 
     3621                <xsl:choose> 
     3622                  <xsl:when test="calType = 2">Contains items you have access to delete.</xsl:when> 
     3623                  <xsl:when test="calType = 3">Used to mask items you do not have access to truly delete, such as many subscribed events.</xsl:when> 
     3624                </xsl:choose> 
     3625              </xsl:attribute> 
     3626              <xsl:value-of select="name"/> 
     3627            </a> 
     3628          </xsl:otherwise> 
     3629        </xsl:choose> 
     3630      <xsl:if test="calendar"> 
     3631        <ul> 
     3632          <xsl:apply-templates select="calendar" mode="myCalendars"/> 
     3633        </ul> 
     3634      </xsl:if> 
     3635    </li> 
    36413636  </xsl:template> 
    36423637