Changeset 2194

Show
Ignore:
Timestamp:
05/22/09 11:32:35
Author:
johnsa
Message:

public clients: fix up export widgets; upgrade jquery

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/blue.css

    r2147 r2194  
    11031103  display: none; 
    11041104} 
    1105 /* 
    1106   dojo widget overrides 
    1107 */ 
    1108 html .dojoFloatingPane { 
    1109   width: 370px; 
    1110   height: 200px; 
    1111   text-align: left; 
    1112 
    1113 html .dojoFloatingPaneTitleBar { 
    1114   color: white; 
    1115   background: #2B4795 url(../../images/curDateRangeBlue.gif) repeat-x bottom; 
    1116 
    1117 html .dojoFloatingPaneTitleText { 
    1118   padding: 0.25em 1em; 
    1119   font-weight: bold; 
    1120   font-size: 0.8em; 
    1121 
    1122 html .dojoFloatingPaneClient input.bwWidgetSubmit { 
    1123   position: absolute; 
    1124   bottom: 1em; 
    1125   right: 1em; 
    1126   width: 80px; 
    1127 
    1128 html .dojoFloatingPaneClient #exportDateRange { 
    1129   margin: 1em 0; 
    1130   text-align: center; 
    1131 
    1132 html .dojoFloatingPaneClient #bwCalendarExportWidgetCalName { 
     1105#exportDateRange #bwExportEndField { 
    11331106  padding-left: 1em; 
    11341107} 
    1135 html .dojoFloatingPaneClient form#exportCalendarForm { 
    1136   margin: 0; 
    1137   padding: 0; 
    1138 } 
    11391108#listTable td.eventListDateTime { 
    11401109  white-space: nowrap; 
  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl

    r2172 r2194  
    136136        <link rel="stylesheet" type="text/css" media="print" href="{$resourcesRoot}/default/default/print.css" /> 
    137137        <!-- load javascript --> 
    138         <xsl:if test="/bedework/page='event' or /bedework/page='calendarList' or /bedework/page='displayCalendarForExport'"> 
    139           <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.2.6.min.js">&#160;</script> 
    140           <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.5.2.min.js">&#160;</script> 
    141           <link rel="stylesheet" href="/bedework-common/javascript/jquery/bedeworkJqueryThemes.css"/> 
    142           <script type="text/javascript"> 
    143             <xsl:comment> 
    144             $.datepicker.setDefaults({ 
    145               constrainInput: true, 
    146               dateFormat: "yy-mm-dd", 
    147               showOn: "both", 
    148               buttonImage: "<xsl:value-of select='$resourcesRoot'/>/images/calIcon.gif", 
    149               buttonImageOnly: true, 
    150               gotoCurrent: true, 
    151               duration: "" 
    152             }); 
    153             </xsl:comment> 
    154           </script> 
    155           <!-- script type="text/javascript" src="{$resourceCommons}/javascript/dojo/dojo.js">&#160;</script --> 
     138        <xsl:if test="/bedework/page='event' or /bedework/page='displayCalendarForExport'"> 
     139          <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.3.2.min.js">&#160;</script> 
     140          <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.7.1.custom.min.js">&#160;</script> 
     141          <link rel="stylesheet" href="/bedework-common/javascript/jquery/css/custom-theme/jquery-ui-1.7.1.custom.css"/> 
     142          <link rel="stylesheet" href="/bedework-common/javascript/jquery/css/custom-theme/bedeworkJquery.css"/> 
    156143          <script type="text/javascript" src="{$resourcesRoot}/resources/javascript/bedework.js">&#160;</script> 
     144          <xsl:if test="/bedework/page='displayCalendarForExport'"> 
     145            <script type="text/javascript"> 
     146              <xsl:comment> 
     147              $.datepicker.setDefaults({ 
     148                constrainInput: true, 
     149                dateFormat: "yy-mm-dd", 
     150                showOn: "both", 
     151                buttonImage: "<xsl:value-of select='$resourcesRoot'/>/images/calIcon.gif", 
     152                buttonImageOnly: true, 
     153                gotoCurrent: true, 
     154                duration: "" 
     155              }); 
     156              $(document).ready(function() { 
     157                $("#bwExportCalendarWidgetStartDate").datepicker({ 
     158                }).attr("readonly", "readonly"); 
     159                $("#bwExportCalendarWidgetEndDate").datepicker({ 
     160                }).attr("readonly", "readonly"); 
     161              }); 
     162              </xsl:comment> 
     163            </script> 
     164          </xsl:if> 
    157165        </xsl:if> 
    158166        <!-- address bar icon --> 
     
    15001508        <input type="radio" name="dateLimits" value="limited" onclick="changeClass('exportDateRange','visible')"/> date range 
    15011509        <div id="exportDateRange" class="invisible"> 
    1502           <!-- Start: <div dojoType="dropdowndatepicker" formatLength="medium" saveFormat="yyyyMMdd" id="bwExportCalendarWidgetStartDate"><xsl:text> </xsl:text></div> 
    1503           End: <div dojoType="dropdowndatepicker" formatLength="medium" saveFormat="yyyyMMdd" id="bwExportCalendarWidgetEndDate"><xsl:text> </xsl:text></div>--> 
    15041510          Start: <input type="text" name="bwExportCalendarWidgetStartDate" id="bwExportCalendarWidgetStartDate" size="10"/> 
    1505           End: <input type="text" name="bwExportCalendarWidgetEndDate" id="bwExportCalendarWidgetEndDate" size="10"/
     1511          <span id="bwExportEndField">End: <input type="text" name="bwExportCalendarWidgetEndDate" id="bwExportCalendarWidgetEndDate" size="10"/></span
    15061512        </div> 
    1507         <script language="JavaScript" type="text/javascript"> 
    1508           <xsl:comment> 
    1509           $("#bwExportCalendarWidgetStartDate").datepicker({ 
    1510           }).attr("readonly", "readonly"); 
    1511           $("#bwExportCalendarWidgetEndDate").datepicker({ 
    1512           }).attr("readonly", "readonly"); 
    1513           </xsl:comment> 
    1514         </script> 
    15151513        <p><input type="submit" value="export" class="bwWidgetSubmit" onclick="fillExportFields(this.form)"/></p> 
    15161514      </form> 
  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/green.css

    r2147 r2194  
    10981098  display: none; 
    10991099} 
    1100 /* dojo widget overrides */ 
    1101 html .dojoFloatingPane { 
    1102   width: 370px; 
    1103   height: 200px; 
    1104   text-align: left; 
    1105 
    1106 html .dojoFloatingPaneTitleBar { 
    1107   color: white; 
    1108   background: #326432 url(../../images/curDateRangeGreen.gif) repeat-x bottom; 
    1109 
    1110 html .dojoFloatingPaneTitleText { 
    1111   padding: 0.25em 1em; 
    1112   font-weight: bold; 
    1113   font-size: 0.8em; 
    1114 
    1115 html .dojoFloatingPaneClient input.bwWidgetSubmit { 
    1116   position: absolute; 
    1117   bottom: 1em; 
    1118   right: 1em; 
    1119   width: 80px; 
    1120 
    1121 html .dojoFloatingPaneClient #exportDateRange { 
    1122   margin: 1em 0; 
    1123   text-align: center; 
    1124 
    1125 html .dojoFloatingPaneClient #bwCalendarExportWidgetCalName { 
     1100#exportDateRange #bwExportEndField { 
    11261101  padding-left: 1em; 
    11271102} 
     1103#listTable td.eventListDateTime { 
     1104  white-space: nowrap; 
     1105} 
    11281106 
  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/red.css

    r2147 r2194  
    10991099  display: none; 
    11001100} 
    1101 /* dojo widget overrides */ 
    1102 html .dojoFloatingPane { 
    1103   width: 370px; 
    1104   height: 200px; 
    1105   text-align: left; 
    1106 
    1107 html .dojoFloatingPaneTitleBar { 
    1108   color: white; 
    1109   background: #7E0000 url(../../images/curDateRangeRed.gif) repeat-x bottom; 
    1110 
    1111 html .dojoFloatingPaneTitleText { 
    1112   padding: 0.25em 1em; 
    1113   font-weight: bold; 
    1114   font-size: 0.8em; 
    1115 
    1116 html .dojoFloatingPaneClient input.bwWidgetSubmit { 
    1117   position: absolute; 
    1118   bottom: 1em; 
    1119   right: 1em; 
    1120   width: 80px; 
    1121 
    1122 html .dojoFloatingPaneClient #exportDateRange { 
    1123   margin: 1em 0; 
    1124   text-align: center; 
    1125 
    1126 html .dojoFloatingPaneClient #bwCalendarExportWidgetCalName { 
     1101#exportDateRange #bwExportEndField { 
    11271102  padding-left: 1em; 
    11281103} 
     1104#listTable td.eventListDateTime { 
     1105  white-space: nowrap; 
     1106} 
  • trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl

    r2172 r2194  
    135135        <link rel="stylesheet" type="text/css" media="print" href="{$resourcesRoot}/default/default/print.css" /> 
    136136        <!-- load javascript --> 
    137         <xsl:if test="/bedework/page='event' or /bedework/page='calendarList' or /bedework/page='displayCalendarForExport'"> 
    138           <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.2.6.min.js">&#160;</script> 
    139           <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.5.2.min.js">&#160;</script> 
    140           <link rel="stylesheet" href="/bedework-common/javascript/jquery/bedeworkJqueryThemes.css"/> 
    141           <script type="text/javascript"> 
    142             <xsl:comment> 
    143             $.datepicker.setDefaults({ 
    144               constrainInput: true, 
    145               dateFormat: "yy-mm-dd", 
    146               showOn: "both", 
    147               buttonImage: "<xsl:value-of select='$resourcesRoot'/>/images/calIcon.gif", 
    148               buttonImageOnly: true, 
    149               gotoCurrent: true, 
    150               duration: "" 
    151             }); 
    152             </xsl:comment> 
    153           </script> 
    154           <!-- script type="text/javascript" src="{$resourceCommons}/javascript/dojo/dojo.js">&#160;</script --> 
     137        <!-- load javascript --> 
     138        <xsl:if test="/bedework/page='event' or /bedework/page='displayCalendarForExport'"> 
     139          <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.3.2.min.js">&#160;</script> 
     140          <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.7.1.custom.min.js">&#160;</script> 
     141          <link rel="stylesheet" href="/bedework-common/javascript/jquery/css/custom-theme/jquery-ui-1.7.1.custom.css"/> 
     142          <link rel="stylesheet" href="/bedework-common/javascript/jquery/css/custom-theme/bedeworkJquery.css"/> 
    155143          <script type="text/javascript" src="{$resourcesRoot}/resources/javascript/bedework.js">&#160;</script> 
     144          <xsl:if test="/bedework/page='displayCalendarForExport'"> 
     145            <script type="text/javascript"> 
     146              <xsl:comment> 
     147              $.datepicker.setDefaults({ 
     148                constrainInput: true, 
     149                dateFormat: "yy-mm-dd", 
     150                showOn: "both", 
     151                buttonImage: "<xsl:value-of select='$resourcesRoot'/>/images/calIcon.gif", 
     152                buttonImageOnly: true, 
     153                gotoCurrent: true, 
     154                duration: "" 
     155              }); 
     156              $(document).ready(function() { 
     157                $("#bwExportCalendarWidgetStartDate").datepicker({ 
     158                }).attr("readonly", "readonly"); 
     159                $("#bwExportCalendarWidgetEndDate").datepicker({ 
     160                }).attr("readonly", "readonly"); 
     161              }); 
     162              </xsl:comment> 
     163            </script> 
     164          </xsl:if> 
    156165        </xsl:if> 
    157166        <!-- address bar icon --> 
     
    14521461      <xsl:variable name="calPath" select="path"/> 
    14531462      <span class="exportCalLink"> 
    1454         <a href="{$calendar-fetchForExport}&amp;virtualPath={$virtualPath}" title="export calendar as iCal"> 
     1463        <a href="{$calendar-fetchForExport}&amp;calPath={$calPath}&amp;virtualPath={$virtualPath}" title="export calendar as iCal"> 
    14551464          <img src="{$resourcesRoot}/images/calIconExport-sm.gif" width="13" height="13" alt="export calendar" border="0"/> 
    14561465        </a> 
     
    14991508        <input type="radio" name="dateLimits" value="limited" onclick="changeClass('exportDateRange','visible')"/> date range 
    15001509        <div id="exportDateRange" class="invisible"> 
    1501           <!-- Start: <div dojoType="dropdowndatepicker" formatLength="medium" saveFormat="yyyyMMdd" id="bwExportCalendarWidgetStartDate"><xsl:text> </xsl:text></div> 
    1502           End: <div dojoType="dropdowndatepicker" formatLength="medium" saveFormat="yyyyMMdd" id="bwExportCalendarWidgetEndDate"><xsl:text> </xsl:text></div>--> 
    15031510          Start: <input type="text" name="bwExportCalendarWidgetStartDate" id="bwExportCalendarWidgetStartDate" size="10"/> 
    1504           End: <input type="text" name="bwExportCalendarWidgetEndDate" id="bwExportCalendarWidgetEndDate" size="10"/
     1511          <span id="bwExportEndField">End: <input type="text" name="bwExportCalendarWidgetEndDate" id="bwExportCalendarWidgetEndDate" size="10"/></span
    15051512        </div> 
    1506         <script language="JavaScript" type="text/javascript"> 
    1507           <xsl:comment> 
    1508           $("#bwExportCalendarWidgetStartDate").datepicker({ 
    1509           }).attr("readonly", "readonly"); 
    1510           $("#bwExportCalendarWidgetEndDate").datepicker({ 
    1511           }).attr("readonly", "readonly"); 
    1512           </xsl:comment> 
    1513         </script> 
    15141513        <p><input type="submit" value="export" class="bwWidgetSubmit" onclick="fillExportFields(this.form)"/></p> 
    15151514      </form> 
  • trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/soe.css

    r2147 r2194  
    10981098  display: none; 
    10991099} 
    1100 /* dojo widget overrides */ 
    1101 html .dojoFloatingPane { 
    1102   width: 370px; 
    1103   height: 200px; 
    1104   text-align: left; 
    1105 
    1106 html .dojoFloatingPaneTitleBar { 
    1107   color: white; 
    1108   background: #326432 url(../../images/curDateRangeGreen.gif) repeat-x bottom; 
    1109 
    1110 html .dojoFloatingPaneTitleText { 
    1111   padding: 0.25em 1em; 
    1112   font-weight: bold; 
    1113   font-size: 0.8em; 
    1114 
    1115 html .dojoFloatingPaneClient input.bwWidgetSubmit { 
    1116   position: absolute; 
    1117   bottom: 1em; 
    1118   right: 1em; 
    1119   width: 80px; 
    1120 
    1121 html .dojoFloatingPaneClient #exportDateRange { 
    1122   margin: 1em 0; 
    1123   text-align: center; 
    1124 
    1125 html .dojoFloatingPaneClient #bwCalendarExportWidgetCalName { 
     1100#exportDateRange #bwExportEndField { 
    11261101  padding-left: 1em; 
    11271102} 
     1103#listTable td.eventListDateTime { 
     1104  white-space: nowrap; 
     1105} 
    11281106