Changeset 1290

Show
Ignore:
Timestamp:
02/14/07 00:22:36
Author:
douglm
Message:

Fix 12/24 hour prefs

Fix bugs in 12hour mode

Start at quota code

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/config/configs/democal.options.xml

    r1153 r1290  
    2020      </global> 
    2121 
    22       <!-- Only used for system initialisation or conversion from 2.3 - ignored thereafter --> 
    2322      <syspars classname="org.bedework.calfacade.BwSystem"> 
    2423        <!-- name must match the global system name --> 

  • trunk/deployment/resources/xsl/default/default/messages.xsl

    r1173 r1290  
    2222        <xsl:choose> 
    2323          <xsl:when test="param='1'"> 
    24             1 public event reference added. 
     24            1 event reference added. 
    2525          </xsl:when> 
    2626          <xsl:otherwise> 
    27             <xsl:value-of select="param"/> public event references added. 
     27            <xsl:value-of select="param"/> event references added. 
    2828          </xsl:otherwise> 
    2929        </xsl:choose> 

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

    r1285 r1290  
    59875987          </td> 
    59885988          <td> 
    5989             <select name="preferredTimeType"> 
    5990               <option value="12hr"> 
    5991                 <xsl:if test="preferredTimeType = '12hr'"> 
     5989            <select name="hour24"> 
     5990              <option value="false"> 
     5991                <xsl:if test="hour24 = 'false'"> 
    59925992                  <xsl:attribute name="selected">selected</xsl:attribute> 
    59935993                </xsl:if> 
    59945994                12 hour + AM/PM 
    59955995              </option> 
    5996               <option value="24hr"> 
    5997                 <xsl:if test="preferredTimeType = '24hr'"> 
     5996              <option value="true"> 
     5997                <xsl:if test="hour24 = 'true'"> 
    59985998                  <xsl:attribute name="selected">selected</xsl:attribute> 
    59995999                </xsl:if> 
    …… 
    60826082          </td> 
    60836083          <td> 
    6084             <select name="workDayStart"> 
     6084            <select name="workdayStart"> 
    60856085              <xsl:call-template name="buildWorkdayOptionsList"> 
    6086                 <xsl:with-param name="selectedVal" select="workDayStart"/> 
     6086                <xsl:with-param name="selectedVal" select="workdayStart"/> 
    60876087              </xsl:call-template> 
    60886088            </select> 
    …… 
    60946094          </td> 
    60956095          <td> 
    6096             <xsl:variable name="workDayEnd" select="workDayEnd"/> 
    6097             <select name="workDayEnd"> 
     6096            <xsl:variable name="workdayEnd" select="workdayEnd"/> 
     6097            <select name="workdayEnd"> 
    60986098              <xsl:call-template name="buildWorkdayOptionsList"> 
    6099                 <xsl:with-param name="selectedVal" select="workDayEnd"/> 
     6099                <xsl:with-param name="selectedVal" select="workdayEnd"/> 
    61006100              </xsl:call-template> 
    61016101            </select>