Changeset 1201

Show
Ignore:
Timestamp:
01/04/07 17:11:22
Author:
johnsa
Message:

user client:

- correct freebusy output (doubled header)
- change values of some submit buttons
- add creating flag back to editEvent page

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1200 r1201  
    246246                    </xsl:when> 
    247247                    <xsl:when test="/bedework/page='freeBusy'"> 
    248                       <xsl:call-template name="utilBar"/> 
    249248                      <xsl:apply-templates select="/bedework/freebusy"/> 
    250249                    </xsl:when> 
    …… 
    17381737      <h2> 
    17391738        <span class="formButtons"> 
    1740           <input name="submit" type="submit" value="Submit Event"/>&#160; 
    1741           <input name="cancelled" type="submit" value="Cancel"/> 
     1739          <input name="submit" type="submit" value="save event"/>&#160; 
     1740          <input name="cancelled" type="submit" value="cancel"/> 
    17421741        </span> 
    17431742        Add Event 
    …… 
    17641763      <h2> 
    17651764        <span class="formButtons"> 
    1766           <input name="submit" type="submit" value="Submit Event"/>&#160; 
    1767           <input name="cancelled" type="submit" value="Cancel"/> 
    1768           <input type="button" value="return to view" onclick="location.replace('{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}')"/> 
     1765          <input name="submit" type="submit" value="save event"/>&#160; 
     1766          <input name="cancelled" type="submit" value="cancel"/> 
     1767          <input type="button" value="go to view" onclick="location.replace('{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}')"/> 
    17691768        </span> 
    17701769        Edit Event 
    …… 
    27272726      <tr> 
    27282727        <td class="submit" colspan="2"> 
    2729           <input name="submit" type="submit" value="Submit Event"/>&#160; 
    2730           <input name="cancelled" type="submit" value="Cancel"/> 
     2728          <input name="submit" type="submit" value="save event"/>&#160; 
     2729          <input name="cancelled" type="submit" value="cancel"/> 
    27312730          <xsl:if test="/bedework/creating != 'true'"> 
    2732             <input type="button" value="return to view" onclick="location.replace('{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}')"/> 
     2731            <input type="button" value="go to view" onclick="location.replace('{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}')"/> 
    27332732          </xsl:if> 
    27342733        </td> 
    …… 
    30633062          <td> 
    30643063            <input name="submit" type="submit" value="Continue"/> 
    3065             <input name="cancelled" type="submit" value="Cancel"/> 
     3064            <input name="cancelled" type="submit" value="cancel"/> 
    30663065          </td> 
    30673066        </tr> 
    …… 
    32763275              <td> 
    32773276                <input type="submit" name="addCategory" value="Add Category"/> 
    3278                 <input type="submit" name="cancelled" value="Cancel"/> 
     3277                <input type="submit" name="cancelled" value="cancel"/> 
    32793278                <input type="reset" value="Clear"/> 
    32803279              </td> 
    …… 
    33153314              <td> 
    33163315                <input type="submit" name="updateCategory" value="Update Category"/> 
    3317                 <input type="submit" name="cancelled" value="Cancel"/> 
     3316                <input type="submit" name="cancelled" value="cancel"/> 
    33183317                <input type="reset" value="Reset"/> 
    33193318              </td> 
    …… 
    35623561      <xsl:choose> 
    35633562        <xsl:when test="/bedework/appvar[key='showAllCalsForEvent']/value = 'true'"> 
    3564           <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar[calType &lt; 2]" mode="selectCalForEventCalTree"/> 
     3563          <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar" mode="selectCalForEventCalTree"/> 
    35653564        </xsl:when> 
    35663565        <xsl:otherwise> 
    3567           <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar[currentAccess/current-user-privilege-set/privilege/write-content and calType &lt; 2]" mode="selectCalForEventCalTree"/> 
     3566          <xsl:apply-templates select="/bedework/myCalendars/calendars/calendar[currentAccess/current-user-privilege-set/privilege/write-content]" mode="selectCalForEventCalTree"/> 
    35683567        </xsl:otherwise> 
    35693568      </xsl:choose> 
    …… 
    35743573      <xsl:choose> 
    35753574        <xsl:when test="/bedework/appvar[key='showAllCalsForEvent']/value = 'true'"> 
    3576           <xsl:apply-templates select="/bedework/mySubscriptions/subscription[not(contains(uri,$userPath))]/calendars/calendar[calType &lt; 2]" mode="selectCalForEventCalTree"/> 
     3575          <xsl:apply-templates select="/bedework/mySubscriptions/subscription[not(contains(uri,$userPath))]/calendars/calendar" mode="selectCalForEventCalTree"/> 
    35773576        </xsl:when> 
    35783577        <xsl:otherwise> 
    3579           <xsl:apply-templates select="/bedework/mySubscriptions/subscription[not(contains(uri,$userPath))]/calendars/calendar[currentAccess/current-user-privilege-set/privilege/write-content and calType &lt; 2]" mode="selectCalForEventCalTree"/> 
     3578          <xsl:apply-templates select="/bedework/mySubscriptions/subscription[not(contains(uri,$userPath))]/calendars/calendar[currentAccess/current-user-privilege-set/privilege/write-content]" mode="selectCalForEventCalTree"/> 
    35803579        </xsl:otherwise> 
    35813580      </xsl:choose> 
    …… 
    36193618      <xsl:if test="calendar"> 
    36203619        <ul> 
    3621           <xsl:apply-templates select="calendar" mode="selectCalForEventCalTree"/> 
     3620          <xsl:apply-templates select="calendar[calType &lt; 2]" mode="selectCalForEventCalTree"/> 
    36223621        </ul> 
    36233622      </xsl:if> 
    …… 
    36643663          <td> 
    36653664            <input type="submit" name="addCalendar" value="Add Calendar/Folder"/> 
    3666             <input type="submit" name="cancelled" value="Cancel"/> 
     3665            <input type="submit" name="cancelled" value="cancel"/> 
    36673666            <input type="reset" value="Clear"/> 
    36683667          </td> 
    …… 
    37513750              </xsl:otherwise> 
    37523751            </xsl:choose> 
    3753             <input type="submit" name="cancelled" value="Cancel"/> 
     3752            <input type="submit" name="cancelled" value="cancel"/> 
    37543753            <input type="reset" value="Reset"/> 
    37553754          </td> 
    …… 
    39113910        <tr> 
    39123911          <td> 
    3913             <input type="submit" name="cancelled" value="Cancel"/> 
     3912            <input type="submit" name="cancelled" value="cancel"/> 
    39143913          </td> 
    39153914          <td align="right"> 
    …… 
    42154214          <td> 
    42164215            <input type="submit" name="addSubscription" value="Add Subscription"/> 
    4217             <input type="submit" name="cancelled" value="Cancel"/> 
     4216            <input type="submit" name="cancelled" value="cancel"/> 
    42184217            <input type="reset" value="Clear"/> 
    42194218          </td> 
    …… 
    42854284          <td> 
    42864285            <input type="submit" name="addSubscription" value="Add Subscription"/> 
    4287             <input type="submit" name="cancelled" value="Cancel"/> 
     4286            <input type="submit" name="cancelled" value="cancel"/> 
    42884287            <input type="reset" value="Clear"/> 
    42894288          </td> 
    …… 
    43984397          <td> 
    43994398            <input type="submit" name="updateSubscription" value="Update Subscription"/> 
    4400             <input type="submit" name="cancelled" value="Cancel"/> 
     4399            <input type="submit" name="cancelled" value="cancel"/> 
    44014400            <input type="reset" value="Reset"/> 
    44024401          </td> 
    …… 
    45664565          <td> 
    45674566            <input name="submit" type="submit" value="Continue"/>&#160; 
    4568             <input name="cancelled" type="submit" value="Cancel"/> 
     4567            <input name="cancelled" type="submit" value="cancel"/> 
    45694568          </td> 
    45704569        </tr> 
    …… 
    46264625          <td> 
    46274626            <input name="submit" type="submit" value="Continue"/> 
    4628             <input name="cancelled" type="submit" value="Cancel"/> 
     4627            <input name="cancelled" type="submit" value="cancel"/> 
    46294628          </td> 
    46304629        </tr> 
    …… 
    46614660          <td> 
    46624661            <input name="submit" type="submit" value="Continue"/>&#160; 
    4663             <input name="cancelled" type="submit" value="Cancel"/> 
     4662            <input name="cancelled" type="submit" value="cancel"/> 
    46644663          </td> 
    46654664        </tr> 
    …… 
    47324731              <td> 
    47334732                <input name="submit" type="submit" value="Submit Location"/> 
    4734                 <input name="cancelled" type="submit" value="Cancel"/> 
     4733                <input name="cancelled" type="submit" value="cancel"/> 
    47354734              </td> 
    47364735            </tr> 
    …… 
    47804779              <td> 
    47814780                <input name="submit" type="submit" value="Submit Location"/> 
    4782                 <input name="cancelled" type="submit" value="Cancel"/> 
     4781                <input name="cancelled" type="submit" value="cancel"/> 
    47834782                <input type="reset" value="Reset"/> 
    47844783              </td> 
    …… 
    49624961          <td class="fieldval scheduleActions"> 
    49634962            <input name="submit" type="submit" value="Submit"/>&#160; 
    4964             <input name="cancelled" type="submit" value="Cancel"/> 
     4963            <input name="cancelled" type="submit" value="cancel"/> 
    49654964          </td> 
    49664965        </tr> 
    …… 
    53895388          <form name="processReply" action="{$schedule-processAttendeeReply}"> 
    53905389            <input type="submit" value="Accept" name="update"/> 
    5391             <input type="submit" value="Cancel" name="cancelled"/> 
     5390            <input type="submit" value="cancel" name="cancelled"/> 
    53925391          </form> 
    53935392        </td> 
    …… 
    55375536          <td> 
    55385537            <input name="submit" type="submit" value="Continue"/> 
    5539             <input name="cancelled" type="submit" value="Cancel"/> 
     5538            <input name="cancelled" type="submit" value="cancel"/> 
    55405539          </td> 
    55415540        </tr> 
    …… 
    58615860      <input type="submit" name="modPrefs" value="Update"/> 
    58625861      <input type="reset" value="Reset"/> 
    5863       <input type="submit" name="cancelled" value="Cancel"/> 
     5862      <input type="submit" name="cancelled" value="cancel"/> 
    58645863    </form> 
    58655864  </xsl:template> 
    …… 
    59635962    <input type="submit" name="modPrefs" value="Update"/> 
    59645963    <input type="reset" value="Reset"/> 
    5965     <input type="submit" name="cancelled" value="Cancel"/> 
     5964    <input type="submit" name="cancelled" value="cancel"/> 
    59665965  </xsl:template> 
    59675966