Changeset 3519

Show
Ignore:
Timestamp:
03/27/12 17:04:32
Author:
johnsa
Message:

admin client: support for date filtering in admin client list events

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • releases/bedework-3.8/deployment/webadmin/webapp/resources/default/default/default.css

    r3508 r3519  
    12161216  padding-right: 2em; 
    12171217} 
     1218#daysSetterBox { 
     1219        margin-left: 1em; 
     1220} 
    12181221.bwEventListOtherGroupTags { 
    12191222  font-size: 0.8em; 

  • releases/bedework-3.8/deployment/webadmin/webapp/resources/default/default/default.xsl

    r3512 r3519  
    223223       not guaranteed to work in portals.  --> 
    224224  <xsl:variable name="portalFriendly">false</xsl:variable> 
     225   
     226        <!-- get the current date set by the user, if exists, else use now --> 
     227        <xsl:variable name="curListDate"> 
     228          <xsl:choose> 
     229            <xsl:when test="/bedework/appvar[key='curListDate']/value"><xsl:value-of select="/bedework/appvar[key='curListDate']/value"/></xsl:when> 
     230            <xsl:otherwise><xsl:value-of select="substring(/bedework/now/date,1,4)"/>-<xsl:value-of select="substring(/bedework/now/date,5,2)"/>-<xsl:value-of select="substring(/bedework/now/date,7,2)"/></xsl:otherwise> 
     231          </xsl:choose> 
     232        </xsl:variable> 
     233        <!-- get the current number of days set by the user, if exists, else use default --> 
     234  <xsl:variable name="curListDays"> 
     235    <xsl:choose> 
     236      <xsl:when test="/bedework/appvar[key='curListDays']/value"><xsl:value-of select="/bedework/appvar[key='curListDays']/value"/></xsl:when> 
     237      <xsl:otherwise><xsl:value-of select="/bedework/defaultdays"/></xsl:otherwise> 
     238    </xsl:choose> 
     239  </xsl:variable> 
    225240 
    226241  <!--==== MAIN TEMPLATE  ====--> 
    …… 
    376391            $(document).ready(function(){ 
    377392 
    378                   <xsl:if test="/bedework/formElements/recurrenceId = ''"> 
     393                    <xsl:if test="/bedework/formElements/recurrenceId = ''"> 
    379394                initRXDates(); 
    380395              </xsl:if> 
    …… 
    403418                 
    404419              </xsl:if> 
     420               
     421              <xsl:if test="/bedework/page='listEvents'"> 
     422                bwSetupListDatePicker(); 
     423              </xsl:if> 
    405424                             
    406425              // If you wish to collapse specific topical areas, you can specify them here: 
    …… 
    415434              }); 
    416435 
     436            }); 
     437            </xsl:comment> 
     438          </script> 
     439        </xsl:if> 
     440        <xsl:if test="/bedework/page='eventList'"> 
     441          <!-- include the localized jQuery datepicker defaults --> 
     442          <xsl:call-template name="jqueryDatepickerDefaults"/> 
     443           
     444          <!-- now setup date and time pickers -->   
     445          <script type="text/javascript"> 
     446            <xsl:comment> 
     447            $(document).ready(function(){ 
     448              // startdate for list 
     449              $("#bwListWidgetStartDate").datepicker({ 
     450                defaultDate: new Date(<xsl:value-of select="substring(/bedework/now/date,1,4)"/>, <xsl:value-of select="number(substring(/bedework/now/date,5,2)) - 1"/>, <xsl:value-of select="substring(/bedework/now/date,7,2)"/>) 
     451              }); 
     452              $("#bwListWidgetStartDate").val('<xsl:value-of select="$curListDate"/>'); 
    417453            }); 
    418454            </xsl:comment> 
    …… 
    826862        <td> 
    827863          <a href="{$event-initUpdateEvent}"> 
     864            <xsl:attribute name="href"><xsl:value-of select="$event-initUpdateEvent"/>&amp;start=<xsl:value-of select="$curListDate"/>&amp;days=<xsl:value-of select="$curListDays"/>&amp;limitdays=true</xsl:attribute> 
    828865            <xsl:if test="not(/bedework/currentCalSuite/name)"> 
    829866              <xsl:attribute name="onclick">alert("<xsl:copy-of select="$bwStr-MMnu-YouMustBeOperating"/>");return false;</xsl:attribute> 
    …… 
    10381075    <div id="bwEventListControls"> 
    10391076      <form name="calForm" id="bwManageEventListControls" method="post" action="{$event-initUpdateEvent}"> 
     1077        <label for="bwListWidgetStartDate"><xsl:copy-of select="$bwStr-EvLs-StartDate"/></label> 
     1078        <input id="bwListWidgetStartDate" name="start" size="10" onchange="setListDate(this.form);"/> 
     1079        <input type="hidden" name="setappvar" id="curListDateHolder"/> 
     1080        <input type="hidden" name="limitdays" value="true"/> 
     1081        <span id="daysSetterBox"> 
     1082                <label for="days"><xsl:copy-of select="$bwStr-EvLs-Days"/></label> 
     1083                <xsl:text> </xsl:text> 
     1084                <!-- <xsl:value-of select="/bedework/defaultdays"/> --> 
     1085          <select id="days" name="days" onchange="setListDate(this.form);"> 
     1086                  <xsl:call-template name="buildListDays"/> 
     1087                </select> 
     1088                <input type="hidden" id="curListDaysHolder" name="setappvar"/> 
     1089              </span> 
     1090         
     1091        <!-- This block contains the original Show Active/All toggle.   
     1092             Uncomment this block to use, though it can be slow if working  
     1093             with large very large numbers of events.  
    10401094        <xsl:copy-of select="$bwStr-EvLs-Show"/> 
    10411095        <xsl:copy-of select="/bedework/formElements/form/listAllSwitchFalse/*"/> 
    …… 
    10431097        <xsl:copy-of select="/bedework/formElements/form/listAllSwitchTrue/*"/> 
    10441098        <xsl:copy-of select="$bwStr-EvLs-All"/> 
     1099        --> 
    10451100      </form> 
    10461101 
    …… 
    10611116          </xsl:for-each> 
    10621117        </select> 
     1118        <input type="hidden" name="start" value="{$curListDate}"/> 
     1119        <input type="hidden" name="limitdays" value="true"/> 
    10631120        <xsl:if test="/bedework/appvar[key='catFilter'] and /bedework/appvar[key='catFilter']/value != 'none'"> 
    10641121          <input type="submit" value="{$bwStr-EvLs-ClearFilter}" onclick="this.form.setappvar.selectedIndex = 0"/> 
    …… 
    10671124    </div> 
    10681125    <xsl:call-template name="eventListCommon"/> 
     1126  </xsl:template> 
     1127   
     1128  <xsl:template name="buildListDays"> 
     1129    <xsl:param name="index">1</xsl:param> 
     1130    <xsl:variable name="max" select="/bedework/maxdays"/> 
     1131    <xsl:if test="number($index) &lt; number($max)"> 
     1132      <option name="listDays($index)"> 
     1133        <xsl:if test="$index = $curListDays"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 
     1134        <xsl:value-of select="$index"/> 
     1135      </option> 
     1136      <xsl:call-template name="buildListDays"> 
     1137        <xsl:with-param name="index"><xsl:value-of select="number($index)+1"/></xsl:with-param> 
     1138      </xsl:call-template> 
     1139    </xsl:if> 
    10691140  </xsl:template> 
    10701141 

  • releases/bedework-3.8/deployment/webadmin/webapp/resources/default/default/strings.xsl

    r3508 r3519  
    101101  <xsl:variable name="bwStr-EvLs-SelectEvent">Select the event that you would like to update:</xsl:variable> 
    102102  <xsl:variable name="bwStr-EvLs-PageTitle">Add new event</xsl:variable> 
     103  <xsl:variable name="bwStr-EvLs-StartDate">Start Date:</xsl:variable> 
     104  <xsl:variable name="bwStr-EvLs-Days">Days:</xsl:variable> 
    103105  <xsl:variable name="bwStr-EvLs-Show">Show:</xsl:variable> 
    104106  <xsl:variable name="bwStr-EvLs-Active">Active</xsl:variable> 

  • releases/bedework-3.8/deployment/webadmin/webapp/resources/es_ES/default/default.css

    r3508 r3519  
    12161216  padding-right: 2em; 
    12171217} 
     1218#daysSetterBox { 
     1219        margin-left: 1em; 
     1220} 
    12181221.bwEventListOtherGroupTags { 
    12191222  font-size: 0.8em; 

  • releases/bedework-3.8/deployment/webadmin/webapp/resources/es_ES/default/default.xsl

    r3510 r3519  
    224224  <xsl:variable name="portalFriendly">false</xsl:variable> 
    225225 
     226        <!-- get the current date set by the user, if exists, else use now --> 
     227        <xsl:variable name="curListDate"> 
     228          <xsl:choose> 
     229            <xsl:when test="/bedework/appvar[key='curListDate']/value"><xsl:value-of select="/bedework/appvar[key='curListDate']/value"/></xsl:when> 
     230            <xsl:otherwise><xsl:value-of select="substring(/bedework/now/date,1,4)"/>-<xsl:value-of select="substring(/bedework/now/date,5,2)"/>-<xsl:value-of select="substring(/bedework/now/date,7,2)"/></xsl:otherwise> 
     231          </xsl:choose> 
     232        </xsl:variable> 
     233        <!-- get the current number of days set by the user, if exists, else use default --> 
     234  <xsl:variable name="curListDays"> 
     235    <xsl:choose> 
     236      <xsl:when test="/bedework/appvar[key='curListDays']/value"><xsl:value-of select="/bedework/appvar[key='curListDays']/value"/></xsl:when> 
     237      <xsl:otherwise><xsl:value-of select="/bedework/defaultdays"/></xsl:otherwise> 
     238    </xsl:choose> 
     239  </xsl:variable> 
     240 
    226241  <!--==== MAIN TEMPLATE  ====--> 
    227242  <xsl:template match="/"> 
    …… 
    404419              </xsl:if> 
    405420 
     421              <xsl:if test="/bedework/page='listEvents'"> 
     422                bwSetupListDatePicker(); 
     423              </xsl:if> 
     424                             
    406425              // If you wish to collapse specific topical areas, you can specify them here: 
    407426              // (note that this will be managed from the admin client in time) 
    …… 
    415434              }); 
    416435 
     436            }); 
     437            </xsl:comment> 
     438          </script> 
     439        </xsl:if> 
     440        <xsl:if test="/bedework/page='eventList'"> 
     441          <!-- include the localized jQuery datepicker defaults --> 
     442          <xsl:call-template name="jqueryDatepickerDefaults"/> 
     443           
     444          <!-- now setup date and time pickers -->   
     445          <script type="text/javascript"> 
     446            <xsl:comment> 
     447            $(document).ready(function(){ 
     448              // startdate for list 
     449              $("#bwListWidgetStartDate").datepicker({ 
     450                defaultDate: new Date(<xsl:value-of select="substring(/bedework/now/date,1,4)"/>, <xsl:value-of select="number(substring(/bedework/now/date,5,2)) - 1"/>, <xsl:value-of select="substring(/bedework/now/date,7,2)"/>) 
     451              }); 
     452              $("#bwListWidgetStartDate").val('<xsl:value-of select="$curListDate"/>'); 
    417453            }); 
    418454            </xsl:comment> 
    …… 
    827863        <td> 
    828864          <a href="{$event-initUpdateEvent}"> 
     865            <xsl:attribute name="href"><xsl:value-of select="$event-initUpdateEvent"/>&amp;start=<xsl:value-of select="$curListDate"/>&amp;days=<xsl:value-of select="$curListDays"/>&amp;limitdays=true</xsl:attribute> 
    829866            <xsl:if test="not(/bedework/currentCalSuite/name)"> 
    830867              <xsl:attribute name="onclick">alert("<xsl:copy-of select="$bwStr-MMnu-YouMustBeOperating"/>");return false;</xsl:attribute> 
    …… 
    10391076    <div id="bwEventListControls"> 
    10401077      <form name="calForm" id="bwManageEventListControls" method="post" action="{$event-initUpdateEvent}"> 
     1078        <label for="bwListWidgetStartDate"><xsl:copy-of select="$bwStr-EvLs-StartDate"/></label> 
     1079        <input id="bwListWidgetStartDate" name="start" size="10" onchange="setListDate(this.form);"/> 
     1080        <input type="hidden" name="setappvar" id="curListDateHolder"/> 
     1081        <input type="hidden" name="limitdays" value="true"/> 
     1082        <span id="daysSetterBox"> 
     1083                <label for="days"><xsl:copy-of select="$bwStr-EvLs-Days"/></label> 
     1084                <xsl:text> </xsl:text> 
     1085                <!-- <xsl:value-of select="/bedework/defaultdays"/> --> 
     1086          <select id="days" name="days" onchange="setListDate(this.form);"> 
     1087                  <xsl:call-template name="buildListDays"/> 
     1088                </select> 
     1089                <input type="hidden" id="curListDaysHolder" name="setappvar"/> 
     1090              </span> 
     1091         
     1092        <!-- This block contains the original Show Active/All toggle.   
     1093             Uncomment this block to use, though it can be slow if working  
     1094             with large very large numbers of events.  
    10411095        <xsl:copy-of select="$bwStr-EvLs-Show"/> 
    10421096        <xsl:copy-of select="/bedework/formElements/form/listAllSwitchFalse/*"/> 
    …… 
    10441098        <xsl:copy-of select="/bedework/formElements/form/listAllSwitchTrue/*"/> 
    10451099        <xsl:copy-of select="$bwStr-EvLs-All"/> 
     1100        --> 
    10461101      </form> 
    10471102 
    …… 
    10621117          </xsl:for-each> 
    10631118        </select> 
     1119        <input type="hidden" name="start" value="{$curListDate}"/> 
     1120        <input type="hidden" name="limitdays" value="true"/> 
    10641121        <xsl:if test="/bedework/appvar[key='catFilter'] and /bedework/appvar[key='catFilter']/value != 'none'"> 
    10651122          <input type="submit" value="{$bwStr-EvLs-ClearFilter}" onclick="this.form.setappvar.selectedIndex = 0"/> 
    …… 
    10681125    </div> 
    10691126    <xsl:call-template name="eventListCommon"/> 
     1127  </xsl:template> 
     1128 
     1129  <xsl:template name="buildListDays"> 
     1130    <xsl:param name="index">1</xsl:param> 
     1131    <xsl:variable name="max" select="/bedework/maxdays"/> 
     1132    <xsl:if test="number($index) &lt; number($max)"> 
     1133      <option name="listDays($index)"> 
     1134        <xsl:if test="$index = $curListDays"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 
     1135        <xsl:value-of select="$index"/> 
     1136      </option> 
     1137      <xsl:call-template name="buildListDays"> 
     1138        <xsl:with-param name="index"><xsl:value-of select="number($index)+1"/></xsl:with-param> 
     1139      </xsl:call-template> 
     1140    </xsl:if> 
    10701141  </xsl:template> 
    10711142 
    …… 
    12611332    </xsl:if> 
    12621333 
    1263     <!-- if a submitted event has comments, display them --> 
    12641334    <xsl:if test="/bedework/page = 'modEventPending'"> 
     1335      <!-- if a submitted event has topical areas that match with  
     1336           those in the calendar suite, convert them --> 
     1337      <script type="text/javascript"> 
     1338      $(document).ready(function() { 
     1339        $("ul.aliasTree input:checked").trigger("onclick"); 
     1340      }); 
     1341      </script> 
     1342     
     1343      <!-- if a submitted event has comments, display them --> 
    12651344      <xsl:if test="form/xproperties/node()[name()='X-BEDEWORK-LOCATION' or name()='X-BEDEWORK-CONTACT' or name()='X-BEDEWORK-CATEGORIES' or name()='X-BEDEWORK-SUBMIT-COMMENT']"> 
    12661345        <script type="text/javascript"> 
    …… 
    29503029              <xsl:if test="$virtualPath = /bedework/formElements/form/xproperties//X-BEDEWORK-ALIAS/values/text"><xsl:attribute name="checked"><xsl:value-of select="checked"/></xsl:attribute></xsl:if> 
    29513030              <xsl:if test="path = /bedework/formElements/form/xproperties//X-BEDEWORK-SUBMIT-ALIAS/values/text"><xsl:attribute name="checked"><xsl:value-of select="checked"/></xsl:attribute></xsl:if> 
     3031              <xsl:if test="/bedework/formElements/form/xproperties//X-BEDEWORK-SUBMIT-ALIAS/values/text = substring-after(aliasUri,'bwcal://')"><xsl:attribute name="checked"><xsl:value-of select="checked"/></xsl:attribute></xsl:if> 
    29523032            </input> 
    29533033            <xsl:choose> 
    …… 
    29563036              </xsl:when> 
    29573037              <xsl:when test="path = /bedework/formElements/form/xproperties//X-BEDEWORK-SUBMIT-ALIAS/values/text"> 
     3038                <strong><xsl:value-of select="summary"/></strong> 
     3039              </xsl:when> 
     3040              <xsl:when test="/bedework/formElements/form/xproperties//X-BEDEWORK-SUBMIT-ALIAS/values/text = substring-after(aliasUri,'bwcal://')"> 
    29583041                <strong><xsl:value-of select="summary"/></strong> 
    29593042              </xsl:when> 

  • releases/bedework-3.8/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl

    r3508 r3519  
    101101  <xsl:variable name="bwStr-EvLs-SelectEvent">Seleccione el evento que desearía actualizar:</xsl:variable> 
    102102  <xsl:variable name="bwStr-EvLs-PageTitle">Añadir nuevo evento</xsl:variable> 
     103  <xsl:variable name="bwStr-EvLs-StartDate">Start Date:</xsl:variable> 
     104  <xsl:variable name="bwStr-EvLs-Days">Days:</xsl:variable> 
    103105  <xsl:variable name="bwStr-EvLs-Show">Mostrar:</xsl:variable> 
    104106  <xsl:variable name="bwStr-EvLs-Active">Activo</xsl:variable> 

  • releases/bedework-3.8/deployment/webadmin/webapp/resources/resources/bedework.js

    r3405 r3519  
    305305  } 
    306306} 
     307// setup the event list dates  
     308function setListDate(formObj) { 
     309  $("#curListDateHolder").val("curListDate(" + formObj.start.value + ")"); 
     310  $("#curListDaysHolder").val("curListDays(" + formObj.days.value + ")"); 
     311  formObj.submit(); 
     312} 

  • trunk/deployment/webadmin/webapp/resources/default/default/default.xsl

    r3518 r3519  
    223223       not guaranteed to work in portals.  --> 
    224224  <xsl:variable name="portalFriendly">false</xsl:variable> 
     225   
     226        <!-- get the current date set by the user, if exists, else use now --> 
     227        <xsl:variable name="curListDate"> 
     228          <xsl:choose> 
     229            <xsl:when test="/bedework/appvar[key='curListDate']/value"><xsl:value-of select="/bedework/appvar[key='curListDate']/value"/></xsl:when> 
     230            <xsl:otherwise><xsl:value-of select="substring(/bedework/now/date,1,4)"/>-<xsl:value-of select="substring(/bedework/now/date,5,2)"/>-<xsl:value-of select="substring(/bedework/now/date,7,2)"/></xsl:otherwise> 
     231          </xsl:choose> 
     232        </xsl:variable> 
     233        <!-- get the current number of days set by the user, if exists, else use default --> 
     234  <xsl:variable name="curListDays"> 
     235    <xsl:choose> 
     236      <xsl:when test="/bedework/appvar[key='curListDays']/value"><xsl:value-of select="/bedework/appvar[key='curListDays']/value"/></xsl:when> 
     237      <xsl:otherwise><xsl:value-of select="/bedework/defaultdays"/></xsl:otherwise> 
     238    </xsl:choose> 
     239  </xsl:variable> 
    225240 
    226241  <!--==== MAIN TEMPLATE  ====--> 
    …… 
    427442          <xsl:call-template name="jqueryDatepickerDefaults"/> 
    428443           
    429           <!-- get the current date set by the user, if exists, else use now --> 
    430           <xsl:variable name="curListDate"> 
    431             <xsl:choose> 
    432               <xsl:when test="/bedework/appvar[key='curListDate']/value"><xsl:value-of select="/bedework/appvar[key='curListDate']/value"/></xsl:when> 
    433               <xsl:otherwise><xsl:value-of select="substring(/bedework/now/date,1,4)"/>-<xsl:value-of select="number(substring(/bedework/now/date,5,2)) - 1"/>-<xsl:value-of select="substring(/bedework/now/date,7,2)"/></xsl:otherwise> 
    434             </xsl:choose> 
    435           </xsl:variable> 
    436444          <!-- now setup date and time pickers -->   
    437445          <script type="text/javascript"> 
    …… 
    853861      <tr> 
    854862        <td> 
    855           <a href="{$event-initUpdateEvent}&amp;limitdays=true"> 
     863          <a href="{$event-initUpdateEvent}"> 
     864            <xsl:attribute name="href"><xsl:value-of select="$event-initUpdateEvent"/>&amp;start=<xsl:value-of select="$curListDate"/>&amp;days=<xsl:value-of select="$curListDays"/>&amp;limitdays=true</xsl:attribute> 
    856865            <xsl:if test="not(/bedework/currentCalSuite/name)"> 
    857866              <xsl:attribute name="onclick">alert("<xsl:copy-of select="$bwStr-MMnu-YouMustBeOperating"/>");return false;</xsl:attribute> 
    …… 
    11071116          </xsl:for-each> 
    11081117        </select> 
    1109         <input type="hidden" name="start"> 
    1110           <xsl:attribute name="value"> 
    1111             <xsl:choose> 
    1112               <xsl:when test="/bedework/appvar[key='curListDate']/value"><xsl:value-of select="/bedework/appvar[key='curListDate']/value"/></xsl:when> 
    1113               <xsl:otherwise><xsl:value-of select="substring(/bedework/now/date,1,4)"/>-<xsl:value-of select="number(substring(/bedework/now/date,5,2)) - 1"/>-<xsl:value-of select="substring(/bedework/now/date,7,2)"/></xsl:otherwise> 
    1114             </xsl:choose> 
    1115           </xsl:attribute> 
    1116         </input> 
     1118        <input type="hidden" name="start" value="{$curListDate}"/> 
    11171119        <input type="hidden" name="limitdays" value="true"/> 
    11181120        <xsl:if test="/bedework/appvar[key='catFilter'] and /bedework/appvar[key='catFilter']/value != 'none'"> 
    …… 
    11261128  <xsl:template name="buildListDays"> 
    11271129    <xsl:param name="index">1</xsl:param> 
    1128     <xsl:variable name="current"> 
    1129       <xsl:choose> 
    1130         <xsl:when test="/bedework/appvar[key='curListDays']/value"><xsl:value-of select="/bedework/appvar[key='curListDays']/value"/></xsl:when> 
    1131         <xsl:otherwise><xsl:value-of select="/bedework/defaultdays"/></xsl:otherwise> 
    1132       </xsl:choose> 
    1133     </xsl:variable> 
    11341130    <xsl:variable name="max" select="/bedework/maxdays"/> 
    11351131    <xsl:if test="number($index) &lt; number($max)"> 
    11361132      <option name="listDays($index)"> 
    1137         <xsl:if test="$index = $current"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 
     1133        <xsl:if test="$index = $curListDays"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 
    11381134        <xsl:value-of select="$index"/> 
    11391135      </option> 

  • trunk/deployment/webadmin/webapp/resources/es_ES/default/default.xsl

    r3516 r3519  
    224224  <xsl:variable name="portalFriendly">false</xsl:variable> 
    225225 
     226        <!-- get the current date set by the user, if exists, else use now --> 
     227        <xsl:variable name="curListDate"> 
     228          <xsl:choose> 
     229            <xsl:when test="/bedework/appvar[key='curListDate']/value"><xsl:value-of select="/bedework/appvar[key='curListDate']/value"/></xsl:when> 
     230            <xsl:otherwise><xsl:value-of select="substring(/bedework/now/date,1,4)"/>-<xsl:value-of select="substring(/bedework/now/date,5,2)"/>-<xsl:value-of select="substring(/bedework/now/date,7,2)"/></xsl:otherwise> 
     231          </xsl:choose> 
     232        </xsl:variable> 
     233        <!-- get the current number of days set by the user, if exists, else use default --> 
     234  <xsl:variable name="curListDays"> 
     235    <xsl:choose> 
     236      <xsl:when test="/bedework/appvar[key='curListDays']/value"><xsl:value-of select="/bedework/appvar[key='curListDays']/value"/></xsl:when> 
     237      <xsl:otherwise><xsl:value-of select="/bedework/defaultdays"/></xsl:otherwise> 
     238    </xsl:choose> 
     239  </xsl:variable> 
     240 
    226241  <!--==== MAIN TEMPLATE  ====--> 
    227242  <xsl:template match="/"> 
    …… 
    427442          <xsl:call-template name="jqueryDatepickerDefaults"/> 
    428443           
    429           <!-- get the current date set by the user, if exists, else use now --> 
    430           <xsl:variable name="curListDate"> 
    431             <xsl:choose> 
    432               <xsl:when test="/bedework/appvar[key='curListDate']/value"><xsl:value-of select="/bedework/appvar[key='curListDate']/value"/></xsl:when> 
    433               <xsl:otherwise><xsl:value-of select="substring(/bedework/now/date,1,4)"/>-<xsl:value-of select="number(substring(/bedework/now/date,5,2)) - 1"/>-<xsl:value-of select="substring(/bedework/now/date,7,2)"/></xsl:otherwise> 
    434             </xsl:choose> 
    435           </xsl:variable> 
    436444          <!-- now setup date and time pickers -->   
    437445          <script type="text/javascript"> 
    …… 
    854862      <tr> 
    855863        <td> 
    856           <a href="{$event-initUpdateEvent}&amp;limitdays=true"> 
     864          <a href="{$event-initUpdateEvent}"> 
     865            <xsl:attribute name="href"><xsl:value-of select="$event-initUpdateEvent"/>&amp;start=<xsl:value-of select="$curListDate"/>&amp;days=<xsl:value-of select="$curListDays"/>&amp;limitdays=true</xsl:attribute> 
    857866            <xsl:if test="not(/bedework/currentCalSuite/name)"> 
    858867              <xsl:attribute name="onclick">alert("<xsl:copy-of select="$bwStr-MMnu-YouMustBeOperating"/>");return false;</xsl:attribute> 
    …… 
    10701079        <input id="bwListWidgetStartDate" name="start" size="10" onchange="setListDate(this.form);"/> 
    10711080        <input type="hidden" name="setappvar" id="curListDateHolder"/> 
    1072         <input type="hidden" name="limitdays" id="true"/> 
     1081        <input type="hidden" name="limitdays" value="true"/> 
    10731082        <span id="daysSetterBox"> 
    10741083                <label for="days"><xsl:copy-of select="$bwStr-EvLs-Days"/></label> 
    10751084                <xsl:text> </xsl:text> 
    10761085                <!-- <xsl:value-of select="/bedework/defaultdays"/> --> 
    1077           <select id="days" name="days"> 
     1086          <select id="days" name="days" onchange="setListDate(this.form);"> 
    10781087                  <xsl:call-template name="buildListDays"/> 
    10791088                </select> 
    …… 
    11081117          </xsl:for-each> 
    11091118        </select> 
    1110         <input type="hidden" name="start"> 
    1111           <xsl:attribute name="value"> 
    1112             <xsl:choose> 
    1113               <xsl:when test="/bedework/appvar[key='curListDate']/value"><xsl:value-of select="/bedework/appvar[key='curListDate']/value"/></xsl:when> 
    1114               <xsl:otherwise><xsl:value-of select="substring(/bedework/now/date,1,4)"/>-<xsl:value-of select="number(substring(/bedework/now/date,5,2)) - 1"/>-<xsl:value-of select="substring(/bedework/now/date,7,2)"/></xsl:otherwise> 
    1115             </xsl:choose> 
    1116           </xsl:attribute> 
    1117         </input> 
    1118         <input type="hidden" name="limitdays" id="true"/> 
     1119        <input type="hidden" name="start" value="{$curListDate}"/> 
     1120        <input type="hidden" name="limitdays" value="true"/> 
    11191121        <xsl:if test="/bedework/appvar[key='catFilter'] and /bedework/appvar[key='catFilter']/value != 'none'"> 
    11201122          <input type="submit" value="{$bwStr-EvLs-ClearFilter}" onclick="this.form.setappvar.selectedIndex = 0"/> 
    …… 
    11271129  <xsl:template name="buildListDays"> 
    11281130    <xsl:param name="index">1</xsl:param> 
    1129     <xsl:variable name="current"> 
    1130       <xsl:choose> 
    1131         <xsl:when test="/bedework/appvar[key='curListDays']/value"><xsl:value-of select="/bedework/appvar[key='curListDays']/value"/></xsl:when> 
    1132         <xsl:otherwise><xsl:value-of select="/bedework/defaultdays"/></xsl:otherwise> 
    1133       </xsl:choose> 
    1134     </xsl:variable> 
    11351131    <xsl:variable name="max" select="/bedework/maxdays"/> 
    11361132    <xsl:if test="number($index) &lt; number($max)"> 
    11371133      <option name="listDays($index)"> 
    1138         <xsl:if test="$index = $current"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 
     1134        <xsl:if test="$index = $curListDays"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if> 
    11391135        <xsl:value-of select="$index"/> 
    11401136      </option>