Index: releases/bedework-3.8/deployment/webadmin/webapp/resources/default/default/default.xsl
===================================================================
--- releases/bedework-3.8/deployment/webadmin/webapp/resources/default/default/default.xsl (revision 3549)
+++ releases/bedework-3.8/deployment/webadmin/webapp/resources/default/default/default.xsl (revision 3558)
@@ -6538,4 +6538,6 @@
                 <xsl:copy-of select="$bwStr-CSPf-DefaultViewModeList"/>
               </option>
+              <!-- GRID is not yet available - needs to be restored in public client -->
+              <!-- 
               <option value="grid">
                 <xsl:if test="/bedework/prefs/defaultViewMode = 'grid'">
@@ -6544,4 +6546,5 @@
                 <xsl:copy-of select="$bwStr-CSPf-DefaultViewModeGrid"/>
               </option>
+              -->
             </select>
           </td>
Index: releases/bedework-3.8/deployment/webadmin/webapp/resources/default/default/strings.xsl
===================================================================
--- releases/bedework-3.8/deployment/webadmin/webapp/resources/default/default/strings.xsl (revision 3534)
+++ releases/bedework-3.8/deployment/webadmin/webapp/resources/default/default/strings.xsl (revision 3558)
@@ -791,8 +791,8 @@
   <xsl:variable name="bwStr-CSPf-CalSuite">Calendar Suite:</xsl:variable>
   <xsl:variable name="bwStr-CSPf-PreferredView">Preferred view:</xsl:variable>
-  <xsl:variable name="bwStr-CSPf-DefaultViewMode">Preferred view mode:</xsl:variable>
-  <xsl:variable name="bwStr-CSPf-DefaultViewModeList">LIST (a list of discrete events from now into the future)</xsl:variable>
-  <xsl:variable name="bwStr-CSPf-DefaultViewModeDaily">DAILY (a list of events grouped by date showing entire view period)</xsl:variable>
-  <xsl:variable name="bwStr-CSPf-DefaultViewModeGrid">GRID (calendar grid - in week and month view periods)</xsl:variable>
+  <xsl:variable name="bwStr-CSPf-DefaultViewMode">Default view mode:</xsl:variable>
+  <xsl:variable name="bwStr-CSPf-DefaultViewModeList">UPCOMING - a list of discrete events from now into the future</xsl:variable>
+  <xsl:variable name="bwStr-CSPf-DefaultViewModeDaily">DAY, WEEK, MONTH - a list of events showing entire view period</xsl:variable>
+  <xsl:variable name="bwStr-CSPf-DefaultViewModeGrid">GRID - calendar grid for week and month view periods</xsl:variable>
   <xsl:variable name="bwStr-CSPf-PreferredViewPeriod">Preferred view period:</xsl:variable>
   <xsl:variable name="bwStr-CSPf-Day">day</xsl:variable>
Index: releases/bedework-3.8/deployment/webadmin/webapp/resources/es_ES/default/default.xsl
===================================================================
--- releases/bedework-3.8/deployment/webadmin/webapp/resources/es_ES/default/default.xsl (revision 3549)
+++ releases/bedework-3.8/deployment/webadmin/webapp/resources/es_ES/default/default.xsl (revision 3558)
@@ -1109,4 +1109,5 @@
           <option value="catFilter(none)"><xsl:copy-of select="$bwStr-EvLs-SelectCategory"/></option>
           <xsl:for-each select="/bedework/events//event/categories//category[generate-id() = generate-id(key('catUid',uid)[1])]">
+            <xsl:sort order="ascending" select="value"/>
             <xsl:variable name="uid" select="uid"/>
             <option value="catFilter({$uid})">
@@ -1367,5 +1368,5 @@
             </a><xsl:text> </xsl:text>
             (<a href="mailto:{$submitterEmail}?subject=[Event%20Submission] {$eventTitle}" title="Email {$submitterEmail}">
-              <img src="{$resourcesRoot}/resources/email.gif" border="0"/>
+              <img src="{$resourcesRoot}/resources/email.gif" border="0" alt="*"/>
               <xsl:copy-of select="$bwStr-AEEF-SendMsg"/>
             </a>)
@@ -1655,5 +1656,5 @@
                   </xsl:if>
                   <xsl:text> </xsl:text>
-                  <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwStartClock"/>
+                  <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwStartClock" alt="*"/>
 
                   <select name="eventStartDate.tzid" id="startTzid" class="timezones">
@@ -1676,8 +1677,8 @@
               <xsl:choose>
                 <xsl:when test="form/end/type='E'">
-                  <input type="radio" name="eventEndType" id="bwEndDateTimeButton" value="E" checked="checked" onClick="changeClass('endDateTime','shown');changeClass('endDuration','invisible');"/>
+                  <input type="radio" name="eventEndType" id="bwEndDateTimeButton" value="E" checked="checked" onclick="changeClass('endDateTime','shown');changeClass('endDuration','invisible');"/>
                 </xsl:when>
                 <xsl:otherwise>
-                  <input type="radio" name="eventEndType" id="bwEndDateTimeButton" value="E" onClick="changeClass('endDateTime','shown');changeClass('endDuration','invisible');"/>
+                  <input type="radio" name="eventEndType" id="bwEndDateTimeButton" value="E" onclick="changeClass('endDateTime','shown');changeClass('endDuration','invisible');"/>
                 </xsl:otherwise>
               </xsl:choose>
@@ -1745,5 +1746,5 @@
                     </xsl:if>
                     <xsl:text> </xsl:text>
-                    <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwEndClock"/>
+                    <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwEndClock" alt="*"/>
 
                     <select name="eventEndDate.tzid" id="endTzid" class="timezones">
@@ -1769,8 +1770,8 @@
                 <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" 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" value="D" onclick="changeClass('endDateTime','invisible');changeClass('endDuration','shown');"/>
                   </xsl:otherwise>
                 </xsl:choose>
@@ -1843,8 +1844,8 @@
                 <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" 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" value="N" onclick="changeClass('endDateTime','invisible');changeClass('endDuration','invisible');"/>
                   </xsl:otherwise>
                 </xsl:choose>
@@ -2218,11 +2219,9 @@
                             <xsl:copy-of select="$bwStr-AEEF-WeekOn"/>
                           </p>
-                          <p>
-                            <div id="weekRecurFields">
-                              <xsl:call-template name="byDayChkBoxList">
-                                <xsl:with-param name="name">byDayWeek</xsl:with-param>
-                              </xsl:call-template>
-                            </div>
-                          </p>
+                          <div id="weekRecurFields">
+                            <xsl:call-template name="byDayChkBoxList">
+                              <xsl:with-param name="name">byDayWeek</xsl:with-param>
+                            </xsl:call-template>
+                          </div>
                           <p class="weekRecurLinks">
                             <a href="javascript:recurSelectWeekdays('weekRecurFields')"><xsl:copy-of select="$bwStr-AEEF-SelectWeekdays"/></a> |
@@ -2257,5 +2256,5 @@
                             <div id="monthRecurFields1">
                               <xsl:copy-of select="$bwStr-AEEF-On"/>
-                              <select name="bymonthposPos1" width="7em" onchange="changeClass('monthRecurFields2','shown')">
+                              <select name="bymonthposPos1" onchange="changeClass('monthRecurFields2','shown')">
                                 <xsl:call-template name="recurrenceDayPosOptions"/>
                               </select>
@@ -2295,5 +2294,5 @@
                             <div id="yearRecurFields1">
                               <xsl:copy-of select="$bwStr-AEEF-On"/>
-                              <select name="byyearposPos1" width="7em" onchange="changeClass('yearRecurFields2','shown')">
+                              <select name="byyearposPos1" onchange="changeClass('yearRecurFields2','shown')">
                                 <xsl:call-template name="recurrenceDayPosOptions"/>
                               </select>
@@ -2447,5 +2446,5 @@
                           </select>
                          <xsl:text> </xsl:text>
-                         <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" alt="bwClock" id="bwRecExcClock"/>
+                         <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwRecExcClock" alt="*"/>
 
                         <select name="tzid" id="rdateTzid" class="timezones">
@@ -2688,4 +2687,7 @@
               <xsl:if test="form/location/preferred/select/option">
                 <select name="prefLocationId" id="bwPreferredLocationList">
+                  <xsl:if test="form/location/all/select/option/@selected and not(form/location/preferred/select/option/@selected)">
+                    <xsl:attribute name="class">invisible</xsl:attribute>
+                  </xsl:if>
                   <option value="">
                     <xsl:copy-of select="$bwStr-AEEF-SelectColon"/>
@@ -2695,5 +2697,5 @@
               </xsl:if>
               <select name="allLocationId" id="bwAllLocationList">
-                <xsl:if test="form/location/preferred/select/option">
+                <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="class">invisible</xsl:attribute>
                 </xsl:if>
@@ -2707,7 +2709,15 @@
                    locations exist -->
               <xsl:if test="form/location/preferred/select/option">
-                <input type="radio" name="toggleLocationLists" value="preferred" checked="checked" onclick="changeClass('bwPreferredLocationList','shown');changeClass('bwAllLocationList','invisible');"/>
+                <input type="radio" name="toggleLocationLists" 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');"/>
+                <input type="radio" name="toggleLocationLists" 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"/>
               </xsl:if>
@@ -2764,4 +2774,7 @@
               <xsl:if test="form/contact/preferred/select/option">
                 <select name="prefContactId" id="bwPreferredContactList">
+                  <xsl:if test="form/contact/all/select/option/@selected and not(form/contact/preferred/select/option/@selected)">
+                    <xsl:attribute name="class">invisible</xsl:attribute>
+                  </xsl:if>
                   <option value="">
                     <xsl:copy-of select="$bwStr-AEEF-SelectColon"/>
@@ -2771,5 +2784,5 @@
               </xsl:if>
               <select name="allContactId" id="bwAllContactList">
-                <xsl:if test="form/contact/preferred/select/option">
+                <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="class">invisible</xsl:attribute>
                 </xsl:if>
@@ -2783,7 +2796,15 @@
                    contacts exist -->
               <xsl:if test="form/contact/preferred/select/option">
-                <input type="radio" name="toggleContactLists" value="preferred" checked="checked" onclick="changeClass('bwPreferredContactList','shown');changeClass('bwAllContactList','invisible');"/>
+                <input type="radio" name="toggleContactLists" 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');"/>
+                <input type="radio" name="toggleContactLists" 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"/>
               </xsl:if>
@@ -3067,4 +3088,6 @@
     <xsl:param name="eventUrlPrefix"/>
     <xsl:param name="canEdit"/>
+    
+    <xsl:variable name="escapedTitle"><xsl:call-template name="escapeJson"><xsl:with-param name="string" select="eventTitle"/></xsl:call-template></xsl:variable>
     <div class="submitBox">
       <xsl:choose>
@@ -3106,5 +3129,5 @@
                 </select>
                 <input type="submit" name="publishEvent" value="{$bwStr-SEBu-PublishEvent}">
-                  <xsl:attribute name="onclick">doPublishEvent(this.form.newCalPath.value,'<xsl:value-of select="$eventTitle"/>','<xsl:value-of select="$eventUrlPrefix"/>',this.form);changeClass('publishBox','invisible');</xsl:attribute>
+                  <xsl:attribute name="onclick">doPublishEvent(this.form.newCalPath.value,"<xsl:value-of select="$escapedTitle"/>","<xsl:value-of select="$eventUrlPrefix"/>",this.form);changeClass('publishBox','invisible');</xsl:attribute>
                 </input>
                 <xsl:if test="$portalFriendly = 'false'">
@@ -3123,5 +3146,5 @@
               <input type="submit" name="updateSubmitEvent" value="{$bwStr-SEBu-UpdateEvent}"/>
               <input type="submit" name="publishEvent" value="{$bwStr-SEBu-PublishEvent}">
-                <xsl:attribute name="onclick">doPublishEvent('<xsl:value-of select="form/calendar/all/select/option/@value"/>','<xsl:value-of select="$eventTitle"/>','<xsl:value-of select="$eventUrlPrefix"/>',this.form);</xsl:attribute>
+                <xsl:attribute name="onclick">doPublishEvent("<xsl:value-of select="form/calendar/all/select/option/@value"/>","<xsl:value-of select="$escapedTitle"/>","<xsl:value-of select="$eventUrlPrefix"/>",this.form);</xsl:attribute>
               </input>
               <input type="submit" name="cancelled" value="{$bwStr-SEBu-Cancel}"/>
@@ -3233,5 +3256,5 @@
       <xsl:attribute name="id"><xsl:value-of select="$name"/>RecurFields<xsl:value-of select="$current"/></xsl:attribute>
       <xsl:copy-of select="$bwStr-BuRF-And"/>
-      <select width="12em">
+      <select>
         <xsl:attribute name="name">by<xsl:value-of select="$name"/>posPos<xsl:value-of select="$current"/></xsl:attribute>
         <xsl:if test="$current != $total">
@@ -6516,4 +6539,6 @@
                 <xsl:copy-of select="$bwStr-CSPf-DefaultViewModeList"/>
               </option>
+              <!-- GRID is not yet available - needs to be restored in public client -->
+              <!-- 
               <option value="grid">
                 <xsl:if test="/bedework/prefs/defaultViewMode = 'grid'">
@@ -6522,4 +6547,5 @@
                 <xsl:copy-of select="$bwStr-CSPf-DefaultViewModeGrid"/>
               </option>
+              -->
             </select>
           </td>
Index: releases/bedework-3.8/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl
===================================================================
--- releases/bedework-3.8/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl (revision 3534)
+++ releases/bedework-3.8/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl (revision 3558)
@@ -791,8 +791,8 @@
   <xsl:variable name="bwStr-CSPf-CalSuite">Calendar Suite:</xsl:variable>
   <xsl:variable name="bwStr-CSPf-PreferredView">Vista preferida:</xsl:variable>
-  <xsl:variable name="bwStr-CSPf-DefaultViewMode">Modo de vista preferida:</xsl:variable>
-  <xsl:variable name="bwStr-CSPf-DefaultViewModeList">LIST (a list of discrete events from now into the future)</xsl:variable>
-  <xsl:variable name="bwStr-CSPf-DefaultViewModeDaily">DAILY (a list of events grouped by date showing entire view period)</xsl:variable>
-  <xsl:variable name="bwStr-CSPf-DefaultViewModeGrid">GRID (calendar grid - in week and month view periods)</xsl:variable>
+  <xsl:variable name="bwStr-CSPf-DefaultViewMode">Modo de vista por defecto:</xsl:variable>
+  <xsl:variable name="bwStr-CSPf-DefaultViewModeList">UPCOMING - a list of discrete events from now into the future</xsl:variable>
+  <xsl:variable name="bwStr-CSPf-DefaultViewModeDaily">DAY, WEEK, MONTH - a list of events showing entire view period</xsl:variable>
+  <xsl:variable name="bwStr-CSPf-DefaultViewModeGrid">GRID - calendar grid for week and month view periods</xsl:variable>
   <xsl:variable name="bwStr-CSPf-PreferredViewPeriod">Periodo de vista preferida:</xsl:variable>
   <xsl:variable name="bwStr-CSPf-Day">día</xsl:variable>
Index: trunk/deployment/webadmin/webapp/resources/default/default/default.xsl
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (revision 3550)
+++ trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (revision 3558)
@@ -6538,4 +6538,6 @@
                 <xsl:copy-of select="$bwStr-CSPf-DefaultViewModeList"/>
               </option>
+              <!-- GRID is not yet available - needs to be restored in public client -->
+              <!-- 
               <option value="grid">
                 <xsl:if test="/bedework/prefs/defaultViewMode = 'grid'">
@@ -6544,4 +6546,5 @@
                 <xsl:copy-of select="$bwStr-CSPf-DefaultViewModeGrid"/>
               </option>
+              -->
             </select>
           </td>
Index: trunk/deployment/webadmin/webapp/resources/default/default/strings.xsl
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/strings.xsl (revision 3535)
+++ trunk/deployment/webadmin/webapp/resources/default/default/strings.xsl (revision 3558)
@@ -791,8 +791,8 @@
   <xsl:variable name="bwStr-CSPf-CalSuite">Calendar Suite:</xsl:variable>
   <xsl:variable name="bwStr-CSPf-PreferredView">Preferred view:</xsl:variable>
-  <xsl:variable name="bwStr-CSPf-DefaultViewMode">Preferred view mode:</xsl:variable>
-  <xsl:variable name="bwStr-CSPf-DefaultViewModeList">LIST (a list of discrete events from now into the future)</xsl:variable>
-  <xsl:variable name="bwStr-CSPf-DefaultViewModeDaily">DAILY (a list of events grouped by date showing entire view period)</xsl:variable>
-  <xsl:variable name="bwStr-CSPf-DefaultViewModeGrid">GRID (calendar grid - in week and month view periods)</xsl:variable>
+  <xsl:variable name="bwStr-CSPf-DefaultViewMode">Default view mode:</xsl:variable>
+  <xsl:variable name="bwStr-CSPf-DefaultViewModeList">UPCOMING - a list of discrete events from now into the future</xsl:variable>
+  <xsl:variable name="bwStr-CSPf-DefaultViewModeDaily">DAY, WEEK, MONTH - a list of events showing entire view period</xsl:variable>
+  <xsl:variable name="bwStr-CSPf-DefaultViewModeGrid">GRID - calendar grid for week and month view periods</xsl:variable>
   <xsl:variable name="bwStr-CSPf-PreferredViewPeriod">Preferred view period:</xsl:variable>
   <xsl:variable name="bwStr-CSPf-Day">day</xsl:variable>
Index: trunk/deployment/webadmin/webapp/resources/es_ES/default/default.xsl
===================================================================
--- trunk/deployment/webadmin/webapp/resources/es_ES/default/default.xsl (revision 3550)
+++ trunk/deployment/webadmin/webapp/resources/es_ES/default/default.xsl (revision 3558)
@@ -1109,4 +1109,5 @@
           <option value="catFilter(none)"><xsl:copy-of select="$bwStr-EvLs-SelectCategory"/></option>
           <xsl:for-each select="/bedework/events//event/categories//category[generate-id() = generate-id(key('catUid',uid)[1])]">
+            <xsl:sort order="ascending" select="value"/>
             <xsl:variable name="uid" select="uid"/>
             <option value="catFilter({$uid})">
@@ -1367,5 +1368,5 @@
             </a><xsl:text> </xsl:text>
             (<a href="mailto:{$submitterEmail}?subject=[Event%20Submission] {$eventTitle}" title="Email {$submitterEmail}">
-              <img src="{$resourcesRoot}/resources/email.gif" border="0"/>
+              <img src="{$resourcesRoot}/resources/email.gif" border="0" alt="*"/>
               <xsl:copy-of select="$bwStr-AEEF-SendMsg"/>
             </a>)
@@ -1655,5 +1656,5 @@
                   </xsl:if>
                   <xsl:text> </xsl:text>
-                  <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwStartClock"/>
+                  <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwStartClock" alt="*"/>
 
                   <select name="eventStartDate.tzid" id="startTzid" class="timezones">
@@ -1676,8 +1677,8 @@
               <xsl:choose>
                 <xsl:when test="form/end/type='E'">
-                  <input type="radio" name="eventEndType" id="bwEndDateTimeButton" value="E" checked="checked" onClick="changeClass('endDateTime','shown');changeClass('endDuration','invisible');"/>
+                  <input type="radio" name="eventEndType" id="bwEndDateTimeButton" value="E" checked="checked" onclick="changeClass('endDateTime','shown');changeClass('endDuration','invisible');"/>
                 </xsl:when>
                 <xsl:otherwise>
-                  <input type="radio" name="eventEndType" id="bwEndDateTimeButton" value="E" onClick="changeClass('endDateTime','shown');changeClass('endDuration','invisible');"/>
+                  <input type="radio" name="eventEndType" id="bwEndDateTimeButton" value="E" onclick="changeClass('endDateTime','shown');changeClass('endDuration','invisible');"/>
                 </xsl:otherwise>
               </xsl:choose>
@@ -1745,5 +1746,5 @@
                     </xsl:if>
                     <xsl:text> </xsl:text>
-                    <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwEndClock"/>
+                    <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwEndClock" alt="*"/>
 
                     <select name="eventEndDate.tzid" id="endTzid" class="timezones">
@@ -1769,8 +1770,8 @@
                 <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" 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" value="D" onclick="changeClass('endDateTime','invisible');changeClass('endDuration','shown');"/>
                   </xsl:otherwise>
                 </xsl:choose>
@@ -1843,8 +1844,8 @@
                 <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" 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" value="N" onclick="changeClass('endDateTime','invisible');changeClass('endDuration','invisible');"/>
                   </xsl:otherwise>
                 </xsl:choose>
@@ -2218,11 +2219,9 @@
                             <xsl:copy-of select="$bwStr-AEEF-WeekOn"/>
                           </p>
-                          <p>
-                            <div id="weekRecurFields">
-                              <xsl:call-template name="byDayChkBoxList">
-                                <xsl:with-param name="name">byDayWeek</xsl:with-param>
-                              </xsl:call-template>
-                            </div>
-                          </p>
+                          <div id="weekRecurFields">
+                            <xsl:call-template name="byDayChkBoxList">
+                              <xsl:with-param name="name">byDayWeek</xsl:with-param>
+                            </xsl:call-template>
+                          </div>
                           <p class="weekRecurLinks">
                             <a href="javascript:recurSelectWeekdays('weekRecurFields')"><xsl:copy-of select="$bwStr-AEEF-SelectWeekdays"/></a> |
@@ -2257,5 +2256,5 @@
                             <div id="monthRecurFields1">
                               <xsl:copy-of select="$bwStr-AEEF-On"/>
-                              <select name="bymonthposPos1" width="7em" onchange="changeClass('monthRecurFields2','shown')">
+                              <select name="bymonthposPos1" onchange="changeClass('monthRecurFields2','shown')">
                                 <xsl:call-template name="recurrenceDayPosOptions"/>
                               </select>
@@ -2295,5 +2294,5 @@
                             <div id="yearRecurFields1">
                               <xsl:copy-of select="$bwStr-AEEF-On"/>
-                              <select name="byyearposPos1" width="7em" onchange="changeClass('yearRecurFields2','shown')">
+                              <select name="byyearposPos1" onchange="changeClass('yearRecurFields2','shown')">
                                 <xsl:call-template name="recurrenceDayPosOptions"/>
                               </select>
@@ -2447,5 +2446,5 @@
                           </select>
                          <xsl:text> </xsl:text>
-                         <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" alt="bwClock" id="bwRecExcClock"/>
+                         <img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" id="bwRecExcClock" alt="*"/>
 
                         <select name="tzid" id="rdateTzid" class="timezones">
@@ -2688,4 +2687,7 @@
               <xsl:if test="form/location/preferred/select/option">
                 <select name="prefLocationId" id="bwPreferredLocationList">
+                  <xsl:if test="form/location/all/select/option/@selected and not(form/location/preferred/select/option/@selected)">
+                    <xsl:attribute name="class">invisible</xsl:attribute>
+                  </xsl:if>
                   <option value="">
                     <xsl:copy-of select="$bwStr-AEEF-SelectColon"/>
@@ -2695,5 +2697,5 @@
               </xsl:if>
               <select name="allLocationId" id="bwAllLocationList">
-                <xsl:if test="form/location/preferred/select/option">
+                <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="class">invisible</xsl:attribute>
                 </xsl:if>
@@ -2707,7 +2709,15 @@
                    locations exist -->
               <xsl:if test="form/location/preferred/select/option">
-                <input type="radio" name="toggleLocationLists" value="preferred" checked="checked" onclick="changeClass('bwPreferredLocationList','shown');changeClass('bwAllLocationList','invisible');"/>
+                <input type="radio" name="toggleLocationLists" 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');"/>
+                <input type="radio" name="toggleLocationLists" 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"/>
               </xsl:if>
@@ -2764,4 +2774,7 @@
               <xsl:if test="form/contact/preferred/select/option">
                 <select name="prefContactId" id="bwPreferredContactList">
+                  <xsl:if test="form/contact/all/select/option/@selected and not(form/contact/preferred/select/option/@selected)">
+                    <xsl:attribute name="class">invisible</xsl:attribute>
+                  </xsl:if>
                   <option value="">
                     <xsl:copy-of select="$bwStr-AEEF-SelectColon"/>
@@ -2771,5 +2784,5 @@
               </xsl:if>
               <select name="allContactId" id="bwAllContactList">
-                <xsl:if test="form/contact/preferred/select/option">
+                <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="class">invisible</xsl:attribute>
                 </xsl:if>
@@ -2783,7 +2796,15 @@
                    contacts exist -->
               <xsl:if test="form/contact/preferred/select/option">
-                <input type="radio" name="toggleContactLists" value="preferred" checked="checked" onclick="changeClass('bwPreferredContactList','shown');changeClass('bwAllContactList','invisible');"/>
+                <input type="radio" name="toggleContactLists" 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');"/>
+                <input type="radio" name="toggleContactLists" 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"/>
               </xsl:if>
@@ -3067,4 +3088,6 @@
     <xsl:param name="eventUrlPrefix"/>
     <xsl:param name="canEdit"/>
+    
+    <xsl:variable name="escapedTitle"><xsl:call-template name="escapeJson"><xsl:with-param name="string" select="eventTitle"/></xsl:call-template></xsl:variable>
     <div class="submitBox">
       <xsl:choose>
@@ -3106,5 +3129,5 @@
                 </select>
                 <input type="submit" name="publishEvent" value="{$bwStr-SEBu-PublishEvent}">
-                  <xsl:attribute name="onclick">doPublishEvent(this.form.newCalPath.value,'<xsl:value-of select="$eventTitle"/>','<xsl:value-of select="$eventUrlPrefix"/>',this.form);changeClass('publishBox','invisible');</xsl:attribute>
+                  <xsl:attribute name="onclick">doPublishEvent(this.form.newCalPath.value,"<xsl:value-of select="$escapedTitle"/>","<xsl:value-of select="$eventUrlPrefix"/>",this.form);changeClass('publishBox','invisible');</xsl:attribute>
                 </input>
                 <xsl:if test="$portalFriendly = 'false'">
@@ -3123,5 +3146,5 @@
               <input type="submit" name="updateSubmitEvent" value="{$bwStr-SEBu-UpdateEvent}"/>
               <input type="submit" name="publishEvent" value="{$bwStr-SEBu-PublishEvent}">
-                <xsl:attribute name="onclick">doPublishEvent('<xsl:value-of select="form/calendar/all/select/option/@value"/>','<xsl:value-of select="$eventTitle"/>','<xsl:value-of select="$eventUrlPrefix"/>',this.form);</xsl:attribute>
+                <xsl:attribute name="onclick">doPublishEvent("<xsl:value-of select="form/calendar/all/select/option/@value"/>","<xsl:value-of select="$escapedTitle"/>","<xsl:value-of select="$eventUrlPrefix"/>",this.form);</xsl:attribute>
               </input>
               <input type="submit" name="cancelled" value="{$bwStr-SEBu-Cancel}"/>
@@ -3233,5 +3256,5 @@
       <xsl:attribute name="id"><xsl:value-of select="$name"/>RecurFields<xsl:value-of select="$current"/></xsl:attribute>
       <xsl:copy-of select="$bwStr-BuRF-And"/>
-      <select width="12em">
+      <select>
         <xsl:attribute name="name">by<xsl:value-of select="$name"/>posPos<xsl:value-of select="$current"/></xsl:attribute>
         <xsl:if test="$current != $total">
@@ -6516,4 +6539,6 @@
                 <xsl:copy-of select="$bwStr-CSPf-DefaultViewModeList"/>
               </option>
+              <!-- GRID is not yet available - needs to be restored in public client -->
+              <!-- 
               <option value="grid">
                 <xsl:if test="/bedework/prefs/defaultViewMode = 'grid'">
@@ -6522,4 +6547,5 @@
                 <xsl:copy-of select="$bwStr-CSPf-DefaultViewModeGrid"/>
               </option>
+              -->
             </select>
           </td>
Index: trunk/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl
===================================================================
--- trunk/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl (revision 3535)
+++ trunk/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl (revision 3558)
@@ -791,8 +791,8 @@
   <xsl:variable name="bwStr-CSPf-CalSuite">Calendar Suite:</xsl:variable>
   <xsl:variable name="bwStr-CSPf-PreferredView">Vista preferida:</xsl:variable>
-  <xsl:variable name="bwStr-CSPf-DefaultViewMode">Modo de vista preferida:</xsl:variable>
-  <xsl:variable name="bwStr-CSPf-DefaultViewModeList">LIST (a list of discrete events from now into the future)</xsl:variable>
-  <xsl:variable name="bwStr-CSPf-DefaultViewModeDaily">DAILY (a list of events grouped by date showing entire view period)</xsl:variable>
-  <xsl:variable name="bwStr-CSPf-DefaultViewModeGrid">GRID (calendar grid - in week and month view periods)</xsl:variable>
+  <xsl:variable name="bwStr-CSPf-DefaultViewMode">Modo de vista por defecto:</xsl:variable>
+  <xsl:variable name="bwStr-CSPf-DefaultViewModeList">UPCOMING - a list of discrete events from now into the future</xsl:variable>
+  <xsl:variable name="bwStr-CSPf-DefaultViewModeDaily">DAY, WEEK, MONTH - a list of events showing entire view period</xsl:variable>
+  <xsl:variable name="bwStr-CSPf-DefaultViewModeGrid">GRID - calendar grid for week and month view periods</xsl:variable>
   <xsl:variable name="bwStr-CSPf-PreferredViewPeriod">Periodo de vista preferida:</xsl:variable>
   <xsl:variable name="bwStr-CSPf-Day">día</xsl:variable>