Changeset 1967

Show
Ignore:
Timestamp:
11/13/08 16:19:00
Author:
johnsa
Message:

some final jquery cleanup

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1966 r1967  
    235235              <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.2.6.min.js">&#160;</script> 
    236236              <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.5.2.min.js">&#160;</script> 
    237               <link rel="stylesheet" href="{$resourcesRoot}/default/default/jquery.css"/> 
     237              <link rel="stylesheet" href="/bedework-common/javascript/jquery/bedeworkJqueryThemes.css"/> 
    238238              <script type="text/javascript"> 
    239239                <xsl:comment> 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl

    r1963 r1967  
    134134          <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.2.6.min.js">&#160;</script> 
    135135          <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.5.2.min.js">&#160;</script> 
    136           <link rel="stylesheet" href="{$resourcesRoot}/default/default/jquery.css"/> 
     136          <link rel="stylesheet" href="/bedework-common/javascript/jquery/bedeworkJqueryThemes.css"/> 
    137137          <script type="text/javascript"> 
    138138            <xsl:comment> 

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

    r1878 r1967  
    9494 
    9595  <!-- the following variable can be set to "true" or "false"; 
    96        to use dojo widgets and fancier UI features, set to false - these are 
    97        not guaranteed to work in portals --> 
     96       to use jQuery widgets and fancier UI features, set to false - these are 
     97       not guaranteed to work in portals. --> 
    9898  <xsl:variable name="portalFriendly">false</xsl:variable> 
    9999 
    …… 
    157157      <script type="text/javascript" src="{$resourcesRoot}/resources/bwClock.js">&#160;</script> 
    158158      <link rel="stylesheet" href="{$resourcesRoot}/resources/bwClock.css"/> 
    159       <script type="text/javascript" src="/bedework-common/javascript/dojo/dojo.js">&#160;</script> 
     159      <xsl:choose> 
     160        <xsl:when test="$portalFriendly = 'true'"> 
     161          <script type="text/javascript" src="{$resourcesRoot}/resources/dynCalendarWidget.js">&#160;</script> 
     162          <link rel="stylesheet" href="{$resourcesRoot}/resources/dynCalendarWidget.css"/> 
     163        </xsl:when> 
     164        <xsl:otherwise> 
     165          <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.2.6.min.js">&#160;</script> 
     166          <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.5.2.min.js">&#160;</script> 
     167          <link rel="stylesheet" href="/bedework-common/javascript/jquery/bedeworkJqueryThemes.css"/> 
     168          <script type="text/javascript"> 
     169            <xsl:comment> 
     170            $.datepicker.setDefaults({ 
     171              constrainInput: true, 
     172              dateFormat: "yy-mm-dd", 
     173              showOn: "both", 
     174              buttonImage: "<xsl:value-of select='$resourcesRoot'/>/resources/calIcon.gif", 
     175              buttonImageOnly: true, 
     176              gotoCurrent: true, 
     177              duration: "" 
     178            }); 
     179            </xsl:comment> 
     180          </script> 
     181        </xsl:otherwise> 
     182      </xsl:choose> 
    160183      <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkEventForm.js">&#160;</script> 
    161184      <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkXProperties.js">&#160;</script> 
    162     </xsl:if> 
    163     <!-- <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkAccess.js">&#160;</script> --> 
    164     <xsl:if test="$portalFriendly = 'true'"> 
    165       <script type="text/javascript" src="{$resourcesRoot}/resources/dynCalendarWidget.js">&#160;</script> 
    166       <link rel="stylesheet" href="{$resourcesRoot}/resources/dynCalendarWidget.css"/> 
    167185    </xsl:if> 
    168186    <script type="text/javascript"> 
    …… 
    633651                    </xsl:when> 
    634652                    <xsl:otherwise> 
    635                       <span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetStartDate" iconURL="{$resourcesRoot}/resources/calIcon.gif"> 
    636                         <xsl:attribute name="value"><xsl:value-of select="form/start/rfc3339DateTime"/></xsl:attribute> 
    637                         <xsl:text> </xsl:text> 
    638                       </span> 
     653                      <!-- span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetStartDate" iconURL="{$resourcesRoot}/resources/calIcon.gif"> 
     654                      <xsl:attribute name="value"><xsl:value-of select="form/start/rfc3339DateTime"/></xsl:attribute> 
     655                      <xsl:text> </xsl:text> 
     656                      </span --> 
     657                      <input type="text" name="bwEventWidgetStartDate" id="bwEventWidgetStartDate" size="10"/> 
     658                      <script language="JavaScript" type="text/javascript"> 
     659                        <xsl:comment> 
     660                        $("#bwEventWidgetStartDate").datepicker({ 
     661                          defaultDate: new Date(<xsl:value-of select="form/start/yearText/input/@value"/>, <xsl:value-of select="number(form/start/month/select/option[@selected = 'selected']/@value) - 1"/>, <xsl:value-of select="form/start/day/select/option[@selected = 'selected']/@value"/>) 
     662                        }).attr("readonly", "readonly"); 
     663                        $("#bwEventWidgetStartDate").val('<xsl:value-of select="substring-before(form/start/rfc3339DateTime,'T')"/>'); 
     664                        //alert($("#bwEventWidgetStartDate").datepicker("getDate")); 
     665                        </xsl:comment> 
     666                      </script> 
    639667                      <input type="hidden" name="eventStartDate.year"> 
    640668                        <xsl:attribute name="value"><xsl:value-of select="form/start/yearText/input/@value"/></xsl:attribute> 
    …… 
    717745                      </xsl:when> 
    718746                      <xsl:otherwise> 
    719                         <span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetEndDate" iconURL="{$resourcesRoot}/resources/calIcon.gif"> 
     747                        <!-- span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetEndDate" iconURL="{$resourcesRoot}/resources/calIcon.gif"> 
    720748                          <xsl:attribute name="value"><xsl:value-of select="form/end/rfc3339DateTime"/></xsl:attribute> 
    721749                          <xsl:text> </xsl:text> 
    722                         </span> 
     750                        </span--> 
     751                        <input type="text" name="bwEventWidgetEndDate" id="bwEventWidgetEndDate" size="10"/> 
     752                        <script language="JavaScript" type="text/javascript"> 
     753                          <xsl:comment> 
     754                          $("#bwEventWidgetEndDate").datepicker({ 
     755                            defaultDate: new Date(<xsl:value-of select="form/end/dateTime/yearText/input/@value"/>, <xsl:value-of select="number(form/end/dateTime/month/select/option[@selected = 'selected']/@value) - 1"/>, <xsl:value-of select="form/end/dateTime/day/select/option[@selected = 'selected']/@value"/>) 
     756                          }).attr("readonly", "readonly"); 
     757                          $("#bwEventWidgetEndDate").val('<xsl:value-of select="substring-before(form/end/rfc3339DateTime,'T')"/>'); 
     758                          </xsl:comment> 
     759                        </script> 
    723760                        <input type="hidden" name="eventEndDate.year"> 
    724761                          <xsl:attribute name="value"><xsl:value-of select="form/end/dateTime/yearText/input/@value"/></xsl:attribute> 

  • trunk/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkEventForm.js

    r1918 r1967  
    2626    to the maximum extent the law permits. */ 
    2727 
    28 dojo.require("dojo.event.*"); 
    29 dojo.require("dojo.widget.*"); 
    30 dojo.require("dojo.widget.DropdownDatePicker"); 
    31 dojo.require("dojo.widget.DropdownTimePicker"); 
    32  
    3328// ======================================================================== 
    3429// ======================================================================== 
    …… 
    4641 * date: String: internal date 
    4742 * time: String 
    48  * tzid timezone id or null 
     43 * tzid: timezone id or null 
    4944 */ 
    5045function BwREXdate(date, time, allDay, floating, utc, tzid) { 
    …… 
    245240  } 
    246241  setComments(formObj); 
    247   //setRecurrence(formObj); 
     242  //if(formObj.freq){ 
     243  //  setRecurrence(formObj); 
     244  //} else we are editing an instance of a recurrence 
    248245  setBedeworkXProperties(formObj,submitter); 
    249246  //setAccessHow(formObj,1); 
    250247  //setAccessAcl(formObj); 
    251248} 
     249/* Set dates based on jQuery widgets */ 
    252250function setDates(formObj) { 
    253251  var startDate = new Date(); 
    254   startDate = dojo.widget.byId("bwEventWidgetStartDate").getDate(); 
     252  startDate = $("#bwEventWidgetStartDate").datepicker("getDate"); 
    255253  formObj["eventStartDate.year"].value = startDate.getFullYear(); 
    256254  formObj["eventStartDate.month"].value = startDate.getMonth() + 1; 
    …… 
    258256 
    259257  var endDate = new Date(); 
    260   endDate = dojo.widget.byId("bwEventWidgetEndDate").getDate(); 
     258  endDate = $("#bwEventWidgetEndDate").datepicker("getDate"); 
    261259  formObj["eventEndDate.year"].value = endDate.getFullYear(); 
    262260  formObj["eventEndDate.month"].value = endDate.getMonth() + 1; 
    …… 
    270268} 
    271269function setBedeworkXProperties(formObj,submitter) { 
    272   // set up specific Bedework X-Properties on event form submission 
     270  // Set up specific Bedework X-Properties on event form submission 
    273271  // Depends on bedeworkXProperties.js 
    274   // Set application x-properties here. 
    275  
    276   // Submission comments as x-properties 
    277   // Only return those comments that contain non-empty values; 
    278   // throw out the subfields if main field has no value. 
    279  
    280   if (formObj["commentLocationAddress"].value != "") { 
    281     bwXProps.update(bwXPropertyLocation, 
    282                   [[bwXParamSubAddress,formObj["commentLocationSubaddress"].value], 
    283                    [bwXParamURL,formObj["commentLocationURL"].value]], 
    284                    formObj["commentLocationAddress"].value,true); 
    285   } 
    286   if (formObj["commentContactName"].value != "") { 
    287     bwXProps.update(bwXPropertyContact, 
    288                   [[bwXParamPhone,formObj["commentContactPhone"].value], 
    289                    [bwXParamURL,formObj["commentContactURL"].value], 
    290                    [bwXParamEmail,formObj["commentContactEmail"].value]], 
    291                    formObj["commentContactName"].value,true); 
    292   } 
    293   if (formObj["commentCategories"].value) { 
    294     bwXProps.update(bwXPropertyCategories,[],formObj["commentCategories"].value,true); 
    295   } 
    296   if (formObj["commentNotes"].value) { 
    297     bwXProps.update(bwXPropertySubmitComment,[],formObj["commentNotes"].value,true); 
    298   } 
     272  // Set application local x-properties here. 
    299273 
    300274  // X-BEDEWORK-IMAGE and its parameters: 
    …… 
    638612        // the following will not be adequate for recurrences smaller than a day; 
    639613        // we will need to set the time properly at that point. 
    640         formObj.until.value = dojo.widget.byId("bwEventWidgetUntilDate").getValue() + "T000000"; 
     614        formObj.until.value = formObj.bwEventUntilDate.value + "T000000"; 
    641615        break; 
    642616    } 
    …… 
    652626  } 
    653627  return true; 
    654 } 
    655  
    656 function setRdateDateTime(formObj) { 
    657   var rdateTime = dojo.byId("bwEventWidgeRdateTime"); 
    658   alert (rdateTime.getValue()); 
    659   if (rdateTime.getValue() != "") { 
    660     /*var rdateTimeObj = rdateTime.getTime(); 
    661     var timeString = rdateTimeObj. 
    662     formOjb.datetime.value += "T" +*/ 
    663   } 
    664 } 
    665  
    666 function untilClickHandler(evt) { 
    667    selectRecurCountUntil('recurUntil'); 
    668628} 
    669629 
    …… 
    707667  return validity; 
    708668} 
     669 
    709670function validateStep3() { 
    710671  var validity = true; 
    …… 
    723684} 
    724685 
    725 // ======================================================= 
    726 // Dojo initialization 
    727 // ======================================================= 
    728  
    729 //function init() { 
    730 //  if(dojo.byId("untilHolder")) { 
    731 //    var untilHolder = dojo.byId("untilHolder"); 
    732 //    dojo.event.connect(untilHolder, "onclick", untilClickHandler); 
    733 //  } // else we are editing an instance of a recurrence 
    734 //} 
    735  
    736 //dojo.addOnLoad(init); 
    737  
    738  
     686 
     687 

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

    r1962 r1967  
    168168  <!-- the following variable can be set to "true" or "false"; 
    169169       to use jQuery widgets and fancier UI features, set to false - these are 
    170        not guaranteed to work in portals. Setting to true will make the 
    171        add/edit event form much faster, but will not support internationalization. --> 
     170       not guaranteed to work in portals. --> 
    172171  <xsl:variable name="portalFriendly">false</xsl:variable> 
    173172 
    …… 
    403402          <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.2.6.min.js">&#160;</script> 
    404403          <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.5.2.min.js">&#160;</script> 
    405           <link rel="stylesheet" href="{$resourcesRoot}/default/default/jquery.css"/> 
     404          <link rel="stylesheet" href="/bedework-common/javascript/jquery/bedeworkJqueryThemes.css"/> 
    406405          <script type="text/javascript"> 
    407406            <xsl:comment> 
    …… 
    417416            </xsl:comment> 
    418417          </script> 
    419           <!-- script type="text/javascript" src="/bedework-common/javascript/dojo/dojo.js">&#160;</script> 
    420           <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkDojo.js">&#160;</script--> 
    421418        </xsl:otherwise> 
    422419      </xsl:choose> 

  • trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkEventForm.js

    r1966 r1967  
    232232 
    233233// ======================================================================== 
     234// Form Manipulation Functions 
    234235// ======================================================================== 
    235236 
    …… 
    245246  //setAccessAcl(formObj); 
    246247} 
    247 /* Set dates based on Dojo widget: DEPRECATED - now using jQuery 
    248 function setDates(formObj) { 
    249   var startDate = new Date(); 
    250   startDate = dojo.widget.byId("bwEventWidgetStartDate").getDate(); 
    251   formObj["eventStartDate.year"].value = startDate.getFullYear(); 
    252   formObj["eventStartDate.month"].value = startDate.getMonth() + 1; 
    253   formObj["eventStartDate.day"].value = startDate.getDate(); 
    254  
    255   var endDate = new Date(); 
    256   endDate = dojo.widget.byId("bwEventWidgetEndDate").getDate(); 
    257   formObj["eventEndDate.year"].value = endDate.getFullYear(); 
    258   formObj["eventEndDate.month"].value = endDate.getMonth() + 1; 
    259   formObj["eventEndDate.day"].value = endDate.getDate(); 
    260 } */ 
    261248/* Set dates based on jQuery widgets */ 
    262249function setDates(formObj) { 
    …… 
    591578        // the following will not be adequate for recurrences smaller than a day; 
    592579        // we will need to set the time properly at that point. 
    593         // Dojo is deprecated: 
    594         //formObj.until.value = dojo.widget.byId("bwEventWidgetUntilDate").getValue() + "T000000"; 
    595580        formObj.until.value = formObj.bwEventUntilDate.value + "T000000"; 
    596581        break; 
    …… 
    609594} 
    610595 
    611 function setRdateDateTime(formObj) { 
    612   var rdateTime = dojo.byId("bwEventWidgeRdateTime"); 
    613   alert (rdateTime.getValue()); 
    614   if (rdateTime.getValue() != "") { 
    615     /*var rdateTimeObj = rdateTime.getTime(); 
    616     var timeString = rdateTimeObj. 
    617     formOjb.datetime.value += "T" +*/ 
    618   } 
    619 } 
    620  
    621  
    622  
    623  
     596 
     597 
     598