Changeset 2191

Show
Ignore:
Timestamp:
05/21/09 23:57:21
Author:
johnsa
Message:

submissions client: upgrade jquery

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2187 r2191  
    11171117  margin: 1em 0 -1em 1em; 
    11181118} 
     1119#bwEventListControls { 
     1120  margin-bottom: 0.5em; 
     1121} 
    11191122#bwEventListControls form { 
    11201123  display: inline; 

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

    r2175 r2191  
    111111        <xsl:choose> 
    112112          <xsl:when test="/bedework/page = 'addEvent'"> 
    113             <xsl:attribute name="onload">focusElement('bwEventTitle');</xsl:attribute> 
     113            <xsl:attribute name="onload">focusElement('bwEventTitle');bwSetupDatePickers();</xsl:attribute> 
    114114          </xsl:when> 
    115115          <xsl:when test="/bedework/page = 'editEvent'"> 
    116             <xsl:attribute name="onload">initRXDates();initXProperties();</xsl:attribute> 
     116            <xsl:attribute name="onload">initRXDates();initXProperties();bwSetupDatePickers();</xsl:attribute> 
    117117          </xsl:when> 
    118118        </xsl:choose> 
    …… 
    167167        </xsl:when> 
    168168        <xsl:otherwise> 
    169           <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.2.6.min.js">&#160;</script> 
     169          <!-- <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.2.6.min.js">&#160;</script> 
    170170          <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.5.2.min.js">&#160;</script> 
    171           <link rel="stylesheet" href="/bedework-common/javascript/jquery/bedeworkJqueryThemes.css"/> 
     171          <link rel="stylesheet" href="/bedework-common/javascript/jquery/bedeworkJqueryThemes.css"/> --> 
     172          <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.3.2.min.js">&#160;</script> 
     173          <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.7.1.custom.min.js">&#160;</script> 
     174          <link rel="stylesheet" href="/bedework-common/javascript/jquery/css/custom-theme/jquery-ui-1.7.1.custom.css"/> 
     175          <link rel="stylesheet" href="/bedework-common/javascript/jquery/css/custom-theme/bedeworkJquery.css"/> 
    172176          <script type="text/javascript"> 
    173177            <xsl:comment> 
    …… 
    181185              duration: "" 
    182186            }); 
     187 
     188            function bwSetupDatePickers() { 
     189              // startdate 
     190              $("#bwEventWidgetStartDate").datepicker({ 
     191                defaultDate: new Date(<xsl:value-of select="/bedework/formElements/form/start/yearText/input/@value"/>, <xsl:value-of select="number(/bedework/formElements/form/start/month/select/option[@selected = 'selected']/@value) - 1"/>, <xsl:value-of select="/bedework/formElements/form/start/day/select/option[@selected = 'selected']/@value"/>) 
     192              }).attr("readonly", "readonly"); 
     193              $("#bwEventWidgetStartDate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/start/rfc3339DateTime,'T')"/>'); 
     194 
     195              // enddate 
     196              $("#bwEventWidgetEndDate").datepicker({ 
     197                defaultDate: new Date(<xsl:value-of select="/bedework/formElements/form/end/dateTime/yearText/input/@value"/>, <xsl:value-of select="number(/bedework/formElements/form/end/dateTime/month/select/option[@selected = 'selected']/@value) - 1"/>, <xsl:value-of select="/bedework/formElements/form/end/dateTime/day/select/option[@selected = 'selected']/@value"/>) 
     198              }).attr("readonly", "readonly"); 
     199              $("#bwEventWidgetEndDate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/end/rfc3339DateTime,'T')"/>'); 
     200            } 
    183201            </xsl:comment> 
    184202          </script> 
    …… 
    656674                    </xsl:when> 
    657675                    <xsl:otherwise> 
    658                       <!-- span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetStartDate" iconURL="{$resourcesRoot}/resources/calIcon.gif"> 
    659                       <xsl:attribute name="value"><xsl:value-of select="form/start/rfc3339DateTime"/></xsl:attribute> 
    660                       <xsl:text> </xsl:text> 
    661                       </span --> 
    662676                      <input type="text" name="bwEventWidgetStartDate" id="bwEventWidgetStartDate" size="10"/> 
    663677                      <script language="JavaScript" type="text/javascript"> 
    664678                        <xsl:comment> 
    665                         $("#bwEventWidgetStartDate").datepicker({ 
     679                        /*$("#bwEventWidgetStartDate").datepicker({ 
    666680                          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"/>) 
    667681                        }).attr("readonly", "readonly"); 
    668682                        $("#bwEventWidgetStartDate").val('<xsl:value-of select="substring-before(form/start/rfc3339DateTime,'T')"/>'); 
    669                         //alert($("#bwEventWidgetStartDate").datepicker("getDate")); 
     683                        */ 
    670684                        </xsl:comment> 
    671685                      </script> 
    …… 
    750764                      </xsl:when> 
    751765                      <xsl:otherwise> 
    752                         <!-- span dojoType="dropdowndatepicker" formatLength="medium" value="today" saveFormat="yyyyMMdd" id="bwEventWidgetEndDate" iconURL="{$resourcesRoot}/resources/calIcon.gif"> 
    753                           <xsl:attribute name="value"><xsl:value-of select="form/end/rfc3339DateTime"/></xsl:attribute> 
    754                           <xsl:text> </xsl:text> 
    755                         </span--> 
    756766                        <input type="text" name="bwEventWidgetEndDate" id="bwEventWidgetEndDate" size="10"/> 
    757767                        <script language="JavaScript" type="text/javascript"> 
    758768                          <xsl:comment> 
    759                           $("#bwEventWidgetEndDate").datepicker({ 
     769                          /*$("#bwEventWidgetEndDate").datepicker({ 
    760770                            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"/>) 
    761771                          }).attr("readonly", "readonly"); 
    762772                          $("#bwEventWidgetEndDate").val('<xsl:value-of select="substring-before(form/end/rfc3339DateTime,'T')"/>'); 
     773                          */ 
    763774                          </xsl:comment> 
    764775                        </script> 

  • trunk/deployment/websubmit/webapp/resources/demoskins/resources/bwClock.css

    r1580 r2191  
    3333} 
    3434#bwClockBox h2 { 
    35   font-size: 12px; 
     35  font-size: 0.9em !important; 
    3636  text-align: center; 
    3737  margin: 0;