Changeset 2974

Show
Ignore:
Timestamp:
08/11/10 10:35:23
Author:
johnsa
Message:

user client: restore recurring flag (turns on/off recurrence) to aid in debugging

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/eventForm.xsl

    r2953 r2974  
    199199        </li>--> 
    200200      </ul> 
     201       
    201202 
    202203    <!-- Basic tab --> 
    …… 
    835836          <!-- has recurrenceId, so is master --> 
    836837           
     838          <!-- the switch is current required to turn recurrence on or off - we can probably infer this instead --> 
     839          <div id="recurringSwitch"> 
     840            <!-- set or remove "recurring" and show or hide all recurrence fields: --> 
     841            <input type="radio" name="recurring" value="true" onclick="swapRecurrence(this)"> 
     842              <xsl:if test="form/recurringEntity = 'true'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if> 
     843            </input> <xsl:copy-of select="$bwStr-AEEF-EventRecurs"/> 
     844            <input type="radio" name="recurring" value="false" onclick="swapRecurrence(this)"> 
     845              <xsl:if test="form/recurringEntity = 'false'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if> 
     846            </input> <xsl:copy-of select="$bwStr-AEEF-EventDoesNotRecur"/> 
     847          </div> 
     848           
    837849          <!-- wrapper for all recurrence fields (rrules and rdates): --> 
    838           <div id="recurrenceFields"> 
     850          <div id="recurrenceFields" class="invisible"> 
    839851            <xsl:if test="form/recurringEntity = 'true'"><xsl:attribute name="class">visible</xsl:attribute></xsl:if> 
    840852 

  • trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/javascript/bedeworkScheduling.js

    r2968 r2974  
    10551055      ); 
    10561056       
    1057       // auto-completion for add attendee input field - DEPRECATED  
     1057      // add attendee box - use jquery UI autocomplete 
    10581058      // carddavUrl supplied in bedework.js 
    10591059      // var carddavUrlTemp = "/ucalrsrc/themes/bedeworkTheme/javascript/addrbookUsers.js" 
    10601060      // var carddavUrlTemp = "/ucalrsrc/themes/bedeworkTheme/javascript/addrbookLocations.js" 
    1061       //$("#bwScheduleTable #bwAddAttendee").autocomplete(carddavUrl, bwAutoCompleteOptions); 
    1062        
    1063       // add attendee box - use jquery UI autocomplete 
    10641061      $("#bwScheduleTable #bwAddAttendee").autocomplete({ 
    10651062        minLength: 1, 
    10661063        // set the data source, call it, and format the results: 
    10671064        source: function(req, include) { 
    1068           // build the address book url; the path to the addressbook is determined by the 
    1069           // radio button choices in the "add attendee" widget 
     1065          // build the address book url; the path to the address book is determined by the 
     1066          // radio button choices in the "add attendee" widget - these are stored on the fly 
     1067          // in the hidden field with id bwCardDavBookPath 
    10701068          addrBookUrl = carddavUrl + "?format=json&addrbook=" + $("#bwCardDavBookPath").val(); 
    10711069           
    1072           // call the server and format the results into an array "items" 
     1070          // call the server and push the results into an array "items" 
    10731071          $.getJSON(addrBookUrl, req, function(data) { 
    10741072            var acResults; 
    …… 
    11081106              } 
    11091107               
    1110               // only add the entry if there is a uri and a lable to use 
     1108              // only add the entry if there is a uri and a label to use 
    11111109              if (curUri != "" && curLabel != "") { 
    11121110                var curItem = {label: curLabel, value: curUri};