Changeset 2635

Show
Ignore:
Timestamp:
01/06/10 13:20:35
Author:
johnsa
Message:

user client: minor changes to scheduling workflow

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2634 r2635  
    66206620          </xsl:when> 
    66216621        </xsl:choose> 
     6622        <!--  
    66226623        <tr> 
    66236624          <td class="fieldname"> 
    …… 
    66276628            <xsl:choose> 
    66286629              <xsl:when test="not(guidcals/calendar)"> 
    6629               <!-- the event has not been added to a calendar, so this is the 
    6630                    first request --> 
    6631  
    6632                 <!-- the string "user/" should not be hard coded; fix this --> 
     6630              <!- - the event has not been added to a calendar, so this is the 
     6631                   first request - - > 
     6632 
     6633                <!- - the string "user/" should not be hard coded; fix this - - > 
    66336634                <xsl:variable name="userPath">user/<xsl:value-of select="/bedework/userid"/></xsl:variable> 
    66346635                <xsl:variable name="writableCalendars"> 
    …… 
    66426643                <xsl:choose> 
    66436644                  <xsl:when test="$writableCalendars = 1"> 
    6644                     <!-- there is only 1 writable calendar, so find it by looking down both trees at once --> 
     6645                    <!- - there is only 1 writable calendar, so find it by looking down both trees at once - - > 
    66456646                    <xsl:variable name="newCalPath"><xsl:value-of select="/bedework/myCalendars//calendar[calType = '1' and 
    66466647                             currentAccess/current-user-privilege-set/privilege/write-content]/path"/><xsl:value-of select="/bedework/mySubscriptions//calendar[calType = '1' and 
    …… 
    66646665                  <xsl:otherwise> 
    66656666                    <input type="hidden" name="newCalPath" id="bwNewCalPathField" value=""/> 
    6666                     <!-- 
     6667                    <!- - 
    66676668                      <xsl:if test="form/calendar/calType = '1'"><xsl:attribute name="value"><xsl:value-of select="form/calendar/path"/></xsl:attribute></xsl:if> 
    6668                     </input>--> 
     6669                    </input>- - > 
    66696670 
    66706671                    <xsl:variable name="userFullPath"><xsl:value-of select="$userPath"/>/</xsl:variable> 
    …… 
    66826683                      </xsl:if> 
    66836684                      <xsl:text> </xsl:text> 
    6684                       <!-- this final text element is required to avoid an empty 
    6685                            span element which is improperly rendered in the browser --> 
     6685                      <!- - this final text element is required to avoid an empty 
     6686                           span element which is improperly rendered in the browser - - > 
    66866687                    </span> 
    66876688 
    …… 
    66936694              </xsl:when> 
    66946695              <xsl:otherwise> 
    6695                 <!-- the event exists in calendars already, so this is a 
     6696                <!- - the event exists in calendars already, so this is a 
    66966697                     subsequent follow-up.  Let the user choose which copies 
    66976698                     of the event to update.  For now, we'll just list them 
    …… 
    66996700 
    67006701                     This should be changed - we will only have one of these so 
    6701                      the for-each is not needed --> 
     6702                     the for-each is not needed - - > 
    67026703                <ul> 
    67036704                  <xsl:for-each select="guidcals/calendar"> 
    …… 
    67146715          </td> 
    67156716        </tr> 
     6717        --> 
    67166718        <xsl:if test="scheduleMethod != '8'"> 
    67176719          <tr>