Changeset 3155

Show
Ignore:
Timestamp:
02/01/11 14:17:12
Author:
johnsa
Message:

submissions client: new bedework timepicker plugin deployed

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • releases/bedework-3.7/deployment/websubmit/webapp/resources/demoskins/es_ES/default/default.xsl

    r3128 r3155  
    149149    <link rel="stylesheet" href="{$resourcesRoot}/default/default/default.css"/> 
    150150    <link rel="icon" type="image/ico" href="{$resourcesRoot}/resources/bedework.ico" /> 
     151     
    151152    <!-- note: the non-breaking spaces in the script bodies below are to avoid 
    152153         losing the script closing tags (which avoids browser problems) --> 
     154    <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.3.2.min.js">&#160;</script> 
     155    <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.7.1.custom.min.js">&#160;</script> 
     156    <link rel="stylesheet" href="/bedework-common/javascript/jquery/css/custom-theme/jquery-ui-1.7.1.custom.css"/> 
     157    <link rel="stylesheet" href="/bedework-common/javascript/jquery/css/custom-theme/bedeworkJquery.css"/> 
     158     
    153159    <script type="text/javascript" src="{$resourcesRoot}/resources/bedework.js">&#160;</script> 
     160     
    154161    <xsl:if test="/bedework/page='addEvent' or /bedework/page='editEvent'"> 
    155       <script type="text/javascript" src="{$resourcesRoot}/resources/bwClock.js">&#160;</script> 
    156       <link rel="stylesheet" href="{$resourcesRoot}/resources/bwClock.css"/> 
     162      <script type="text/javascript" src="/bedework-common/javascript/bedework/bwClock.js">&#160;</script> 
     163      <link rel="stylesheet" href="/bedework-common/javascript/bedework/bwClock.css"/> 
    157164      <xsl:choose> 
    158165        <xsl:when test="$portalFriendly = 'true'"> 
     
    161168        </xsl:when> 
    162169        <xsl:otherwise> 
    163           <!-- <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.2.6.min.js">&#160;</script> 
    164           <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.5.2.min.js">&#160;</script> 
    165           <link rel="stylesheet" href="/bedework-common/javascript/jquery/bedeworkJqueryThemes.css"/> --> 
    166           <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.3.2.min.js">&#160;</script> 
    167           <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.7.1.custom.min.js">&#160;</script> 
    168           <link rel="stylesheet" href="/bedework-common/javascript/jquery/css/custom-theme/jquery-ui-1.7.1.custom.css"/> 
    169           <link rel="stylesheet" href="/bedework-common/javascript/jquery/css/custom-theme/bedeworkJquery.css"/> 
    170170          <script type="text/javascript"> 
    171171            <xsl:comment> 
     
    186186              }).attr("readonly", "readonly"); 
    187187              $("#bwEventWidgetStartDate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/start/rfc3339DateTime,'T')"/>'); 
    188  
     188               
     189              // starttime 
     190              $("#bwStartClock").bwTimePicker({ 
     191                hour24: <xsl:value-of select="/bedework/hour24"/>, 
     192                attachToId: "calWidgetStartTimeHider", 
     193                hourIds: ["eventStartDateHour","eventStartDateSchedHour"], 
     194                minuteIds: ["eventStartDateMinute","eventStartDateSchedMinute"], 
     195                ampmIds: ["eventStartDateAmpm","eventStartDateSchedAmpm"], 
     196                hourLabel: "<xsl:value-of select="$bwStr-Cloc-Hour"/>", 
     197                minuteLabel: "<xsl:value-of select="$bwStr-Cloc-Minute"/>", 
     198                amLabel: "<xsl:value-of select="$bwStr-Cloc-AM"/>", 
     199                pmLabel: "<xsl:value-of select="$bwStr-Cloc-PM"/>" 
     200              }); 
     201               
    189202              // enddate 
    190203              $("#bwEventWidgetEndDate").datepicker({ 
     
    192205              }).attr("readonly", "readonly"); 
    193206              $("#bwEventWidgetEndDate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/end/rfc3339DateTime,'T')"/>'); 
     207               
     208              // endtime 
     209              $("#bwEndClock").bwTimePicker({ 
     210                hour24: <xsl:value-of select="/bedework/hour24"/>, 
     211                attachToId: "calWidgetEndTimeHider", 
     212                hourIds: ["eventEndDateHour"], 
     213                minuteIds: ["eventEndDateMinute"], 
     214                ampmIds: ["eventEndDateAmpm"], 
     215                hourLabel: "<xsl:value-of select="$bwStr-Cloc-Hour"/>", 
     216                minuteLabel: "<xsl:value-of select="$bwStr-Cloc-Minute"/>", 
     217                amLabel: "<xsl:value-of select="$bwStr-Cloc-AM"/>", 
     218                pmLabel: "<xsl:value-of select="$bwStr-Cloc-PM"/>" 
     219              }); 
    194220            } 
    195221            </xsl:comment> 
     
    691717                <div class="{$timeFieldsClass}" id="startTimeFields"> 
    692718                  <span id="calWidgetStartTimeHider" class="show"> 
    693                     <xsl:copy-of select="form/start/hour/*"/> 
    694                     <xsl:copy-of select="form/start/minute/*"/> 
    695                     <xsl:if test="form/start/ampm"> 
    696                       <xsl:copy-of select="form/start/ampm/*"/> 
    697                     </xsl:if> 
     719                          <select name="eventStartDate.hour" id="eventStartDateHour"> 
     720                            <xsl:copy-of select="form/start/hour/select/*"/> 
     721                          </select> 
     722                          <select name="eventStartDate.minute" id="eventStartDateMinute"> 
     723                            <xsl:copy-of select="form/start/minute/select/*"/> 
     724                          </select> 
     725                          <xsl:if test="form/start/ampm"> 
     726                            <select name="eventStartDate.ampm" id="eventStartDateAmpm"> 
     727                              <xsl:copy-of select="form/start/ampm/select/*"/> 
     728                            </select> 
     729                          </xsl:if> 
    698730                    <xsl:text> </xsl:text> 
    699                     <a href="javascript:bwClockLaunch('eventStartDate');"><img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" alt="bwClock"/></a
     731                    <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" alt="bwClock" id="bwStartClock"/
    700732 
    701733                    <select name="eventStartDate.tzid" id="startTzid" class="timezones"> 
     
    781813                  <div class="{$timeFieldsClass}" id="endTimeFields"> 
    782814                    <span id="calWidgetEndTimeHider" class="show"> 
    783                       <xsl:copy-of select="form/end/dateTime/hour/*"/> 
    784                       <xsl:copy-of select="form/end/dateTime/minute/*"/> 
    785                       <xsl:if test="form/end/dateTime/ampm"> 
    786                         <xsl:copy-of select="form/end/dateTime/ampm/*"/> 
    787                       </xsl:if> 
     815                            <select name="eventEndDate.hour" id="eventEndDateHour"> 
     816                              <xsl:copy-of select="form/end/dateTime/hour/select/*"/> 
     817                            </select> 
     818                            <select name="eventEndDate.minute" id="eventEndDateMinute"> 
     819                              <xsl:copy-of select="form/end/dateTime/minute/select/*"/> 
     820                            </select> 
     821                            <xsl:if test="form/start/ampm"> 
     822                              <select name="eventEndDate.ampm" id="eventEndDateAmpm"> 
     823                                <xsl:copy-of select="form/end/dateTime/ampm/select/*"/> 
     824                              </select> 
     825                            </xsl:if> 
    788826                      <xsl:text> </xsl:text> 
    789                       <a href="javascript:bwClockLaunch('eventEndDate');"><img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" alt="bwClock"/></a
     827                      <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" alt="bwClock" id="bwEndClock"/
    790828 
    791829                      <select name="eventEndDate.tzid" id="endTzid" class="timezones"> 
     
    12781316            <!-- we've hit an unresolvable alias; stop descending --> 
    12791317            <input type="checkbox" name="forDiplayOnly" disabled="disabled"/> 
    1280             <em><xsl:value-of select="name"/>?</em> 
     1318            <em><xsl:value-of select="summary"/>?</em> 
    12811319          </xsl:when> 
    12821320          <xsl:when test="calType = '0'"> 
     
    12841322                 underlying calendar aliases --> 
    12851323            <img src="{$resourcesRoot}/resources/catIcon.gif" width="13" height="13" alt="folder" class="folderForAliasTree" border="0"/> 
    1286             <xsl:value-of select="name"/> 
     1324            <xsl:value-of select="summary"/> 
    12871325          </xsl:when> 
    12881326          <xsl:otherwise> 
    12891327            <xsl:variable name="virtualPath">/user<xsl:for-each select="ancestor-or-self::calendar/name">/<xsl:value-of select="."/></xsl:for-each></xsl:variable> 
    1290             <input type="checkbox" name="alias" onclick="toggleBedeworkXProperty('X-BEDEWORK-SUBMIT-ALIAS','{$virtualPath}',this.checked)"> 
     1328            <xsl:variable name="displayName" select="summary"/> 
     1329            <input type="checkbox" name="alias" onclick="toggleBedeworkXProperty('X-BEDEWORK-SUBMIT-ALIAS','{$displayName}','{$virtualPath}',this.checked)"> 
    12911330              <xsl:attribute name="value"><xsl:value-of select="$virtualPath"/></xsl:attribute> 
    12921331              <xsl:if test="$virtualPath = /bedework/formElements/form/xproperties//X-BEDEWORK-SUBMIT-ALIAS/values/text"><xsl:attribute name="checked"><xsl:value-of select="checked"/></xsl:attribute></xsl:if> 
     
    12941333            <xsl:choose> 
    12951334              <xsl:when test="$virtualPath = /bedework/formElements/form/xproperties//X-BEDEWORK-SUBMIT-ALIAS/values/text"> 
    1296                 <strong><xsl:value-of select="name"/></strong> 
     1335                <strong><xsl:value-of select="summary"/></strong> 
    12971336              </xsl:when> 
    12981337              <xsl:otherwise> 
    1299                 <xsl:value-of select="name"/> 
     1338                <xsl:value-of select="summary"/> 
    13001339              </xsl:otherwise> 
    13011340            </xsl:choose> 
  • releases/bedework-3.7/deployment/websubmit/webapp/resources/demoskins/es_ES/default/strings.xsl

    r3128 r3155  
    138138  <xsl:variable name="bwStr-Cloc-Switch">cambiar</xsl:variable> 
    139139  <xsl:variable name="bwStr-Cloc-Close">cerrar</xsl:variable> 
    140  
     140   
     141  <!-- xsl:template name="newclock" --> 
     142  <xsl:variable name="bwStr-Cloc-Hour">Hora</xsl:variable> 
     143  <xsl:variable name="bwStr-Cloc-Minute">Minuto</xsl:variable> 
     144  <xsl:variable name="bwStr-Cloc-AM">am</xsl:variable> 
     145  <xsl:variable name="bwStr-Cloc-PM">pm</xsl:variable> 
     146   
    141147  <!-- xsl:template name="eventList" --> 
    142148  <xsl:variable name="bwStr-EvLs-PendingEvents">Eventos pendientes</xsl:variable> 
  • trunk/deployment/websubmit/webapp/resources/demoskins/es_ES/default/default.xsl

    r3127 r3155  
    149149    <link rel="stylesheet" href="{$resourcesRoot}/default/default/default.css"/> 
    150150    <link rel="icon" type="image/ico" href="{$resourcesRoot}/resources/bedework.ico" /> 
     151     
    151152    <!-- note: the non-breaking spaces in the script bodies below are to avoid 
    152153         losing the script closing tags (which avoids browser problems) --> 
     154    <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.3.2.min.js">&#160;</script> 
     155    <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.7.1.custom.min.js">&#160;</script> 
     156    <link rel="stylesheet" href="/bedework-common/javascript/jquery/css/custom-theme/jquery-ui-1.7.1.custom.css"/> 
     157    <link rel="stylesheet" href="/bedework-common/javascript/jquery/css/custom-theme/bedeworkJquery.css"/> 
     158     
    153159    <script type="text/javascript" src="{$resourcesRoot}/resources/bedework.js">&#160;</script> 
     160     
    154161    <xsl:if test="/bedework/page='addEvent' or /bedework/page='editEvent'"> 
    155       <script type="text/javascript" src="{$resourcesRoot}/resources/bwClock.js">&#160;</script> 
    156       <link rel="stylesheet" href="{$resourcesRoot}/resources/bwClock.css"/> 
     162      <script type="text/javascript" src="/bedework-common/javascript/bedework/bwClock.js">&#160;</script> 
     163      <link rel="stylesheet" href="/bedework-common/javascript/bedework/bwClock.css"/> 
    157164      <xsl:choose> 
    158165        <xsl:when test="$portalFriendly = 'true'"> 
     
    161168        </xsl:when> 
    162169        <xsl:otherwise> 
    163           <!-- <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.2.6.min.js">&#160;</script> 
    164           <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.5.2.min.js">&#160;</script> 
    165           <link rel="stylesheet" href="/bedework-common/javascript/jquery/bedeworkJqueryThemes.css"/> --> 
    166           <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.3.2.min.js">&#160;</script> 
    167           <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.7.1.custom.min.js">&#160;</script> 
    168           <link rel="stylesheet" href="/bedework-common/javascript/jquery/css/custom-theme/jquery-ui-1.7.1.custom.css"/> 
    169           <link rel="stylesheet" href="/bedework-common/javascript/jquery/css/custom-theme/bedeworkJquery.css"/> 
    170170          <script type="text/javascript"> 
    171171            <xsl:comment> 
     
    186186              }).attr("readonly", "readonly"); 
    187187              $("#bwEventWidgetStartDate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/start/rfc3339DateTime,'T')"/>'); 
    188  
     188               
     189              // starttime 
     190              $("#bwStartClock").bwTimePicker({ 
     191                hour24: <xsl:value-of select="/bedework/hour24"/>, 
     192                attachToId: "calWidgetStartTimeHider", 
     193                hourIds: ["eventStartDateHour","eventStartDateSchedHour"], 
     194                minuteIds: ["eventStartDateMinute","eventStartDateSchedMinute"], 
     195                ampmIds: ["eventStartDateAmpm","eventStartDateSchedAmpm"], 
     196                hourLabel: "<xsl:value-of select="$bwStr-Cloc-Hour"/>", 
     197                minuteLabel: "<xsl:value-of select="$bwStr-Cloc-Minute"/>", 
     198                amLabel: "<xsl:value-of select="$bwStr-Cloc-AM"/>", 
     199                pmLabel: "<xsl:value-of select="$bwStr-Cloc-PM"/>" 
     200              }); 
     201               
    189202              // enddate 
    190203              $("#bwEventWidgetEndDate").datepicker({ 
     
    192205              }).attr("readonly", "readonly"); 
    193206              $("#bwEventWidgetEndDate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/end/rfc3339DateTime,'T')"/>'); 
     207               
     208              // endtime 
     209              $("#bwEndClock").bwTimePicker({ 
     210                hour24: <xsl:value-of select="/bedework/hour24"/>, 
     211                attachToId: "calWidgetEndTimeHider", 
     212                hourIds: ["eventEndDateHour"], 
     213                minuteIds: ["eventEndDateMinute"], 
     214                ampmIds: ["eventEndDateAmpm"], 
     215                hourLabel: "<xsl:value-of select="$bwStr-Cloc-Hour"/>", 
     216                minuteLabel: "<xsl:value-of select="$bwStr-Cloc-Minute"/>", 
     217                amLabel: "<xsl:value-of select="$bwStr-Cloc-AM"/>", 
     218                pmLabel: "<xsl:value-of select="$bwStr-Cloc-PM"/>" 
     219              }); 
    194220            } 
    195221            </xsl:comment> 
     
    691717                <div class="{$timeFieldsClass}" id="startTimeFields"> 
    692718                  <span id="calWidgetStartTimeHider" class="show"> 
    693                     <xsl:copy-of select="form/start/hour/*"/> 
    694                     <xsl:copy-of select="form/start/minute/*"/> 
    695                     <xsl:if test="form/start/ampm"> 
    696                       <xsl:copy-of select="form/start/ampm/*"/> 
    697                     </xsl:if> 
     719                          <select name="eventStartDate.hour" id="eventStartDateHour"> 
     720                            <xsl:copy-of select="form/start/hour/select/*"/> 
     721                          </select> 
     722                          <select name="eventStartDate.minute" id="eventStartDateMinute"> 
     723                            <xsl:copy-of select="form/start/minute/select/*"/> 
     724                          </select> 
     725                          <xsl:if test="form/start/ampm"> 
     726                            <select name="eventStartDate.ampm" id="eventStartDateAmpm"> 
     727                              <xsl:copy-of select="form/start/ampm/select/*"/> 
     728                            </select> 
     729                          </xsl:if> 
    698730                    <xsl:text> </xsl:text> 
    699                     <a href="javascript:bwClockLaunch('eventStartDate');"><img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" alt="bwClock"/></a
     731                    <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" alt="bwClock" id="bwStartClock"/
    700732 
    701733                    <select name="eventStartDate.tzid" id="startTzid" class="timezones"> 
     
    781813                  <div class="{$timeFieldsClass}" id="endTimeFields"> 
    782814                    <span id="calWidgetEndTimeHider" class="show"> 
    783                       <xsl:copy-of select="form/end/dateTime/hour/*"/> 
    784                       <xsl:copy-of select="form/end/dateTime/minute/*"/> 
    785                       <xsl:if test="form/end/dateTime/ampm"> 
    786                         <xsl:copy-of select="form/end/dateTime/ampm/*"/> 
    787                       </xsl:if> 
     815                            <select name="eventEndDate.hour" id="eventEndDateHour"> 
     816                              <xsl:copy-of select="form/end/dateTime/hour/select/*"/> 
     817                            </select> 
     818                            <select name="eventEndDate.minute" id="eventEndDateMinute"> 
     819                              <xsl:copy-of select="form/end/dateTime/minute/select/*"/> 
     820                            </select> 
     821                            <xsl:if test="form/start/ampm"> 
     822                              <select name="eventEndDate.ampm" id="eventEndDateAmpm"> 
     823                                <xsl:copy-of select="form/end/dateTime/ampm/select/*"/> 
     824                              </select> 
     825                            </xsl:if> 
    788826                      <xsl:text> </xsl:text> 
    789                       <a href="javascript:bwClockLaunch('eventEndDate');"><img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" alt="bwClock"/></a
     827                      <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" alt="bwClock" id="bwEndClock"/
    790828 
    791829                      <select name="eventEndDate.tzid" id="endTzid" class="timezones"> 
     
    12781316            <!-- we've hit an unresolvable alias; stop descending --> 
    12791317            <input type="checkbox" name="forDiplayOnly" disabled="disabled"/> 
    1280             <em><xsl:value-of select="name"/>?</em> 
     1318            <em><xsl:value-of select="summary"/>?</em> 
    12811319          </xsl:when> 
    12821320          <xsl:when test="calType = '0'"> 
     
    12841322                 underlying calendar aliases --> 
    12851323            <img src="{$resourcesRoot}/resources/catIcon.gif" width="13" height="13" alt="folder" class="folderForAliasTree" border="0"/> 
    1286             <xsl:value-of select="name"/> 
     1324            <xsl:value-of select="summary"/> 
    12871325          </xsl:when> 
    12881326          <xsl:otherwise> 
    12891327            <xsl:variable name="virtualPath">/user<xsl:for-each select="ancestor-or-self::calendar/name">/<xsl:value-of select="."/></xsl:for-each></xsl:variable> 
    1290             <input type="checkbox" name="alias" onclick="toggleBedeworkXProperty('X-BEDEWORK-SUBMIT-ALIAS','{$virtualPath}',this.checked)"> 
     1328            <xsl:variable name="displayName" select="summary"/> 
     1329            <input type="checkbox" name="alias" onclick="toggleBedeworkXProperty('X-BEDEWORK-SUBMIT-ALIAS','{$displayName}','{$virtualPath}',this.checked)"> 
    12911330              <xsl:attribute name="value"><xsl:value-of select="$virtualPath"/></xsl:attribute> 
    12921331              <xsl:if test="$virtualPath = /bedework/formElements/form/xproperties//X-BEDEWORK-SUBMIT-ALIAS/values/text"><xsl:attribute name="checked"><xsl:value-of select="checked"/></xsl:attribute></xsl:if> 
     
    12941333            <xsl:choose> 
    12951334              <xsl:when test="$virtualPath = /bedework/formElements/form/xproperties//X-BEDEWORK-SUBMIT-ALIAS/values/text"> 
    1296                 <strong><xsl:value-of select="name"/></strong> 
     1335                <strong><xsl:value-of select="summary"/></strong> 
    12971336              </xsl:when> 
    12981337              <xsl:otherwise> 
    1299                 <xsl:value-of select="name"/> 
     1338                <xsl:value-of select="summary"/> 
    13001339              </xsl:otherwise> 
    13011340            </xsl:choose> 
  • trunk/deployment/websubmit/webapp/resources/demoskins/es_ES/default/strings.xsl

    r3127 r3155  
    138138  <xsl:variable name="bwStr-Cloc-Switch">cambiar</xsl:variable> 
    139139  <xsl:variable name="bwStr-Cloc-Close">cerrar</xsl:variable> 
    140  
     140   
     141  <!-- xsl:template name="newclock" --> 
     142  <xsl:variable name="bwStr-Cloc-Hour">Hora</xsl:variable> 
     143  <xsl:variable name="bwStr-Cloc-Minute">Minuto</xsl:variable> 
     144  <xsl:variable name="bwStr-Cloc-AM">am</xsl:variable> 
     145  <xsl:variable name="bwStr-Cloc-PM">pm</xsl:variable> 
     146   
    141147  <!-- xsl:template name="eventList" --> 
    142148  <xsl:variable name="bwStr-EvLs-PendingEvents">Eventos pendientes</xsl:variable>