Changeset 1966

Show
Ignore:
Timestamp:
11/13/08 11:09:59
Author:
johnsa
Message:

admin web client widgets converted to jquery

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/deployment/webadmin/webapp/resources/default/default/default.xsl

    r1893 r1966  
    210210 
    211211  <!-- the following variable can be set to "true" or "false"; 
    212        to use dojo widgets and fancier UI features, set to false - these are 
    213        not guaranteed to work in portals --> 
     212       to use jQuery widgets and fancier UI features, set to false - these are 
     213       not guaranteed to work in portals. Setting to true will make the 
     214       add/edit event form much faster, but will not support internationalization. --> 
    214215  <xsl:variable name="portalFriendly">false</xsl:variable> 
    215216 
     
    226227          <script type="text/javascript" src="{$resourcesRoot}/resources/bwClock.js">&#160;</script> 
    227228          <link rel="stylesheet" href="{$resourcesRoot}/resources/bwClock.css"/> 
    228           <script type="text/javascript" src="/bedework-common/javascript/dojo/dojo.js">&#160;</script> 
     229          <xsl:choose> 
     230            <xsl:when test="$portalFriendly = 'true'"> 
     231              <script type="text/javascript" src="{$resourcesRoot}/resources/dynCalendarWidget.js">&#160;</script> 
     232              <link rel="stylesheet" href="{$resourcesRoot}/resources/dynCalendarWidget.css"/> 
     233            </xsl:when> 
     234            <xsl:otherwise> 
     235              <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.2.6.min.js">&#160;</script> 
     236              <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"/> 
     238              <script type="text/javascript"> 
     239                <xsl:comment> 
     240                $.datepicker.setDefaults({ 
     241                  constrainInput: true, 
     242                  dateFormat: "yy-mm-dd", 
     243                  showOn: "both", 
     244                  buttonImage: "<xsl:value-of select='$resourcesRoot'/>/resources/calIcon.gif", 
     245                  buttonImageOnly: true, 
     246                  gotoCurrent: true, 
     247                  duration: "" 
     248                }); 
     249                </xsl:comment> 
     250              </script> 
     251              <!-- script type="text/javascript" src="/bedework-common/javascript/dojo/dojo.js">&#160;</script--> 
     252            </xsl:otherwise> 
     253          </xsl:choose> 
    229254          <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkEventForm.js">&#160;</script> 
    230255          <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkXProperties.js">&#160;</script> 
    231           <xsl:if test="$portalFriendly = 'true'"> 
    232             <script type="text/javascript" src="{$resourcesRoot}/resources/dynCalendarWidget.js">&#160;</script> 
    233             <link rel="stylesheet" href="{$resourcesRoot}/resources/dynCalendarWidget.css"/> 
    234           </xsl:if> 
    235256          <script type="text/javascript"> 
    236257            <xsl:comment> 
     
    12371258                  </xsl:when> 
    12381259                  <xsl:otherwise> 
    1239                     <span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetStartDate" iconURL="{$resourcesRoot}/resources/calIcon.gif"> 
     1260                    <!-- span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetStartDate" iconURL="{$resourcesRoot}/resources/calIcon.gif"> 
    12401261                      <xsl:attribute name="value"><xsl:value-of select="form/start/rfc3339DateTime"/></xsl:attribute> 
    12411262                      <xsl:text> </xsl:text> 
    1242                     </span> 
     1263                    </span--> 
     1264                    <input type="text" name="bwEventWidgetStartDate" id="bwEventWidgetStartDate" size="10"/> 
     1265                    <script language="JavaScript" type="text/javascript"> 
     1266                      <xsl:comment> 
     1267                      $("#bwEventWidgetStartDate").datepicker({ 
     1268                        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"/>) 
     1269                      }).attr("readonly", "readonly"); 
     1270                      $("#bwEventWidgetStartDate").val('<xsl:value-of select="substring-before(form/start/rfc3339DateTime,'T')"/>'); 
     1271                      //alert($("#bwEventWidgetStartDate").datepicker("getDate")); 
     1272                      </xsl:comment> 
     1273                    </script> 
    12431274                    <input type="hidden" name="eventStartDate.year"> 
    12441275                      <xsl:attribute name="value"><xsl:value-of select="form/start/yearText/input/@value"/></xsl:attribute> 
     
    13161347                    </xsl:when> 
    13171348                    <xsl:otherwise> 
    1318                       <span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetEndDate" iconURL="{$resourcesRoot}/resources/calIcon.gif"> 
     1349                      <!-- span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetEndDate" iconURL="{$resourcesRoot}/resources/calIcon.gif"> 
    13191350                        <xsl:attribute name="value"><xsl:value-of select="form/end/rfc3339DateTime"/></xsl:attribute> 
    13201351                        <xsl:text> </xsl:text> 
    1321                       </span> 
     1352                      </span--> 
     1353                      <input type="text" name="bwEventWidgetEndDate" id="bwEventWidgetEndDate" size="10"/> 
     1354                      <script language="JavaScript" type="text/javascript"> 
     1355                        <xsl:comment> 
     1356                        $("#bwEventWidgetEndDate").datepicker({ 
     1357                          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"/>) 
     1358                        }).attr("readonly", "readonly"); 
     1359                        $("#bwEventWidgetEndDate").val('<xsl:value-of select="substring-before(form/end/rfc3339DateTime,'T')"/>'); 
     1360                        </xsl:comment> 
     1361                      </script> 
    13221362                      <input type="hidden" name="eventEndDate.year"> 
    13231363                        <xsl:attribute name="value"><xsl:value-of select="form/end/dateTime/yearText/input/@value"/></xsl:attribute> 
     
    16551695                            until 
    16561696                            <span id="untilHolder"> 
    1657                               <span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetUntilDate" iconURL="{$resourcesRoot}/resources/calIcon.gif"> 
     1697                              <!-- span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetUntilDate" iconURL="{$resourcesRoot}/resources/calIcon.gif"> 
    16581698                                <xsl:attribute name="value"><xsl:value-of select="form/start/rfc3339DateTime"/></xsl:attribute> 
    16591699                                <xsl:text> </xsl:text> 
    1660                               </span> 
     1700                              </span --> 
     1701                              <input type="hidden" name="bwEventUntilDate" id="bwEventUntilDate" size="10"/> 
     1702                              <input type="text" name="bwEventWidgetUntilDate" id="bwEventWidgetUntilDate" size="10" onfocus="selectRecurCountUntil('recurUntil')"/> 
     1703                              <script language="JavaScript" type="text/javascript"> 
     1704                                <xsl:comment> 
     1705                                $("#bwEventWidgetUntilDate").datepicker({ 
     1706                                  <xsl:choose> 
     1707                                    <xsl:when test="form/recurrence/until"> 
     1708                                      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)"/>), 
     1709                                    </xsl:when> 
     1710                                    <xsl:otherwise> 
     1711                                      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"/>), 
     1712                                    </xsl:otherwise> 
     1713                                  </xsl:choose> 
     1714                                  altField: "#bwEventUntilDate", 
     1715                                  altFormat: "yymmdd" 
     1716                                }).attr("readonly", "readonly"); 
     1717                                $("#bwEventWidgetUntilDate").val('<xsl:value-of select="substring-before(form/start/rfc3339DateTime,'T')"/>'); 
     1718                                </xsl:comment> 
     1719                              </script> 
    16611720                            </span> 
    16621721                          </p> 
     
    18931952                      store as UTC<br/>--> 
    18941953                      <div class="dateFields"> 
    1895                         <input name="eventRdate.date" 
     1954                        <!-- input name="eventRdate.date" 
    18961955                               dojoType="dropdowndatepicker" 
    18971956                               formatLength="medium" 
     
    18991958                               saveFormat="yyyyMMdd" 
    19001959                               id="bwEventWidgeRdate" 
    1901                                iconURL="{$resourcesRoot}/resources/calIcon.gif"/> 
     1960                               iconURL="{$resourcesRoot}/resources/calIcon.gif"/--> 
     1961                        <input type="text" name="eventRdate.date" id="bwEventWidgetRdate" size="10"/> 
     1962                        <script language="JavaScript" type="text/javascript"> 
     1963                          <xsl:comment> 
     1964                          $("#bwEventWidgetRdate").datepicker({ 
     1965                            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"/>), 
     1966                            dateFormat: "yymmdd" 
     1967                          }).attr("readonly", "readonly"); 
     1968                          $("#bwEventWidgetRdate").val('<xsl:value-of select="substring-before(form/start/rfc3339DateTime,'T')"/>'); 
     1969                          </xsl:comment> 
     1970                        </script> 
    19021971                      </div> 
    19031972                      <div id="rdateTimeFields" class="timeFields"> 
  • trunk/deployment/webadmin/webapp/resources/resources/bedeworkAccess.js

    • Property svn:eol-style deleted
  • trunk/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js

    • Property svn:eol-style deleted
    r1918 r1966  
    2525    special, consequential, or incidental damages related to the software, 
    2626    to the maximum extent the law permits. */ 
    27  
    28 dojo.require("dojo.event.*"); 
    29 dojo.require("dojo.widget.*"); 
    30 dojo.require("dojo.widget.DropdownDatePicker"); 
    31 dojo.require("dojo.widget.DropdownTimePicker"); 
    3227 
    3328// ======================================================================== 
     
    337332  //setAccessAcl(formObj); 
    338333} 
     334 
     335/* Set dates based on jQuery widgets */ 
    339336function setDates(formObj) { 
    340337  var startDate = new Date(); 
    341   startDate = dojo.widget.byId("bwEventWidgetStartDate").getDate(); 
     338  startDate = $("#bwEventWidgetStartDate").datepicker("getDate"); 
    342339  formObj["eventStartDate.year"].value = startDate.getFullYear(); 
    343340  formObj["eventStartDate.month"].value = startDate.getMonth() + 1; 
     
    345342 
    346343  var endDate = new Date(); 
    347   endDate = dojo.widget.byId("bwEventWidgetEndDate").getDate(); 
     344  endDate = $("#bwEventWidgetEndDate").datepicker("getDate"); 
    348345  formObj["eventEndDate.year"].value = endDate.getFullYear(); 
    349346  formObj["eventEndDate.month"].value = endDate.getMonth() + 1; 
     
    351348} 
    352349function setBedeworkXProperties(formObj,submitter) { 
    353   // set up specific Bedework X-Properties on event form submission 
     350  // Set up specific Bedework X-Properties on event form submission 
    354351  // Depends on bedeworkXProperties.js 
    355352  // Set application local x-properties here. 
     
    668665        // the following will not be adequate for recurrences smaller than a day; 
    669666        // we will need to set the time properly at that point. 
    670         formObj.until.value = dojo.widget.byId("bwEventWidgetUntilDate").getValue() + "T000000"; 
     667        // Dojo is deprecated: 
     668        //formObj.until.value = dojo.widget.byId("bwEventWidgetUntilDate").getValue() + "T000000"; 
     669        formObj.until.value = formObj.bwEventUntilDate.value + "T000000"; 
    671670        break; 
    672671    } 
     
    682681  } 
    683682  return true; 
    684 } 
    685  
    686 function setRdateDateTime(formObj) { 
    687   var rdateTime = dojo.byId("bwEventWidgeRdateTime"); 
    688   alert (rdateTime.getValue()); 
    689   if (rdateTime.getValue() != "") { 
    690     /*var rdateTimeObj = rdateTime.getTime(); 
    691     var timeString = rdateTimeObj. 
    692     formOjb.datetime.value += "T" +*/ 
    693   } 
    694 } 
    695  
    696 function untilClickHandler(evt) { 
    697    selectRecurCountUntil('recurUntil'); 
    698683} 
    699684 
     
    706691} 
    707692 
    708  
    709 function init() { 
    710   if(dojo.byId("untilHolder")) { 
    711     var untilHolder = dojo.byId("untilHolder"); 
    712     dojo.event.connect(untilHolder, "onclick", untilClickHandler); 
    713   } // else we are editing an instance of a recurrence 
    714 } 
    715  
    716 dojo.addOnLoad(init); 
    717  
    718  
  • trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkEventForm.js

    r1962 r1966  
    4141 * date: String: internal date 
    4242 * time: String 
    43  * tzid timezone id or null 
     43 * tzid: timezone id or null 
    4444 */ 
    4545function BwREXdate(date, time, allDay, floating, utc, tzid) { 
     
    276276  // Set up specific Bedework X-Properties on event form submission 
    277277  // Depends on bedeworkXProperties.js 
    278   // Set application x-properties here. 
     278  // Set application local x-properties here. 
    279279 
    280280  // X-BEDEWORK-IMAGE and its parameters: