Changeset 1231

Show
Ignore:
Timestamp:
01/18/07 15:44:43
Author:
johnsa
Message:

web clients - work on recurrences

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1229 r1231  
    11131113                  <!-- set or remove "recurring" and show or hide all recurrence fields: --> 
    11141114                  <input type="radio" name="recurring" value="true" onclick="swapRecurrence(this)"> 
    1115                     <xsl:if test="form/recurrence"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if> 
     1115                    <xsl:if test="form/recurringEntity = 'true'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if> 
    11161116                  </input> event recurs 
    11171117                  <input type="radio" name="recurring" value="false" onclick="swapRecurrence(this)"> 
    1118                     <xsl:if test="not(form/recurrence)"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if> 
     1118                    <xsl:if test="form/recurringEntity = 'false'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if> 
    11191119                  </input> event does not recur 
    11201120                </div> 
    …… 
    11221122                <!-- wrapper for all recurrence fields (rrules and rdates): --> 
    11231123                <div id="recurrenceFields" class="invisible"> 
    1124                   <xsl:if test="form/recurrence"><xsl:attribute name="class">visible</xsl:attribute></xsl:if> 
     1124                  <xsl:if test="form/recurringEntity = 'true'"><xsl:attribute name="class">visible</xsl:attribute></xsl:if> 
    11251125 
    11261126                  <!-- show or hide rrules fields: --> 
    …… 
    11281128                  <span id="rrulesSwitch"> 
    11291129                    <xsl:choose> 
    1130                       <xsl:when test="/bedeworkadmin/creating = 'true'"> 
    1131                         create recurrence rules 
     1130                      <xsl:when test="form/recurrence"> 
     1131                        change recurrence rules 
    11321132                      </xsl:when> 
    11331133                      <xsl:otherwise> 
    1134                         change recurrence rules 
     1134                        create recurrence rules 
    11351135                      </xsl:otherwise> 
    11361136                    </xsl:choose> 
    …… 
    11421142 
    11431143                  <xsl:if test="form/recurrence"> 
    1144                     <!-- Output descriptive recurrence information.  Probably not 
     1144                    <!-- Output descriptive recurrence rules information.  Probably not 
    11451145                         complete yet. Replace all strings so can be 
    11461146                         more easily internationalized. --> 

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

    r1229 r1231  
    23312331            <!-- set or remove "recurring" and show or hide all recurrence fields: --> 
    23322332            <input type="radio" name="recurring" value="true" onclick="swapRecurrence(this)"> 
    2333               <xsl:if test="form/recurrence"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if> 
     2333              <xsl:if test="form/recurringEntity = 'true'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if> 
    23342334            </input> event recurs 
    23352335            <input type="radio" name="recurring" value="false" onclick="swapRecurrence(this)"> 
    2336               <xsl:if test="not(form/recurrence)"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if> 
     2336              <xsl:if test="form/recurringEntity = 'false'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if> 
    23372337            </input> event does not recur 
    23382338          </div> 
    …… 
    23402340          <!-- wrapper for all recurrence fields (rrules and rdates): --> 
    23412341          <div id="recurrenceFields" class="invisible"> 
    2342             <xsl:if test="form/recurrence"><xsl:attribute name="class">visible</xsl:attribute></xsl:if> 
     2342            <xsl:if test="form/recurringEntity = 'true'"><xsl:attribute name="class">visible</xsl:attribute></xsl:if> 
    23432343 
    23442344            <!-- show or hide rrules fields: --> 
    …… 
    23462346            <span id="rrulesSwitch"> 
    23472347              <xsl:choose> 
    2348                 <xsl:when test="/bedework/creating = 'true'"> 
    2349                   create recurrence rules 
     2348                <xsl:when test="form/recurrence"> 
     2349                  change recurrence rules 
    23502350                </xsl:when> 
    23512351                <xsl:otherwise> 
    2352                   change recurrence rules 
     2352                  create recurrence rules 
    23532353                </xsl:otherwise> 
    23542354              </xsl:choose> 
    …… 
    23602360 
    23612361            <xsl:if test="form/recurrence"> 
    2362               <!-- Output descriptive recurrence information.  Probably not 
     2362              <!-- Output descriptive recurrence rules information.  Probably not 
    23632363                   complete yet. Replace all strings so can be 
    23642364                   more easily internationalized. -->