Changeset 2374
- Timestamp:
- 09/14/09 11:47:31
- Files:
-
- releases/bedework-3.5/deployment/webadmin/webapp/resources/default/default/default.xsl (modified) (4 diffs)
- releases/bedework-3.5/deployment/webadmin/webapp/resources/resources/bedework.js (modified) (1 diff)
- releases/bedework-3.5/deployment/webadmin/webapp/resources/resources/bedeworkPrefs.js (added)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
releases/bedework-3.5/deployment/webadmin/webapp/resources/default/default/default.xsl
r2308 r2374 353 353 </script> 354 354 </xsl:if> 355 </xsl:if> 356 <xsl:if test="/bedework/page='calSuitePrefs'"> 357 <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.3.2.min.js"> </script> 358 <script type="text/javascript" src="{$resourcesRoot}/resources/bedework.js"> </script> 359 <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkPrefs.js"> </script> 355 360 </xsl:if> 356 361 <xsl:if test="/bedework/page='upload' or … … 1565 1570 <xsl:copy-of select="form/end/dateTime/minute/select/*"/> 1566 1571 </select> 1567 <xsl:if test="form/end/ ampm">1572 <xsl:if test="form/end/dateTime/ampm/select"> 1568 1573 <select name="eventEndDate.ampm"> 1569 1574 <xsl:copy-of select="form/end/dateTime/ampm/select/*"/> … … 5456 5461 </xsl:for-each> 5457 5462 </select> 5458 5459 <div class="desc">5460 Default timezone id for date/time values. This should normally be your local timezone.5461 </div>5462 5463 </td> 5463 5464 </tr> … … 5994 5995 </ul> 5995 5996 </div> 5997 </td> 5998 </tr> 5999 <tr> 6000 <th> 6001 Preferred time type: 6002 </th> 6003 <td> 6004 <select name="hour24"> 6005 <option value="false"> 6006 <xsl:if test="/bedework/prefs/hour24 = 'false'"> 6007 <xsl:attribute name="selected">selected</xsl:attribute> 6008 </xsl:if> 6009 12 hour + AM/PM 6010 </option> 6011 <option value="true"> 6012 <xsl:if test="/bedework/prefs/hour24 = 'true'"> 6013 <xsl:attribute name="selected">selected</xsl:attribute> 6014 </xsl:if> 6015 24 hour 6016 </option> 6017 </select> 6018 </td> 6019 </tr> 6020 <tr> 6021 <th> 6022 Preferred end date/time type: 6023 </th> 6024 <td> 6025 <select name="preferredEndType"> 6026 <option value="duration"> 6027 <xsl:if test="/bedework/prefs/preferredEndType = 'duration'"> 6028 <xsl:attribute name="selected">selected</xsl:attribute> 6029 </xsl:if> 6030 duration 6031 </option> 6032 <option value="date"> 6033 <xsl:if test="/bedework/prefs/preferredEndType = 'date'"> 6034 <xsl:attribute name="selected">selected</xsl:attribute> 6035 </xsl:if> 6036 date/time 6037 </option> 6038 </select> 6039 </td> 6040 </tr> 6041 <tr> 6042 <th> 6043 Default timezone: 6044 </th> 6045 <td> 6046 <xsl:variable name="tzid" select="/bedework/prefs/tzid"/> 6047 6048 <select name="defaultTzid" id="defaultTzid"> 6049 <option value="-1">select timezone...</option> 6050 </select> 6051 5996 6052 </td> 5997 6053 </tr> releases/bedework-3.5/deployment/webadmin/webapp/resources/resources/bedework.js
r2268 r2374 28 28 in the coming versions, but for now don't try to exchange them. */ 29 29 30 /* Global variables / properties */ 31 // URLs 32 var timezoneUrl = "/tzsvr/?names"; 33 var carddavUrl = "/ucarddav/find"; 34 30 35 var debug = false; // very basic debugging for now 31 36
