Changeset 1962

Show
Ignore:
Timestamp:
11/11/08 17:00:48
Author:
johnsa
Message:

converted date widgets to jquery datepicker in personal client

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1961 r1962  
    167167 
    168168  <!-- the following variable can be set to "true" or "false"; 
    169        to use dojo widgets and fancier UI features, set to false - these are 
     169       to use jQuery widgets and fancier UI features, set to false - these are 
    170170       not guaranteed to work in portals. Setting to true will make the 
    171171       add/edit event form much faster, but will not support internationalization. --> 
    …… 
    403403          <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.2.6.min.js">&#160;</script> 
    404404          <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.5.2.min.js">&#160;</script> 
    405           <link rel="stylesheet" href="/bedework-common/javascript/jquery/themes/ui.datepicker.css"/> 
     405          <link rel="stylesheet" href="{$resourcesRoot}/default/default/jquery.css"/> 
    406406          <script type="text/javascript"> 
    407407            <xsl:comment> 
    …… 
    24612461                    </xsl:when> 
    24622462                    <xsl:otherwise> 
    2463                       <span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetEndDate" iconURL="{$resourcesRoot}/resources/calIcon.gif"> 
     2463                      <!-- span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetEndDate" iconURL="{$resourcesRoot}/resources/calIcon.gif"> 
    24642464                        <xsl:attribute name="value"><xsl:value-of select="form/end/rfc3339DateTime"/></xsl:attribute> 
    24652465                        <xsl:text> </xsl:text> 
    2466                       </span> 
     2466                      </span--> 
     2467                      <input type="text" name="bwEventWidgetEndDate" id="bwEventWidgetEndDate" size="10"/> 
     2468                      <script language="JavaScript" type="text/javascript"> 
     2469                        <xsl:comment> 
     2470                        $("#bwEventWidgetEndDate").datepicker({ 
     2471                          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"/>) 
     2472                        }).attr("readonly", "readonly"); 
     2473                        $("#bwEventWidgetEndDate").val('<xsl:value-of select="substring-before(form/end/rfc3339DateTime,'T')"/>'); 
     2474                        </xsl:comment> 
     2475                      </script> 
    24672476                      <input type="hidden" name="eventEndDate.year"> 
    24682477                        <xsl:attribute name="value"><xsl:value-of select="form/end/dateTime/yearText/input/@value"/></xsl:attribute> 
    …… 
    30373046                      until 
    30383047                      <span id="untilHolder"> 
    3039                         <span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetUntilDate" iconURL="{$resourcesRoot}/resources/calIcon.gif"> 
     3048                        <!-- span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetUntilDate" iconURL="{$resourcesRoot}/resources/calIcon.gif"> 
    30403049                          <xsl:attribute name="value"><xsl:value-of select="form/start/rfc3339DateTime"/></xsl:attribute> 
    30413050                          <xsl:text> </xsl:text> 
    3042                         </span> 
     3051                        </span --> 
     3052                        <input type="hidden" name="bwEventUntilDate" id="bwEventUntilDate" size="10"/> 
     3053                        <input type="text" name="bwEventWidgetUntilDate" id="bwEventWidgetUntilDate" size="10" onfocus="selectRecurCountUntil('recurUntil')"/> 
     3054                        <script language="JavaScript" type="text/javascript"> 
     3055                          <xsl:comment> 
     3056                          $("#bwEventWidgetUntilDate").datepicker({ 
     3057                            <xsl:choose> 
     3058                              <xsl:when test="form/recurrence/until"> 
     3059                                defaultDate: new Date(<xsl:value-of select="substring(form/recurrence/until,1,4)"/>, <xsl:value-of select="number(substring(form/recurrence/until,5,2)) - 1"/>, <xsl:value-of select="substring(form/recurrence/until,7,2)"/>), 
     3060                              </xsl:when> 
     3061                              <xsl:otherwise> 
     3062                                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"/>), 
     3063                              </xsl:otherwise> 
     3064                            </xsl:choose> 
     3065                            altField: "#bwEventUntilDate", 
     3066                            altFormat: "yymmdd" 
     3067                          }).attr("readonly", "readonly"); 
     3068                          $("#bwEventWidgetUntilDate").val('<xsl:value-of select="substring-before(form/start/rfc3339DateTime,'T')"/>'); 
     3069                          </xsl:comment> 
     3070                        </script> 
    30433071                      </span> 
    30443072                    </p> 
    …… 
    32753303                store as UTC<br/>--> 
    32763304                <div class="dateFields"> 
    3277                   <input name="eventRdate.date" 
     3305                  <!-- input name="eventRdate.date" 
    32783306                         dojoType="dropdowndatepicker" 
    32793307                         formatLength="medium" 
    32803308                         value="today" 
    32813309                         saveFormat="yyyyMMdd" 
    3282                          id="bwEventWidgeRdate" 
    3283                          iconURL="{$resourcesRoot}/resources/calIcon.gif"/> 
     3310                         id="bwEventWidgetRdate" 
     3311                         iconURL="{$resourcesRoot}/resources/calIcon.gif"/--> 
     3312                  <input type="text" name="eventRdate.date" id="bwEventWidgetRdate" size="10"/> 
     3313                  <script language="JavaScript" type="text/javascript"> 
     3314                    <xsl:comment> 
     3315                    $("#bwEventWidgetRdate").datepicker({ 
     3316                      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"/>), 
     3317                      dateFormat: "yymmdd" 
     3318                    }).attr("readonly", "readonly"); 
     3319                    $("#bwEventWidgetRdate").val('<xsl:value-of select="substring-before(form/start/rfc3339DateTime,'T')"/>'); 
     3320                    </xsl:comment> 
     3321                  </script> 
    32843322                </div> 
    32853323                <div id="rdateTimeFields" class="timeFields"> 

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

    r1960 r1962  
    245245  //setAccessAcl(formObj); 
    246246} 
     247/* Set dates based on Dojo widget: DEPRECATED - now using jQuery 
    247248function setDates(formObj) { 
    248249  var startDate = new Date(); 
    …… 
    254255  var endDate = new Date(); 
    255256  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} */ 
     261/* Set dates based on jQuery widgets */ 
     262function setDates(formObj) { 
     263  var startDate = new Date(); 
     264  startDate = $("#bwEventWidgetStartDate").datepicker("getDate"); 
     265  formObj["eventStartDate.year"].value = startDate.getFullYear(); 
     266  formObj["eventStartDate.month"].value = startDate.getMonth() + 1; 
     267  formObj["eventStartDate.day"].value = startDate.getDate(); 
     268 
     269  var endDate = new Date(); 
     270  endDate = $("#bwEventWidgetEndDate").datepicker("getDate"); 
    256271  formObj["eventEndDate.year"].value = endDate.getFullYear(); 
    257272  formObj["eventEndDate.month"].value = endDate.getMonth() + 1; 
    …… 
    576591        // the following will not be adequate for recurrences smaller than a day; 
    577592        // we will need to set the time properly at that point. 
    578         formObj.until.value = dojo.widget.byId("bwEventWidgetUntilDate").getValue() + "T000000"; 
     593        // Dojo is deprecated: 
     594        //formObj.until.value = dojo.widget.byId("bwEventWidgetUntilDate").getValue() + "T000000"; 
     595        formObj.until.value = formObj.bwEventUntilDate.value + "T000000"; 
    579596        break; 
    580597    } 
    …… 
    602619} 
    603620 
    604 /* jQuery Features */ 
    605  
    606 $(document).ready(function(){ 
    607  
    608   $.datepicker.setDefaults({ 
    609     showOn: "both", 
    610     buttonImageOnly: false 
    611   }) 
    612  
    613 }); 
    614  
    615  
    616  
     621 
     622 
     623