Index: trunk/deployment/webadmin/webapp/resources/default/default/default.xsl
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (revision 1871)
+++ trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (revision 1874)
@@ -2088,5 +2088,5 @@
           </td>
         </tr>
-        <!-- Url -->
+        <!-- Image Url -->
         <tr>
           <td class="optional">
@@ -2095,7 +2095,5 @@
           <td>
             <input type="text" name="xBwImageHolder" value="" class="edit" size="30">
-              <xsl:if test="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']">
-                <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text"/></xsl:attribute>
-              </xsl:if>
+              <xsl:attribute name="value"><xsl:value-of select="form/xproperties/node()[name()='X-BEDEWORK-IMAGE']/values/text"/></xsl:attribute>
             </input>
             <xsl:text> </xsl:text>
@@ -2334,5 +2332,9 @@
         </xsl:if>
       </table>
-      <xsl:call-template name="submitEventButtons"/>
+      <xsl:if test="not(starts-with(form/calendar/path,$submissionsRootUnencoded))">
+        <!-- don't create two instances of the submit buttons on pending events;
+             the publishing buttons require numerous unique ids -->
+        <xsl:call-template name="submitEventButtons"/>
+      </xsl:if>
     </form>
   </xsl:template>
Index: trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl
===================================================================
--- trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl (revision 1871)
+++ trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl (revision 1874)
@@ -1780,5 +1780,5 @@
   <xsl:template name="footer">
     <div id="footer">
-      Demonstration calendar; place footer information here.
+      Based on the <a href="http://www.bedework.org/">Bedework Calendar System</a>
     </div>
     <table id="skinSelectorTable" border="0" cellpadding="0" cellspacing="0">
Index: trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl
===================================================================
--- trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl (revision 1837)
+++ trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/default.xsl (revision 1874)
@@ -1641,8 +1641,8 @@
   <xsl:template name="footer">
     <div id="footer">
-      Demonstration calendar; place footer information here.
+      Footer information here
     </div>
     <div id="subFoot">
-      Based on the <a href="http://www.bedework.org/">Bedework Calendar</a> |
+      Based on the <a href="http://www.bedework.org/">Bedework Calendar System</a> |
       <a href="?noxslt=yes">show XML</a> |
       <a href="?refreshXslt=yes">refresh XSLT</a>
Index: trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl (revision 1871)
+++ trunk/deployment/websubmit/webapp/resources/demoskins/default/default/default.xsl (revision 1874)
@@ -870,23 +870,4 @@
             </td>
           </tr>
-          <!--  Link (url associated with event)  -->
-          <tr>
-            <td class="fieldname"><em>Event Link:</em></td>
-            <td class="fieldval">
-              <xsl:variable name="link" select="form/link/input/@value"/>
-              <input type="text" name="event.link" size="81" value="{$link}"/>
-              <span class="note"> optional</span>
-            </td>
-          </tr>
-          <!-- Cost -->
-          <tr>
-            <td class="fieldname"><em>Cost:</em></td>
-            <td class="fieldval">
-              <input type="text" name="event.cost" size="81" value="">
-                <xsl:attribute name="value"><xsl:value-of select="form/cost/input/@value"/></xsl:attribute>
-              </input>
-              <span class="note"> optional</span>
-            </td>
-          </tr>
           <!--  Status  -->
           <tr>
@@ -907,4 +888,35 @@
               </input>
               cancelled
+            </td>
+          </tr>
+          <!-- Cost -->
+          <tr>
+            <td class="fieldname"><em>Cost:</em></td>
+            <td class="fieldval">
+              <input type="text" name="event.cost" size="30" value="">
+                <xsl:attribute name="value"><xsl:value-of select="form/cost/input/@value"/></xsl:attribute>
+              </input>
+              <span class="note"> optional: if any, and place to purchase tickets</span>
+            </td>
+          </tr>
+          <!--  Link (url associated with event)  -->
+          <tr>
+            <td class="fieldname"><em>Event URL:</em></td>
+            <td class="fieldval">
+              <input type="text" name="event.link" size="30" value="">
+                <xsl:attribute name="value"><xsl:value-of select="form/link/input/@value"/></xsl:attribute>
+              </input>
+              <span class="note"> optional: for more information about the event</span>
+            </td>
+          </tr>
+          <!-- Image Url -->
+          <tr>
+            <td class="fieldname"><em>Image URL:</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"> optional: to include an image with the event description</span>
             </td>
           </tr>
Index: trunk/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkEventForm.js
===================================================================
--- trunk/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkEventForm.js (revision 1852)
+++ trunk/deployment/websubmit/webapp/resources/demoskins/resources/bedeworkEventForm.js (revision 1874)
@@ -44,5 +44,5 @@
 
 /* An rdate
-/* date: String: internal date
+ * date: String: internal date
  * time: String
  * tzid timezone id or null
@@ -274,16 +274,27 @@
   // Set application x-properties here.
 
-  // Sumbission comments as x-properties
-  bwXProps.update(bwXPropertyLocation,
+  // Submission comments as x-properties
+  // Only return those comments that contain non-empty values;
+  // throw out the subfields if main field has no value.
+
+  if (formObj["commentLocationAddress"].value != "") {
+    bwXProps.update(bwXPropertyLocation,
                   [[bwXParamSubAddress,formObj["commentLocationSubaddress"].value],
                    [bwXParamURL,formObj["commentLocationURL"].value]],
                    formObj["commentLocationAddress"].value,true);
-  bwXProps.update(bwXPropertyContact,
+  }
+  if (formObj["commentContactName"].value != "") {
+    bwXProps.update(bwXPropertyContact,
                   [[bwXParamPhone,formObj["commentContactPhone"].value],
                    [bwXParamURL,formObj["commentContactURL"].value],
                    [bwXParamEmail,formObj["commentContactEmail"].value]],
                    formObj["commentContactName"].value,true);
-  bwXProps.update(bwXPropertyCategories,[],formObj["commentCategories"].value,true);
-  bwXProps.update(bwXPropertySubmitComment,[],formObj["commentNotes"].value,true);
+  }
+  if (formObj["commentCategories"].value) {
+    bwXProps.update(bwXPropertyCategories,[],formObj["commentCategories"].value,true);
+  }
+  if (formObj["commentNotes"].value) {
+    bwXProps.update(bwXPropertySubmitComment,[],formObj["commentNotes"].value,true);
+  }
 
   // X-BEDEWORK-IMAGE and its parameters: