Index: trunk/deployment/webadmin/webapp/resources/default/default/default.xsl
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (revision 3591)
+++ trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (revision 3592)
@@ -1582,17 +1582,17 @@
               </xsl:choose>
             </xsl:variable>
-            <xsl:choose>
-              <xsl:when test="form/allDay/input/@checked='checked'">
-                <input type="checkbox" name="allDayFlag" onclick="swapAllDayEvent(this)" value="on" checked="checked"/>
-                <input type="hidden" name="eventStartDate.dateOnly" value="on" id="allDayStartDateField"/>
-                <input type="hidden" name="eventEndDate.dateOnly" value="on" id="allDayEndDateField"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <input type="checkbox" name="allDayFlag" onclick="swapAllDayEvent(this)" value="off"/>
-                <input type="hidden" name="eventStartDate.dateOnly" value="off" id="allDayStartDateField"/>
-                <input type="hidden" name="eventEndDate.dateOnly" value="off" id="allDayEndDateField"/>
-              </xsl:otherwise>
-            </xsl:choose>
-            <xsl:copy-of select="$bwStr-AEEF-AllDay"/>
+            
+            <!-- All day flag -->
+            <input type="checkbox" name="allDayFlag" id="allDayFlag" onclick="swapAllDayEvent(this)" value="off">
+              <xsl:if test="form/allDay/input/@checked='checked'">
+                <xsl:attribute name="checked">checked</xsl:attribute>
+                <xsl:attribute name="value">on</xsl:attribute>
+              </xsl:if>
+            </input>
+            <input type="hidden" name="eventStartDate.dateOnly" value="on" id="allDayStartDateField"/>
+            <input type="hidden" name="eventEndDate.dateOnly" value="on" id="allDayEndDateField"/>
+            <label for="allDayFlag">
+              <xsl:copy-of select="$bwStr-AEEF-AllDay"/>
+            </label>
 
             <!-- floating event: no timezone (and not UTC) -->
@@ -1600,17 +1600,15 @@
                  (e.g. from import); to restore this field, remove the if  -->
             <xsl:if test="form/floating/input/@checked='checked'">
-              <xsl:choose>
-                <xsl:when test="form/floating/input/@checked='checked'">
-                  <input type="checkbox" name="floatingFlag" id="floatingFlag" onclick="swapFloatingTime(this)" value="on" checked="checked"/>
-                  <input type="hidden" name="eventStartDate.floating" value="on" id="startFloating"/>
-                  <input type="hidden" name="eventEndDate.floating" value="on" id="endFloating"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <input type="checkbox" name="floatingFlag" id="floatingFlag" onclick="swapFloatingTime(this)" value="off"/>
-                  <input type="hidden" name="eventStartDate.floating" value="off" id="startFloating"/>
-                  <input type="hidden" name="eventEndDate.floating" value="off" id="endFloating"/>
-                </xsl:otherwise>
-              </xsl:choose>
-              <xsl:copy-of select="$bwStr-AEEF-Floating"/>
+              <input type="checkbox" name="floatingFlag" id="floatingFlag" onclick="swapFloatingTime(this)" value="off">
+	              <xsl:if test="form/floating/input/@checked='checked'">
+	                <xsl:attribute name="checked">checked</xsl:attribute>
+	                <xsl:attribute name="value">on</xsl:attribute>
+	              </xsl:if>
+              </input>
+              <input type="hidden" name="eventStartDate.floating" value="off" id="startFloating"/>
+              <input type="hidden" name="eventEndDate.floating" value="off" id="endFloating"/>
+              <label for="floatingFlag">
+                <xsl:copy-of select="$bwStr-AEEF-Floating"/>
+              </label>
             </xsl:if>
 
@@ -1620,16 +1618,12 @@
                  to restore this field, remove the if -->
             <xsl:if test="form/storeUTC/input/@checked='checked'">
-              <xsl:choose>
-                <xsl:when test="form/storeUTC/input/@checked='checked'">
-                  <input type="checkbox" name="storeUTCFlag" id="storeUTCFlag" onclick="swapStoreUTC(this)" value="on" checked="checked"/>
-                  <input type="hidden" name="eventStartDate.storeUTC" value="on" id="startStoreUTC"/>
-                  <input type="hidden" name="eventEndDate.storeUTC" value="on" id="endStoreUTC"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <input type="checkbox" name="storeUTCFlag" id="storeUTCFlag" onclick="swapStoreUTC(this)" value="off"/>
-                  <input type="hidden" name="eventStartDate.storeUTC" value="off" id="startStoreUTC"/>
-                  <input type="hidden" name="eventEndDate.storeUTC" value="off" id="endStoreUTC"/>
-                </xsl:otherwise>
-              </xsl:choose>
+              <input type="checkbox" name="storeUTCFlag" id="storeUTCFlag" onclick="swapStoreUTC(this)" value="off">
+                <xsl:if test="form/storeUTC/input/@checked='checked'">
+                  <xsl:attribute name="checked">checked</xsl:attribute>
+                  <xsl:attribute name="value">on</xsl:attribute>
+                </xsl:if>
+              </input>
+              <input type="hidden" name="eventStartDate.storeUTC" value="off" id="startStoreUTC"/>
+              <input type="hidden" name="eventEndDate.storeUTC" value="off" id="endStoreUTC"/>
               <xsl:copy-of select="$bwStr-AEEF-StoreAsUTC"/>
             </xsl:if>
@@ -1721,5 +1715,7 @@
                 </xsl:otherwise>
               </xsl:choose>
-              <xsl:copy-of select="$bwStr-AEEF-Date"/>
+              <label for="bwEndDateTimeButton">
+                <xsl:copy-of select="$bwStr-AEEF-Date"/>
+              </label>
               <xsl:variable name="endDateTimeClass">
                 <xsl:choose>
@@ -1808,11 +1804,13 @@
                 <xsl:choose>
                   <xsl:when test="form/end/type='D'">
-                    <input type="radio" name="eventEndType" value="D" checked="checked" onclick="changeClass('endDateTime','invisible');changeClass('endDuration','shown');"/>
+                    <input type="radio" name="eventEndType" id="bwEndDurationButton" value="D" checked="checked" onclick="changeClass('endDateTime','invisible');changeClass('endDuration','shown');"/>
                   </xsl:when>
                   <xsl:otherwise>
-                    <input type="radio" name="eventEndType" value="D" onclick="changeClass('endDateTime','invisible');changeClass('endDuration','shown');"/>
+                    <input type="radio" name="eventEndType" id="bwEndDurationButton" value="D" onclick="changeClass('endDateTime','invisible');changeClass('endDuration','shown');"/>
                   </xsl:otherwise>
                 </xsl:choose>
-                <xsl:copy-of select="$bwStr-AEEF-Duration"/>
+                <label for="bwEndDurationButton">
+                  <xsl:copy-of select="$bwStr-AEEF-Duration"/>
+                </label>
                 <xsl:variable name="endDurationClass">
                   <xsl:choose>
@@ -1882,11 +1880,13 @@
                 <xsl:choose>
                   <xsl:when test="form/end/type='N'">
-                    <input type="radio" name="eventEndType" value="N" checked="checked" onclick="changeClass('endDateTime','invisible');changeClass('endDuration','invisible');"/>
+                    <input type="radio" name="eventEndType" id="bwEndNoneButton" value="N" checked="checked" onclick="changeClass('endDateTime','invisible');changeClass('endDuration','invisible');"/>
                   </xsl:when>
                   <xsl:otherwise>
-                    <input type="radio" name="eventEndType" value="N" onclick="changeClass('endDateTime','invisible');changeClass('endDuration','invisible');"/>
+                    <input type="radio" name="eventEndType" id="bwEndNoneButton" value="N" onclick="changeClass('endDateTime','invisible');changeClass('endDuration','invisible');"/>
                   </xsl:otherwise>
                 </xsl:choose>
-                <xsl:copy-of select="$bwStr-AEEF-ThisEventHasNoDurationEndDate"/>
+                <label for="bwEndNoneButton">
+                  <xsl:copy-of select="$bwStr-AEEF-ThisEventHasNoDurationEndDate"/>
+                </label>
               </div>
             </div>
@@ -1949,10 +1949,16 @@
 		                  <xsl:if test="$canEdit = 'false'"><xsl:attribute name="class">invisible</xsl:attribute></xsl:if>
 		                  <!-- set or remove "recurring" and show or hide all recurrence fields: -->
-		                  <input type="radio" name="recurring" value="true" onclick="swapRecurrence(this)">
+		                  <input type="radio" name="recurring" id="bwRecurringOnButton" value="true" onclick="swapRecurrence(this)">
 		                    <xsl:if test="form/recurringEntity = 'true'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if>
-		                  </input><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-AEEF-EventRecurs"/>
-		                  <input type="radio" name="recurring" value="false" onclick="swapRecurrence(this)">
+		                  </input>
+		                  <label for="bwRecurringOnButton">
+		                    <xsl:copy-of select="$bwStr-AEEF-EventRecurs"/>
+		                  </label>
+		                  <input type="radio" name="recurring" id="bwRecurringOffButton" value="false" onclick="swapRecurrence(this)">
 		                    <xsl:if test="form/recurringEntity = 'false'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if>
-		                  </input><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-AEEF-EventDoesNotRecur"/>
+		                  </input>
+		                  <label for="bwRecurringOffButton">
+		                    <xsl:copy-of select="$bwStr-AEEF-EventDoesNotRecur"/>
+		                  </label>
 		                </div>
 		              </xsl:when>
@@ -1985,6 +1991,8 @@
                       <xsl:attribute name="class">invisible</xsl:attribute>
                     </xsl:if>
-                    <input type="checkbox" name="rrulesUiSwitch" value="advanced" onchange="swapVisible(this,'advancedRrules')"/>
-                    <xsl:copy-of select="$bwStr-AEEF-ShowAdvancedRecurrenceRules"/>
+                    <input type="checkbox" name="rrulesUiSwitch" id="bwRrulesAdvancedButton" value="advanced" onchange="swapVisible(this,'advancedRrules')"/>
+                    <label for="bwRrulesAdvancedButton">
+                      <xsl:copy-of select="$bwStr-AEEF-ShowAdvancedRecurrenceRules"/>
+                    </label>
                   </span>
 
@@ -2132,10 +2140,25 @@
                       <td id="recurrenceFrequency" rowspan="2">
                         <em><xsl:copy-of select="$bwStr-AEEF-Frequency"/></em><br/>
-                        <input type="radio" name="freq" value="NONE" onclick="showRrules(this.value)" checked="checked"/><xsl:copy-of select="$bwStr-AEEF-None"/><br/>
+                        <input type="radio" name="freq" id="bwFreqNone" value="NONE" onclick="showRrules(this.value)" checked="checked"/>
+                        <label for="bwFreqNone">
+                          <xsl:copy-of select="$bwStr-AEEF-None"/>
+                        </label><br/>
                         <!--<input type="radio" name="freq" value="HOURLY" onclick="showRrules(this.value)"/>hourly<br/>-->
-                        <input type="radio" name="freq" value="DAILY" onclick="showRrules(this.value)"/><xsl:copy-of select="$bwStr-AEEF-Daily"/><br/>
-                        <input type="radio" name="freq" value="WEEKLY" onclick="showRrules(this.value)"/><xsl:copy-of select="$bwStr-AEEF-Weekly"/><br/>
-                        <input type="radio" name="freq" value="MONTHLY" onclick="showRrules(this.value)"/><xsl:copy-of select="$bwStr-AEEF-Monthly"/><br/>
-                        <input type="radio" name="freq" value="YEARLY" onclick="showRrules(this.value)"/><xsl:copy-of select="$bwStr-AEEF-Yearly"/>
+                        <input type="radio" name="freq" id="bwFreqDaily" value="DAILY" onclick="showRrules(this.value)"/>
+                        <label for="bwFreqDaily">
+                          <xsl:copy-of select="$bwStr-AEEF-Daily"/>
+                        </label><br/>
+                        <input type="radio" name="freq" id="bwFreqWeekly" value="WEEKLY" onclick="showRrules(this.value)"/>
+                        <label for="bwFreqWeekly">
+                          <xsl:copy-of select="$bwStr-AEEF-Weekly"/>
+                        </label><br/>
+                        <input type="radio" name="freq" id="bwFreqMonthly" value="MONTHLY" onclick="showRrules(this.value)"/>
+                        <label for="bwFreqMonthly">
+                          <xsl:copy-of select="$bwStr-AEEF-Monthly"/>
+                        </label><br/>
+                        <input type="radio" name="freq" id="bwFreqYearly" value="YEARLY" onclick="showRrules(this.value)"/>
+                        <label for="bwFreqYearly">
+                          <xsl:copy-of select="$bwStr-AEEF-Yearly"/>
+                        </label>
                       </td>
                       <!-- recurrence count, until, forever -->
@@ -2565,13 +2588,22 @@
             <span>
               <xsl:if test="$canEdit = 'false'"><xsl:attribute name="class">invisible</xsl:attribute></xsl:if>
-              <input type="radio" name="eventStatus" value="CONFIRMED" checked="checked">
+              <input type="radio" name="eventStatus" id="bwStatusConfirmedButton" value="CONFIRMED" checked="checked">
                 <xsl:if test="form/status = 'CONFIRMED'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if>
-              </input><xsl:copy-of select="$bwStr-AEEF-Confirmed"/>
-              <input type="radio" name="eventStatus" value="TENTATIVE">
+              </input>
+              <label for="bwStatusConfirmedButton">
+                <xsl:copy-of select="$bwStr-AEEF-Confirmed"/>
+              </label>
+              <input type="radio" name="eventStatus" id="bwStatusTentativeButton" value="TENTATIVE">
                 <xsl:if test="form/status = 'TENTATIVE'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if>
-              </input><xsl:copy-of select="$bwStr-AEEF-Tentative"/>
-              <input type="radio" name="eventStatus" value="CANCELLED">
+              </input>
+              <label for="bwStatusTentativeButton">
+                <xsl:copy-of select="$bwStr-AEEF-Tentative"/>
+              </label>
+              <input type="radio" name="eventStatus" id="bwStatusCancelledButton" value="CANCELLED">
                 <xsl:if test="form/status = 'CANCELLED'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if>
-              </input><xsl:copy-of select="$bwStr-AEEF-Canceled"/>
+              </input>
+              <label for="bwStatusCancelledButton">
+                <xsl:copy-of select="$bwStr-AEEF-Canceled"/>
+              </label>
             </span>
             <xsl:if test="$canEdit = 'false'">
@@ -2747,16 +2779,20 @@
                    locations exist -->
               <xsl:if test="form/location/preferred/select/option">
-                <input type="radio" name="toggleLocationLists" value="preferred" onclick="changeClass('bwPreferredLocationList','shown');changeClass('bwAllLocationList','invisible');">
+                <input type="radio" name="toggleLocationLists" id="bwLocationPreferredButton" value="preferred" onclick="changeClass('bwPreferredLocationList','shown');changeClass('bwAllLocationList','invisible');">
                   <xsl:if test="form/location/preferred/select/option and not(form/location/all/select/option/@selected and not(form/location/preferred/select/option/@selected))">
                     <xsl:attribute name="checked">checked</xsl:attribute>
                   </xsl:if>
                 </input>
-                <xsl:copy-of select="$bwStr-AEEF-Preferred"/>
-                <input type="radio" name="toggleLocationLists" value="all" onclick="changeClass('bwPreferredLocationList','invisible');changeClass('bwAllLocationList','shown');">
+                <label for="bwLocationPreferredButton">
+                  <xsl:copy-of select="$bwStr-AEEF-Preferred"/>
+                </label>
+                <input type="radio" name="toggleLocationLists" id="bwLocationAllButton" value="all" onclick="changeClass('bwPreferredLocationList','invisible');changeClass('bwAllLocationList','shown');">
                   <xsl:if test="form/location/all/select/option/@selected and not(form/location/preferred/select/option/@selected)">
                     <xsl:attribute name="checked">checked</xsl:attribute>
                   </xsl:if>
                 </input>
-                <xsl:copy-of select="$bwStr-AEEF-All"/>
+                <label for="bwLocationAllButton">
+                  <xsl:copy-of select="$bwStr-AEEF-All"/>
+                </label>
               </xsl:if>
             </span>
@@ -2834,16 +2870,20 @@
                    contacts exist -->
               <xsl:if test="form/contact/preferred/select/option">
-                <input type="radio" name="toggleContactLists" value="preferred" onclick="changeClass('bwPreferredContactList','shown');changeClass('bwAllContactList','invisible');">
+                <input type="radio" name="toggleContactLists" id="bwContactPreferredButton" value="preferred" onclick="changeClass('bwPreferredContactList','shown');changeClass('bwAllContactList','invisible');">
                   <xsl:if test="form/contact/preferred/select/option and not(form/contact/all/select/option/@selected and not(form/contact/preferred/select/option/@selected))">
                     <xsl:attribute name="checked">checked</xsl:attribute>
                   </xsl:if>
                 </input>
-                <xsl:copy-of select="$bwStr-AEEF-Preferred"/>
-                <input type="radio" name="toggleContactLists" value="all" onclick="changeClass('bwPreferredContactList','invisible');changeClass('bwAllContactList','shown');">
+                <label for="bwContactPreferredButton">
+                  <xsl:copy-of select="$bwStr-AEEF-Preferred"/>
+                </label>
+                <input type="radio" name="toggleContactLists" id="bwContactAllButton" value="all" onclick="changeClass('bwPreferredContactList','invisible');changeClass('bwAllContactList','shown');">
                   <xsl:if test="form/contact/all/select/option/@selected and not(form/contact/preferred/select/option/@selected)">
                     <xsl:attribute name="checked">checked</xsl:attribute>
                   </xsl:if>
                 </input>
-                <xsl:copy-of select="$bwStr-AEEF-All"/>
+                <label for="bwContactAllButton">
+                  <xsl:copy-of select="$bwStr-AEEF-All"/>
+                </label>
               </xsl:if>
             </span>