Changeset 1418

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

user client: updates to the Schedule Meeting and Edit Meeting interfaces

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1415 r1418  
    4444  color: black; 
    4545} 
    46 #bedework h2 .formButtons { 
     46#bedework .formButtons { 
    4747  float: right; 
    4848  font-size: 0.8em; 

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

    r1415 r1418  
    18531853  <!--==== EDIT EVENT ====--> 
    18541854  <xsl:template match="formElements" mode="editEvent"> 
    1855     <xsl:variable name="subscriptionId" select="subscriptionId"/> 
    1856     <xsl:variable name="calPathEncoded" select="form/calendar/encodedPath"/> 
    1857     <xsl:variable name="calPath" select="form/calendar/path"/> 
    1858     <xsl:variable name="guid" select="guid"/> 
    1859     <xsl:variable name="recurrenceId" select="recurrenceId"/> 
    18601855    <!-- The name "eventForm" is referenced by several javascript functions. Do not 
    18611856    change it without modifying bedework.js --> 
    …… 
    18681863        Edit  
    18691864        <xsl:choose>   
    1870           <xsl:when test="form/scheduleMethod = 2">Meeting</xsl:when> 
     1865          <xsl:when test="form/scheduleMethod = 2"> 
     1866            Meeting <input type="button" value="edit attendees" onclick="window.location='{$event-attendeesForEvent}'"/> 
     1867          </xsl:when> 
    18711868          <xsl:otherwise>Event</xsl:otherwise> 
    18721869        </xsl:choose> 
    …… 
    19851982          </td> 
    19861983          <td class="fieldval"> 
    1987             <!-- the string "user/" should not be hard coded; fix in 3.3.1 --> 
     1984            <!-- the string "user/" should not be hard coded; fix this --> 
    19881985            <xsl:variable name="userPath">user/<xsl:value-of select="/bedework/userid"/></xsl:variable> 
    19891986            <xsl:variable name="writableCalendars"> 
    …… 
    19961993            </xsl:variable> 
    19971994            <xsl:choose> 
    1998               <xsl:when test="/bedework/creating = 'true' and $writableCalendars = 1"> 
     1995              <xsl:when test="$writableCalendars = 1"> 
    19991996                <!-- there is only 1 writable calendar, so find it by looking down both trees at once --> 
    20001997                <xsl:variable name="newCalPath"><xsl:value-of select="/bedework/myCalendars//calendar[calType = '1' and 
    …… 
    29162913    </div> 
    29172914 
    2918     <!-- Access Control tab --> 
    2919     <!-- ================== --> 
     2915    <!-- Access tab --> 
     2916    <!-- ========== --> 
    29202917    <div id="bwEventTab-Access" class="invisible"> 
    29212918      <div id="sharingBox"> 
    …… 
    29262923          <xsl:with-param name="recurrenceId" select="$recurrenceId"/> 
    29272924        </xsl:apply-templates> 
    2928         <form name="eventShareForm" method="post" action="{$event-setAccess}" id="shareForm" onsubmit="setAccessHow(this)"> 
     2925        <!--<form name="eventShareForm" method="post" action="{$event-setAccess}" id="shareForm" onsubmit="setAccessHow(this)"> 
    29292926          <input type="hidden" name="calPath" value="{$calPath}"/> 
    29302927          <input type="hidden" name="guid" value="{$guid}"/> 
    2931           <input type="hidden" name="recurid" value="{$recurrenceId}"/> 
     2928          <input type="hidden" name="recurid" value="{$recurrenceId}"/>--> 
    29322929          <xsl:call-template name="entityAccessForm"> 
    29332930            <xsl:with-param name="hideSubmitButton">true</xsl:with-param> 
    29342931          </xsl:call-template> 
    2935         </form> 
     2932        <!--</form>--> 
    29362933      </div> 
    29372934    </div> 
    2938  
    29392935 
    29402936    <div class="eventSubmitButtons"> 
    …… 
    32973293  <xsl:template name="attendees"> 
    32983294    <h2> 
     3295      <span class="formButtons"><input type="button" value="continue" onclick="window.location='{$gotoEditEvent}'"/></span> 
    32993296      Schedule Meeting 
    33003297    </h2> 
    …… 
    33763373                <th colspan="2">Recipients</th> 
    33773374              </tr> 
     3375              <tr class="subHead"> 
     3376                <td></td> 
     3377                <td>recipient</td> 
     3378              </tr> 
    33783379              <xsl:for-each select="/bedework/recipients/recipient"> 
    33793380                <xsl:variable name="recipientUri" select="."/> 
    …… 
    33983399               being used to pick out just the freebusy node and 
    33993400               shorten the select statements below. --> 
    3400             <xsl:variable name="currentTimezone">America/Los_Angeles</xsl:variable> 
    34013401            <xsl:variable name="formattedStartDate"> 
    34023402              <xsl:value-of select="substring(start,1,4)"/>-<xsl:value-of select="number(substring(start,5,2))"/>-<xsl:value-of select="number(substring(start,7,2))"/> 
    …… 
    34223422                  </span> 
    34233423                </th> 
    3424                 <!--<th colspan="32" class="right"> 
     3424                <!-- at some point allow switching of timezones: 
     3425                <th colspan="32" class="right"> 
     3426                  <xsl:variable name="currentTimezone">America/Los_Angeles</xsl:variable> 
    34253427                  <xsl:value-of select="$formattedStartDate"/> to <xsl:value-of select="$formattedEndDate"/> 
    34263428                  <select name="timezone" id="timezonesDropDown" onchange="submit()"> 
    …… 
    34753477                        </xsl:choose> 
    34763478                      </xsl:attribute> 
    3477                       <a href="{$initEvent}&amp;meetingStartdt={$startDate}&amp;meetingDuration={$meetingDuration}"> 
     3479                      <a href="{$gotoEditEvent}&amp;meetingStartdt={$startDate}&amp;meetingDuration={$meetingDuration}"> 
    34783480                        <xsl:choose> 
    34793481                          <xsl:when test="((numBusy &gt; 0) and (numBusy &lt; 9)) or ((numTentative &gt; 0) and (numTentative &lt; 9)) and (number(numBusy) + number(numTentative) &lt; 9)"> 
    …… 
    35203522          </xsl:for-each> 
    35213523 
    3522           <p><input type="button" value="continue" onclick="window.location='{$gotoEditEvent}'"/></p> 
     3524          <div class="eventSubmitButtons"> 
     3525            <input type="button" value="continue" onclick="window.location='{$gotoEditEvent}'"/> 
     3526          </div> 
    35233527        </div> 
    35243528      </form>