Index: releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/default.xsl
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (revision 3038)
+++ releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/default.xsl (revision 3128)
@@ -4063,9 +4063,9 @@
             <xsl:choose>
               <xsl:when test="calType = '0'">aliasFolder</xsl:when>
-              <xsl:otherwise><xsl:copy-of select="$bwStr-Cals-Alias"/></xsl:otherwise>
+              <xsl:otherwise>alias</xsl:otherwise>
             </xsl:choose>
           </xsl:when>
-          <xsl:when test="calType = '0'"><xsl:copy-of select="$bwStr-Cals-Folder"/></xsl:when>
-          <xsl:otherwise><xsl:copy-of select="$bwStr-Cals-Calendar"/></xsl:otherwise>
+          <xsl:when test="calType = '0'">folder</xsl:when>
+          <xsl:otherwise>calendar</xsl:otherwise>
         </xsl:choose>
       </xsl:attribute>
@@ -4091,6 +4091,6 @@
       <xsl:if test="calType = '0' and isSubscription = 'false'">
         <xsl:text> </xsl:text>
-        <a href="{$calendar-initAdd}&amp;calPath={$calPath}" title="add a calendar or folder">
-          <img src="{$resourcesRoot}/resources/calAddIcon.gif" width="13" height="13" alt="add a calendar or folder" border="0"/>
+        <a href="{$calendar-initAdd}&amp;calPath={$calPath}" title="{$bwStr-Cals-Add}">
+          <img src="{$resourcesRoot}/resources/calAddIcon.gif" width="13" height="13" alt="{$bwStr-Cals-Add}" border="0"/>
         </a>
       </xsl:if>
@@ -4112,7 +4112,7 @@
           <xsl:when test="disabled = 'true'">unknown</xsl:when>
           <xsl:when test="lastRefreshStatus &gt;= 300">unknown</xsl:when>
-          <xsl:when test="isSubscription = 'true'"><xsl:copy-of select="$bwStr-Cals-Alias"/></xsl:when>
-          <xsl:when test="calType = '0'"><xsl:copy-of select="$bwStr-Cals-Folder"/></xsl:when>
-          <xsl:otherwise><xsl:copy-of select="$bwStr-Cals-Calendar"/></xsl:otherwise>
+          <xsl:when test="isSubscription = 'true'">alias</xsl:when>
+          <xsl:when test="calType = '0'">folder</xsl:when>
+          <xsl:otherwise>calendar</xsl:otherwise>
         </xsl:choose>
       </xsl:attribute>
@@ -5641,5 +5641,5 @@
             </span>
             <xsl:text> </xsl:text>
-            [<a href="javascript:launchCalSelectWindow('{$event-selectCalForEvent}')" class="small">change</a>]
+            [<a href="javascript:launchCalSelectWindow('{$event-selectCalForEvent}')" class="small"><xsl:copy-of select="$bwStr-Upld-Change"/></a>]
           </td>
         </tr>
@@ -5842,5 +5842,5 @@
         </tr>
         <tr>
-          <th></th>
+          <th><xsl:copy-of select="$bwStr-MdSP-UserInboxDefaultName"/></th>
           <td>
             <xsl:variable name="userInbox" select="/bedework/system/userInbox"/>
@@ -6883,5 +6883,5 @@
                   <tr>
                     <td>
-                      <img src="{$resourcesRoot}/resources/userIcon.gif" width="13" height="13" border="0" alt="user"/>
+                      <img src="{$resourcesRoot}/resources/userIcon.gif" width="13" height="13" border="0" alt="{$bwStr-MAGM-User}"/>
                     </td>
                     <td>
@@ -6890,6 +6890,6 @@
                     <td>
                       <xsl:variable name="acct" select="account"/>
-                      <a href="{$admingroup-updateMembers}&amp;removeGroupMember={$acct}&amp;kind=user" title="remove">
-                        <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="remove"/>
+                      <a href="{$admingroup-updateMembers}&amp;removeGroupMember={$acct}&amp;kind=user" title="{$bwStr-MAGM-Remove}">
+                        <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="{$bwStr-MAGM-Remove}"/>
                       </a>
                     </td>
@@ -6908,6 +6908,6 @@
                     <td>
                       <xsl:variable name="acct" select="account"/>
-                      <a href="{$admingroup-updateMembers}&amp;removeGroupMember={$acct}&amp;kind=group" title="remove">
-                        <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="remove"/>
+                      <a href="{$admingroup-updateMembers}&amp;removeGroupMember={$acct}&amp;kind=group" title="{$bwStr-MAGM-Remove}">
+                        <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="{$bwStr-MAGM-Remove}"/>
                       </a>
                     </td>
@@ -6921,6 +6921,6 @@
     </table>
     <p>
-      <img src="{$resourcesRoot}/resources/userIcon.gif" width="13" height="13" border="0" alt="user"/><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-MAGM-User"/>,
-      <img src="{$resourcesRoot}/resources/groupIcon.gif" width="13" height="13" border="0" alt="group"/>
+      <img src="{$resourcesRoot}/resources/userIcon.gif" width="13" height="13" border="0" alt="{$bwStr-MAGM-User}"/><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-MAGM-User"/>,
+      <img src="{$resourcesRoot}/resources/groupIcon.gif" width="13" height="13" border="0" alt="{$bwStr-MAGM-Group}"/>
       <xsl:text> </xsl:text>
       <strong><xsl:copy-of select="$bwStr-MAGM-Group"/></strong>
Index: releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/strings.xsl
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/strings.xsl (revision 3038)
+++ releases/bedework-3.7/deployment/webadmin/webapp/resources/default/default/strings.xsl (revision 3128)
@@ -445,4 +445,5 @@
   <xsl:variable name="bwStr-Cals-Folder">folder</xsl:variable>
   <xsl:variable name="bwStr-Cals-Calendar">calendar</xsl:variable>
+  <xsl:variable name="bwStr-Cals-Add">add a calendar or folder</xsl:variable>
 
   <!--  xsl:template match="calendar" mode="listForDisplay" -->
@@ -637,4 +638,5 @@
   <xsl:variable name="bwStr-Upld-IntoCalendar">Into calendar:</xsl:variable>
   <xsl:variable name="bwStr-Upld-NoneSelected"><em>none selected</em></xsl:variable>
+  <xsl:variable name="bwStr-Upld-Change">change</xsl:variable>
   <xsl:variable name="bwStr-Upld-AffectsFreeBusy">Affects free/busy:</xsl:variable>
   <xsl:variable name="bwStr-Upld-AcceptEventsSettings">accept event's settings</xsl:variable>
@@ -688,4 +690,5 @@
   <xsl:variable name="bwStr-MdSP-TrashCalendarDefaultNameNote">Default name for user trash calendar. Used when initializing user. Possibly can be changed.</xsl:variable>
   <xsl:variable name="bwStr-MdSP-InboxNote">Default name for user inbox. Used when initializing user. Possibly can be changed.</xsl:variable>
+  <xsl:variable name="bwStr-MdSP-UserInboxDefaultName">User Inbox Default name:</xsl:variable>
   <xsl:variable name="bwStr-MdSP-UserOutboxDefaultName">User Outbox Default name:</xsl:variable>
   <xsl:variable name="bwStr-MdSP-UserOutboxDefaultNameNote">Default name for user outbox. Used when initializing user. Possibly can be changed.</xsl:variable>
@@ -854,4 +857,5 @@
   <xsl:variable name="bwStr-MAGM-Name">Name:</xsl:variable>
   <xsl:variable name="bwStr-MAGM-Members">Members:</xsl:variable>
+  <xsl:variable name="bwStr-MAGM-Remove">remove</xsl:variable>
 
   <!--  xsl:template name="deleteAdminGroupConfirm" -->
Index: releases/bedework-3.7/deployment/webadmin/webapp/resources/es_ES/default/default.xsl
===================================================================
--- releases/bedework-3.7/deployment/webadmin/webapp/resources/es_ES/default/default.xsl (revision 3124)
+++ releases/bedework-3.7/deployment/webadmin/webapp/resources/es_ES/default/default.xsl (revision 3128)
@@ -4063,9 +4063,9 @@
             <xsl:choose>
               <xsl:when test="calType = '0'">aliasFolder</xsl:when>
-              <xsl:otherwise><xsl:copy-of select="$bwStr-Cals-Alias"/></xsl:otherwise>
+              <xsl:otherwise>alias</xsl:otherwise>
             </xsl:choose>
           </xsl:when>
-          <xsl:when test="calType = '0'"><xsl:copy-of select="$bwStr-Cals-Folder"/></xsl:when>
-          <xsl:otherwise><xsl:copy-of select="$bwStr-Cals-Calendar"/></xsl:otherwise>
+          <xsl:when test="calType = '0'">folder</xsl:when>
+          <xsl:otherwise>calendar</xsl:otherwise>
         </xsl:choose>
       </xsl:attribute>
@@ -4091,6 +4091,6 @@
       <xsl:if test="calType = '0' and isSubscription = 'false'">
         <xsl:text> </xsl:text>
-        <a href="{$calendar-initAdd}&amp;calPath={$calPath}" title="add a calendar or folder">
-          <img src="{$resourcesRoot}/resources/calAddIcon.gif" width="13" height="13" alt="add a calendar or folder" border="0"/>
+        <a href="{$calendar-initAdd}&amp;calPath={$calPath}" title="{$bwStr-Cals-Add}">
+          <img src="{$resourcesRoot}/resources/calAddIcon.gif" width="13" height="13" alt="{$bwStr-Cals-Add}" border="0"/>
         </a>
       </xsl:if>
@@ -4112,7 +4112,7 @@
           <xsl:when test="disabled = 'true'">unknown</xsl:when>
           <xsl:when test="lastRefreshStatus &gt;= 300">unknown</xsl:when>
-          <xsl:when test="isSubscription = 'true'"><xsl:copy-of select="$bwStr-Cals-Alias"/></xsl:when>
-          <xsl:when test="calType = '0'"><xsl:copy-of select="$bwStr-Cals-Folder"/></xsl:when>
-          <xsl:otherwise><xsl:copy-of select="$bwStr-Cals-Calendar"/></xsl:otherwise>
+          <xsl:when test="isSubscription = 'true'">alias</xsl:when>
+          <xsl:when test="calType = '0'">folder</xsl:when>
+          <xsl:otherwise>calendar</xsl:otherwise>
         </xsl:choose>
       </xsl:attribute>
@@ -5641,5 +5641,5 @@
             </span>
             <xsl:text> </xsl:text>
-            [<a href="javascript:launchCalSelectWindow('{$event-selectCalForEvent}')" class="small">change</a>]
+            [<a href="javascript:launchCalSelectWindow('{$event-selectCalForEvent}')" class="small"><xsl:copy-of select="$bwStr-Upld-Change"/></a>]
           </td>
         </tr>
@@ -5842,5 +5842,5 @@
         </tr>
         <tr>
-          <th></th>
+          <th><xsl:copy-of select="$bwStr-MdSP-UserInboxDefaultName"/></th>
           <td>
             <xsl:variable name="userInbox" select="/bedework/system/userInbox"/>
@@ -6883,5 +6883,5 @@
                   <tr>
                     <td>
-                      <img src="{$resourcesRoot}/resources/userIcon.gif" width="13" height="13" border="0" alt="user"/>
+                      <img src="{$resourcesRoot}/resources/userIcon.gif" width="13" height="13" border="0" alt="{$bwStr-MAGM-User}"/>
                     </td>
                     <td>
@@ -6890,6 +6890,6 @@
                     <td>
                       <xsl:variable name="acct" select="account"/>
-                      <a href="{$admingroup-updateMembers}&amp;removeGroupMember={$acct}&amp;kind=user" title="remove">
-                        <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="remove"/>
+                      <a href="{$admingroup-updateMembers}&amp;removeGroupMember={$acct}&amp;kind=user" title="{$bwStr-MAGM-Remove}">
+                        <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="{$bwStr-MAGM-Remove}"/>
                       </a>
                     </td>
@@ -6908,6 +6908,6 @@
                     <td>
                       <xsl:variable name="acct" select="account"/>
-                      <a href="{$admingroup-updateMembers}&amp;removeGroupMember={$acct}&amp;kind=group" title="remove">
-                        <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="remove"/>
+                      <a href="{$admingroup-updateMembers}&amp;removeGroupMember={$acct}&amp;kind=group" title="{$bwStr-MAGM-Remove}">
+                        <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="{$bwStr-MAGM-Remove}"/>
                       </a>
                     </td>
@@ -6921,6 +6921,6 @@
     </table>
     <p>
-      <img src="{$resourcesRoot}/resources/userIcon.gif" width="13" height="13" border="0" alt="user"/><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-MAGM-User"/>,
-      <img src="{$resourcesRoot}/resources/groupIcon.gif" width="13" height="13" border="0" alt="group"/>
+      <img src="{$resourcesRoot}/resources/userIcon.gif" width="13" height="13" border="0" alt="{$bwStr-MAGM-User}"/><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-MAGM-User"/>,
+      <img src="{$resourcesRoot}/resources/groupIcon.gif" width="13" height="13" border="0" alt="{$bwStr-MAGM-Group}"/>
       <xsl:text> </xsl:text>
       <strong><xsl:copy-of select="$bwStr-MAGM-Group"/></strong>
Index: releases/bedework-3.7/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl
===================================================================
--- releases/bedework-3.7/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl (revision 3124)
+++ releases/bedework-3.7/deployment/webadmin/webapp/resources/es_ES/default/strings.xsl (revision 3128)
@@ -445,4 +445,5 @@
   <xsl:variable name="bwStr-Cals-Folder">carpeta</xsl:variable>
   <xsl:variable name="bwStr-Cals-Calendar">calendario</xsl:variable>
+  <xsl:variable name="bwStr-Cals-Add">add a calendar or folder</xsl:variable>
 
   <!--  xsl:template match="calendar" mode="listForDisplay" -->
@@ -637,4 +638,5 @@
   <xsl:variable name="bwStr-Upld-IntoCalendar">Dentro del calendario:</xsl:variable>
   <xsl:variable name="bwStr-Upld-NoneSelected"><em>ninguno seleccionado</em></xsl:variable>
+  <xsl:variable name="bwStr-Upld-Change">cambiar</xsl:variable>
   <xsl:variable name="bwStr-Upld-AffectsFreeBusy">Afecta libre/ocupado:</xsl:variable>
   <xsl:variable name="bwStr-Upld-AcceptEventsSettings">aceptar los ajustes del evento</xsl:variable>
@@ -688,4 +690,5 @@
   <xsl:variable name="bwStr-MdSP-TrashCalendarDefaultNameNote">Nombre por defecto de la papelera de calendario de usuario. Usada al inicializar el usuario. Podría cambiarse.</xsl:variable>
   <xsl:variable name="bwStr-MdSP-InboxNote">Nombre por defecto del inbox del usuario. Usado al inicializar el usuario. Podría cambiarse.</xsl:variable>
+  <xsl:variable name="bwStr-MdSP-UserInboxDefaultName">Nombre por defecto de la bandeja de entrada del usuario:</xsl:variable>
   <xsl:variable name="bwStr-MdSP-UserOutboxDefaultName">Nombre por defecto del outbox del usuario:</xsl:variable>
   <xsl:variable name="bwStr-MdSP-UserOutboxDefaultNameNote">Nombre por defecto del outbox del usuario. Usado al inicializar el usuario. Podría cambiarse.</xsl:variable>
@@ -854,4 +857,5 @@
   <xsl:variable name="bwStr-MAGM-Name">Nombre:</xsl:variable>
   <xsl:variable name="bwStr-MAGM-Members">Miembros:</xsl:variable>
+  <xsl:variable name="bwStr-MAGM-Remove">quitar</xsl:variable>
 
   <!--  xsl:template name="deleteAdminGroupConfirm" -->
Index: releases/bedework-3.7/deployment/websubmit/webapp/resources/demoskins/es_ES/default/default.css
===================================================================
---  (revision )
+++ releases/bedework-3.7/deployment/websubmit/webapp/resources/demoskins/es_ES/default/default.css (revision 3128)
@@ -1,0 +1,820 @@
+/*
+   Licensed to Jasig under one or more contributor license
+   agreements. See the NOTICE file distributed with this work
+   for additional information regarding copyright ownership.
+   Jasig licenses this file to you under the Apache License,
+   Version 2.0 (the "License"); you may not use this file
+   except in compliance with the License. You may obtain a
+   copy of the License at:
+  
+   http://www.apache.org/licenses/LICENSE-2.0
+  
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on
+   an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied. See the License for the
+   specific language governing permissions and limitations
+   under the License.  
+*/
+
+body {
+  /* removed for portals */
+  margin: 0;
+  padding: 0;
+  background-color: #ddd;
+  color: black;
+  font-size: 16px;
+}
+
+#bedework {
+  /* this is the main wrapper div used to encapsulate all Bedework CSS; we
+     will prepend each selector below with this ID - this helps encapsulate
+     the css for use in portal environments (though it does imply that only
+     one instance should be running on a portal page) */
+  font-family : Arial, Helvetica, sans-serif;
+  font-size: 100%; /* to make IE behave */
+  background-color: white;
+  color: black;
+  padding: 0;
+  margin: 0;
+  min-width: 835px;
+}
+/* Generic selectors*/
+#bedework h2 {
+  margin: 0em;
+  padding: 0.2em 0.2em 0.2em 0.5em;
+  font-size: 1.3em;
+}
+#bedework h2 a:link,
+#bedework h2 a:active,
+#bedework h2 a:visited,
+#bedework h2 a:hover {
+  color: black;
+  background-color: transparent;
+  text-decoration: none;
+}
+#bedework .formButtons {
+  float: right;
+  font-size: 0.8em;
+}
+#bedework #bwCommentNotes {
+  clear: both;
+  margin: 1em 0.5em;
+}
+#bedework div.eventSubmitButtons {
+  clear: both;
+  text-align: right;
+  margin: 1em 0.5em;
+}
+#bedework .eventSubmitButtons input,
+#bedework .formButtons input {
+  margin: 0;
+  font-size: 1.1em;
+}
+#bedework .eventSubmitButtons input.submit {
+  color: #060;
+}
+#bedework h3 {
+  margin: 0em;
+  padding: 1em 0.2em 0em 0.2em;
+  font-size: 1.1em;
+}
+#bedework h4 {
+  margin: 0em;
+  padding: 1em 0.2em 0em 0.2em;
+  font-size: 1em;
+}
+#bedework td {
+  vertical-align: top;
+}
+#bedework .center {
+  text-align: center;
+}
+#bedework .small {
+  font-size: 0.8em;
+}
+/* Header IDs and classes */
+
+#bedework #header {
+  color: #eee;
+  background-color : #333;
+  margin: 0em;
+  padding: 0.5em 1em 0.5em 1em;
+}
+#bedework #header a {
+  color: #dde;
+  background-color : transparent;
+}
+#bedework #header h1 {
+  font-size: 1.4em;
+  margin: 0.5em 0.5em 0em 0em;
+}
+#bedework #header img {
+  float: right;
+  border: 0;
+}
+#bedework #adminLeftColumn {
+  float: left;
+}
+#bedework #adminRightColumn {
+  float: left;
+  margin: 1em 0 1em 3em;
+}
+#bedework #statusBar {
+  margin: 0em;
+  padding: 0.2em 1em;
+  text-align: right;
+  color: #eee;
+  /*background-color: #edc;*/
+  background-color: #5c7486;
+  font-size: 0.8em;
+}
+#bedework #statusBarTable td.leftCell {
+  color: #666;
+  background-color: #edc;
+  text-align: left;
+  padding: 0.2em 0em 0.2em 1em;
+}
+#bedework #statusBar span.status {
+  font-weight: bold;
+}
+#bedework #statusBar a:link,
+#bedework #statusBar a:active,
+#bedework #statusBar a:visited {
+  text-decoration : none;
+  color: #eee;
+  background-color: transparent;
+}
+#bedework #statusBar a:hover {
+  text-decoration: underline;
+  color: #eee;
+  background-color: transparent;
+}
+/* MenuTabs */
+#bedework #menuTabs {
+  margin: 0;
+  padding: 6px 0 4px 0;
+  color: #eee;
+  background-color: #ddd;
+  font-size: 0.9em;
+  border-bottom: 1px solid #999;
+}
+#bedework #menuTabs li {
+  display: inline;
+  margin: 0;
+  /*color: #eee;
+  background: #009 url("../../resources/menuBgBlue.gif") repeat-x top;*/
+  color: #777;
+  background-color: #eee;
+  padding-top: 6px;
+  padding-bottom: 4px;
+  padding-left: 1em;
+  padding-right: 1em;
+  border-bottom: 1px solid #999;
+  border-right: 1px solid #999;
+}
+#bedework #menuTabs li.selected {
+  color: #333;
+  background: white url("../../resources/menuBgGray.gif") repeat-x top;
+  border-bottom: 1px solid white;
+}
+#bedework #menuTabs a:link,
+#bedework #menuTabs a:active,
+#bedework #menuTabs a:hover,
+#bedework #menuTabs a:visited {
+  color: #777;
+  background-color: transparent;
+  text-decoration: none;
+}
+#bedework #menuTabs li.selected a:link,
+#bedework #menuTabs li.selected a:active,
+#bedework #menuTabs li.selected a:hover,
+#bedework #menuTabs li.selected a:visited {
+  color: black;
+  background-color: transparent;
+  text-decoration: none;
+}
+#bedework #bodyContent {
+  position: relative;
+  margin: 0;
+  padding:  2em;
+}
+#bedework .bwActionIcons {
+  position: absolute;
+  white-space: nowrap;
+  border: 2px solid #999;
+  background-color: #eee;
+  color: black;
+  padding: 0.5em;
+  margin: 0;
+}
+#bedework .bwActionIconsInGrid {
+  margin-left: -100px;
+}
+#bedework .bwActionIconsInList {
+  right: 2em;
+}
+#bedework .bwActionIcons a:link,
+#bedework .bwActionIcons a:active,
+#bedework .bwActionIcons a:visited {
+  display: block;
+  margin: 0 0 2px 0;
+  color: #666 !important; /* set important to override other more specific selectors */
+  background-color: transparent;
+  font-size: 0.75em;
+  text-decoration: none;
+}
+#bedework .bwActionIcons a:hover {
+  color: black !important; /* set important to override other more specific selectors */
+  background-color: transparent;
+}
+#bedework #messages,
+#bedework #errors {
+  font-size: 0.8em;
+  margin: 0;
+  padding: 0.3em 0 0.3em 1em;
+  border-bottom: 1px solid Gray;
+  color: black;
+  background: #ff0 url(../../resources/glassFill-message.gif) repeat-x top;
+}
+#bedework #errors {
+  border-bottom: 2px solid red;
+}
+#bedework #errors li,
+#bedework #messages li {
+  list-style: none;
+}
+#bedework #messages p,
+#bedework #errors p {
+  margin: 0;
+  padding: 2px 0;
+}
+#bedework #bodyContent h1 {
+  font-size: 1.2em;
+}
+#bedework #bodyContent h2 {
+  font-size: 1.1em;
+}
+#bedework #introduction li {
+  margin-bottom: 1em;
+}
+#bedework #introduction a:link,
+#bedework #introduction a:active,
+#bedework #introduction a:visited,
+#bedework #introduction a:hover {
+  text-decoration: underline;
+}
+#bedework #eventFormTabs {
+}
+#bedework #instructions {
+  padding: 0.5em;
+  margin: 0 0 1em 0;
+  border: 1px solid #ccc;
+  background-color: #ffe;
+  font-size: 0.9em;
+}
+#bedework .navButtons {
+  float: right;
+  text-align: right;
+}
+#bedework .navButtons img {
+  vertical-align: middle;
+}
+#bedework .navBox {
+  padding: 4px;
+  background-color: #ffe;
+  border: 1px solid #ccc;
+}
+#bedework #bwBottomNav {
+  padding: 0.5em;
+  margin: 0 0 1em 0;
+  font-size: 0.9em;
+  text-align: right;
+}
+#bedework ul.submenu {
+  margin: 0;
+  padding: 0;
+  font-size: 0.8em;
+  border-bottom: 1px solid #ccc;
+}
+#bedework ul.submenu li {
+  display: inline;
+  margin: 0 4px 0 0;
+  padding: 0 1em 0 1em;
+  border-left: 1px solid #ccc;
+  border-right: 1px solid #ccc;
+  border-top: 1px solid #ccc;
+  color: black;
+  background-color: #ddd;
+}
+#bedework ul.submenu li.selected {
+  color: black;
+  background-color: white;
+  border-bottom: 1px solid white;
+}
+#bedework ul.submenu li a:link,
+#bedework ul.submenu li a:active,
+#bedework ul.submenu li a:visited {
+  margin: 0;
+  padding: 0;
+  text-decoration: none;
+}
+#bedework ul.submenu li a:hover,
+#bedework ul.submenu li:hover {
+  color: black;
+  background-color: #ffe;
+  text-decoration: none;
+}
+#bedework ul.submenu li.selected:hover {
+  color: black;
+  background-color: white;
+}
+#bedework #eventFormContent {
+  margin: 0;
+  padding: 1em;
+  border: 1px solid #ccc;
+}
+#bedework #standardForm {
+  margin: 0;
+  padding: 0;
+}
+#bedework #calSelectWidget {
+  position: absolute;
+  margin: 0;
+  padding: 1em;
+  border: 1px solid #666;
+  background-color: white;
+  color: black;
+}
+#bedework #calSelectWidget h2 {
+  font-size: 1em;
+  font-weight: normal;
+  margin: -1em -1em 0 -1em;
+  padding: 4px 0;
+  background: #233979 url(../../resources/glassFill-02.gif) repeat-x bottom;
+  color : #eee;
+  text-align: center;
+}
+#bedework #calSelectWidget #calSelectWidgetCloser {
+  position: absolute;
+  right: 2px;
+  top:  2px;
+  display: block;
+  font-weight: bold;
+  background-color: #ddd;
+  color: #333;
+  border-top: 1px solid #999;
+  border-left: 1px solid #999;
+  border-right: 1px solid #666;
+  border-bottom: 1px solid #666;
+  margin: 0;
+  padding: 0 2px;
+  text-decoration: none;
+}
+#bedework .mainForm {
+  padding: 0;
+  margin: 0 0 1.5em 0;
+  font-weight: bold;
+  color: black;
+}
+#bedework .subForm {
+  font-size: 0.9em;
+  padding: 1em;
+  margin: 0;
+  background-color: #eee;
+  color: black;
+}
+#bedework .subForm label {
+  float: left;
+  text-align: right;
+  width: 150px;
+  padding: 0 1em 0 0;
+}
+#bedework p.subFormMessage {
+  font-size: 0.9em;
+  margin: 1em 0 0 0;
+  padding: 0;
+}
+#bedework .subForm p {
+  margin: 0 0 0.5em 0;
+  padding: 0;
+}
+#bedework .bigSelect {
+  font-size: 1.1em;
+}
+#bedework table.common {
+  width: 100%;
+  font-size: 0.9em;
+  margin: 0px;
+  padding: 0px;
+}
+#bedework table.common th {
+  text-align: left;
+  vertical-align: top;
+  padding: 0.5em;
+  background-color: #ddd;
+  color: black;
+  white-space: nowrap;
+}
+#bedework table.common th.thin {
+  width: 80px;
+}
+#bedework table.common th.icon {
+  margin: 0em;
+  vertical-align: middle;
+  padding: 0.5em 1em 0.2em 0;
+  font-size: 0.7em;
+  background-color: #fff;
+  color: black;
+}
+#bedework table.common th.commonHeader {
+  vertical-align: middle;
+  background-color: #666;
+  color: #eee;
+  padding: 0.2em 0.5em;
+  text-align: left;
+  font-weight: normal;
+}
+#bedework table.common th.commonHeader a:link,
+#bedework table.common th.commonHeader a:active,
+#bedework table.common th.commonHeader a:visited {
+  background-color: inherit;
+  color: #eee;
+  padding: 0.2em;
+  text-align: left;
+}
+#bedework table.common th.commonHeader a:hover {
+  background-color: inherit;
+  color: #ff9;
+  padding: 0.2em;
+  text-align: left;
+}
+#bedework table.common td {
+  padding: 0;
+}
+#bedework table.common td.filler {
+  height: 250px;
+}
+#bedework table.common td.fill {
+  background-color: #ddd;
+  color: black;
+  font-weight: bold;
+  padding: 0.2em 0.5em 0.2em 0.5em;
+}
+#bedework table.common th.leftBorder,
+#bedework table.common td.leftBorder {
+  border-left: 1px solid #999;
+  border-top: 1px solid #999;
+  padding-left: 1em;
+}
+#bedework table.common td.fieldval {
+  margin: 0em;
+  vertical-align: top;
+  padding: 0.5em 0.5em 0.2em 1em;
+}
+#bedework table.common td.fieldname {
+  width: 100px;
+  margin: 0em;
+  vertical-align: top;
+  padding: 0.5em 0.5em 0.2em 0.5em;
+  white-space: nowrap;
+}
+#bedework table.dottedBorder td.fieldname {
+  text-align: right;
+}
+#bedework table.common td.comments p {
+  margin: 0;
+  padding: 0.5em 0 1em 0;
+  border-top: 1px dashed #ddd;
+}
+#bedework table.common td.submit {
+  padding: 0.5em 0.5em 0.2em 0.5em;
+  color: black;
+  background: white;
+  text-align: right;
+  border-top: 1px solid #ccc;
+}
+#bedework table.common td.eventLinks {
+  background-color: #ddd;
+  color: #eee;
+  padding: 6px 0;
+  text-align: center;
+}
+#bedework input:focus,
+#bedework textarea:focus,
+#bedework select:focus {
+  background-color: #ffb !important;
+  color: inherit;
+}
+#bedework select:focus option {
+  background-color: white;
+  color: inherit;
+}
+#bedework table.common #eventActions {
+  float: right;
+  clear: none;
+  font-size: 0.8em;
+}
+#bedework table.common #eventActions img,
+#bedework #refreshEventAction img {
+display: inline;
+  margin-right: 2px;
+  vertical-align: middle;
+}
+#bedework #refreshEventAction {
+  padding-left: 1em;
+}
+#bedework table.common td.allField {
+  white-space: nowrap;
+  text-align: right;
+  font-style: italic;
+  background-color : white;
+  color: black;
+  padding: 0.2em;
+}
+#bedework table.common .borderRight {
+  border-right: 1px solid #999;
+}
+#bedework table.common tr#exportDateRange td.dates {
+  border-bottom: 1px solid #999;
+  padding: 0.5em;
+}
+#bedework table.common .padMeTop {
+  padding-top: 1em !important;
+}
+#bedework table.common .padMe {
+  padding: 1em !important;
+}
+#bedework .dateFields {
+  display: inline;
+}
+#bedework .timeFields {
+  display: inline;
+  margin-left: 1em;
+}
+#bedework .dateStartEndBox {
+  border: 1px solid #ccb;
+  margin: 4px;
+  padding: 4px;
+  white-space: nowrap;
+}
+#bedework .dateStartEndBox strong {
+  display: block;
+}
+#bedework .startDateLabel {
+  margin-left: 26px;
+}
+#bedework select.timezones {
+  margin-left: 1em;
+  width: 160px;
+}
+#bedework div.durationBox {
+  border: 1px solid #ccb;
+  display: inline;
+  margin: 4px;
+  padding: 4px;
+}
+#bedework .durationSpacerText {
+  font-weight: bold;
+  margin: 0 1em;
+}
+#bedework table#manage td {
+  padding: 0.2em 0 0 0.5em;
+}
+#bedework #bwEventTab-Recurrence {
+  margin: 0 1em;
+  font-size: 0.9em;
+}
+#bedework #bwEventCalDisplay {
+  font-weight: bold;
+  margin-right: 1em;
+}
+#bedework #clock {
+  position: absolute;
+  top: 160px;
+  margin: auto;
+}
+#bedework #startTimeFields img,
+#bedework #endTimeFields img {
+  vertical-align: middle;
+}
+#bedework #tztable {
+  margin-top: 1em;
+}
+#bedework #tztable td {
+  padding: 2px 4px;
+}
+#bedework .chkBoxListItem {
+  display: block;
+  float: left;
+  width: 3em;
+}
+#bedework .shown {
+  display: inline;
+}
+#bedework .visible {
+  /* like shown, but apply no styles to this class */
+}
+#bedework .invisible {
+  display: none !important;
+}
+#bedework .hidden {
+  visibility: hidden;
+}
+#bedework .padMe {
+  padding: 1em 0 !important;
+}
+#bedework .strong {
+  font-weight: bold;
+}
+#bedework .posrelative {
+  /* this class is used primarily to lock absolutely positioned elements to
+     their parent.  Be careful removing this class from elements that
+     contain an absolutely positioned div. */
+  position: relative;
+}
+#bedework #comments p {
+  margin: 0 0 1em 2em;
+}
+/* Calendars and Subscriptions */
+#calendarTable td,
+#bedework #subsTable td {
+  padding: 0 0.5em;
+  vertical-align: top;
+}
+#bedework #calendarTable td.cals,
+#bedework #subsTable td.cals {
+  border-right: 1px solid #aaa;
+  font-size: 0.9em;
+}
+#bedework #calendarTable td.cals {
+  width: 300px;
+}
+#bedework #subsTable td.cals {
+  width: 200px;
+}
+#bedework .calendarTree ul {
+  padding-left: 10px;
+  margin-left: 10px;
+}
+#bedework .calendarTree li {
+  padding-top: 0.25em;
+}
+#bedework li.folder {
+  list-style-image: url(../../resources/catIcon.gif);
+}
+#bedework  li.calendar {
+  list-style-image: url(../../resources/calIcon-sm.gif);
+}
+#bedework .calendarTree a:link,
+#bedework .calendarTree a:active,
+#bedework .calendarTree a:visited {
+  text-decoration: none;
+  border: none;
+}
+#bedework .calendarTree a:hover {
+  color: black;
+  background-color: #ff3;
+}
+#bedework .inoutboxActive {
+  font-weight: bold;
+  font-size: 0.9em;
+}
+#bedework img.subStyle {
+  float: right;
+  clear: right;
+  padding: 0;
+  margin: 0 10px 0 2px;
+  width: 0.8em;
+  height: 0.5em;
+  border: 1px solid #666 !important;
+}
+#bedework .aliasTree {
+  margin: 1em 0;
+  padding: 0;
+}
+#bedework .aliasTree li {
+  list-style: none !important;
+  margin: 0;
+  padding: 0;
+}
+#bedework .aliasTree li ul {
+  margin: 0 0 0.5em 0.75em;
+  padding-left: 10px;
+}
+#bedework img.folderForAliasTree {
+  padding: 0.5em 0.2em 0 0.5em;
+}
+#bedework #submitTable {
+  width: 98%; /* less than 100% helps avoid IE weirdness */
+  margin: 1em 0;
+}
+#bedework #submitTable td {
+  white-space: nowrap;
+}
+#bedework .note {
+  margin: 0;
+  padding: 0 0 1em 0;
+  font-size: 0.8em;
+  font-style: italic;
+}
+#bedework .contextHelp {
+  position: relative;
+  margin-left: 0.5em;
+}
+#bedework .helpBox {
+  margin: 1em;
+  padding: 0.5em;
+  border: 2px solid #999;
+  color: black;
+  background-color: #fee;
+}
+/* Footer */
+#bedework #footer {
+  font-size: 0.7em;
+  text-align : center;
+  margin-top: 0em;
+  padding: 1em;
+  color: #333;
+  background-color: #eee;
+  border-bottom: 2px solid #999;
+  white-space: nowrap;
+}
+#bedework #footer a {
+  color: #333;
+  background-color: transparent;
+  text-decoration: underline;
+}
+#bedework #subfoot {
+  padding: 0.5em 1em;
+  font-size: 0.7em;
+  color: #333;
+  background-color: #ddd;
+}
+#bedework #subfoot a {
+  color: #999;
+  background-color: inherit;
+}
+/*   LINKS    */
+#bedework a:link,
+#bedework a:active {
+  color: #00a;
+  background-color: transparent;
+  text-decoration: none;
+}
+#bedework a:visited {
+  color: #008;
+  background-color: transparent;
+  text-decoration: none;
+}
+#bedework a:hover {
+  color: red;
+  background-color: transparent;
+  text-decoration: none;
+}
+#bedework span.time {
+  text-transform : lowercase;
+}
+#bedework .padTop {
+  padding-top: 1em;
+}
+#bedework .nowrap {
+  white-space: nowrap;
+}
+#bedework #featureHighlight {
+  color: #dd0;
+  font-style: italic;
+}
+#bedework .highlight {
+  color: black;
+  background: #ff0 url(../../resources/glassFill-message.gif) repeat-x top;
+  /*background-color: #ff0;*/
+  border: 1px solid #333;
+}
+#bedework .notice {
+  font-weight: bold;
+  font-style: italic;
+}
+#bedework #commonListTable {
+  font-size: 0.9em;
+  margin-bottom: 2em;
+}
+#bedework #commonListTable th {
+  padding: 0.2em 1em 0.2em 0.5em;
+  background-color : #ccc;
+  color: black;
+  white-space: nowrap;
+  text-align: left;
+}
+#bedework #commonListTable td {
+  vertical-align: top;
+  font-size: 0.9em;
+  padding: 0.2em 1em 0.2em 0.5em;
+  color: black;
+  background-color: #eee;
+}
+#commonListTable td.unclaimed {
+  background-color: #eee;
+  color: #900 !important;
+  font-style: italic;
+}
Index: releases/bedework-3.7/deployment/websubmit/webapp/resources/demoskins/es_ES/default/default.xsl
===================================================================
---  (revision )
+++ releases/bedework-3.7/deployment/websubmit/webapp/resources/demoskins/es_ES/default/default.xsl (revision 3128)
@@ -1,0 +1,1680 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Licensed to Jasig under one or more contributor license
+    agreements. See the NOTICE file distributed with this work
+    for additional information regarding copyright ownership.
+    Jasig licenses this file to you under the Apache License,
+    Version 2.0 (the "License"); you may not use this file
+    except in compliance with the License. You may obtain a
+    copy of the License at:
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on
+    an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied. See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<xsl:stylesheet
+  version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml">
+<xsl:output
+  method="xml"
+  indent="no"
+  media-type="text/html"
+  doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"
+  doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
+  standalone="yes"
+  omit-xml-declaration="yes"/>
+
+  <!-- ========================================================= -->
+  <!--         PUBLIC EVENTS SUBMISSION CALENDAR STYLESHEET      -->
+  <!-- ========================================================= -->
+
+  <!-- DEFINE INCLUDES -->
+  <xsl:include href="../../../bedework-common/default/default/errors.xsl"/>
+  <xsl:include href="../../../bedework-common/default/default/messages.xsl"/>
+  <xsl:include href="../../../bedework-common/default/default/util.xsl"/>
+  <xsl:include href="./strings.xsl"/>
+
+  <!-- DEFINE GLOBAL CONSTANTS -->
+  <!-- URL of html resources (images, css, other html); by default this is
+       set to the application root, but for the personal calendar
+       this should be changed to point to a
+       web server over https to avoid mixed content errors, e.g.,
+  <xsl:variable name="resourcesRoot">https://mywebserver.edu/myresourcesdir</xsl:variable>
+    -->
+  <xsl:variable name="resourcesRoot" select="/bedework/browserResourceRoot"/>
+
+  <!-- URL of the XSL template directory -->
+  <!-- The approot is an appropriate place to put
+       included stylesheets and xml fragments. These are generally
+       referenced relatively (like errors.xsl and messages.xsl above);
+       this variable is here for your convenience if you choose to
+       reference it explicitly.  It is not used in this stylesheet, however,
+       and can be safely removed if you so choose. -->
+  <xsl:variable name="appRoot" select="/bedework/approot"/>
+
+  <!-- Properly encoded prefixes to the application actions; use these to build
+       urls; allows the application to be used without cookies or within a portal.
+       These urls are rewritten in header.jsp and simply passed through for use
+       here. Every url includes a query string (either ?b=de or a real query
+       string) so that all links constructed in this stylesheet may begin the
+       query string with an ampersand. -->
+
+  <xsl:variable name="submissionsRootEncoded" select="/bedework/submissionsRoot/encoded"/>
+  <xsl:variable name="submissionsRootUnencoded" select="/bedework/submissionsRoot/unencoded"/>
+
+  <!-- main -->
+  <xsl:variable name="setup" select="/bedework/urlPrefixes/setup"/>
+  <xsl:variable name="initEvent" select="/bedework/urlPrefixes/event/initEvent"/>
+  <xsl:variable name="initPendingEvents" select="/bedework/urlPrefixes/event/initPendingEvents"/>
+  <xsl:variable name="addEvent" select="/bedework/urlPrefixes/event/addEvent"/>
+  <xsl:variable name="editEvent" select="/bedework/urlPrefixes/event/editEvent"/>
+  <xsl:variable name="gotoEditEvent" select="/bedework/urlPrefixes/event/gotoEditEvent"/>
+  <xsl:variable name="updateEvent" select="/bedework/urlPrefixes/event/updateEvent"/>
+  <xsl:variable name="delEvent" select="/bedework/urlPrefixes/event/delEvent"/>
+  <xsl:variable name="initUpload" select="/bedework/urlPrefixes/misc/initUpload"/>
+  <xsl:variable name="upload" select="/bedework/urlPrefixes/misc/upload"/>
+
+  <!-- URL of the web application - includes web context -->
+  <xsl:variable name="urlPrefix" select="/bedework/urlprefix"/>
+
+  <!-- Other generally useful global variables -->
+  <xsl:variable name="prevdate" select="/bedework/previousdate"/>
+  <xsl:variable name="nextdate" select="/bedework/nextdate"/>
+  <xsl:variable name="curdate" select="/bedework/currentdate/date"/>
+  <xsl:variable name="skin">default</xsl:variable>
+  <xsl:variable name="publicCal">/cal</xsl:variable>
+
+  <!-- the following variable can be set to "true" or "false";
+       to use jQuery widgets and fancier UI features, set to false - these are
+       not guaranteed to work in portals. -->
+  <xsl:variable name="portalFriendly">false</xsl:variable>
+
+ <!-- BEGIN MAIN TEMPLATE -->
+  <xsl:template match="/">
+    <html lang="en">
+      <head>
+        <xsl:call-template name="headSection"/>
+      </head>
+      <body>
+        <xsl:choose>
+          <xsl:when test="/bedework/page = 'addEvent'">
+            <xsl:attribute name="onload">focusElement('bwEventTitle');bwSetupDatePickers();</xsl:attribute>
+          </xsl:when>
+          <xsl:when test="/bedework/page = 'editEvent'">
+            <xsl:attribute name="onload">initRXDates();initXProperties();bwSetupDatePickers();</xsl:attribute>
+          </xsl:when>
+        </xsl:choose>
+        <div id="bedework"><!-- main wrapper div -->
+          <xsl:call-template name="header"/>
+          <xsl:call-template name="messagesAndErrors"/>
+          <xsl:call-template name="menuTabs"/>
+          <div id="bodyContent">
+            <xsl:choose>
+              <xsl:when test="/bedework/page='addEvent'">
+                <xsl:apply-templates select="/bedework/formElements" mode="addEvent"/>
+              </xsl:when>
+              <xsl:when test="/bedework/page='eventList'">
+                <xsl:call-template name="eventList"/>
+              </xsl:when>
+              <xsl:when test="/bedework/page='editEvent'">
+                <xsl:apply-templates select="/bedework/formElements" mode="editEvent"/>
+              </xsl:when>
+              <xsl:when test="/bedework/page='upload'">
+                <xsl:call-template name="upload" />
+              </xsl:when>
+              <xsl:otherwise>
+                <!-- home / entrance screen -->
+                <xsl:call-template name="home"/>
+              </xsl:otherwise>
+            </xsl:choose>
+          </div>
+          <!-- footer -->
+          <xsl:call-template name="footer"/>
+        </div>
+      </body>
+    </html>
+  </xsl:template>
+
+  <!--==== HEAD SECTION  ====-->
+  <xsl:template name="headSection">
+    <title><xsl:copy-of select="$bwStr-Head-BedeworkSubmitPubEv"/></title>
+    <meta name="robots" content="noindex,nofollow"/>
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+    <link rel="stylesheet" href="{$resourcesRoot}/default/default/default.css"/>
+    <link rel="icon" type="image/ico" href="{$resourcesRoot}/resources/bedework.ico" />
+    <!-- note: the non-breaking spaces in the script bodies below are to avoid
+         losing the script closing tags (which avoids browser problems) -->
+    <script type="text/javascript" src="{$resourcesRoot}/resources/bedework.js">&#160;</script>
+    <xsl:if test="/bedework/page='addEvent' or /bedework/page='editEvent'">
+      <script type="text/javascript" src="{$resourcesRoot}/resources/bwClock.js">&#160;</script>
+      <link rel="stylesheet" href="{$resourcesRoot}/resources/bwClock.css"/>
+      <xsl:choose>
+        <xsl:when test="$portalFriendly = 'true'">
+          <script type="text/javascript" src="{$resourcesRoot}/resources/dynCalendarWidget.js">&#160;</script>
+          <link rel="stylesheet" href="{$resourcesRoot}/resources/dynCalendarWidget.css"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <!-- <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.2.6.min.js">&#160;</script>
+          <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.5.2.min.js">&#160;</script>
+          <link rel="stylesheet" href="/bedework-common/javascript/jquery/bedeworkJqueryThemes.css"/> -->
+          <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-1.3.2.min.js">&#160;</script>
+          <script type="text/javascript" src="/bedework-common/javascript/jquery/jquery-ui-1.7.1.custom.min.js">&#160;</script>
+          <link rel="stylesheet" href="/bedework-common/javascript/jquery/css/custom-theme/jquery-ui-1.7.1.custom.css"/>
+          <link rel="stylesheet" href="/bedework-common/javascript/jquery/css/custom-theme/bedeworkJquery.css"/>
+          <script type="text/javascript">
+            <xsl:comment>
+            $.datepicker.setDefaults({
+              constrainInput: true,
+              dateFormat: "yy-mm-dd",
+              showOn: "both",
+              buttonImage: "<xsl:value-of select='$resourcesRoot'/>/resources/calIcon.gif",
+              buttonImageOnly: true,
+              gotoCurrent: true,
+              duration: ""
+            });
+
+            function bwSetupDatePickers() {
+              // startdate
+              $("#bwEventWidgetStartDate").datepicker({
+                defaultDate: new Date(<xsl:value-of select="/bedework/formElements/form/start/yearText/input/@value"/>, <xsl:value-of select="number(/bedework/formElements/form/start/month/select/option[@selected = 'selected']/@value) - 1"/>, <xsl:value-of select="/bedework/formElements/form/start/day/select/option[@selected = 'selected']/@value"/>)
+              }).attr("readonly", "readonly");
+              $("#bwEventWidgetStartDate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/start/rfc3339DateTime,'T')"/>');
+
+              // enddate
+              $("#bwEventWidgetEndDate").datepicker({
+                defaultDate: new Date(<xsl:value-of select="/bedework/formElements/form/end/dateTime/yearText/input/@value"/>, <xsl:value-of select="number(/bedework/formElements/form/end/dateTime/month/select/option[@selected = 'selected']/@value) - 1"/>, <xsl:value-of select="/bedework/formElements/form/end/dateTime/day/select/option[@selected = 'selected']/@value"/>)
+              }).attr("readonly", "readonly");
+              $("#bwEventWidgetEndDate").val('<xsl:value-of select="substring-before(/bedework/formElements/form/end/rfc3339DateTime,'T')"/>');
+            }
+            </xsl:comment>
+          </script>
+        </xsl:otherwise>
+      </xsl:choose>
+      <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkEventForm.js">&#160;</script>
+      <script type="text/javascript" src="/bedework-common/javascript/bedework/bedeworkXProperties.js">&#160;</script>
+      <script type="text/javascript" src="/bedework-common/javascript/bedework/bedeworkUtil.js">&#160;</script>
+    </xsl:if>
+    <script type="text/javascript">
+      <xsl:comment>
+      function focusElement(id) {
+      // focuses element by id
+        document.getElementById(id).focus();
+      }
+      function initRXDates() {
+        // return string values to be loaded into javascript for rdates
+        <xsl:for-each select="/bedework/formElements/form/rdates/rdate">
+          bwRdates.update('<xsl:value-of select="date"/>','<xsl:value-of select="time"/>',false,false,false,'<xsl:value-of select="tzid"/>');
+        </xsl:for-each>
+        // return string values to be loaded into javascript for exdates
+        <xsl:for-each select="/bedework/formElements/form/exdates/rdate">
+          bwExdates.update('<xsl:value-of select="date"/>','<xsl:value-of select="time"/>',false,false,false,'<xsl:value-of select="tzid"/>');
+        </xsl:for-each>
+      }
+      function initXProperties() {
+        <xsl:for-each select="/bedework/formElements/form/xproperties/node()[text()]">
+          bwXProps.init('<xsl:value-of select="name()"/>',[<xsl:for-each select="parameters/node()">['<xsl:value-of select="name()"/>','<xsl:value-of select="node()"/>']<xsl:if test="position() != last()">,</xsl:if></xsl:for-each>],'<xsl:call-template name="escapeApos"><xsl:with-param name="str"><xsl:value-of select="values/text"/></xsl:with-param></xsl:call-template>');
+        </xsl:for-each>
+      }
+      </xsl:comment>
+    </script>
+  </xsl:template>
+
+  <!--==== HEADER TEMPLATES and NAVIGATION  ====-->
+
+  <xsl:template name="header">
+    <div id="header">
+      <a href="/bedework/">
+        <img id="logo"
+            alt="logo"
+            src="{$resourcesRoot}/resources/bedeworkAdminLogo.gif"
+            width="217"
+            height="40"
+            border="0"/>
+      </a>
+      <!-- set the page heading: -->
+      <h1>
+        <xsl:copy-of select="$bwStr-Hedr-BedeworkPubEventSub"/>
+      </h1>
+    </div>
+    <div id="statusBar">
+      <xsl:copy-of select="$bwStr-Hedr-LoggedInAs"/>
+          <xsl:text> </xsl:text>
+          <strong><xsl:value-of select="/bedework/userid"/></strong>
+          <xsl:text> </xsl:text>
+          <span class="logout"><a href="{$setup}&amp;logout=true"><xsl:copy-of select="$bwStr-Hedr-Logout"/></a></span>
+    </div>
+  </xsl:template>
+
+  <xsl:template name="messagesAndErrors">
+    <xsl:if test="/bedework/message">
+      <ul id="messages">
+        <xsl:for-each select="/bedework/message">
+          <li><xsl:apply-templates select="."/></li>
+        </xsl:for-each>
+      </ul>
+    </xsl:if>
+    <xsl:if test="/bedework/error">
+      <ul id="errors">
+        <xsl:for-each select="/bedework/error">
+          <li><xsl:apply-templates select="."/></li>
+        </xsl:for-each>
+      </ul>
+    </xsl:if>
+  </xsl:template>
+
+  <!--==== MENUTABS ====-->
+  <xsl:template name="menuTabs">
+    <ul id="menuTabs">
+      <xsl:choose>
+        <xsl:when test="/bedework/page='home'">
+          <li class="selected"><xsl:copy-of select="$bwStr-MeTa-Overview"/></li>
+          <li><a href="{$initEvent}"><xsl:copy-of select="$bwStr-MeTa-AddEvent"/></a></li>
+          <li><a href="{$initPendingEvents}&amp;calPath={$submissionsRootEncoded}&amp;listAllEvents=true"><xsl:copy-of select="$bwStr-MeTa-MyPendingEvents"/></a></li>
+        </xsl:when>
+        <xsl:when test="/bedework/page='eventList'">
+          <li><a href="{$setup}"><xsl:copy-of select="$bwStr-MeTa-Overview"/></a></li>
+          <li><a href="{$initEvent}"><xsl:copy-of select="$bwStr-MeTa-AddEvent"/></a></li>
+          <li class="selected"><xsl:copy-of select="$bwStr-MeTa-MyPendingEvents"/></li>
+        </xsl:when>
+        <xsl:otherwise>
+          <li><a href="{$setup}"><xsl:copy-of select="$bwStr-MeTa-Overview"/></a></li>
+          <li class="selected"><xsl:copy-of select="$bwStr-MeTa-AddEvent"/></li>
+          <li><a href="{$initPendingEvents}&amp;calPath={$submissionsRootEncoded}&amp;listAllEvents=true"><xsl:copy-of select="$bwStr-MeTa-MyPendingEvents"/></a></li>
+        </xsl:otherwise>
+      </xsl:choose>
+    </ul>
+  </xsl:template>
+
+  <!--==== HOME ====-->
+  <xsl:template name="home">
+    <div class="navButtons navBox">
+      <a href="{$initEvent}"><xsl:copy-of select="$bwStr-Home-Start"/>
+        <img alt="previous"
+          src="{$resourcesRoot}/resources/arrowRight.gif"
+          width="13"
+          height="13"
+          border="0"/>
+      </a>
+    </div>
+    <h1><xsl:copy-of select="$bwStr-Home-EnteringEvents"/></h1>
+    <ol id="introduction">
+      <li>
+        <xsl:copy-of select="$bwStr-Home-BeforeSubmitting"/><xsl:text> </xsl:text><a href="/cal"><xsl:copy-of select="$bwStr-Home-SeeIfItHasBeenEntered"/></a>.<xsl:text> </xsl:text><xsl:copy-of select="$bwStr-Home-ItIsPossible"/>
+      </li>
+      <li>
+        <xsl:copy-of select="$bwStr-Home-MakeYourTitles"/>
+      </li>
+      <li>
+        <xsl:copy-of select="$bwStr-Home-DoNotInclude"/>
+      </li>
+    </ol>
+  </xsl:template>
+
+  <!--==== ADD EVENT ====-->
+  <xsl:template match="formElements" mode="addEvent">
+    <xsl:variable name="submitter">
+      <xsl:choose>
+        <xsl:when test="form/xproperties/node()[name()='X-BEDEWORK-SUBMITTEDBY']"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMITTEDBY']/values/text"/></xsl:when>
+        <xsl:otherwise><xsl:value-of select="/bedework/userid"/></xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <form name="eventForm" method="post" action="{$addEvent}" id="standardForm" onsubmit="return setEventFields(this,{$portalFriendly},'{$submitter}');">
+      <xsl:apply-templates select="." mode="eventForm"/>
+    </form>
+  </xsl:template>
+
+  <!--==== EDIT EVENT ====-->
+  <xsl:template match="formElements" mode="editEvent">
+    <xsl:variable name="submitter">
+      <xsl:choose>
+        <xsl:when test="form/xproperties/node()[name()='X-BEDEWORK-SUBMITTEDBY']"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMITTEDBY']/values/text"/></xsl:when>
+        <xsl:otherwise><xsl:value-of select="/bedework/userid"/></xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <form name="eventForm" method="post" action="{$updateEvent}" id="standardForm" onsubmit="return setEventFields(this,{$portalFriendly},'{$submitter}');">
+      <xsl:apply-templates select="." mode="eventForm"/>
+    </form>
+  </xsl:template>
+
+
+  <!--==== ADD and EDIT EVENT FORM ====-->
+  <xsl:template match="formElements" mode="eventForm">
+    <xsl:variable name="calPathEncoded" select="form/calendar/encodedPath"/>
+    <xsl:variable name="calPath" select="form/calendar/path"/>
+    <xsl:variable name="guid" select="guid"/>
+    <xsl:variable name="recurrenceId" select="recurrenceId"/>
+    <!-- comment field to hold the user's suggestions:  -->
+    <input type="hidden" name="xbwsubmitcomment" id="bwEventComment" value=""/>
+
+      <!-- event info for edit event -->
+      <xsl:if test="/bedework/creating != 'true'">
+
+        <table class="common" cellspacing="0">
+          <tr>
+            <th colspan="2" class="commonHeader">
+              <div id="eventActions">
+                <xsl:choose>
+                  <xsl:when test="recurrenceId != ''">
+                    <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/>
+                    <xsl:copy-of select="$bwStr-FoEl-DeleteColon"/>
+                    <a href="{$delEvent}&amp;calPath={$calPath}&amp;guid={$guid}" title="delete master (recurring event)"><xsl:copy-of select="$bwStr-FoEl-All"/></a>,
+                    <a href="{$delEvent}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="delete instance (recurring event)"><xsl:copy-of select="$bwStr-FoEl-Instance"/>instance</a>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <a href="{$delEvent}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="delete event">
+                      <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/>
+                      <xsl:copy-of select="$bwStr-FoEl-Delete"/>
+                      <xsl:if test="form/recurringEntity='true'">
+                        <xsl:copy-of select="$bwStr-FoEl-All"/>
+                      </xsl:if>
+                    </a>
+                  </xsl:otherwise>
+                </xsl:choose>
+              </div>
+              <!-- Display type of event -->
+              <xsl:variable name="entityType">
+                <xsl:choose>
+                  <xsl:when test="entityType = '2'"><xsl:copy-of select="$bwStr-FoEl-TASK"/></xsl:when>
+                  <xsl:when test="scheduleMethod = '2'"><xsl:copy-of select="$bwStr-FoEl-Meeting"/></xsl:when>
+                  <xsl:otherwise><xsl:copy-of select="$bwStr-FoEl-EVENT"/></xsl:otherwise>
+                </xsl:choose>
+              </xsl:variable>
+              <xsl:if test="form/recurringEntity='true' or recurrenceId != ''">
+                <xsl:copy-of select="$bwStr-FoEl-Recurring"/>
+              </xsl:if>
+              <xsl:choose>
+                <xsl:when test="form">
+                  <!-- just a placeholder: need to add owner to the jsp -->
+                  <xsl:copy-of select="$bwStr-FoEl-Personal"/><xsl:text> </xsl:text><xsl:value-of select="$entityType"/>
+                </xsl:when>
+                <xsl:when test="public = 'true'">
+                  <xsl:copy-of select="$bwStr-FoEl-Public"/><xsl:text> </xsl:text><xsl:value-of select="$entityType"/>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:value-of select="$entityType"/> (<xsl:value-of select="calendar/owner"/>)
+                </xsl:otherwise>
+              </xsl:choose>
+              <xsl:if test="form/recurringEntity='true' and recurrenceId = ''">
+                <xsl:text> </xsl:text>
+                <em><xsl:copy-of select="$bwStr-FoEl-RecurrenceMaster"/></em>
+              </xsl:if>
+            </th>
+          </tr>
+        </table>
+      </xsl:if>
+
+    <div id="instructions">
+      <div id="bwHelp-Details">
+        <div class="navButtons">
+          <a href="javascript:show('bwEventTab-Location','bwHelp-Location','bwBottomNav-Location');hide('bwEventTab-Details','bwHelp-Details','bwBottomNav-Details');"
+             onclick="return validateStep1();">
+            <xsl:copy-of select="$bwStr-FoEl-Next"/>
+            <xsl:text> </xsl:text>
+            <img alt="{$bwStr-FoEl-Next}"
+              src="{$resourcesRoot}/resources/arrowRight.gif"
+              width="13"
+              height="13"
+              border="0"/>
+          </a>
+        </div>
+        <xsl:copy-of select="$bwStr-FoEl-Step1"/>
+      </div>
+      <div id="bwHelp-Location" class="invisible">
+        <div class="navButtons">
+          <a href="javascript:show('bwEventTab-Details','bwHelp-Details','bwBottomNav-Details'); hide('bwEventTab-Location','bwHelp-Location','bwBottomNav-Location');">
+            <img alt="{$bwStr-FoEl-Previous}"
+              src="{$resourcesRoot}/resources/arrowLeft.gif"
+              width="13"
+              height="13"
+              border="0"/>
+            <xsl:text> </xsl:text>
+            <xsl:copy-of select="$bwStr-FoEl-Previous"/>
+          </a> |
+          <a href="javascript:show('bwEventTab-Contact','bwHelp-Contact','bwBottomNav-Contact'); hide('bwEventTab-Location','bwHelp-Location','bwBottomNav-Location');"
+             onclick="return validateStep2();">
+            <xsl:copy-of select="$bwStr-FoEl-Next"/>
+            <xsl:text> </xsl:text>
+            <img alt="{$bwStr-FoEl-Next}"
+              src="{$resourcesRoot}/resources/arrowRight.gif"
+              width="13"
+              height="13"
+              border="0"/>
+          </a>
+        </div>
+        <xsl:copy-of select="$bwStr-FoEl-Step2"/>
+      </div>
+      <div id="bwHelp-Contact" class="invisible">
+        <div class="navButtons">
+          <a href="javascript:show('bwEventTab-Location','bwHelp-Location','bwBottomNav-Location'); hide('bwHelp-Contact','bwEventTab-Contact','bwBottomNav-Contact');">
+            <img alt="{$bwStr-FoEl-Previous}"
+              src="{$resourcesRoot}/resources/arrowLeft.gif"
+              width="13"
+              height="13"
+              border="0"/>
+            <xsl:text> </xsl:text>
+            <xsl:copy-of select="$bwStr-FoEl-Previous"/>
+          </a> |
+          <a href="javascript:show('bwEventTab-Categories','bwHelp-Categories','bwBottomNav-Categories'); hide('bwHelp-Contact','bwEventTab-Contact','bwBottomNav-Contact');"
+             onclick="return validateStep3();">
+            <xsl:copy-of select="$bwStr-FoEl-Next"/>
+            <xsl:text> </xsl:text>
+            <img alt="{$bwStr-FoEl-Next}"
+              src="{$resourcesRoot}/resources/arrowRight.gif"
+              width="13"
+              height="13"
+              border="0"/>
+          </a>
+        </div>
+        <xsl:copy-of select="$bwStr-FoEl-Step3"/>
+      </div>
+      <div id="bwHelp-Categories" class="invisible">
+        <!-- this tab is now "topical areas - we will leave the ids named "categories" for now. -->
+        <div class="navButtons">
+          <a href="javascript:show('bwEventTab-Contact','bwHelp-Contact','bwBottomNav-Contact'); hide('bwHelp-Categories','bwEventTab-Categories','bwBottomNav-Categories');">
+            <img alt="{$bwStr-FoEl-Previous}"
+              src="{$resourcesRoot}/resources/arrowLeft.gif"
+              width="13"
+              height="13"
+              border="0"/>
+            <xsl:text> </xsl:text>
+            <xsl:copy-of select="$bwStr-FoEl-Previous"/>
+          </a> |
+          <a href="javascript:show('bwHelp-Review','bwEventTab-Review','bwBottomNav-Review'); hide('bwHelp-Categories','bwEventTab-Categories','bwBottomNav-Categories'); ">
+            <xsl:copy-of select="$bwStr-FoEl-Next"/>
+            <xsl:text> </xsl:text>
+            <img alt="{$bwStr-FoEl-Next}"
+              src="{$resourcesRoot}/resources/arrowRight.gif"
+              width="13"
+              height="13"
+              border="0"/>
+          </a>
+        </div>
+        <xsl:copy-of select="$bwStr-FoEl-Step4"/>
+      </div>
+      <div id="bwHelp-Review" class="invisible">
+        <div class="navButtons">
+          <a href="javascript:show('bwHelp-Categories','bwEventTab-Categories','bwBottomNav-Categories'); hide('bwHelp-Review','bwEventTab-Review','bwBottomNav-Review'); ">
+            <img alt="{$bwStr-FoEl-Previous}"
+              src="{$resourcesRoot}/resources/arrowLeft.gif"
+              width="13"
+              height="13"
+              border="0"/>
+            <xsl:text> </xsl:text>
+            <xsl:copy-of select="$bwStr-FoEl-Previous"/>
+          </a>
+          <span class="hidden">
+            <!-- this is here just to take up the appropriate space  -->
+            <xsl:text> </xsl:text>|<xsl:text> </xsl:text>
+            <xsl:copy-of select="$bwStr-FoEl-Next"/>
+            <xsl:text> </xsl:text>
+            <img alt="{$bwStr-FoEl-Next}"
+              src="{$resourcesRoot}/resources/arrowRight.gif"
+              width="13"
+              height="13"
+              border="0"/>
+          </span>
+        </div>
+        <xsl:copy-of select="$bwStr-FoEl-Step5"/>
+      </div>
+    </div>
+
+    <div id="eventFormContent">
+      <!-- Basic tab -->
+      <!-- ============== -->
+      <!-- this tab is visible by default -->
+      <div id="bwEventTab-Details">
+        <table cellspacing="0" class="common">
+          <!-- Calendar -->
+          <!-- ======== -->
+          <xsl:variable name="submissionCalendars">
+            <xsl:value-of select="count(/bedework/myCalendars//calendar[calType='1'])"/>
+          </xsl:variable>
+          <tr>
+            <xsl:if test="$submissionCalendars = 1">
+              <xsl:attribute name="class">invisible</xsl:attribute>
+              <!-- hide this row altogether if there is only one calendar; if you want the calendar
+                   path displayed, comment out this xsl:if. -->
+            </xsl:if>
+            <td class="fieldname">
+              <xsl:copy-of select="$bwStr-FoEl-Calendar"/>
+            </td>
+            <td class="fieldval">
+              <xsl:choose>
+                <xsl:when test="$submissionCalendars = 1">
+                  <!-- there is only 1 writable calendar, just send a hidden field -->
+                  <xsl:variable name="newCalPath"><xsl:value-of select="/bedework/myCalendars//calendar[calType='1']/path"/></xsl:variable>
+                  <input type="hidden" name="newCalPath" value="{$newCalPath}"/>
+                  <span id="bwEventCalDisplay">
+                    <xsl:value-of select="$newCalPath"/>
+                  </span>
+                </xsl:when>
+                <xsl:otherwise>
+                  <select name="newCalPath" id="bwNewCalPathField">
+                    <xsl:for-each select="/bedework/myCalendars//calendar[calType='1']">
+                      <option>
+                        <xsl:attribute name="value"><xsl:value-of select="path"/></xsl:attribute>
+                        <xsl:value-of select="substring-after(substring-after(path,/bedework/submissionsRoot/unencoded),'/')"/>
+                      </option>
+                    </xsl:for-each>
+                  </select>
+                </xsl:otherwise>
+              </xsl:choose>
+            </td>
+          </tr>
+          <!--  Summary (title) of event  -->
+          <!--  ========================= -->
+          <tr>
+            <td class="fieldname">
+              <xsl:copy-of select="$bwStr-FoEl-Title"/>
+            </td>
+            <td class="fieldval">
+              <div id="bwEventTitleNotice" class="invisible"><xsl:copy-of select="$bwStr-FoEl-MustIncludeTitle"/></div> <!-- a holder for validation notes -->
+              <xsl:variable name="title" select="form/title/input/@value"/>
+              <input type="text" name="summary" size="80" value="{$title}" id="bwEventTitle"/>
+            </td>
+          </tr>
+
+          <!--  Date and Time -->
+          <!--  ============= -->
+          <tr>
+            <td class="fieldname">
+              <xsl:copy-of select="$bwStr-FoEl-DateAndTime"/>
+            </td>
+            <td class="fieldval">
+              <!-- Set the timefields class for the first load of the page;
+                   subsequent changes will take place using javascript without a
+                   page reload. -->
+              <xsl:variable name="timeFieldsClass">
+                <xsl:choose>
+                  <xsl:when test="form/allDay/input/@checked='checked'">invisible</xsl:when>
+                  <xsl:otherwise>timeFields</xsl:otherwise>
+                </xsl:choose>
+              </xsl:variable>
+
+              <!-- date only event: anniversary event - often interpreted as "all day event" -->
+              <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="true" id="allDayStartDateField"/>
+                  <input type="hidden" name="eventEndDate.dateOnly" value="true" id="allDayEndDateField"/>
+                </xsl:when>
+                <xsl:otherwise>
+                  <input type="checkbox" name="allDayFlag" onclick="swapAllDayEvent(this)" value="off"/>
+                  <input type="hidden" name="eventStartDate.dateOnly" value="false" id="allDayStartDateField"/>
+                  <input type="hidden" name="eventEndDate.dateOnly" value="false" id="allDayEndDateField"/>
+                </xsl:otherwise>
+              </xsl:choose>
+              <xsl:copy-of select="$bwStr-FoEl-AllDay"/>
+
+              <!-- HIDE floating event: no timezone (and not UTC)
+              <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="true" id="startFloating"/>
+                  <input type="hidden" name="eventEndDate.floating" value="true" 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="false" id="startFloating"/>
+                  <input type="hidden" name="eventEndDate.floating" value="false" id="endFloating"/>
+                </xsl:otherwise>
+              </xsl:choose>
+              floating -->
+
+              <!-- HIDE store time as coordinated universal time (UTC)
+              <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="true" id="startStoreUTC"/>
+                  <input type="hidden" name="eventEndDate.storeUTC" value="true" 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="false" id="startStoreUTC"/>
+                  <input type="hidden" name="eventEndDate.storeUTC" value="false" id="endStoreUTC"/>
+                </xsl:otherwise>
+              </xsl:choose>
+              store as UTC-->
+
+              <br/>
+              <div class="dateStartEndBox">
+                <strong><xsl:copy-of select="$bwStr-FoEl-Start"/></strong>
+                <div class="dateFields">
+                  <span class="startDateLabel"><xsl:copy-of select="$bwStr-FoEl-Date"/><xsl:text> </xsl:text></span>
+                  <xsl:choose>
+                    <xsl:when test="$portalFriendly = 'true'">
+                      <xsl:copy-of select="/bedework/formElements/form/start/month/*"/>
+                      <xsl:copy-of select="/bedework/formElements/form/start/day/*"/>
+                      <xsl:choose>
+                        <xsl:when test="/bedework/creating = 'true'">
+                          <xsl:copy-of select="/bedework/formElements/form/start/year/*"/>
+                        </xsl:when>
+                        <xsl:otherwise>
+                          <xsl:copy-of select="/bedework/formElements/form/start/yearText/*"/>
+                        </xsl:otherwise>
+                      </xsl:choose>
+                      <script language="JavaScript" type="text/javascript">
+                        <xsl:comment>
+                        startDateDynCalWidget = new dynCalendar('startDateDynCalWidget', <xsl:value-of select="number(/bedework/formElements/form/start/yearText/input/@value)"/>, <xsl:value-of select="number(/bedework/formElements/form/start/month/select/option[@selected='selected']/@value)-1"/>, <xsl:value-of select="number(/bedework/formElements/form/start/day/select/option[@selected='selected']/@value)"/>, 'startDateCalWidgetCallback', '<xsl:value-of select="$resourcesRoot"/>/resources/');
+                        </xsl:comment>
+                      </script>
+                    </xsl:when>
+                    <xsl:otherwise>
+                      <input type="text" name="bwEventWidgetStartDate" id="bwEventWidgetStartDate" size="10"/>
+                      <script language="JavaScript" type="text/javascript">
+                        <xsl:comment>
+                        /*$("#bwEventWidgetStartDate").datepicker({
+                          defaultDate: new Date(<xsl:value-of select="form/start/yearText/input/@value"/>, <xsl:value-of select="number(form/start/month/select/option[@selected = 'selected']/@value) - 1"/>, <xsl:value-of select="form/start/day/select/option[@selected = 'selected']/@value"/>)
+                        }).attr("readonly", "readonly");
+                        $("#bwEventWidgetStartDate").val('<xsl:value-of select="substring-before(form/start/rfc3339DateTime,'T')"/>');
+                        */
+                        </xsl:comment>
+                      </script>
+                      <input type="hidden" name="eventStartDate.year">
+                        <xsl:attribute name="value"><xsl:value-of select="form/start/yearText/input/@value"/></xsl:attribute>
+                      </input>
+                      <input type="hidden" name="eventStartDate.month">
+                        <xsl:attribute name="value"><xsl:value-of select="form/start/month/select/option[@selected = 'selected']/@value"/></xsl:attribute>
+                      </input>
+                      <input type="hidden" name="eventStartDate.day">
+                        <xsl:attribute name="value"><xsl:value-of select="form/start/day/select/option[@selected = 'selected']/@value"/></xsl:attribute>
+                      </input>
+                    </xsl:otherwise>
+                  </xsl:choose>
+                </div>
+                <div class="{$timeFieldsClass}" id="startTimeFields">
+                  <span id="calWidgetStartTimeHider" class="show">
+                    <xsl:copy-of select="form/start/hour/*"/>
+                    <xsl:copy-of select="form/start/minute/*"/>
+                    <xsl:if test="form/start/ampm">
+                      <xsl:copy-of select="form/start/ampm/*"/>
+                    </xsl:if>
+                    <xsl:text> </xsl:text>
+                    <a href="javascript:bwClockLaunch('eventStartDate');"><img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" alt="bwClock"/></a>
+
+                    <select name="eventStartDate.tzid" id="startTzid" class="timezones">
+                      <xsl:if test="form/floating/input/@checked='checked'"><xsl:attribute name="disabled">disabled</xsl:attribute></xsl:if>
+                      <option value="-1"><xsl:copy-of select="$bwStr-FoEl-SelectTimezone"/></option>
+                      <xsl:variable name="startTzId" select="form/start/tzid"/>
+                      <xsl:for-each select="/bedework/timezones/timezone">
+                        <option>
+                          <xsl:attribute name="value"><xsl:value-of select="id"/></xsl:attribute>
+                          <xsl:if test="$startTzId = id"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if>
+                          <xsl:value-of select="name"/>
+                        </option>
+                      </xsl:for-each>
+                    </select>
+                  </span>
+                </div>
+              </div>
+              <div class="dateStartEndBox">
+                <strong>
+                  <xsl:choose>
+                    <xsl:when test="form/entityType = '2'"><xsl:copy-of select="$bwStr-FoEl-Due"/></xsl:when>
+                    <xsl:otherwise><xsl:copy-of select="$bwStr-FoEl-End"/></xsl:otherwise>
+                  </xsl:choose>
+                </strong>
+                <xsl:choose>
+                  <xsl:when test="form/end/type='E'">
+                    <input type="radio" name="eventEndType" value="E" checked="checked" onclick="changeClass('endDateTime','shown');changeClass('endDuration','invisible');"/>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <input type="radio" name="eventEndType" value="E" onclick="changeClass('endDateTime','shown');changeClass('endDuration','invisible');"/>
+                  </xsl:otherwise>
+                </xsl:choose>
+                <xsl:copy-of select="$bwStr-FoEl-Date"/>
+                <xsl:variable name="endDateTimeClass">
+                  <xsl:choose>
+                    <xsl:when test="form/end/type='E'">shown</xsl:when>
+                    <xsl:otherwise>invisible</xsl:otherwise>
+                  </xsl:choose>
+                </xsl:variable>
+                <div class="{$endDateTimeClass}" id="endDateTime">
+                  <div class="dateFields">
+                    <xsl:choose>
+                      <xsl:when test="$portalFriendly = 'true'">
+                        <xsl:copy-of select="/bedework/formElements/form/end/dateTime/month/*"/>
+                        <xsl:copy-of select="/bedework/formElements/form/end/dateTime/day/*"/>
+                        <xsl:choose>
+                          <xsl:when test="/bedework/creating = 'true'">
+                            <xsl:copy-of select="/bedework/formElements/form/end/dateTime/year/*"/>
+                          </xsl:when>
+                          <xsl:otherwise>
+                            <xsl:copy-of select="/bedework/formElements/form/end/dateTime/yearText/*"/>
+                          </xsl:otherwise>
+                        </xsl:choose>
+                        <script language="JavaScript" type="text/javascript">
+                        <xsl:comment>
+                          endDateDynCalWidget = new dynCalendar('endDateDynCalWidget', <xsl:value-of select="number(/bedework/formElements/form/start/yearText/input/@value)"/>, <xsl:value-of select="number(/bedework/formElements/form/start/month/select/option[@selected='selected']/@value)-1"/>, <xsl:value-of select="number(/bedework/formElements/form/start/day/select/option[@selected='selected']/@value)"/>, 'endDateCalWidgetCallback', '<xsl:value-of select="$resourcesRoot"/>/resources/');
+                        </xsl:comment>
+                        </script>
+                      </xsl:when>
+                      <xsl:otherwise>
+                        <input type="text" name="bwEventWidgetEndDate" id="bwEventWidgetEndDate" size="10"/>
+                        <script language="JavaScript" type="text/javascript">
+                          <xsl:comment>
+                          /*$("#bwEventWidgetEndDate").datepicker({
+                            defaultDate: new Date(<xsl:value-of select="form/end/dateTime/yearText/input/@value"/>, <xsl:value-of select="number(form/end/dateTime/month/select/option[@selected = 'selected']/@value) - 1"/>, <xsl:value-of select="form/end/dateTime/day/select/option[@selected = 'selected']/@value"/>)
+                          }).attr("readonly", "readonly");
+                          $("#bwEventWidgetEndDate").val('<xsl:value-of select="substring-before(form/end/rfc3339DateTime,'T')"/>');
+                          */
+                          </xsl:comment>
+                        </script>
+                        <input type="hidden" name="eventEndDate.year">
+                          <xsl:attribute name="value"><xsl:value-of select="form/end/dateTime/yearText/input/@value"/></xsl:attribute>
+                        </input>
+                        <input type="hidden" name="eventEndDate.month">
+                          <xsl:attribute name="value"><xsl:value-of select="form/end/dateTime/month/select/option[@selected = 'selected']/@value"/></xsl:attribute>
+                        </input>
+                        <input type="hidden" name="eventEndDate.day">
+                          <xsl:attribute name="value"><xsl:value-of select="form/end/dateTime/day/select/option[@selected = 'selected']/@value"/></xsl:attribute>
+                        </input>
+                      </xsl:otherwise>
+                    </xsl:choose>
+                  </div>
+                  <div class="{$timeFieldsClass}" id="endTimeFields">
+                    <span id="calWidgetEndTimeHider" class="show">
+                      <xsl:copy-of select="form/end/dateTime/hour/*"/>
+                      <xsl:copy-of select="form/end/dateTime/minute/*"/>
+                      <xsl:if test="form/end/dateTime/ampm">
+                        <xsl:copy-of select="form/end/dateTime/ampm/*"/>
+                      </xsl:if>
+                      <xsl:text> </xsl:text>
+                      <a href="javascript:bwClockLaunch('eventEndDate');"><img src="{$resourcesRoot}/resources/clockIcon.gif" width="16" height="15" border="0" alt="bwClock"/></a>
+
+                      <select name="eventEndDate.tzid" id="endTzid" class="timezones">
+                        <xsl:if test="form/floating/input/@checked='checked'"><xsl:attribute name="disabled">disabled</xsl:attribute></xsl:if>
+                        <option value="-1"><xsl:copy-of select="$bwStr-FoEl-SelectTimezone"/></option>
+                        <xsl:variable name="endTzId" select="form/end/dateTime/tzid"/>
+                        <xsl:for-each select="/bedework/timezones/timezone">
+                          <option>
+                            <xsl:attribute name="value"><xsl:value-of select="id"/></xsl:attribute>
+                              <xsl:if test="$endTzId = id"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if>
+                            <xsl:value-of select="name"/>
+                          </option>
+                        </xsl:for-each>
+                      </select>
+                    </span>
+                  </div>
+                </div><br/>
+                <div id="clock" class="invisible">
+                  <xsl:call-template name="clock"/>
+                </div>
+                <div class="dateFields">
+                  <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');"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                      <input type="radio" name="eventEndType" value="D" onclick="changeClass('endDateTime','invisible');changeClass('endDuration','shown');"/>
+                    </xsl:otherwise>
+                  </xsl:choose>
+                  <xsl:copy-of select="$bwStr-FoEl-Duration"/>
+                  <xsl:variable name="endDurationClass">
+                    <xsl:choose>
+                      <xsl:when test="form/end/type='D'">shown</xsl:when>
+                      <xsl:otherwise>invisible</xsl:otherwise>
+                    </xsl:choose>
+                  </xsl:variable>
+                  <xsl:variable name="durationHrMinClass">
+                    <xsl:choose>
+                      <xsl:when test="form/allDay/input/@checked='checked'">invisible</xsl:when>
+                      <xsl:otherwise>shown</xsl:otherwise>
+                    </xsl:choose>
+                  </xsl:variable>
+                  <div class="{$endDurationClass}" id="endDuration">
+                    <xsl:choose>
+                      <xsl:when test="form/end/duration/weeks/input/@value = '0'">
+                      <!-- we are using day, hour, minute format -->
+                      <!-- must send either no week value or week value of 0 (zero) -->
+                        <div class="durationBox">
+                          <input type="radio" name="eventDuration.type" value="daytime" onclick="swapDurationType('daytime')" checked="checked"/>
+                          <xsl:variable name="daysStr" select="form/end/duration/days/input/@value"/>
+                          <input type="text" name="eventDuration.daysStr" size="2" value="{$daysStr}" id="durationDays"/><xsl:copy-of select="$bwStr-FoEl-Days"/>
+                          <span id="durationHrMin" class="{$durationHrMinClass}">
+                            <xsl:variable name="hoursStr" select="form/end/duration/hours/input/@value"/>
+                            <input type="text" name="eventDuration.hoursStr" size="2" value="{$hoursStr}" id="durationHours"/><xsl:copy-of select="$bwStr-FoEl-Hours"/>
+                            <xsl:variable name="minutesStr" select="form/end/duration/minutes/input/@value"/>
+                            <input type="text" name="eventDuration.minutesStr" size="2" value="{$minutesStr}" id="durationMinutes"/><xsl:copy-of select="$bwStr-FoEl-Minutes"/>
+                          </span>
+                        </div>
+                        <span class="durationSpacerText"><xsl:copy-of select="$bwStr-FoEl-Or"/></span>
+                        <div class="durationBox">
+                          <input type="radio" name="eventDuration.type" value="weeks" onclick="swapDurationType('week')"/>
+                          <xsl:variable name="weeksStr" select="form/end/duration/weeks/input/@value"/>
+                          <input type="text" name="eventDuration.weeksStr" size="2" value="{$weeksStr}" id="durationWeeks" disabled="disabled"/><xsl:copy-of select="$bwStr-FoEl-Weeks"/>
+                        </div>
+                      </xsl:when>
+                      <xsl:otherwise>
+                        <!-- we are using week format -->
+                        <div class="durationBox">
+                          <input type="radio" name="eventDuration.type" value="daytime" onclick="swapDurationType('daytime')"/>
+                          <xsl:variable name="daysStr" select="form/end/duration/days/input/@value"/>
+                          <input type="text" name="eventDuration.daysStr" size="2" value="{$daysStr}" id="durationDays" disabled="disabled"/><xsl:copy-of select="$bwStr-FoEl-Days"/>
+                          <span id="durationHrMin" class="{$durationHrMinClass}">
+                            <xsl:variable name="hoursStr" select="form/end/duration/hours/input/@value"/>
+                            <input type="text" name="eventDuration.hoursStr" size="2" value="{$hoursStr}" id="durationHours" disabled="disabled"/><xsl:copy-of select="$bwStr-FoEl-Hours"/>
+                            <xsl:variable name="minutesStr" select="form/end/duration/minutes/input/@value"/>
+                            <input type="text" name="eventDuration.minutesStr" size="2" value="{$minutesStr}" id="durationMinutes" disabled="disabled"/><xsl:copy-of select="$bwStr-FoEl-Minutes"/>
+                          </span>
+                        </div>
+                        <span class="durationSpacerText"><xsl:copy-of select="$bwStr-FoEl-Or"/></span>
+                        <div class="durationBox">
+                          <input type="radio" name="eventDuration.type" value="weeks" onclick="swapDurationType('week')" checked="checked"/>
+                          <xsl:variable name="weeksStr" select="form/end/duration/weeks/input/@value"/>
+                          <input type="text" name="eventDuration.weeksStr" size="2" value="{$weeksStr}" id="durationWeeks"/><xsl:copy-of select="$bwStr-FoEl-Weeks"/>
+                        </div>
+                      </xsl:otherwise>
+                    </xsl:choose>
+                  </div>
+                </div><br/>
+                <div class="dateFields" id="noDuration">
+                  <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');"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                      <input type="radio" name="eventEndType" value="N" onclick="changeClass('endDateTime','invisible');changeClass('endDuration','invisible');"/>
+                    </xsl:otherwise>
+                  </xsl:choose>
+                  <xsl:copy-of select="$bwStr-FoEl-This"/><xsl:text> </xsl:text>
+                  <xsl:choose>
+                    <xsl:when test="form/entityType = '2'"><xsl:copy-of select="$bwStr-FoEl-Task"/></xsl:when>
+                    <xsl:otherwise><xsl:copy-of select="$bwStr-FoEl-Event"/></xsl:otherwise>
+                  </xsl:choose>
+                  <xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-HasNoDurationEndDate"/>
+                </div>
+              </div>
+            </td>
+          </tr>
+
+          <!--  Description  -->
+          <tr>
+            <td class="fieldname"><xsl:copy-of select="$bwStr-FoEl-Description"/></td>
+            <td class="fieldval">
+              <div id="bwEventDescNotice" class="invisible"><xsl:copy-of select="$bwStr-FoEl-MustIncludeDescription"/></div> <!-- a holder for validation notes -->
+              <xsl:choose>
+                <xsl:when test="normalize-space(form/desc/textarea) = ''">
+                  <textarea name="description" cols="60" rows="4" id="bwEventDesc">
+                    <xsl:text> </xsl:text>
+                  </textarea>
+                  <!-- keep this space to avoid browser
+                  rendering errors when the text area is empty -->
+                </xsl:when>
+                <xsl:otherwise>
+                  <textarea name="description" cols="60" rows="4" id="bwEventDesc">
+                    <xsl:value-of select="form/desc/textarea"/>
+                  </textarea>
+                </xsl:otherwise>
+              </xsl:choose>
+            </td>
+          </tr>
+          <!--  Status  -->
+          <tr>
+            <td class="fieldname">
+              <xsl:copy-of select="$bwStr-FoEl-Status"/>
+            </td>
+            <td class="fieldval">
+              <input type="radio" name="eventStatus" value="CONFIRMED">
+                <xsl:if test="form/status = 'CONFIRMED' or /bedework/creating = 'true' or form/status = ''"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if>
+              </input>
+              <xsl:copy-of select="$bwStr-FoEl-Confirmed"/>
+              <input type="radio" name="eventStatus" value="TENTATIVE">
+                <xsl:if test="form/status = 'TENTATIVE'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if>
+              </input>
+              <xsl:copy-of select="$bwStr-FoEl-Tentative"/>
+              <input type="radio" name="eventStatus" value="CANCELLED">
+                <xsl:if test="form/status = 'CANCELLED'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if>
+              </input>
+              <xsl:copy-of select="$bwStr-FoEl-Canceled"/>
+            </td>
+          </tr>
+          <!-- Cost -->
+          <tr>
+            <td class="fieldname"><em><xsl:copy-of select="$bwStr-FoEl-Cost"/></em></td>
+            <td class="fieldval">
+              <input type="text" name="eventCost" size="30" value="">
+                <xsl:attribute name="value"><xsl:value-of select="form/cost/input/@value"/></xsl:attribute>
+              </input>
+              <span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-CostOptional"/></span>
+            </td>
+          </tr>
+          <!--  Link (url associated with event)  -->
+          <tr>
+            <td class="fieldname"><em><xsl:copy-of select="$bwStr-FoEl-EventURL"/></em></td>
+            <td class="fieldval">
+              <input type="text" name="eventLink" size="30" value="">
+                <xsl:attribute name="value"><xsl:value-of select="form/link/input/@value"/></xsl:attribute>
+              </input>
+              <span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-EventURLOptional"/></span>
+            </td>
+          </tr>
+          <!-- Image Url -->
+          <tr>
+            <td class="fieldname"><em><xsl:copy-of select="$bwStr-FoEl-ImageURL"/></em></td>
+            <td class="fieldval">
+              <input type="text" name="xBwImageHolder" size="30" value="">
+                <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text"/></xsl:attribute>
+              </input>
+              <xsl:text> </xsl:text>
+              <span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-ImageURLOptional"/></span>
+            </td>
+          </tr>
+        </table>
+      </div>
+
+      <!-- Location tab -->
+      <!-- ============== -->
+      <div id="bwEventTab-Location" class="invisible">
+        <div id="bwLocationUidNotice" class="invisible"><xsl:copy-of select="$bwStr-FoEl-MustSelectLocation"/></div>
+        <div class="mainForm">
+          <span id="eventFormLocationList">
+            <select name="locationUid" class="bigSelect" id="bwLocationUid">
+              <option value=""><xsl:copy-of select="$bwStr-FoEl-SelectExistingLocation"/></option>
+              <xsl:copy-of select="form/location/locationmenu/select/*"/>
+            </select>
+          </span>
+        </div>
+        <p class="subFormMessage">
+          <xsl:copy-of select="$bwStr-FoEl-DidntFindLocation"/>
+        </p>
+        <div class="subForm">
+          <p>
+            <label for="commentLocationAddress"><xsl:copy-of select="$bwStr-FoEl-Address"/><xsl:text> </xsl:text></label>
+            <input type="text" name="commentLocationAddress" id="bwCommentLocationAddress">
+              <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-LOCATION']/values/text"/></xsl:attribute>
+            </input>
+          </p>
+          <p>
+            <label for="commentLocationSubaddress"><em><xsl:copy-of select="$bwStr-FoEl-SubAddress"/></em> </label>
+            <input type="text" name="commentLocationSubaddress" id="commentLocationSubaddress">
+              <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-LOCATION']/parameters/node()[name()='X-BEDEWORK-PARAM-SUBADDRESS']"/></xsl:attribute>
+            </input>
+            <span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-Optional"/></span>
+          </p>
+          <p>
+            <label for="commentLocationURL"><em><xsl:copy-of select="$bwStr-FoEl-URL"/></em> </label>
+            <input type="text" name="commentLocationURL" id="commentLocationURL">
+              <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-LOCATION']/parameters/node()[name()='X-BEDEWORK-PARAM-URL']"/></xsl:attribute>
+            </input>
+            <span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-Optional"/></span>
+          </p>
+        </div>
+      </div>
+
+      <!-- Contact tab -->
+      <!-- ============== -->
+      <div id="bwEventTab-Contact" class="invisible">
+        <div id="bwContactUidNotice" class="invisible"><xsl:copy-of select="$bwStr-FoEl-MustSelectContact"/></div>
+        <div class="mainForm">
+          <select name="contactUid" id="bwContactUid" class="bigSelect">
+            <option value="">
+              <xsl:copy-of select="$bwStr-FoEl-SelectExistingContact"/>
+            </option>
+            <xsl:copy-of select="form/contact/all/select/*"/>
+          </select>
+        </div>
+        <p class="subFormMessage">
+          <xsl:copy-of select="$bwStr-FoEl-DidntFindContact"/>
+        </p>
+        <div class="subForm">
+          <p>
+            <label for="commentContactName"><xsl:copy-of select="$bwStr-FoEl-OrganizationName"/><xsl:text> </xsl:text> </label>
+            <input type="text" name="commentContactName" id="bwCommentContactName" size="40">
+              <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/values/text"/></xsl:attribute>
+            </input>
+            <span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-PleaseLimitContacts"/></span>
+          </p>
+          <p>
+            <label for="commentContactPhone"><em><xsl:copy-of select="$bwStr-FoEl-Phone"/></em> </label>
+            <input type="text" name="commentContactPhone">
+              <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-PHONE']"/></xsl:attribute>
+            </input>
+            <span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-Optional"/></span>
+          </p>
+          <p>
+            <label for="commentContactURL"><em><xsl:copy-of select="$bwStr-FoEl-URL"/></em> </label>
+            <input type="text" name="commentContactURL">
+              <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-URL']"/></xsl:attribute>
+            </input>
+            <span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-Optional"/></span>
+          </p>
+          <p>
+            <label for="commentContactEmail"><em><xsl:copy-of select="$bwStr-FoEl-Email"/></em> </label>
+            <input type="text" name="commentContactEmail">
+              <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CONTACT']/parameters/node()[name()='X-BEDEWORK-PARAM-EMAIL']"/></xsl:attribute>
+            </input>
+            <span class="note"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-FoEl-Optional"/></span>
+          </p>
+        </div>
+      </div>
+
+      <!-- Categories tab (now Topical areas) -->
+      <!-- ================================== -->
+      <div id="bwEventTab-Categories" class="invisible">
+        <!-- Topical area  -->
+        <!-- These are the subscriptions (aliases) where the events should show up.
+             By selecting one or more of these, appropriate categories will be set on the event -->
+        <ul class="aliasTree">
+          <!-- hard coding the "aliases" name is not best, but will do for now -->
+          <xsl:apply-templates select="form/calendars/calendar/calendar[name='aliases']" mode="showEventFormAliases">
+            <xsl:with-param name="root">true</xsl:with-param>
+          </xsl:apply-templates>
+        </ul>
+        <p class="subFormMessage">
+          <xsl:copy-of select="$bwStr-FoEl-MissingTopicalArea"/>
+        </p>
+        <div class="subForm">
+          <p>
+            <label for="commentCategories"><xsl:copy-of select="$bwStr-FoEl-TypeOfEvent"/><xsl:text> </xsl:text></label>
+            <input type="text" name="commentCategories" size="80">
+              <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CATEGORIES']/values/text"/></xsl:attribute>
+            </input>
+          </p>
+        </div>
+        <!-- xsl:variable name="catCount" select="count(form/categories/all/category)"/>
+        <xsl:choose>
+          <xsl:when test="not(form/categories/all/category)">
+            no categories defined
+          </xsl:when>
+          <xsl:otherwise>
+            <table cellpadding="0" id="allCategoryCheckboxes">
+              <tr>
+                <td>
+                  <xsl:for-each select="form/categories/all/category[position() &lt;= ceiling($catCount div 2)]">
+                    <input type="checkbox" name="catUid">
+                      <xsl:attribute name="value"><xsl:value-of select="uid"/></xsl:attribute>
+                      <xsl:if test="uid = ../../current//category/uid"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if>
+                      <xsl:value-of select="value"/>
+                    </input><br/>
+                  </xsl:for-each>
+                </td>
+                <td>
+                  <xsl:for-each select="form/categories/all/category[position() &gt; ceiling($catCount div 2)]">
+                    <input type="checkbox" name="catUid">
+                      <xsl:attribute name="value"><xsl:value-of select="uid"/></xsl:attribute>
+                      <xsl:if test="uid = ../../current//category/uid"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if>
+                      <xsl:value-of select="value"/>
+                    </input><br/>
+                  </xsl:for-each>
+                </td>
+              </tr>
+            </table>
+          </xsl:otherwise>
+        </xsl:choose>
+        <p class="subFormMessage">
+          Didn't find the category you want?  Suggest a new one:
+        </p>
+        <div class="subForm">
+          <p>
+            <label for="commentCategories">Category suggestion: </label>
+            <input type="text" name="commentCategories" size="30">
+              <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-CATEGORIES']/values/text"/></xsl:attribute>
+            </input>
+          </p>
+        </div-->
+      </div>
+
+      <!--   Review tab   -->
+      <!-- ============== -->
+      <div id="bwEventTab-Review" class="invisible">
+        <!--  <table id="bwEventSubmitReview" class="common">
+          <tr>
+            <th colspan="2">Event Details</th>
+          </tr>-->
+          <!-- the form elements will be inserted here -->
+        <!-- </table>-->
+
+        <div id="bwCommentNotes">
+          <!-- holders for validation notes -->
+          <div id="xBwEmailHolderNotice" class="invisible"><xsl:copy-of select="$bwStr-FoEl-MustIncludeEmail"/></div>
+          <div id="xBwEmailHolderInvalidNotice" class="invisible"><xsl:copy-of select="$bwStr-FoEl-InvalidEmailAddress"/></div>
+          <p>
+            <label for="xBwEmailHolder"><xsl:copy-of select="$bwStr-FoEl-EnterEmailAddress"/><xsl:text> </xsl:text></label><br/>
+            <input type="text" name="xBwEmailHolder" id="xBwEmailHolder" size="80">
+              <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-SUBMITTER-EMAIL']/values/text"/></xsl:attribute>
+            </input>
+          </p>
+
+          <p>
+            <xsl:copy-of select="$bwStr-FoEl-FinalNotes"/><br/>
+          <!-- note: don't remove the #160 from the textarea or browsers will see it as a closed tag when empty -->
+           <textarea name="commentNotes" cols="60" rows="4"><!--
+           --><xsl:value-of select="normalize-space(form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text)"/><!--
+           --><xsl:if test="normalize-space(form/xproperties/node()[name()='X-BEDEWORK-SUBMIT-COMMENT']/values/text) = ''">&#160;</xsl:if><!--
+           --></textarea>
+          </p>
+        </div>
+        <div class="eventSubmitButtons">
+          <input name="submit" class="submit" type="submit" value="{$bwStr-FoEl-SubmitForApproval}"/>
+          <input name="cancelled" type="submit" value="{$bwStr-FoEl-Cancel}"/>
+        </div>
+      </div>
+    </div>
+
+    <div id="bwBottomNav">
+      <div id="bwBottomNav-Details">
+        <div class="navButtons">
+          <a href="javascript:show('bwEventTab-Location','bwHelp-Location','bwBottomNav-Location'); hide('bwEventTab-Details','bwHelp-Details','bwBottomNav-Details');"
+             onclick="return validateStep1();">
+            <xsl:copy-of select="$bwStr-FoEl-Next"/>
+            <xsl:text> </xsl:text>
+            <img alt="{$bwStr-FoEl-Next}"
+              src="{$resourcesRoot}/resources/arrowRight.gif"
+              width="13"
+              height="13"
+              border="0"/>
+          </a>
+        </div>
+      </div>
+      <div id="bwBottomNav-Location" class="invisible">
+        <div class="navButtons">
+          <a href="javascript:show('bwEventTab-Details','bwHelp-Details','bwBottomNav-Details'); hide('bwEventTab-Location','bwHelp-Location','bwBottomNav-Location');">
+            <img alt="{$bwStr-FoEl-Previous}"
+              src="{$resourcesRoot}/resources/arrowLeft.gif"
+              width="13"
+              height="13"
+              border="0"/>
+            <xsl:text> </xsl:text>
+            <xsl:copy-of select="$bwStr-FoEl-Previous"/>
+          </a> |
+          <a href="javascript:show('bwEventTab-Contact','bwHelp-Contact','bwBottomNav-Contact'); hide('bwEventTab-Location','bwHelp-Location','bwBottomNav-Location');"
+             onclick="return validateStep2();">
+            <xsl:copy-of select="$bwStr-FoEl-Next"/>
+            <xsl:text> </xsl:text>
+            <img alt="{$bwStr-FoEl-Next}"
+              src="{$resourcesRoot}/resources/arrowRight.gif"
+              width="13"
+              height="13"
+              border="0"/>
+          </a>
+        </div>
+      </div>
+      <div id="bwBottomNav-Contact" class="invisible">
+        <div class="navButtons">
+          <a href="javascript:show('bwEventTab-Location','bwHelp-Location','bwBottomNav-Location'); hide('bwHelp-Contact','bwEventTab-Contact','bwBottomNav-Contact');">
+            <img alt="{$bwStr-FoEl-Previous}"
+              src="{$resourcesRoot}/resources/arrowLeft.gif"
+              width="13"
+              height="13"
+              border="0"/>
+            <xsl:text> </xsl:text>
+            <xsl:copy-of select="$bwStr-FoEl-Previous"/>
+          </a> |
+          <a href="javascript:show('bwEventTab-Categories','bwHelp-Categories','bwBottomNav-Categories'); hide('bwHelp-Contact','bwEventTab-Contact','bwBottomNav-Contact');"
+             onclick="return validateStep3();">
+            <xsl:copy-of select="$bwStr-FoEl-Next"/>
+            <xsl:text> </xsl:text>
+            <img alt="{$bwStr-FoEl-Next}"
+              src="{$resourcesRoot}/resources/arrowRight.gif"
+              width="13"
+              height="13"
+              border="0"/>
+          </a>
+        </div>
+      </div>
+      <div id="bwBottomNav-Categories" class="invisible">
+        <div class="navButtons">
+          <a href="javascript:show('bwEventTab-Contact','bwHelp-Contact','bwBottomNav-Contact'); hide('bwHelp-Categories','bwEventTab-Categories','bwBottomNav-Categories');">
+            <img alt="{$bwStr-FoEl-Previous}"
+              src="{$resourcesRoot}/resources/arrowLeft.gif"
+              width="13"
+              height="13"
+              border="0"/>
+            <xsl:text> </xsl:text>
+            <xsl:copy-of select="$bwStr-FoEl-Previous"/>
+          </a> |
+          <a href="javascript:show('bwHelp-Review','bwEventTab-Review','bwBottomNav-Review'); hide('bwHelp-Categories','bwEventTab-Categories','bwBottomNav-Categories');">
+            <!-- displayReview('standardForm','bwEventSubmitReview',1) -->
+            <xsl:copy-of select="$bwStr-FoEl-Next"/>
+            <xsl:text> </xsl:text>
+            <img alt="{$bwStr-FoEl-Next}"
+              src="{$resourcesRoot}/resources/arrowRight.gif"
+              width="13"
+              height="13"
+              border="0"/>
+          </a>
+        </div>
+      </div>
+      <div id="bwBottomNav-Review" class="invisible">
+        <div class="navButtons">
+          <a href="javascript:show('bwHelp-Categories','bwEventTab-Categories','bwBottomNav-Categories'); hide('bwHelp-Review','bwEventTab-Review','bwBottomNav-Review'); ">
+            <img alt="{$bwStr-FoEl-Previous}"
+              src="{$resourcesRoot}/resources/arrowLeft.gif"
+              width="13"
+              height="13"
+              border="0"/>
+            <xsl:text> </xsl:text>
+            <xsl:copy-of select="$bwStr-FoEl-Previous"/>
+          </a>
+          <span class="hidden">
+            <xsl:text> </xsl:text>|<xsl:text> </xsl:text>
+            <xsl:copy-of select="$bwStr-FoEl-Next"/>
+            <xsl:text> </xsl:text>
+            <img alt="{$bwStr-FoEl-Next}"
+              src="{$resourcesRoot}/resources/arrowRight.gif"
+              width="13"
+              height="13"
+              border="0"/>
+          </span>
+        </div>
+      </div>
+    </div>
+  </xsl:template>
+
+  <xsl:template match="calendar" mode="showEventFormAliases">
+    <xsl:param name="root">false</xsl:param>
+    <li>
+      <xsl:if test="$root != 'true'">
+        <!-- hide the root calendar. -->
+        <xsl:choose>
+          <xsl:when test="calType = '7' or calType = '8'">
+            <!-- we've hit an unresolvable alias; stop descending -->
+            <input type="checkbox" name="forDiplayOnly" disabled="disabled"/>
+            <em><xsl:value-of select="name"/>?</em>
+          </xsl:when>
+          <xsl:when test="calType = '0'">
+            <!-- no direct selecting of folders or folder aliases: we only want users to select the
+                 underlying calendar aliases -->
+            <img src="{$resourcesRoot}/resources/catIcon.gif" width="13" height="13" alt="folder" class="folderForAliasTree" border="0"/>
+            <xsl:value-of select="name"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:variable name="virtualPath">/user<xsl:for-each select="ancestor-or-self::calendar/name">/<xsl:value-of select="."/></xsl:for-each></xsl:variable>
+            <input type="checkbox" name="alias" onclick="toggleBedeworkXProperty('X-BEDEWORK-SUBMIT-ALIAS','{$virtualPath}',this.checked)">
+              <xsl:attribute name="value"><xsl:value-of select="$virtualPath"/></xsl:attribute>
+              <xsl:if test="$virtualPath = /bedework/formElements/form/xproperties//X-BEDEWORK-SUBMIT-ALIAS/values/text"><xsl:attribute name="checked"><xsl:value-of select="checked"/></xsl:attribute></xsl:if>
+            </input>
+            <xsl:choose>
+              <xsl:when test="$virtualPath = /bedework/formElements/form/xproperties//X-BEDEWORK-SUBMIT-ALIAS/values/text">
+                <strong><xsl:value-of select="name"/></strong>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:value-of select="name"/>
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:if>
+
+      <xsl:if test="calendar">
+        <ul>
+          <xsl:apply-templates select="calendar" mode="showEventFormAliases"/>
+        </ul>
+      </xsl:if>
+    </li>
+  </xsl:template>
+
+  <xsl:template match="val" mode="weekMonthYearNumbers">
+    <xsl:if test="position() != 1 and position() = last()"><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-WMYN-Next"/><xsl:text> </xsl:text></xsl:if>
+    <xsl:value-of select="."/><xsl:choose>
+      <xsl:when test="substring(., string-length(.)-1, 2) = '11' or
+                      substring(., string-length(.)-1, 2) = '12' or
+                      substring(., string-length(.)-1, 2) = '13'">th</xsl:when>
+      <xsl:when test="substring(., string-length(.), 1) = '1'">st</xsl:when>
+      <xsl:when test="substring(., string-length(.), 1) = '2'">nd</xsl:when>
+      <xsl:when test="substring(., string-length(.), 1) = '3'">rd</xsl:when>
+      <xsl:otherwise>th</xsl:otherwise>
+    </xsl:choose>
+    <xsl:if test="position() != last()">, </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="byDayChkBoxList">
+    <xsl:param name="name"/>
+    <xsl:for-each select="/bedework/shortdaynames/val">
+      <xsl:variable name="pos" select="position()"/>
+      <input type="checkbox">
+        <xsl:attribute name="value"><xsl:value-of select="/bedework/recurdayvals/val[position() = $pos]"/></xsl:attribute>
+        <xsl:attribute name="name"><xsl:value-of select="$name"/></xsl:attribute>
+      </input>
+      <xsl:value-of select="."/>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template name="buildCheckboxList">
+    <xsl:param name="current"/>
+    <xsl:param name="end"/>
+    <xsl:param name="name"/>
+    <xsl:param name="splitter">10</xsl:param>
+    <span class="chkBoxListItem">
+      <input type="checkbox">
+        <xsl:attribute name="name"><xsl:value-of select="$name"/></xsl:attribute>
+        <xsl:attribute name="value"><xsl:value-of select="$current"/></xsl:attribute>
+      </input>
+      <xsl:value-of select="$current"/>
+    </span>
+    <xsl:if test="$current mod $splitter = 0"><br/></xsl:if>
+    <xsl:if test="$current = $end"><br/></xsl:if>
+    <xsl:if test="$current &lt; $end">
+      <xsl:call-template name="buildCheckboxList">
+        <xsl:with-param name="current"><xsl:value-of select="$current + 1"/></xsl:with-param>
+        <xsl:with-param name="end"><xsl:value-of select="$end"/></xsl:with-param>
+        <xsl:with-param name="name"><xsl:value-of select="$name"/></xsl:with-param>
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="recurrenceDayPosOptions">
+    <option value="0"><xsl:copy-of select="$bwStr-RDPO-None"/></option>
+    <option value="1"><xsl:copy-of select="$bwStr-RDPO-TheFirst"/></option>
+    <option value="2"><xsl:copy-of select="$bwStr-RDPO-TheSecond"/></option>
+    <option value="3"><xsl:copy-of select="$bwStr-RDPO-TheThird"/></option>
+    <option value="4"><xsl:copy-of select="$bwStr-RDPO-TheFourth"/></option>
+    <option value="5"><xsl:copy-of select="$bwStr-RDPO-TheFifth"/></option>
+    <option value="-1"><xsl:copy-of select="$bwStr-RDPO-TheLast"/></option>
+    <option value=""><xsl:copy-of select="$bwStr-RDPO-Every"/></option>
+  </xsl:template>
+
+  <xsl:template name="buildRecurFields">
+    <xsl:param name="current"/>
+    <xsl:param name="total"/>
+    <xsl:param name="name"/>
+    <div class="invisible">
+      <xsl:attribute name="id"><xsl:value-of select="$name"/>RecurFields<xsl:value-of select="$current"/></xsl:attribute>
+      <xsl:copy-of select="$bwStr-BReF-And"/>
+      <select width="12em">
+        <xsl:attribute name="name">by<xsl:value-of select="$name"/>posPos<xsl:value-of select="$current"/></xsl:attribute>
+        <xsl:if test="$current != $total">
+          <xsl:attribute name="onchange">changeClass('<xsl:value-of select="$name"/>RecurFields<xsl:value-of select="$current+1"/>','shown')</xsl:attribute>
+        </xsl:if>
+        <xsl:call-template name="recurrenceDayPosOptions"/>
+      </select>
+      <xsl:call-template name="byDayChkBoxList"/>
+    </div>
+    <xsl:if test="$current &lt; $total">
+      <xsl:call-template name="buildRecurFields">
+        <xsl:with-param name="current"><xsl:value-of select="$current+1"/></xsl:with-param>
+        <xsl:with-param name="total"><xsl:value-of select="$total"/></xsl:with-param>
+        <xsl:with-param name="name"><xsl:value-of select="$name"/></xsl:with-param>
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="buildNumberOptions">
+    <xsl:param name="current"/>
+    <xsl:param name="total"/>
+    <option value="{$current}"><xsl:value-of select="$current"/></option>
+    <xsl:if test="$current &lt; $total">
+      <xsl:call-template name="buildNumberOptions">
+        <xsl:with-param name="current"><xsl:value-of select="$current+1"/></xsl:with-param>
+        <xsl:with-param name="total"><xsl:value-of select="$total"/></xsl:with-param>
+      </xsl:call-template>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template name="clock">
+    <div id="bwClock">
+      <!-- Bedework 24-Hour Clock time selection widget
+           used with resources/bwClock.js and resources/bwClock.css -->
+      <xsl:variable name="hour24" select="/bedework/hour24"/><!-- true or false -->
+      <div id="bwClockClock">
+        <img id="clockMap" src="{$resourcesRoot}/resources/clockMap.gif" width="368" height="368" border="0" alt="bwClock" usemap="#bwClockMap" />
+      </div>
+      <div id="bwClockCover">
+        &#160;
+        <!-- this is a special effect div used simply to cover the pixelated edge
+             where the clock meets the clock box title -->
+      </div>
+      <div id="bwClockBox">
+        <h2>
+          <xsl:copy-of select="$bwStr-Cloc-Bedework24HourClock"/>
+        </h2>
+        <div id="bwClockDateTypeIndicator">
+          <xsl:copy-of select="$bwStr-Cloc-Type"/>
+        </div>
+        <div id="bwClockTime">
+          <xsl:copy-of select="$bwStr-Cloc-SelectTime"/>
+        </div>
+        <div id="bwClockSwitch">
+          <xsl:copy-of select="$bwStr-Cloc-Switch"/>
+        </div>
+        <div id="bwClockCloseText">
+          <xsl:copy-of select="$bwStr-Cloc-Close"/>
+        </div>
+        <div id="bwClockCloseButton">
+          <a href="javascript:bwClockClose();">X</a>
+        </div>
+      </div>
+      <map name="bwClockMap" id="bwClockMap">
+        <area shape="rect" alt="close clock" title="close clock" coords="160,167, 200,200" href="javascript:bwClockClose()"/>
+        <area shape="poly" alt="minute 00:55" title="minute 00:55" coords="156,164, 169,155, 156,107, 123,128" href="javascript:bwClockUpdateDateTimeForm('minute','55')" />
+        <area shape="poly" alt="minute 00:50" title="minute 00:50" coords="150,175, 156,164, 123,128, 103,161" href="javascript:bwClockUpdateDateTimeForm('minute','50')" />
+        <area shape="poly" alt="minute 00:45" title="minute 00:45" coords="150,191, 150,175, 103,161, 103,206" href="javascript:bwClockUpdateDateTimeForm('minute','45')" />
+        <area shape="poly" alt="minute 00:40" title="minute 00:40" coords="158,208, 150,191, 105,206, 123,237" href="javascript:bwClockUpdateDateTimeForm('minute','40')" />
+        <area shape="poly" alt="minute 00:35" title="minute 00:35" coords="171,218, 158,208, 123,238, 158,261" href="javascript:bwClockUpdateDateTimeForm('minute','35')" />
+        <area shape="poly" alt="minute 00:30" title="minute 00:30" coords="193,218, 172,218, 158,263, 209,263" href="javascript:bwClockUpdateDateTimeForm('minute','30')" />
+        <area shape="poly" alt="minute 00:25" title="minute 00:25" coords="209,210, 193,218, 209,261, 241,240" href="javascript:bwClockUpdateDateTimeForm('minute','25')" />
+        <area shape="poly" alt="minute 00:20" title="minute 00:20" coords="216,196, 209,210, 241,240, 261,206" href="javascript:bwClockUpdateDateTimeForm('minute','20')" />
+        <area shape="poly" alt="minute 00:15" title="minute 00:15" coords="216,178, 216,196, 261,206, 261,159" href="javascript:bwClockUpdateDateTimeForm('minute','15')" />
+        <area shape="poly" alt="minute 00:10" title="minute 00:10" coords="209,164, 216,178, 261,159, 240,126" href="javascript:bwClockUpdateDateTimeForm('minute','10')" />
+        <area shape="poly" alt="minute 00:05" title="minute 00:05" coords="196,155, 209,164, 238,126, 206,107" href="javascript:bwClockUpdateDateTimeForm('minute','5')" />
+        <area shape="poly" alt="minute 00:00" title="minute 00:00" coords="169,155, 196,155, 206,105, 156,105" href="javascript:bwClockUpdateDateTimeForm('minute','0')" />
+        <area shape="poly" alt="11 PM, 2300 hour" title="11 PM, 2300 hour" coords="150,102, 172,96, 158,1, 114,14" href="javascript:bwClockUpdateDateTimeForm('hour','23',{$hour24})" />
+        <area shape="poly" alt="10 PM, 2200 hour" title="10 PM, 2200 hour" coords="131,114, 150,102, 114,14, 74,36" href="javascript:bwClockUpdateDateTimeForm('hour','22',{$hour24})" />
+        <area shape="poly" alt="9 PM, 2100 hour" title="9 PM, 2100 hour" coords="111,132, 131,114, 74,36, 40,69" href="javascript:bwClockUpdateDateTimeForm('hour','21',{$hour24})" />
+        <area shape="poly" alt="8 PM, 2000 hour" title="8 PM, 2000 hour" coords="101,149, 111,132, 40,69, 15,113" href="javascript:bwClockUpdateDateTimeForm('hour','20',{$hour24})" />
+        <area shape="poly" alt="7 PM, 1900 hour" title="7 PM, 1900 hour" coords="95,170, 101,149, 15,113, 1,159" href="javascript:bwClockUpdateDateTimeForm('hour','19',{$hour24})" />
+        <area shape="poly" alt="6 PM, 1800 hour" title="6 PM, 1800 hour" coords="95,196, 95,170, 0,159, 0,204" href="javascript:bwClockUpdateDateTimeForm('hour','18',{$hour24})" />
+        <area shape="poly" alt="5 PM, 1700 hour" title="5 PM, 1700 hour" coords="103,225, 95,196, 1,205, 16,256" href="javascript:bwClockUpdateDateTimeForm('hour','17',{$hour24})" />
+        <area shape="poly" alt="4 PM, 1600 hour" title="4 PM, 1600 hour" coords="116,245, 103,225, 16,256, 41,298" href="javascript:bwClockUpdateDateTimeForm('hour','16',{$hour24})" />
+        <area shape="poly" alt="3 PM, 1500 hour" title="3 PM, 1500 hour" coords="134,259, 117,245, 41,298, 76,332" href="javascript:bwClockUpdateDateTimeForm('hour','15',{$hour24})" />
+        <area shape="poly" alt="2 PM, 1400 hour" title="2 PM, 1400 hour" coords="150,268, 134,259, 76,333, 121,355" href="javascript:bwClockUpdateDateTimeForm('hour','14',{$hour24})" />
+        <area shape="poly" alt="1 PM, 1300 hour" title="1 PM, 1300 hour" coords="169,273, 150,268, 120,356, 165,365" href="javascript:bwClockUpdateDateTimeForm('hour','13',{$hour24})" />
+        <area shape="poly" alt="Noon, 1200 hour" title="Noon, 1200 hour" coords="193,273, 169,273, 165,365, 210,364" href="javascript:bwClockUpdateDateTimeForm('hour','12',{$hour24})" />
+        <area shape="poly" alt="11 AM, 1100 hour" title="11 AM, 1100 hour" coords="214,270, 193,273, 210,363, 252,352" href="javascript:bwClockUpdateDateTimeForm('hour','11',{$hour24})" />
+        <area shape="poly" alt="10 AM, 1000 hour" title="10 AM, 1000 hour" coords="232,259, 214,270, 252,352, 291,330" href="javascript:bwClockUpdateDateTimeForm('hour','10',{$hour24})" />
+        <area shape="poly" alt="9 AM, 0900 hour" title="9 AM, 0900 hour" coords="251,240, 232,258, 291,330, 323,301" href="javascript:bwClockUpdateDateTimeForm('hour','9',{$hour24})" />
+        <area shape="poly" alt="8 AM, 0800 hour" title="8 AM, 0800 hour" coords="263,219, 251,239, 323,301, 349,261" href="javascript:bwClockUpdateDateTimeForm('hour','8',{$hour24})" />
+        <area shape="poly" alt="7 AM, 0700 hour" title="7 AM, 0700 hour" coords="269,194, 263,219, 349,261, 363,212" href="javascript:bwClockUpdateDateTimeForm('hour','7',{$hour24})" />
+        <area shape="poly" alt="6 AM, 0600 hour" title="6 AM, 0600 hour" coords="269,172, 269,193, 363,212, 363,155" href="javascript:bwClockUpdateDateTimeForm('hour','6',{$hour24})" />
+        <area shape="poly" alt="5 AM, 0500 hour" title="5 AM, 0500 hour" coords="263,150, 269,172, 363,155, 351,109" href="javascript:bwClockUpdateDateTimeForm('hour','5',{$hour24})" />
+        <area shape="poly" alt="4 AM, 0400 hour" title="4 AM, 0400 hour" coords="251,130, 263,150, 351,109, 325,68" href="javascript:bwClockUpdateDateTimeForm('hour','4',{$hour24})" />
+        <area shape="poly" alt="3 AM, 0300 hour" title="3 AM, 0300 hour" coords="234,112, 251,130, 325,67, 295,37" href="javascript:bwClockUpdateDateTimeForm('hour','3',{$hour24})" />
+        <area shape="poly" alt="2 AM, 0200 hour" title="2 AM, 0200 hour" coords="221,102, 234,112, 295,37, 247,11" href="javascript:bwClockUpdateDateTimeForm('hour','2',{$hour24})" />
+        <area shape="poly" alt="1 AM, 0100 hour" title="1 AM, 0100 hour" coords="196,96, 221,102, 247,10, 209,-1, 201,61, 206,64, 205,74, 199,75" href="javascript:bwClockUpdateDateTimeForm('hour','1',{$hour24})" />
+        <area shape="poly" alt="Midnight, 0000 hour" title="Midnight, 0000 hour" coords="172,96, 169,74, 161,73, 161,65, 168,63, 158,-1, 209,-1, 201,61, 200,62, 206,64, 205,74, 198,75, 196,96, 183,95" href="javascript:bwClockUpdateDateTimeForm('hour','0',{$hour24})" />
+      </map>
+    </div>
+  </xsl:template>
+
+  <!--++++++++++++++++++ Events ++++++++++++++++++++-->
+  <xsl:template name="eventList">
+    <h1><xsl:copy-of select="$bwStr-EvLs-PendingEvents"/></h1>
+    <p>
+      <xsl:copy-of select="$bwStr-EvLs-EventsBelowWaiting"/>
+    </p>
+    <xsl:call-template name="eventListCommon"/>
+  </xsl:template>
+
+  <xsl:template name="eventListCommon">
+    <table id="commonListTable">
+      <tr>
+        <th><xsl:copy-of select="$bwStr-EvLC-Title"/></th>
+        <th><xsl:copy-of select="$bwStr-EvLC-ClaimedBy"/></th>
+        <th><xsl:copy-of select="$bwStr-EvLC-Start"/></th>
+        <th><xsl:copy-of select="$bwStr-EvLC-End"/></th>
+        <th><xsl:copy-of select="$bwStr-EvLC-TopicalAreas"/></th>
+        <th><xsl:copy-of select="$bwStr-EvLC-Description"/></th>
+      </tr>
+
+      <xsl:for-each select="/bedework/events/event">
+        <xsl:variable name="calPath" select="calendar/encodedPath"/>
+        <xsl:variable name="guid" select="guid"/>
+        <xsl:variable name="recurrenceId" select="recurrenceId"/>
+        <tr>
+          <td>
+            <a href="{$editEvent}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
+              <xsl:choose>
+                <xsl:when test="summary != ''">
+                  <xsl:value-of select="summary"/>
+                </xsl:when>
+                <xsl:otherwise>
+                  <em><xsl:copy-of select="$bwStr-EvLC-NoTitle"/></em>
+                </xsl:otherwise>
+              </xsl:choose>
+            </a>
+          </td>
+          <xsl:choose>
+            <xsl:when test="xproperties/X-BEDEWORK-SUBMISSION-CLAIMANT">
+              <td>
+                <xsl:value-of select="xproperties/X-BEDEWORK-SUBMISSION-CLAIMANT/values/text"/>
+                <xsl:text> </xsl:text>
+                (<xsl:value-of select="xproperties/X-BEDEWORK-SUBMISSION-CLAIMANT/parameters/X-BEDEWORK-SUBMISSION-CLAIMANT-USER"/>)
+              </td>
+            </xsl:when>
+            <xsl:otherwise>
+              <td class="unclaimed"><xsl:copy-of select="$bwStr-EvLC-Unclaimed"/></td>
+            </xsl:otherwise>
+          </xsl:choose>
+          <td class="date">
+            <xsl:value-of select="start/shortdate"/>
+            <xsl:text> </xsl:text>
+            <xsl:value-of select="start/time"/>
+          </td>
+          <td class="date">
+            <xsl:value-of select="end/shortdate"/>
+            <xsl:text> </xsl:text>
+            <xsl:value-of select="end/time"/>
+          </td>
+          <td>
+            <xsl:for-each select="xproperties/X-BEDEWORK-SUBMIT-ALIAS">
+              <xsl:call-template name="substring-afterLastInstanceOf">
+                <xsl:with-param name="string" select="values/text"/>
+                <xsl:with-param name="char">/</xsl:with-param>
+              </xsl:call-template><br/>
+            </xsl:for-each>
+          </td>
+          <td>
+            <xsl:value-of select="description"/>
+            <xsl:if test="recurring = 'true' or recurrenceId != ''">
+              <div class="recurrenceEditLinks">
+                <xsl:copy-of select="$bwStr-EvLC-RecurringEvent"/>
+                <xsl:copy-of select="$bwStr-EvLC-Edit"/>
+                <a href="{$editEvent}&amp;calPath={$calPath}&amp;guid={$guid}">
+                  <xsl:copy-of select="$bwStr-EvLC-Master"/>
+                </a> |
+                <a href="{$editEvent}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
+                  <xsl:copy-of select="$bwStr-EvLC-Instance"/>
+                </a>
+              </div>
+            </xsl:if>
+          </td>
+        </tr>
+      </xsl:for-each>
+    </table>
+  </xsl:template>
+
+  <!--==== UPLOAD ====-->
+  <xsl:template name="upload">
+  <!-- The name "eventForm" is referenced by several javascript functions. Do not
+    change it without modifying bedework.js -->
+    <form name="eventForm" method="post" action="{$upload}" id="standardForm"  enctype="multipart/form-data">
+      <h2><xsl:copy-of select="$bwStr-Upld-UploadICalFile"/></h2>
+      <table class="common" cellspacing="0">
+        <tr>
+          <td class="fieldname">
+            <xsl:copy-of select="$bwStr-Upld-Filename"/>
+          </td>
+          <td align="left">
+            <input type="file" name="uploadFile" size="60" />
+          </td>
+        </tr>
+        <tr>
+          <td class="fieldname padMeTop">
+            <xsl:copy-of select="$bwStr-Upld-IntoCalendar"/>
+          </td>
+          <td align="left" class="padMeTop">
+            <input type="hidden" name="newCalPath" id="bwNewCalPathField" value=""/>
+            <span id="bwEventCalDisplay">
+              <em><xsl:copy-of select="$bwStr-Upld-DefaultCalendar"/></em>
+            </span>
+          </td>
+        </tr>
+        <tr>
+          <td class="fieldname padMeTop">
+            <xsl:copy-of select="$bwStr-Upld-AffectsFreeBusy"/>
+          </td>
+          <td align="left" class="padMeTop">
+            <input type="radio" value="" name="transparency" checked="checked"/><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-Upld-AcceptEventsSettings"/><br/>
+            <input type="radio" value="OPAQUE" name="transparency"/><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-Upld-Opaque"/><xsl:text> </xsl:text><span class="note"><xsl:copy-of select="$bwStr-Upld-Yes"/></span><br/>
+            <input type="radio" value="TRANSPARENT" name="transparency"/><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-Upld-No"/><xsl:text> </xsl:text><span class="note"><xsl:copy-of select="$bwStr-Upld-Transparent"/></span><br/>
+          </td>
+        </tr>
+        <tr>
+          <td class="fieldname padMeTop">
+            <xsl:copy-of select="$bwStr-Upld-Status"/>
+          </td>
+          <td align="left" class="padMeTop">
+            <input type="radio" value="" name="status" checked="checked"/><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-Upld-AcceptEventsStatus"/><br/>
+            <input type="radio" value="CONFIRMED" name="status"/><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-Upld-Confirmed"/><br/>
+            <input type="radio" value="TENTATIVE" name="status"/><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-Upld-Tentative"/><br/>
+            <input type="radio" value="CANCELLED" name="status"/><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-Upld-Canceled"/><br/>
+          </td>
+        </tr>
+      </table>
+      <table border="0" id="submitTable">
+        <tr>
+          <td>
+            <input name="submit" type="submit" value="{$bwStr-Upld-Continue}"/>
+            <input name="cancelled" type="submit" value="{$bwStr-Upld-Cancel}"/>
+          </td>
+        </tr>
+      </table>
+    </form>
+  </xsl:template>
+
+  <!--==== UTILITY TEMPLATES ====-->
+
+  <!-- time formatter (should be extended as needed) -->
+  <xsl:template name="timeFormatter">
+    <xsl:param name="timeString"/><!-- required -->
+    <xsl:param name="showMinutes">yes</xsl:param>
+    <xsl:param name="showAmPm">yes</xsl:param>
+    <xsl:param name="hour24">no</xsl:param>
+    <xsl:variable name="hour" select="number(substring($timeString,1,2))"/>
+    <xsl:variable name="minutes" select="substring($timeString,3,2)"/>
+    <xsl:variable name="AmPm">
+      <xsl:choose>
+        <xsl:when test="$hour &lt; 12"><xsl:copy-of select="$bwStr-TiFo-AM"/></xsl:when>
+        <xsl:otherwise><xsl:copy-of select="$bwStr-TiFo-PM"/></xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:choose>
+      <xsl:when test="hour24 = 'yes'">
+        <xsl:value-of select="$hour"/><!--
+     --><xsl:if test="$showMinutes = 'yes'">:<xsl:value-of select="$minutes"/></xsl:if>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:choose>
+          <xsl:when test="$hour = 0">12</xsl:when>
+          <xsl:when test="$hour &lt; 13"><xsl:value-of select="$hour"/></xsl:when>
+          <xsl:otherwise><xsl:value-of select="$hour - 12"/></xsl:otherwise>
+        </xsl:choose><!--
+     --><xsl:if test="$showMinutes = 'yes'">:<xsl:value-of select="$minutes"/></xsl:if>
+        <xsl:if test="$showAmPm = 'yes'">
+          <xsl:text> </xsl:text>
+          <xsl:value-of select="$AmPm"/>
+        </xsl:if>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <!--==== FOOTER ====-->
+  <xsl:template name="footer">
+    <div id="footer">
+      <xsl:copy-of select="$bwStr-Foot-BasedOnThe"/><xsl:text> </xsl:text><a href="http://www.bedework.org/"><xsl:copy-of select="$bwStr-Foot-BedeworkCalendarSystem"/></a>
+    </div>
+    <div id="subfoot">
+      <a href="http://www.bedework.org/"><xsl:copy-of select="$bwStr-Foot-BedeworkWebsite"/></a> |
+      <a href="?noxslt=yes"><xsl:copy-of select="$bwStr-Foot-ShowXML"/></a> |
+      <a href="?refreshXslt=yes"><xsl:copy-of select="$bwStr-Foot-RefreshXSLT"/></a>
+    </div>
+  </xsl:template>
+
+</xsl:stylesheet>
Index: releases/bedework-3.7/deployment/websubmit/webapp/resources/demoskins/es_ES/default/strings.xsl
===================================================================
---  (revision )
+++ releases/bedework-3.7/deployment/websubmit/webapp/resources/demoskins/es_ES/default/strings.xsl (revision 3128)
@@ -1,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet
+  version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml">
+
+  <!-- xsl:template match="/" -->
+
+  <!-- xsl:template name="headSection" -->
+  <xsl:variable name="bwStr-Head-BedeworkSubmitPubEv">Bedework: enviar un evento público</xsl:variable>
+
+  <!-- xsl:template name="header" -->
+  <xsl:variable name="bwStr-Hedr-BedeworkPubEventSub">Envío de eventos públicos de Bedework</xsl:variable>
+  <xsl:variable name="bwStr-Hedr-LoggedInAs">Conectado como</xsl:variable>
+  <xsl:variable name="bwStr-Hedr-Logout">desconectar</xsl:variable>
+
+  <!-- xsl:template name="messagesAndErrors" -->
+
+  <!-- xsl:template name="menuTabs" -->
+  <xsl:variable name="bwStr-MeTa-Overview">Presentación</xsl:variable>
+  <xsl:variable name="bwStr-MeTa-AddEvent">Añadir evento</xsl:variable>
+  <xsl:variable name="bwStr-MeTa-MyPendingEvents">Mis eventos pendientes</xsl:variable>
+
+  <!-- xsl:template name="home" -->
+  <xsl:variable name="bwStr-Home-Start">empezar</xsl:variable>
+  <xsl:variable name="bwStr-Home-EnteringEvents">Introducir eventos</xsl:variable>
+  <xsl:variable name="bwStr-Home-BeforeSubmitting">Antes de enviar un evento público,</xsl:variable>
+  <xsl:variable name="bwStr-Home-SeeIfItHasBeenEntered">mire si ya ha sido introducido</xsl:variable>
+  <xsl:variable name="bwStr-Home-ItIsPossible">Es posible que un evento pueda ser creado con un título distinto al que podría esperar.</xsl:variable>
+  <xsl:variable name="bwStr-Home-MakeYourTitles">Haga que sus títulos sean descriptivos: en lugar de "Conferencia" use "Serie de conferencias musicales: 'Usos del acorde napolitano'". "Club de cine" podría ser bastante ambiguo, mientras que "Club de cine: 'Ciudadano Kane'" es mejor. Tenga en cuenta que su evento "compartirá el escenario" con otros eventos del calendario, trate de ser tan claro como sea posible cuando piense en títulos. No exprese sólo lo que es el evento, intente explicar brevemente de que trata. Dé más detalles del evento en el campo descripción, pero trate de no repetir la misma información. Intente pensar como un usuario cuando sugiera un evento: use lenguaje que explicaría su evento a alguien que no sabe absolutamente nada sobre el mismo.</xsl:variable>
+  <xsl:variable name="bwStr-Home-DoNotInclude">No incluya localizaciones y fechas en el campo descripción (a menos que sea para añadir información extra que no está disponible).</xsl:variable>
+
+  <!-- xsl:template match="formElements" mode="addEvent" -->
+  <!-- xsl:template match="formElements" mode="editEvent" -->
+  <!-- xsl:template match="formElements" mode="eventForm" -->
+  <xsl:variable name="bwStr-FoEl-DeleteColon">Borrar:</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Instance">instancia</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Delete">Borrar</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-All">todo</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-TASK">Tarea</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Task">tarea</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Meeting">Reunión</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-EVENT">Evento</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Event">evento</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Recurring">Recurrente</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Personal">Personal</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Public">Público</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-RecurrenceMaster">(recurrencia maestra)</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Next">siguiente</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Step1"><strong>Paso 1:</strong> Introduzca los detalles del evento. <em>Los campos opcionales están en cursiva.</em></xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Previous">anterior</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Step2"><strong>Paso 2:</strong> Seleccione localización.</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Step3"><strong>Paso 3:</strong> Seleccione contacto.</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Step4"><strong>Paso 4:</strong> Sugiera áreas tópicas. <em>Opcional.</em></xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Step5"><strong>Paso 5:</strong> Información de contacto y comentarios.</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Calendar">Calendario:</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Title">Título:</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-MustIncludeTitle">Debe incluir un título.</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-DateAndTime">Fecha y hora:</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-AllDay">todo el día</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Start">Comienzo:</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Date">Fecha</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-SelectTimezone">seleccione zona horaria</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Due">Due:</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-End">Final:</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Date">Fecha</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Duration">Duración</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Days">días</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Hours">horas</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Minutes">minutos</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Weeks">semanas</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Or">o</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-This">Este</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-HasNoDurationEndDate">no tiene duración / fecha de finalización</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Description">Descripción</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-MustIncludeDescription">Debe incluir una descripción.</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Status">Estado:</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Confirmed">confirmado</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Tentative">tentativa</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Canceled">cancelado</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Cost">Coste:</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-CostOptional">opcional: si lo hubiera, y lugar donde obtener las entradas</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-EventURL">URL del evento:</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-EventURLOptional">opcional: para más información sobre el evento</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-ImageURL">URL de la imagen:</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-ImageURLOptional">opcional: para incluir una imagen con la descripción del evento</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-MustSelectLocation">Debe seleccionar una localización o sugerir una más abajo.</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-SelectExistingLocation">seleccione una localización existente...</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-DidntFindLocation">¿No encontró la localización? Sugiera una nueva:</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Address">Dirección:</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-SubAddress">Sub-dirección:</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Optional">opcional</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-URL">URL:</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-MustSelectContact">Debe seleccionar un contacto o sugerir uno más abajo.</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-SelectExistingContact">seleccione un contacto existente...</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-DidntFindContact">¿No encontró el contacto que necesita? Sugiera uno nuevo:</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-OrganizationName">Nombre de la organización:</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-PleaseLimitContacts">Por favor, limite los contactos a organizaciones, no a individuos.</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Phone">Teléfono:</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Email">Email:</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-MissingTopicalArea">¿Echa en falta un área tópica? Por favor, describa que tipo de evento está enviando:</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-TypeOfEvent">Tipo de evento:</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-MustIncludeEmail">Debe incluir su dirección de correo electrónico.</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-InvalidEmailAddress">Esto no parece ser una dirección de email válida. Por favor, corríjala.</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-EnterEmailAddress">Introduzca su dirección de email:</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-FinalNotes">Por favor, proporcione cualquier aviso final o instrucciones a tener en cuenta en su evento:</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-SubmitForApproval">enviar para ser aprobado</xsl:variable>
+  <xsl:variable name="bwStr-FoEl-Cancel">cancelar</xsl:variable>
+
+  <!-- xsl:template match="calendar" mode="showEventFormAliases" -->
+
+  <!-- xsl:template match="val" mode="weekMonthYearNumbers" -->
+  <xsl:variable name="bwStr-WMYN-Next">y</xsl:variable>
+
+  <!-- xsl:template name="byDayChkBoxList" -->
+
+  <!-- xsl:template name="buildCheckboxList" -->
+
+  <!-- xsl:template name="recurrenceDayPosOptions" -->
+  <xsl:variable name="bwStr-RDPO-None">ninguno</xsl:variable>
+  <xsl:variable name="bwStr-RDPO-TheFirst">el primero</xsl:variable>
+  <xsl:variable name="bwStr-RDPO-TheSecond">el segundo</xsl:variable>
+  <xsl:variable name="bwStr-RDPO-TheThird">el tercero</xsl:variable>
+  <xsl:variable name="bwStr-RDPO-TheFourth">el cuarto</xsl:variable>
+  <xsl:variable name="bwStr-RDPO-TheFifth">el quinto</xsl:variable>
+  <xsl:variable name="bwStr-RDPO-TheLast">el último</xsl:variable>
+  <xsl:variable name="bwStr-RDPO-Every">cada</xsl:variable>
+
+  <!-- xsl:template name="buildRecurFields" -->
+  <xsl:variable name="bwStr-BReF-And">y</xsl:variable>
+
+  <!-- xsl:template name="buildNumberOptions" -->
+
+  <!-- xsl:template name="clock" -->
+  <xsl:variable name="bwStr-Cloc-Bedework24HourClock">Reloj de 24 horas de Bedework</xsl:variable>
+  <xsl:variable name="bwStr-Cloc-Type">tipo</xsl:variable>
+  <xsl:variable name="bwStr-Cloc-SelectTime">seleccione hora</xsl:variable>
+  <xsl:variable name="bwStr-Cloc-Switch">cambiar</xsl:variable>
+  <xsl:variable name="bwStr-Cloc-Close">cerrar</xsl:variable>
+
+  <!-- xsl:template name="eventList" -->
+  <xsl:variable name="bwStr-EvLs-PendingEvents">Eventos pendientes</xsl:variable>
+  <xsl:variable name="bwStr-EvLs-EventsBelowWaiting">Los eventos de debajo están a la espera de ser publicados por un administrador del calendario. Puede editarlos o borrarlos hasta que hayan sido aceptados. Una vez que el evento es publicado no lo verá más en su lista.</xsl:variable>
+
+  <!-- xsl:template name="eventListCommon" -->
+  <xsl:variable name="bwStr-EvLC-Title">Título</xsl:variable>
+  <xsl:variable name="bwStr-EvLC-ClaimedBy">Reclamado por</xsl:variable>
+  <xsl:variable name="bwStr-EvLC-Start">Comienzo</xsl:variable>
+  <xsl:variable name="bwStr-EvLC-End">Final</xsl:variable>
+  <xsl:variable name="bwStr-EvLC-TopicalAreas">Areas tópicas</xsl:variable>
+  <xsl:variable name="bwStr-EvLC-Description">Descripción</xsl:variable>
+  <xsl:variable name="bwStr-EvLC-NoTitle">sin título</xsl:variable>
+  <xsl:variable name="bwStr-EvLC-Unclaimed">no reclamado</xsl:variable>
+  <xsl:variable name="bwStr-EvLC-RecurringEvent">Evento recurrente.</xsl:variable>
+  <xsl:variable name="bwStr-EvLC-Edit">Editar:</xsl:variable>
+  <xsl:variable name="bwStr-EvLC-Master">maestro</xsl:variable>
+  <xsl:variable name="bwStr-EvLC-Instance">instancia</xsl:variable>
+
+  <!-- xsl:template name="upload" -->
+  <xsl:variable name="bwStr-Upld-AffectsFreeBusy">Afecta libre/ocupado:</xsl:variable>
+  <xsl:variable name="bwStr-Upld-Yes">sí</xsl:variable>
+  <xsl:variable name="bwStr-Upld-Transparent">(transparente: el estado del evento no afecta su libre/ocupado)</xsl:variable>
+  <xsl:variable name="bwStr-Upld-No">no</xsl:variable>
+  <xsl:variable name="bwStr-Upld-Opaque">(opaco: el estado del evento afecta su libre/ocupado)</xsl:variable>
+  <xsl:variable name="bwStr-Upld-UploadICalFile">Cargar fichero iCAL</xsl:variable>
+  <xsl:variable name="bwStr-Upld-Filename">Nombre del fichero:</xsl:variable>
+  <xsl:variable name="bwStr-Upld-IntoCalendar">Dentro del calendario:</xsl:variable>
+  <xsl:variable name="bwStr-Upld-DefaultCalendar">calendario por defecto</xsl:variable>
+  <xsl:variable name="bwStr-Upld-AcceptEventsSettings">aceptar las características del evento</xsl:variable>
+  <xsl:variable name="bwStr-Upld-Status">Estado:</xsl:variable>
+  <xsl:variable name="bwStr-Upld-AcceptEventsStatus">aceptar el estado del evento</xsl:variable>
+  <xsl:variable name="bwStr-Upld-Confirmed">confirmado</xsl:variable>
+  <xsl:variable name="bwStr-Upld-Tentative">tentativa</xsl:variable>
+  <xsl:variable name="bwStr-Upld-Canceled">cancelado</xsl:variable>
+  <xsl:variable name="bwStr-Upld-Continue">Continuar</xsl:variable>
+  <xsl:variable name="bwStr-Upld-Cancel">cancelar</xsl:variable>
+
+  <!-- xsl:template name="timeFormatter" -->
+  <xsl:variable name="bwStr-TiFo-AM">AM</xsl:variable>
+  <xsl:variable name="bwStr-TiFo-PM">PM</xsl:variable>
+
+  <!-- xsl:template name="footer" -->
+  <xsl:variable name="bwStr-Foot-BasedOnThe">Basado en</xsl:variable>
+  <xsl:variable name="bwStr-Foot-ShowXML">mostrar XML</xsl:variable>
+  <xsl:variable name="bwStr-Foot-RefreshXSLT">refrescar XSLT</xsl:variable>
+  <xsl:variable name="bwStr-Foot-BedeworkWebsite">Página web de Bedework</xsl:variable>
+  <xsl:variable name="bwStr-Foot-BedeworkCalendarSystem">Sistema de calendario de Bedework</xsl:variable>
+
+</xsl:stylesheet>
Index: releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/default/strings.xsl
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/default/strings.xsl (revision 3039)
+++ releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/default/strings.xsl (revision 3128)
@@ -68,4 +68,5 @@
   <xsl:variable name="bwStr-Navi-WeekOf">Week of</xsl:variable>
   <xsl:variable name="bwStr-Navi-Go">go</xsl:variable>
+  <xsl:variable name="bwStr-Navi-Today">today</xsl:variable>
 
   <!--  xsl:template name="utilBar" -->
Index: releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/es_ES/default/default.xsl
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/es_ES/default/default.xsl (revision 2934)
+++ releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/es_ES/default/default.xsl (revision 3128)
@@ -44,5 +44,5 @@
   <xsl:include href="./globals.xsl" />
   <xsl:include href="../strings.xsl" />
-  <!-- xsl:include href="../localeSettings.xsl" /-->
+  <xsl:include href="../localeSettings.xsl" />
 
   <!-- DEFAULT THEME NAME -->
Index: releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/es_ES/default/widget.xsl
===================================================================
---  (revision )
+++ releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/es_ES/default/widget.xsl (revision 3128)
@@ -1,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Licensed to Jasig under one or more contributor license
+    agreements. See the NOTICE file distributed with this work
+    for additional information regarding copyright ownership.
+    Jasig licenses this file to you under the Apache License,
+    Version 2.0 (the "License"); you may not use this file
+    except in compliance with the License. You may obtain a
+    copy of the License at:
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on
+    an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied. See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<xsl:stylesheet
+  version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml">
+<xsl:output
+  method="text"
+  indent="yes"
+  media-type="application/json"
+  standalone="yes"/>
+
+  <!-- ====================================================== -->
+  <!--    PERSONAL CALENDAR STYLESHEET for JSON WIDGETS       -->
+  <!-- ====================================================== -->
+ 
+  <!-- GENERATE KEYS -->
+  <!-- We occasionally need to pick out unique events from the calendar tree view
+       which breaks up an event across multiple days.  In the future, we may
+       work from a list of unique events and build the tree from it in the UI. -->
+       <xsl:key name="eventUid" match="event" use="guid"/>
+
+  <!-- DEFINE INCLUDES -->
+  <xsl:include href="./globals.xsl" />
+  <xsl:include href="../strings.xsl" />
+  <!-- xsl:include href="../localeSettings.xsl" /-->
+
+  <!-- DEFAULT WIDGET STYLESHEET -->
+  <!-- to change the default json stylesheets, change this include -->
+  <xsl:include href="../../widgets/json.xsl" />
+
+</xsl:stylesheet>
Index: releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/es_ES/localeSettings.xsl
===================================================================
---  (revision )
+++ releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/es_ES/localeSettings.xsl (revision 3128)
@@ -1,0 +1,87 @@
+<!-- 
+    Licensed to Jasig under one or more contributor license
+    agreements. See the NOTICE file distributed with this work
+    for additional information regarding copyright ownership.
+    Jasig licenses this file to you under the Apache License,
+    Version 2.0 (the "License"); you may not use this file
+    except in compliance with the License. You may obtain a
+    copy of the License at:
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on
+    an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied. See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<xsl:stylesheet
+  version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml">
+
+  <!-- LOCALE SETTINGS -->
+  <!-- A place for javascript strings and locale specific javascript overrides -->
+
+  <xsl:template name="bedeworkSchedulingStrings">
+    <script type="text/javascript">
+      var bwAttendeeRoleChair = "CHAIR";
+			var bwAttendeeRoleRequired = "REQ-PARTICIPANT";
+			var bwAttendeeRoleOptional = "OPT-PARTICIPANT";
+			var bwAttendeeRoleNonParticipant = "NON-PARTICIPANT";
+			var bwAttendeeStatusNeedsAction = "NEEDS-ACTION";
+			var bwAttendeeStatusAccepted = "ACCEPTED";
+			var bwAttendeeStatusDeclined = "DECLINED";
+			var bwAttendeeStatusTentative = "TENTATIVE";
+			var bwAttendeeStatusDelegated = "DELEGATED";
+			var bwAttendeeStatusCompleted = "COMPLETED";
+			var bwAttendeeStatusInProcess = "IN-PROCESS";
+			var bwAttendeeTypePerson = "person";
+			var bwAttendeeTypeLocation = "location";
+			var bwAttendeeTypeResource = "resource";
+			
+			// display strings for the values above
+			// should be put with other internationalized strings
+			// can be translated
+			var bwAttendeeDispRoleChair = "chair";
+			var bwAttendeeDispRoleRequired = "required participant";
+			var bwAttendeeDispRoleOptional = "optional participant";
+			var bwAttendeeDispRoleNonParticipant = "non-participant";
+			var bwAttendeeDispStatusNeedsAction = "needs action";
+			var bwAttendeeDispStatusAccepted = "accepted";
+			var bwAttendeeDispStatusDeclined = "declined";
+			var bwAttendeeDispStatusTentative = "tentative";
+			var bwAttendeeDispStatusDelegated = "delegated";
+			var bwAttendeeDispStatusCompleted = "completed";
+			var bwAttendeeDispStatusInProcess = "in-process";
+			var bwAttendeeDispTypePerson = "person";
+			var bwAttendeeDispTypeLocation = "location";
+			var bwAttendeeDispTypeResource = "resource";
+			
+			var bwFreeBusyDispTypeBusy = "BUSY";
+			var bwFreeBusyDispTypeTentative = "TENTATIVE";
+			var bwAddAttendeeDisp = "add attendee...";
+			var bwAddDisp = "add";
+			var bwAttendeeExistsDisp = "attendee exists";
+			var bwAddAttendeeRoleDisp = "Role:";
+			var bwAddAttendeeTypeDisp = "Type:";
+			var bwAddAttendeeBookDisp = "Book:";
+			var bwEventSubmitMeetingDisp = "send";
+			var bwEventSubmitDisp = "save";
+			
+			var bwReqParticipantDisp = "required";
+			var bwOptParticipantDisp = "optional";
+			var bwChairDisp = "chair";
+			var bwNonParticipant = "non-participant";
+			var bwNeedsAction = "needs action";
+			var bwAccepted = "accepted";
+			var bwDeclined = "declined";
+			var bwTentative = "tentative";
+			var bwDelegated = "delegated";
+			
+			var bwErrorAttendees = "Error: attendees not returned";
+      
+    </script>
+  </xsl:template>
+</xsl:stylesheet>
Index: releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/es_ES/strings.xsl
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/es_ES/strings.xsl (revision 3039)
+++ releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/es_ES/strings.xsl (revision 3128)
@@ -68,4 +68,5 @@
   <xsl:variable name="bwStr-Navi-WeekOf">Semana de</xsl:variable>
   <xsl:variable name="bwStr-Navi-Go">ir</xsl:variable>
+  <xsl:variable name="bwStr-Navi-Today">hoy</xsl:variable>
 
   <!--  xsl:template name="utilBar" -->
Index: releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/css/bedeworkTheme.css
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/css/bedeworkTheme.css (revision 3065)
+++ releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/css/bedeworkTheme.css (revision 3128)
@@ -552,5 +552,5 @@
 }
 #bedework #navigationBarTable td {
-  vertical-align: top;
+  vertical-align: middle;
 }
 #bedework #navigationBarTable form {
@@ -563,8 +563,11 @@
 }
 #bedework #navigationBarTable td.todayButton {
-  padding: 1em 1em 0 1em;
+  padding: 0 1em 0 1em;
 }
 #bedework #navigationBarTable td.gotoForm {
-  padding: 1em 0.5em 0 0;
+  padding: 0 0.5em 0 0;
+}
+#bedework #navigationBarTable button {
+  padding: 0 4px 2px 4px;
 }
 #bedework #navigationBarTable td.leftCell {
Index: releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/navigation.xsl
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/navigation.xsl (revision 3007)
+++ releases/bedework-3.7/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/navigation.xsl (revision 3128)
@@ -99,7 +99,7 @@
         </td>
         <td class="todayButton">
-          <a href="{$navAction}&amp;viewType=todayView&amp;date={$curdate}">
-            <img src="{$resourcesRoot}/images/std-button-today-off.gif" width="54" height="22" border="0" alt="Go to Today" align="left"/>
-          </a>
+          <button type="button" onclick="window.location='{$navAction}&amp;viewType=todayView&amp;date={$curdate}'">
+            <xsl:value-of select="$bwStr-Navi-Today"/>
+          </button>
         </td>
         <td align="right" class="gotoForm">