Changeset 1130

Show
Ignore:
Timestamp:
12/08/06 15:59:37
Author:
johnsa
Message:

more work on timezone elements, floating time, and store dates as UTC in personal client UI

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1128 r1130  
    17571757            </xsl:choose> 
    17581758            all day event 
    1759             <input type="checkbox" name="floating" id="floating" onclick="swapFloatingTime(this)" value="on"/> 
    1760             <xsl:if test="/bedework/formElements/form/floating/input/@checked='checked'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if> 
     1759            <xsl:choose> 
     1760              <xsl:when test="/bedework/formElements/form/floating/input/@checked='checked'"> 
     1761                <input type="checkbox" name="floatingFlag" id="floatingFlag" onclick="swapFloatingTime(this)" value="on" checked="checked"/> 
     1762                <input type="hidden" name="eventStartDate.floating" value="on" id="startFloating"/> 
     1763                <input type="hidden" name="eventEndDate.floating" value="on" id="endFloating"/> 
     1764              </xsl:when> 
     1765              <xsl:otherwise> 
     1766                <input type="checkbox" name="floatingFlag" id="floatingFlag" onclick="swapFloatingTime(this)" value="off"/> 
     1767                <input type="hidden" name="eventStartDate.floating" value="off" id="startFloating"/> 
     1768                <input type="hidden" name="eventEndDate.floating" value="off" id="endFloating"/> 
     1769              </xsl:otherwise> 
     1770            </xsl:choose> 
    17611771            floating 
    1762             <input type="checkbox" name="storeUTC" id="storeUTC" onclick="swapStoreUTC(this)" value="on"/> 
    1763             <xsl:if test="/bedework/formElements/form/storeUTC/input/@checked='checked'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if> 
     1772            <xsl:choose> 
     1773              <xsl:when test="/bedework/formElements/form/floating/input/@checked='checked'"> 
     1774                <input type="checkbox" name="storeUTCFlag" id="storeUTCFlag" onclick="swapStoreUTC(this)" value="on" checked="checked"/> 
     1775                <input type="hidden" name="eventStartDate.storeUTC" value="on" id="startStoreUTC"/> 
     1776                <input type="hidden" name="eventEndDate.storeUTC" value="on" id="endStoreUTC"/> 
     1777              </xsl:when> 
     1778              <xsl:otherwise> 
     1779                <input type="checkbox" name="storeUTCFlag" id="storeUTCFlag" onclick="swapStoreUTC(this)" value="off"/> 
     1780                <input type="hidden" name="eventStartDate.storeUTC" value="off" id="startStoreUTC"/> 
     1781                <input type="hidden" name="eventEndDate.storeUTC" value="off" id="endStoreUTC"/> 
     1782              </xsl:otherwise> 
     1783            </xsl:choose> 
    17641784            store as UTC 
    17651785            <br/> 
    …… 
    18531873                    <a href="javascript:bwClockLaunch('eventEndDate');"><img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0"/></a> 
    18541874 
    1855                     <select name="eventStartDate.tzid" id="endTzid" class="timezones"> 
     1875                    <select name="eventEndDate.tzid" id="endTzid" class="timezones"> 
    18561876                      <xsl:for-each select="/bedework/timezones/timezone"> 
    18571877                        <option> 
    …… 
    23322352            </xsl:choose> 
    23332353            all day event 
    2334             <input type="checkbox" name="floating" id="floating" onclick="swapFloatingTime(this)" value="on"/> 
    2335             <xsl:if test="/bedework/formElements/form/floating/input/@checked='checked'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if> 
     2354            <xsl:choose> 
     2355              <xsl:when test="/bedework/formElements/form/floating/input/@checked='checked'"> 
     2356                <input type="checkbox" name="floatingFlag" id="floatingFlag" onclick="swapFloatingTime(this)" value="on" checked="checked"/> 
     2357                <input type="hidden" name="eventStartDate.floating" value="on" id="startFloating"/> 
     2358                <input type="hidden" name="eventEndDate.floating" value="on" id="endFloating"/> 
     2359              </xsl:when> 
     2360              <xsl:otherwise> 
     2361                <input type="checkbox" name="floatingFlag" id="floatingFlag" onclick="swapFloatingTime(this)" value="off"/> 
     2362                <input type="hidden" name="eventStartDate.floating" value="off" id="startFloating"/> 
     2363                <input type="hidden" name="eventEndDate.floating" value="off" id="endFloating"/> 
     2364              </xsl:otherwise> 
     2365            </xsl:choose> 
    23362366            floating 
    2337             <input type="checkbox" name="storeUTC" id="storeUTC" onclick="swapStoreUTC(this)" value="on"/> 
    2338             <xsl:if test="/bedework/formElements/form/storeUTC/input/@checked='checked'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if> 
     2367            <xsl:choose> 
     2368              <xsl:when test="/bedework/formElements/form/floating/input/@checked='checked'"> 
     2369                <input type="checkbox" name="storeUTCFlag" id="storeUTCFlag" onclick="swapStoreUTC(this)" value="on" checked="checked"/> 
     2370                <input type="hidden" name="eventStartDate.storeUTC" value="on" id="startStoreUTC"/> 
     2371                <input type="hidden" name="eventEndDate.storeUTC" value="on" id="endStoreUTC"/> 
     2372              </xsl:when> 
     2373              <xsl:otherwise> 
     2374                <input type="checkbox" name="storeUTCFlag" id="storeUTC" onclick="swapStoreUTC(this)" value="off"/> 
     2375                <input type="hidden" name="eventStartDate.storeUTCFlag" value="off" id="startStoreUTC"/> 
     2376                <input type="hidden" name="eventEndDate.storeUTC" value="off" id="endStoreUTC"/> 
     2377              </xsl:otherwise> 
     2378            </xsl:choose> 
    23392379            store as UTC 
    23402380            <br/> 
    …… 
    24292469                    <a href="javascript:bwClockLaunch('eventEndDate');"><img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0"/></a> 
    24302470 
    2431                     <select name="eventStartDate.tzid" id="endTzid" class="timezones"> 
     2471                    <select name="eventEndDate.tzid" id="endTzid" class="timezones"> 
    24322472                      <xsl:if test="/bedework/formElements/form/floating/input/@checked='checked'"><xsl:attribute name="disabled">true</xsl:attribute></xsl:if> 
    24332473                      <xsl:for-each select="/bedework/timezones/timezone"> 

  • trunk/deployment/webuser/webapp/resources/demoskins/resources/includes.js

    r1125 r1130  
    2424  startTimezone = document.getElementById("startTzid"); 
    2525  endTimezone = document.getElementById("endTzid"); 
     26  startFloating = document.getElementById("startFloating"); 
     27  endFloating = document.getElementById("endFloating"); 
    2628  if (obj.checked) { 
    27     storeUtcField = document.getElementById("storeUTC"); 
    28     storeUtcField.checked = false; 
     29    document.getElementById("storeUTCFlag").checked = false; 
    2930    startTimezone.disabled = true; 
    3031    endTimezone.disabled = true; 
     32    startFloating.value = "on"; 
     33    endFloating.value = "on"; 
    3134  } else { 
    3235    startTimezone.disabled = false; 
    3336    endTimezone.disabled = false; 
     37    startFloating.value = "off"; 
     38    endFloating.value = "off"; 
    3439  } 
    3540} 
    …… 
    3742  startTimezone = document.getElementById("startTzid"); 
    3843  endTimezone = document.getElementById("endTzid"); 
     44  startStoreUTC = document.getElementById("startStoreUTC"); 
     45  endStoreUTC = document.getElementById("endStoreUTC"); 
    3946  if (obj.checked) { 
    40     floatingTimeField = document.getElementById("floating"); 
    41     floatingTimeField.checked = false; 
     47    document.getElementById("floatingFlag").checked = false; 
    4248    startTimezone.disabled = false; 
    4349    endTimezone.disabled = false; 
     50    startStoreUTC.value = "on"; 
     51    endStoreUTC.value = "on"; 
     52  } else { 
     53    startStoreUTC.value = "off"; 
     54    endStoreUTC.value = "off"; 
    4455  } 
    4556}