Changeset 716

Show
Ignore:
Timestamp:
07/07/06 12:52:17
Author:
johnsa
Message:

user management updates to freebusy aggregator; added timezone pulldown

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/deployment/freebusyAggregator/webapp/resources/demoskins/MainCampus/default/default/default.css

    r714 r716  
    120120  text-align: center; 
    121121} 
    122 #bodyBlock td#userCell h4 { 
     122#bodyBlock td#attendeeCell h4 { 
    123123  margin-top: 0; 
    124124  text-align: left; 
    125125  padding-left: 1em; 
    126126} 
    127 #bodyBlock td#userCell p { 
     127#bodyBlock td#attendeeCell p { 
    128128  margin: 0.5em; 
    129129} 
    130 #bodyBlock table#users { 
     130#bodyBlock table#attendees { 
    131131  margin: 1em; 
    132132  padding: 0; 
    …… 
    223223  text-decoration: none; 
    224224} 
     225#freeBusy #timezonesDropDown { 
     226  width: 14em; 
     227  font-size: 8pt; 
     228  margin: 0 1em 0 2em; 
     229} 
     230#freeBusy #timezonesButton { 
     231  font-size: 8pt; 
     232} 
    225233#content { 
    226234  border-top: 1px solid #ccc; 
    …… 
    230238  margin-top: 1em; 
    231239} 
    232 #content img { 
     240/*#content img { 
    233241  margin: 1em auto; 
    234 } 
    235 #modUser legend { 
     242}*/ 
     243legend { 
    236244  font-weight: bold; 
    237245} 
    238 #modUser table { 
    239   display: block; 
    240 } 
    241 #modUser th { 
     246#attendeeList tr.a td { 
     247  background: white; 
     248  color: black; 
     249} 
     250#attendeeList tr.b td { 
     251  background: #eee; 
     252  color: black; 
     253} 
     254#attendeeList th { 
     255  color: white; 
     256  background: #0038A8; 
     257  text-align: center; 
     258  padding: 4px; 
     259  border-bottom: 1px solid #bbb; 
     260  border-top: 1px solid #bbb; 
     261} 
     262#attendeeList td { 
     263  padding: 0.5em 1em; 
     264  border-bottom: 1px solid #bbb; 
     265} 
     266#attendeeList td.editIcon { 
     267  border-right: 1px solid #bbb; 
     268  border-bottom: none !important; 
     269  color: black; 
     270  background: white !important; 
     271  text-align: center; 
     272} 
     273#attendeeList td.trashIcon { 
     274  border-left: 1px solid #bbb; 
     275  border-bottom: none !important; 
     276  color: black; 
     277  background: white !important; 
     278  text-align: center; 
     279} 
     280#modAttendee th { 
    242281  font-weight: normal; 
    243282  text-align: right; 

  • trunk/calendar3/deployment/freebusyAggregator/webapp/resources/demoskins/MainCampus/default/default/default.xsl

    r714 r716  
    6969  <xsl:variable name="initialise" select="/bedework-fbaggregator/urlPrefixes/initialise"/> 
    7070  <xsl:variable name="fetchFreeBusy" select="/bedework-fbaggregator/urlPrefixes/fetchFreeBusy"/> 
    71   <xsl:variable name="manageAttendees" select="/bedework-fbaggregator/urlPrefixes/manageUsers"/> 
    72   <xsl:variable name="addUser" select="/bedework-fbaggregator/urlPrefixes/addUser"/> 
     71  <xsl:variable name="manageAttendees" select="/bedework-fbaggregator/urlPrefixes/manageAttendees"/> 
     72  <xsl:variable name="showAddAttendee" select="/bedework-fbaggregator/urlPrefixes/showAddAttendee"/> 
     73  <xsl:variable name="editAttendee" select="/bedework-fbaggregator/urlPrefixes/editAttendee"/> 
     74  <xsl:variable name="addAttendee" select="/bedework-fbaggregator/urlPrefixes/addAttendee"/> 
    7375  <xsl:variable name="getTimeZones" select="/bedework-fbaggregator/urlPrefixes/getTimeZones"/> 
    7476 
    …… 
    7779  <xsl:variable name="urlPrefix" select="/bedework-fbaggregator/urlprefix"/> --> 
    7880 
    79   <!-- Other generally useful global variables 
    80   <xsl:variable name="prevdate" select="/bedework-fbaggregator/previousdate"/> 
     81  <!-- Other generally useful global variables--> 
     82  <xsl:variable name="currentTimezone">America/New_York</xsl:variable><!-- for now just set it --> 
     83  <!--<xsl:variable name="prevdate" select="/bedework-fbaggregator/previousdate"/> 
    8184  <xsl:variable name="nextdate" select="/bedework-fbaggregator/nextdate"/> 
    8285  <xsl:variable name="curdate" select="/bedework-fbaggregator/currentdate/date"/> 
    …… 
    122125        </xsl:if> 
    123126        <xsl:choose> 
    124           <xsl:when test="/bedework-fbaggregator/page='manageUsers'"> 
     127          <xsl:when test="/bedework-fbaggregator/page='manageAttendees'"> 
    125128            <xsl:call-template name="manageAttendees"/> 
     129          </xsl:when> 
     130          <xsl:when test="/bedework-fbaggregator/page='addAttendee'"> 
     131            <xsl:call-template name="addAttendee"/> 
    126132          </xsl:when> 
    127133          <xsl:when test="/bedework-fbaggregator/page='timeZones'"> 
    …… 
    231237                        </span> 
    232238                      </th> 
    233                       <th colspan="16"> 
     239                      <th colspan="32" class="right"> 
    234240                        <xsl:value-of select="$startDate"/> to <xsl:value-of select="$endDate"/> 
    235                       </th> 
    236                       <th colspan="16"> 
    237                         America/New_York <span class="subLink">[<a href="{$getTimeZones}">change</a>]</span> 
    238                         <!--<form name="timezones" action="setTimeZone" method="post"> 
    239                           <select name="timezone"> 
     241                        <select name="timezone" id="timezonesDropDown"> 
    240242                          <xsl:for-each select="/bedework-fbaggregator/timezones/tzid"> 
    241243                            <option> 
    242244                              <xsl:attribute name="value"><xsl:value-of select="."/></xsl:attribute> 
     245                              <xsl:if test="node() = $currentTimezone"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 
    243246                              <xsl:value-of select="."/> 
    244247                            </option> 
    245248                          </xsl:for-each> 
    246249                        </select> 
    247                         <input type="submit" value="change"/> 
    248                           <span class="tzLink">[<a href="{$getTimeZones}">map</a>]</span> 
    249                         </form>--> 
     250                        <!--<input type="submit" value="change" id="timezonesButton"/> 
     251                        <span class="subLink">[<a href="{$getTimeZones}">map</a>]</span>--> 
    250252                      </th> 
    251253                    </tr> 
    …… 
    343345        </tr> 
    344346        <tr> 
    345           <td id="userCell" colspan="2"> 
     347          <td id="attendeeCell" colspan="2"> 
    346348            <h4>attendees <span class="subLink">[<a href="{$manageAttendees}">manage</a>]</span></h4> 
    347349            <p> 
    …… 
    350352              <input type="radio" name="all" value="false"/>selected attendees 
    351353            </p> 
    352              <table id="users"> 
    353                <xsl:for-each select="/bedework-fbaggregator/users/user"> 
     354             <table id="attendees"> 
     355               <xsl:for-each select="/bedework-fbaggregator/attendees/attendee"> 
    354356                 <xsl:variable name="account" select="account"/> 
    355357                 <xsl:variable name="accountClass"> 
    …… 
    364366                    </td> 
    365367                    <td> 
    366                       <img src="{$resourcesRoot}/resources/userIcon.gif" width="13" height="13" border="0" alt="user"/> 
     368                      <img src="{$resourcesRoot}/resources/userIcon.gif" width="13" height="13" border="0" alt="attendee"/> 
    367369                    </td> 
    368370                    <td> 
    …… 
    384386                    <!--<tr> 
    385387                      <td> 
    386                         <img src="{$resourcesRoot}/resources/userIcon.gif" width="13" height="13" border="0" alt="user"/> 
     388                        <img src="{$resourcesRoot}/resources/userIcon.gif" width="13" height="13" border="0" alt="attendee"/> 
    387389                      </td> 
    388390                      <td> 
    …… 
    442444    <div id="content"> 
    443445      <h2>Manage Attendees</h2> 
    444       <form action="{$addUser}" method="post"> 
    445         <fieldset id="modUser"> 
    446           <legend>Add user/group:</legend> 
    447           <table> 
     446      <p><a href="{$showAddAttendee}"><input type="button" value="add attendee"/></a></p> 
     447      <fieldset id="attendeeList"> 
     448        <legend>Edit/remove attendees:</legend> 
     449        <table cellspacing="0"> 
     450          <tr class="header"> 
     451            <td class="editIcon">edit</td> 
     452            <th>account</th> 
     453            <th>type</th> 
     454            <th>host</th> 
     455            <th>port</th> 
     456            <th>secure</th> 
     457            <th>url</th> 
     458            <td class="trashIcon">remove</td> 
     459          </tr> 
     460          <xsl:for-each select="/bedework-fbaggregator/attendees/attendee"> 
     461            <xsl:variable name="rowClass"> 
     462              <xsl:choose> 
     463                <xsl:when test="position() mod 2 = 1">a</xsl:when> 
     464                <xsl:otherwise>b</xsl:otherwise> 
     465              </xsl:choose> 
     466            </xsl:variable> 
     467            <tr class="{$rowClass}"> 
     468              <td class="editIcon"><img src="{$resourcesRoot}/resources/userIcon.gif" width="13" height="13" border="0" alt="remove"/></td> 
     469              <td><xsl:value-of select="account"/></td> 
     470              <td><xsl:value-of select="type"/></td> 
     471              <td><xsl:value-of select="host"/></td> 
     472              <td><xsl:value-of select="port"/></td> 
     473              <td><xsl:value-of select="secure"/></td> 
     474              <td><xsl:value-of select="url"/></td> 
     475              <td class="trashIcon"><img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="remove"/></td> 
     476            </tr> 
     477          </xsl:for-each> 
     478        </table> 
     479      </fieldset> 
     480    </div> 
     481  </xsl:template> 
     482 
     483  <xsl:template name="addAttendee"> 
     484    <div id="content"> 
     485      <h2>Manage Attendees</h2> 
     486      <form action="{$addAttendee}" method="post"> 
     487        <fieldset id="modAttendee"> 
     488          <legend>Add attendee:</legend> 
     489          <table cellspacing="0"> 
    448490            <tr> 
    449491              <th>Attendee's account:</th> 
    …… 
    480522              <td> 
    481523                <input 
    482                  type="text" 
     524                 type="password" 
    483525                 name="authPw" 
    484526                 size="40"