Index: trunk/deployment/webadmin/webapp/resources/default/default/default.xsl
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (revision 1837)
+++ trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (revision 1841)
@@ -247,6 +247,4 @@
               <xsl:for-each select="form/xproperties/node()">
                 bwXprops.init('<xsl:value-of select="name()"/>',[<xsl:for-each select="parameters/node()">['<xsl:value-of select="name()"/>','<xsl:value-of select="node()"/>']</xsl:for-each>],"<xsl:value-of select="values/text"/>");
-                <!-- <xsl:variable name="xprop"><xsl:value-of select="name()"/><xsl:for-each select="parameters/node()">;<xsl:value-of select="name()"/>=<xsl:value-of select="node()"/></xsl:for-each>:<xsl:value-of select="values/text"/></xsl:variable>
-                <input type="hidden" name="xproperty" value="{$xprop}" id="name()"/> -->
               </xsl:for-each>
             }
@@ -1059,5 +1057,6 @@
     </xsl:if>
 
-    <form name="eventForm" method="post" onsubmit="setEventFields(this,{$portalFriendly})">
+    <xsl:variable name="submitter" select="/bedework/userInfo/group"/>
+    <form name="eventForm" method="post" onsubmit="setEventFields(this,{$portalFriendly},'{$submitter}')">
       <xsl:choose>
         <xsl:when test="/bedework/page = 'modEventPending'">
Index: trunk/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js
===================================================================
--- trunk/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js (revision 1837)
+++ trunk/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js (revision 1841)
@@ -317,10 +317,10 @@
 // ========================================================================
 
-function setEventFields(formObj,portalFriendly) {
+function setEventFields(formObj,portalFriendly,submitter) {
   if (!portalFriendly) {
     setDates(formObj);
   }
   setRecurrence(formObj);
-  setBedeworkXProperties(formObj);
+  setBedeworkXProperties(formObj,submitter);
 
   //setAccessHow(formObj,1);
Index: trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl (revision 1816)
+++ trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl (revision 1841)
@@ -107,5 +107,5 @@
         <xsl:if test="/bedework/page = 'editEvent' and
                       normalize-space(/bedework/formElements/form/xproperties/xproperty[@name='X-BEDEWORK-SUBMIT-COMMENT']/value) != ''">
-          <xsl:attribute name="onload">getComments('standardForm','<xsl:value-of select="/bedework/formElements/form/xproperties/xproperty[@name='X-BEDEWORK-SUBMIT-COMMENT']/value"/>');</xsl:attribute>
+          <xsl:attribute name="onload">initRXDates();initXProperties();getComments('standardForm','<xsl:value-of select="/bedework/formElements/form/xproperties/xproperty[@name='X-BEDEWORK-SUBMIT-COMMENT']/value"/>');</xsl:attribute>
         </xsl:if>
         <div id="bedework"><!-- main wrapper div -->
@@ -155,4 +155,5 @@
       <script type="text/javascript" src="/bedework-common/javascript/dojo/dojo.js">&#160;</script>
       <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkEventForm.js">&#160;</script>
+      <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkXProperties.js">&#160;</script>
     </xsl:if>
     <!-- <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkAccess.js">&#160;</script> -->
@@ -163,10 +164,23 @@
     <script type="text/javascript">
       <xsl:comment>
-      <![CDATA[
       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="form/xproperties/node()">
+          bwXprops.init('<xsl:value-of select="name()"/>',[<xsl:for-each select="parameters/node()">['<xsl:value-of select="name()"/>','<xsl:value-of select="node()"/>']</xsl:for-each>],"<xsl:value-of select="values/text"/>");
+        </xsl:for-each>
+      }
       </xsl:comment>
     </script>
@@ -281,5 +295,6 @@
   <!--==== ADD EVENT ====-->
   <xsl:template match="formElements" mode="addEvent">
-    <form name="eventForm" method="post" action="{$addEvent}" id="standardForm" onsubmit="setEventFields(this);">
+    <xsl:variable name="submitter" select="/bedework/userid"/>
+    <form name="eventForm" method="post" action="{$addEvent}" id="standardForm" onsubmit="setEventFields(this,{$portalFriendly},'{$submitter}');">
       <xsl:apply-templates select="." mode="eventForm"/>
     </form>
@@ -288,5 +303,6 @@
   <!--==== EDIT EVENT ====-->
   <xsl:template match="formElements" mode="editEvent">
-    <form name="eventForm" method="post" action="{$updateEvent}" id="standardForm" onsubmit="setEventFields(this);">
+    <xsl:variable name="submitter" select="/bedework/userid"/>
+    <form name="eventForm" method="post" action="{$updateEvent}" id="standardForm" onsubmit="setEventFields(this,{$portalFriendly},'{$submitter}');">
       <xsl:apply-templates select="." mode="eventForm"/>
     </form>
Index: trunk/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkEventForm.js
===================================================================
--- trunk/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkEventForm.js (revision 1816)
+++ trunk/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkEventForm.js (revision 1841)
@@ -240,8 +240,11 @@
 // ========================================================================
 
-function setEventFields(formObj) {
-  setDates(formObj);
+function setEventFields(formObj,portalFriendly,submitter) {
+  if (!portalFriendly) {
+    setDates(formObj);
+  }
   setComments(formObj);
   setRecurrence(formObj);
+  setBedeworkXProperties(formObj,submitter);
   setAccessHow(formObj,1);
   //setAccessAcl(formObj);
Index: trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (revision 1812)
+++ trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (revision 1841)
@@ -189,5 +189,5 @@
           </xsl:when>
           <xsl:when test="/bedework/page = 'editEvent'">
-            <xsl:attribute name="onload">initRXDates();</xsl:attribute>
+            <xsl:attribute name="onload">initRXDates();initXProperties();focusElement('bwEventTitle');</xsl:attribute>
           </xsl:when>
           <xsl:when test="/bedework/page = 'attendees'">
@@ -379,4 +379,5 @@
       <script type="text/javascript" src="/bedework-common/javascript/dojo/dojo.js">&#160;</script>
       <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkEventForm.js">&#160;</script>
+      <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkXProperties.js">&#160;</script>
       <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkAccess.js">&#160;</script>
       <xsl:if test="$portalFriendly = 'true'">
@@ -401,4 +402,9 @@
           <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="form/xproperties/node()">
+            bwXprops.init('<xsl:value-of select="name()"/>',[<xsl:for-each select="parameters/node()">['<xsl:value-of select="name()"/>','<xsl:value-of select="node()"/>']</xsl:for-each>],"<xsl:value-of select="values/text"/>");
           </xsl:for-each>
         }
@@ -1989,5 +1995,6 @@
   <!-- The name "eventForm" is referenced by several javascript functions. Do not
     change it without modifying bedework.js -->
-    <form name="eventForm" method="post" action="{$addEvent}" id="standardForm" onsubmit="setEventFields(this,{$portalFriendly})">
+    <xsl:variable name="submitter" select="/bedework/userid"/>
+    <form name="eventForm" method="post" action="{$addEvent}" id="standardForm" onsubmit="setEventFields(this,{$portalFriendly},'{$submitter}')">
       <h2>
         <span class="formButtons">
@@ -2009,5 +2016,6 @@
     <!-- The name "eventForm" is referenced by several javascript functions. Do not
     change it without modifying bedework.js -->
-    <form name="eventForm" method="post" action="{$updateEvent}" id="standardForm" onsubmit="setEventFields(this,{$portalFriendly})">
+    <xsl:variable name="submitter" select="/bedework/userid"/>
+    <form name="eventForm" method="post" action="{$updateEvent}" id="standardForm" onsubmit="setEventFields(this,{$portalFriendly},'{$submitter}')">
       <h2>
         <span class="formButtons">
Index: trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkEventForm.js
===================================================================
--- trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkEventForm.js (revision 1728)
+++ trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkEventForm.js (revision 1841)
@@ -239,10 +239,10 @@
 // ========================================================================
 
-
-function setEventFields(formObj,portalFriendly) {
+function setEventFields(formObj,portalFriendly,submitter) {
   if (!portalFriendly) {
     setDates(formObj);
   }
   setRecurrence(formObj);
+  setBedeworkXProperties(formObj,submitter);
   setAccessHow(formObj,1);
   //setAccessAcl(formObj);