Index: trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css (revision 1151)
+++ trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css (revision 1155)
@@ -676,4 +676,7 @@
 #recurrenceFields #recurrenceTable p {
   margin: 0 0 0.5em 0;
+}
+#recurrenceFields #recurrenceTable p.weekRecurLinks {
+  margin: 1em 0 0.5em 0;
 }
 #recurrenceFields #recurrenceTable .extraByMonthPosFields {
Index: trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (revision 1154)
+++ trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (revision 1155)
@@ -2195,6 +2195,5 @@
           recurring
           <span id="recurrenceUiSwitch" class="invisible">
-            <input type="radio" name="recurrenceUiSwitch" value="simple"/>simple
-            <input type="radio" name="recurrenceUiSwitch" value="advanced" checked="checked"/>advanced
+            <input type="checkbox" name="recurrenceUiSwitch" value="simple" onchange="swapVisible(this,'advancedRecurrenceRules')"/>show advanced recurrence rules
           </span>
 
@@ -2226,123 +2225,125 @@
                     <p>does not recur</p>
                   </div>
-                  <!-- hourly -->
-                  <div id="hourlyRecurrenceRules" class="invisible">
-                    <strong>Interval:</strong>
-                    every <input type="text" name="hourlyInterval" size="2" value="1"/> hour(s)
-                  </div>
-                  <!-- daily -->
-                  <div id="dailyRecurrenceRules" class="invisible">
-                    <p>
+                  <span id="advancedRecurrenceRules" class="invisible">
+                    <!-- hourly -->
+                    <div id="hourlyRecurrenceRules" class="invisible">
                       <strong>Interval:</strong>
-                      every <input type="text" name="dailyInterval" size="2" value="1"/> day(s)
-                    </p>
-                  </div>
-                  <!-- weekly -->
-                  <div id="weeklyRecurrenceRules" class="invisible">
-                    <p>
-                      <strong>Interval:</strong>
-                      every <input type="text" name="weeklyInterval" size="2" value="1"/> week(s) on:<br/>
-                    </p>
-                    <p>
-                      <div id="weekRecurFields">
-                        <xsl:call-template name="byDayChkBoxList">
-                          <xsl:with-param name="name">byDayWeek</xsl:with-param>
+                      every <input type="text" name="hourlyInterval" size="2" value="1"/> hour(s)
+                    </div>
+                    <!-- daily -->
+                    <div id="dailyRecurrenceRules" class="invisible">
+                      <p>
+                        <strong>Interval:</strong>
+                        every <input type="text" name="dailyInterval" size="2" value="1"/> day(s)
+                      </p>
+                    </div>
+                    <!-- weekly -->
+                    <div id="weeklyRecurrenceRules" class="invisible">
+                      <p>
+                        <strong>Interval:</strong>
+                        every <input type="text" name="weeklyInterval" size="2" value="1"/> week(s) on:<br/>
+                      </p>
+                      <p>
+                        <div id="weekRecurFields">
+                          <xsl:call-template name="byDayChkBoxList">
+                            <xsl:with-param name="name">byDayWeek</xsl:with-param>
+                          </xsl:call-template>
+                        </div>
+                      </p>
+                      <p class="weekRecurLinks">
+                        <a href="javascript:recurSelectWeekdays('weekRecurFields')">select weekdays</a> |
+                        <a href="javascript:recurSelectWeekends('weekRecurFields')">select weekends</a>
+                      </p>
+                    </div>
+                    <!-- monthly -->
+                    <div id="monthlyRecurrenceRules" class="invisible">
+                      <p>
+                        <strong>Interval:</strong>
+                        every <input type="text" name="monthlyInterval" size="2" value="1"/> month(s)
+                      </p>
+                      <div id="monthRecurFields">
+                        <div id="monthRecurFields1">
+                          on
+                          <select name="bymonthposPos1" width="7em" onchange="changeClass('monthRecurFields2','shown')">
+                            <xsl:call-template name="recurrenceDayPosOptions"/>
+                          </select>
+                          <xsl:call-template name="byDayChkBoxList"/>
+                        </div>
+                        <xsl:call-template name="buildRecurFields">
+                          <xsl:with-param name="current">2</xsl:with-param>
+                          <xsl:with-param name="total">10</xsl:with-param>
+                          <xsl:with-param name="name">month</xsl:with-param>
                         </xsl:call-template>
                       </div>
-                    </p>
-                    <p align="right">
-                      <a href="javascript:recurSelectWeekdays('weekRecurFields')">select weekdays</a> |
-                      <a href="javascript:recurSelectWeekends('weekRecurFields')">select weekends</a>
-                    </p>
-                  </div>
-                  <!-- monthly -->
-                  <div id="monthlyRecurrenceRules" class="invisible">
-                    <p>
+                      <p>
+                        <input type="checkbox" name="swapMonthDaysCheckBoxList" value="" onclick="swapVisible(this,'monthDaysCheckBoxList')"/>
+                        on these days:<br/>
+                        <div id="monthDaysCheckBoxList" class="invisible">
+                          <xsl:call-template name="buildCheckboxList">
+                            <xsl:with-param name="current">1</xsl:with-param>
+                            <xsl:with-param name="end">31</xsl:with-param>
+                            <xsl:with-param name="name">monthDayBoxes</xsl:with-param>
+                          </xsl:call-template>
+                        </div>
+                      </p>
+                    </div>
+                    <!-- yearly -->
+                    <div id="yearlyRecurrenceRules" class="invisible">
                       <strong>Interval:</strong>
-                      every <input type="text" name="monthlyInterval" size="2" value="1"/> month(s)
-                    </p>
-                    <div id="monthRecurFields">
-                      <div id="monthRecurFields1">
-                        on
-                        <select name="bymonthposPos1" width="7em" onchange="changeClass('monthRecurFields2','shown')">
-                          <xsl:call-template name="recurrenceDayPosOptions"/>
-                        </select>
-                        <xsl:call-template name="byDayChkBoxList"/>
-                      </div>
-                      <xsl:call-template name="buildRecurFields">
-                        <xsl:with-param name="current">2</xsl:with-param>
-                        <xsl:with-param name="total">10</xsl:with-param>
-                        <xsl:with-param name="name">month</xsl:with-param>
-                      </xsl:call-template>
-                    </div>
-                    <p>
-                      <input type="checkbox" name="swapMonthDaysCheckBoxList" value="" onclick="swapVisible(this,'monthDaysCheckBoxList')"/>
-                      on these days:<br/>
-                      <div id="monthDaysCheckBoxList" class="invisible">
-                        <xsl:call-template name="buildCheckboxList">
-                          <xsl:with-param name="current">1</xsl:with-param>
-                          <xsl:with-param name="end">31</xsl:with-param>
-                          <xsl:with-param name="name">monthDayBoxes</xsl:with-param>
+                      every <input type="text" name="yearlyInterval" size="2" value="1"/> years(s)<br/>
+                      <div id="yearRecurFields">
+                        <div id="yearRecurFields1">
+                          on
+                          <select name="byyearposPos1" width="7em" onchange="changeClass('yearRecurFields2','shown')">
+                            <xsl:call-template name="recurrenceDayPosOptions"/>
+                          </select>
+                          <xsl:call-template name="byDayChkBoxList"/>
+                        </div>
+                        <xsl:call-template name="buildRecurFields">
+                          <xsl:with-param name="current">2</xsl:with-param>
+                          <xsl:with-param name="total">10</xsl:with-param>
+                          <xsl:with-param name="name">year</xsl:with-param>
                         </xsl:call-template>
                       </div>
-                    </p>
-                  </div>
-                  <!-- yearly -->
-                  <div id="yearlyRecurrenceRules" class="invisible">
-                    <strong>Interval:</strong>
-                    every <input type="text" name="yearlyInterval" size="2" value="1"/> years(s)<br/>
-                    <div id="yearRecurFields">
-                      <div id="yearRecurFields1">
-                        on
-                        <select name="byyearposPos1" width="7em" onchange="changeClass('yearRecurFields2','shown')">
-                          <xsl:call-template name="recurrenceDayPosOptions"/>
-                        </select>
-                        <xsl:call-template name="byDayChkBoxList"/>
-                      </div>
-                      <xsl:call-template name="buildRecurFields">
-                        <xsl:with-param name="current">2</xsl:with-param>
-                        <xsl:with-param name="total">10</xsl:with-param>
-                        <xsl:with-param name="name">year</xsl:with-param>
-                      </xsl:call-template>
+                      <p>
+                        <input type="checkbox" name="swapYearMonthCheckBoxList" value="" onclick="swapVisible(this,'yearMonthCheckBoxList')"/>
+                        in these months:
+                        <div id="yearMonthCheckBoxList" class="invisible">
+                          <xsl:for-each select="/bedework/monthlabels/val">
+                            <xsl:variable name="pos"><xsl:value-of select="position()"/></xsl:variable>
+                            <span class="chkBoxListItem">
+                              <input type="checkbox" name="yearMonths">
+                                <xsl:attribute name="value"><xsl:value-of select="/bedework/monthvalues/val[position() = $pos]"/></xsl:attribute>
+                              </input>
+                              <xsl:value-of select="."/>
+                            </span>
+                            <xsl:if test="$pos mod 6 = 0"><br/></xsl:if>
+                          </xsl:for-each>
+                        </div>
+                      </p>
+                      <p>
+                        <input type="checkbox" name="swapYearMonthDaysCheckBoxList" value="" onclick="swapVisible(this,'yearMonthDaysCheckBoxList')"/>
+                        on these days of the month:<br/>
+                        <div id="yearMonthDaysCheckBoxList" class="invisible">
+                          <xsl:call-template name="buildCheckboxList">
+                            <xsl:with-param name="current">1</xsl:with-param>
+                            <xsl:with-param name="end">31</xsl:with-param>
+                            <xsl:with-param name="name">yearMonthDayBoxes</xsl:with-param>
+                          </xsl:call-template>
+                        </div>
+                      </p>
+                      <p>
+                        <input type="checkbox" name="swapYearDaysCheckBoxList" value="" onclick="swapVisible(this,'yearDaysCheckBoxList')"/>
+                        on these days of the year:<br/>
+                        <div id="yearDaysCheckBoxList" class="invisible">
+                          <xsl:call-template name="buildCheckboxList">
+                            <xsl:with-param name="current">1</xsl:with-param>
+                            <xsl:with-param name="end">366</xsl:with-param>
+                            <xsl:with-param name="name">yearDayBoxes</xsl:with-param>
+                          </xsl:call-template>
+                        </div>
+                      </p>
                     </div>
-                    <p>
-                      <input type="checkbox" name="swapYearMonthCheckBoxList" value="" onclick="swapVisible(this,'yearMonthCheckBoxList')"/>
-                      in these months:
-                      <div id="yearMonthCheckBoxList" class="invisible">
-                        <xsl:for-each select="/bedework/monthlabels/val">
-                          <xsl:variable name="pos"><xsl:value-of select="position()"/></xsl:variable>
-                          <span class="chkBoxListItem">
-                            <input type="checkbox" name="yearMonths">
-                              <xsl:attribute name="value"><xsl:value-of select="/bedework/monthvalues/val[position() = $pos]"/></xsl:attribute>
-                            </input>
-                            <xsl:value-of select="."/>
-                          </span>
-                          <xsl:if test="$pos mod 6 = 0"><br/></xsl:if>
-                        </xsl:for-each>
-                      </div>
-                    </p>
-                    <p>
-                      <input type="checkbox" name="swapYearMonthDaysCheckBoxList" value="" onclick="swapVisible(this,'yearMonthDaysCheckBoxList')"/>
-                      on these days of the month:<br/>
-                      <div id="yearMonthDaysCheckBoxList" class="invisible">
-                        <xsl:call-template name="buildCheckboxList">
-                          <xsl:with-param name="current">1</xsl:with-param>
-                          <xsl:with-param name="end">31</xsl:with-param>
-                          <xsl:with-param name="name">yearMonthDayBoxes</xsl:with-param>
-                        </xsl:call-template>
-                      </div>
-                    </p>
-                    <p>
-                      <input type="checkbox" name="swapYearDaysCheckBoxList" value="" onclick="swapVisible(this,'yearDaysCheckBoxList')"/>
-                      on these days of the year:<br/>
-                      <div id="yearDaysCheckBoxList" class="invisible">
-                        <xsl:call-template name="buildCheckboxList">
-                          <xsl:with-param name="current">1</xsl:with-param>
-                          <xsl:with-param name="end">366</xsl:with-param>
-                          <xsl:with-param name="name">yearDayBoxes</xsl:with-param>
-                        </xsl:call-template>
-                      </div>
-                    </p>
-                  </div>
+                  </span>
                 </td>
               </tr>
Index: trunk/deployment/webuser/webapp/resources/demoskins/resources/includes.js
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/resources/includes.js (revision 1154)
+++ trunk/deployment/webuser/webapp/resources/demoskins/resources/includes.js (revision 1155)
@@ -182,24 +182,52 @@
           var monthByDayId = 'monthRecurFields' + i;
           var byday = new Array();
-          var bymonthday = new Array;
+          var bymonthday = new Array();
+          var byyearday = new Array();
           // get the byday values
           while (document.getElementById(monthByDayId)) {
             var monthFields = document.getElementById(monthByDayId);
-            var monthPosSelect = monthFields.getElementsByTagName('select');
-            var monthPos = monthPosSelect[0][monthPosSelect[0].selectedIndex].value;
-            if (monthPos) {
-              byday = collectRecurChkBoxVals(byday,monthFields.getElementsByTagName('input'),monthPos);
+            var dayPosSelect = monthFields.getElementsByTagName('select');
+            var dayPos = dayPosSelect[0][dayPosSelect[0].selectedIndex].value;
+            if (dayPos) {
+              byday = collectRecurChkBoxVals(byday,monthFields.getElementsByTagName('input'),dayPos);
             }
             monthByDayId = monthByDayId.substring(0,monthByDayId.length-1) + ++i;
           }
-          // get the bymonthdayvalues
+          // get the bymonthday values
           bymonthday = collectRecurChkBoxVals(bymonthday,document.getElementById('monthDaysCheckBoxList').getElementsByTagName('input'),false);
           // set the form values
+          formObj.byday.value = byday.join(',');
           formObj.bymonthday.value = bymonthday.join(',');
+          formObj.interval.value = formObj.monthlyInterval.value;
+          break;
+        case "YEARLY":
+          var i = 1;
+          var yearByDayId = 'yearRecurFields' + i;
+          var byday = new Array();
+          var bymonthday = new Array();
+          var bymonth = new Array();
+          var byyearday = new Array();
+          // get the byday values
+          while (document.getElementById(yearByDayId)) {
+            var yearFields = document.getElementById(yearByDayId);
+            var dayPosSelect = yearFields.getElementsByTagName('select');
+            var dayPos = dayPosSelect[0][dayPosSelect[0].selectedIndex].value;
+            if (dayPos) {
+              byday = collectRecurChkBoxVals(byday,yearFields.getElementsByTagName('input'),dayPos);
+            }
+            yearByDayId = yearByDayId.substring(0,yearByDayId.length-1) + ++i;
+          }
+          // get the bymonth values
+          bymonth = collectRecurChkBoxVals(bymonth,document.getElementById('yearMonthCheckBoxList').getElementsByTagName('input'),false);
+          // get the bymonthday values
+          bymonthday = collectRecurChkBoxVals(bymonthday,document.getElementById('yearMonthDaysCheckBoxList').getElementsByTagName('input'),false);
+          // get the byyearday values
+          byyearday = collectRecurChkBoxVals(byyearday,document.getElementById('yearDaysCheckBoxList').getElementsByTagName('input'),false);
+
+          // set the form values
           formObj.byday.value = byday.join(',');
-          alert(formObj.monthlyInterval);
-          formObj.interval.value = formObj.monthlyInterval.value;
-          break;
-        case "YEARLY":
+          formObj.bymonth.value = bymonth.join(',');
+          formObj.bymonthday.value = bymonthday.join(',');
+          formObj.byyearday.value = byyearday.join(',');
           formObj.interval.value = formObj.yearlyInterval.value;
           break;
@@ -223,5 +251,5 @@
     }
   }
-  alert("frequency: " + freq + "\ninterval: " + formObj.interval.value + "\ncount: " + formObj.count.value + "\nuntil: " + formObj.until.value + "\nbyday: " + formObj.byday.value + "\nbymonthday" + formObj.bymonthday.value + "\nbymonth" + formObj.bymonth.value + "\nbyyearday" + formObj.byyearday.value + "\n");
+  //alert("frequency: " + freq + "\ninterval: " + formObj.interval.value + "\ncount: " + formObj.count.value + "\nuntil: " + formObj.until.value + "\nbyday: " + formObj.byday.value + "\nbymonthday: " + formObj.bymonthday.value + "\nbymonth: " + formObj.bymonth.value + "\nbyyearday: " + formObj.byyearday.value + "\n");
   return true;
 }
@@ -234,11 +262,11 @@
 }
 // returns an array of collected checkbox values
-function collectRecurChkBoxVals(valArray,chkBoxes,monthPos) {
+function collectRecurChkBoxVals(valArray,chkBoxes,dayPos) {
   if (chkBoxes) {
     if (typeof chkBoxes.length != 'undefined') {
       for (i = 0; i < chkBoxes.length; i++) {
         if (chkBoxes[i].checked == true) {
-          if (monthPos) {
-            valArray.push(monthPos + chkBoxes[i].value);
+          if (dayPos) {
+            valArray.push(dayPos + chkBoxes[i].value);
           } else {
             valArray.push(chkBoxes[i].value);