Index: trunk/deployment/webadmin/webapp/resources/default/default/default.css
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/default.css (revision 1681)
+++ trunk/deployment/webadmin/webapp/resources/default/default/default.css (revision 1690)
@@ -698,6 +698,23 @@
 }
 #submitTable {
+  position: relative; /* allows for absolute positioning within the table, e.g. #pubishBox */
   width: 96%; /* less than 100% helps avoid IE weirdness */
   margin-top: 1em;
+}
+#publishBox {
+  position: absolute;
+  padding: 1em;
+  background-color: #ffa;
+  color: black;
+  border: 1px solid #333;
+  width: 420px;
+  height: 60px;
+}
+#publishBoxCloseButton {
+  position: absolute;
+  top: 0;
+  right: 0;
+  margin: 0;
+  padding: 0;
 }
 #sharingBox {
Index: trunk/deployment/webadmin/webapp/resources/default/default/default.xsl
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (revision 1682)
+++ trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (revision 1690)
@@ -1028,16 +1028,40 @@
           </td>
         </tr>
-        <tr>
-          <td class="fieldName">
-            Calendar:**
-          </td>
-          <td>
-            <xsl:if test="form/calendar/preferred/select/option">
-              <select name="prefCalendarId">
+        <xsl:if test="not(starts-with(form/calendar/path,$submissionsRootUnencoded))">
+          <tr>
+            <td class="fieldName">
+              Calendar:**
+            </td>
+            <td>
+              <xsl:if test="form/calendar/preferred/select/option">
+                <select name="prefCalendarId">
+                  <option>
+                    <xsl:attribute name="value"><xsl:value-of select="form/calendar/path"/></xsl:attribute>
+                    Select preferred:
+                  </option>
+                  <xsl:for-each select="form/calendar/preferred/select/option">
+                    <xsl:sort select="." order="ascending"/>
+                    <option>
+                      <xsl:attribute name="value"><xsl:value-of select="@value"/></xsl:attribute>
+                      <xsl:if test="@selected"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if>
+                      <xsl:choose>
+                        <xsl:when test="starts-with(node(),/bedework/submissionsRoot/unencoded)">
+                          submitted events
+                        </xsl:when>
+                        <xsl:otherwise>
+                          <xsl:value-of select="substring-after(node(),'/public/')"/>
+                        </xsl:otherwise>
+                      </xsl:choose>
+                    </option>
+                  </xsl:for-each>
+                </select><br/>
+                or Calendar (all):
+              </xsl:if>
+              <select name="calendarId">
                 <option>
                   <xsl:attribute name="value"><xsl:value-of select="form/calendar/path"/></xsl:attribute>
-                  Select preferred:
+                  Select:
                 </option>
-                <xsl:for-each select="form/calendar/preferred/select/option">
+                <xsl:for-each select="form/calendar/all/select/option">
                   <xsl:sort select="." order="ascending"/>
                   <option>
@@ -1054,34 +1078,12 @@
                   </option>
                 </xsl:for-each>
-              </select><br/>
-              or Calendar (all):
-            </xsl:if>
-            <select name="calendarId">
-              <option>
-                <xsl:attribute name="value"><xsl:value-of select="form/calendar/path"/></xsl:attribute>
-                Select:
-              </option>
-              <xsl:for-each select="form/calendar/all/select/option">
-                <xsl:sort select="." order="ascending"/>
-                <option>
-                  <xsl:attribute name="value"><xsl:value-of select="@value"/></xsl:attribute>
-                  <xsl:if test="@selected"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if>
-                  <xsl:choose>
-                    <xsl:when test="starts-with(node(),/bedework/submissionsRoot/unencoded)">
-                      submitted events
-                    </xsl:when>
-                    <xsl:otherwise>
-                      <xsl:value-of select="substring-after(node(),'/public/')"/>
-                    </xsl:otherwise>
-                  </xsl:choose>
-                </option>
-              </xsl:for-each>
-            </select>
-            <xsl:text> </xsl:text>
-            <span id="calDescriptionsLink">
-              <a href="javascript:launchSimpleWindow('{$calendar-fetchDescriptions}')">calendar descriptions</a>
-            </span>
-          </td>
-        </tr>
+              </select>
+              <xsl:text> </xsl:text>
+              <span id="calDescriptionsLink">
+                <a href="javascript:launchSimpleWindow('{$calendar-fetchDescriptions}')">calendar descriptions</a>
+              </span>
+            </td>
+          </tr>
+        </xsl:if>
 
         <tr>
@@ -2258,6 +2260,42 @@
           <xsl:when test="starts-with(form/calendar/path,$submissionsRootUnencoded)">
             <td>
+              <div id="publishBox" class="invisible">
+                <div id="publishBoxCloseButton">
+                  <a href="javascript:resetPublishBox('calendarId')">
+                    <img src="{$resourcesRoot}/resources/closeIcon.gif" width="20" height="20" alt="close" border="0"/>
+                  </a>
+                </div>
+                <strong>Select a calendar in which to publish this event:</strong><br/>
+                <select name="calendarId" id="calendarId">
+                  <option>
+                    <xsl:attribute name="value"><xsl:value-of select="form/calendar/path"/></xsl:attribute>
+                    Select:
+                  </option>
+                  <xsl:for-each select="form/calendar/all/select/option">
+                    <xsl:sort select="." order="ascending"/>
+                    <option>
+                      <xsl:attribute name="value"><xsl:value-of select="@value"/></xsl:attribute>
+                      <xsl:if test="@selected"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if>
+                      <xsl:choose>
+                        <xsl:when test="starts-with(node(),/bedework/submissionsRoot/unencoded)">
+                          submitted events
+                        </xsl:when>
+                        <xsl:otherwise>
+                          <xsl:value-of select="substring-after(node(),'/public/')"/>
+                        </xsl:otherwise>
+                      </xsl:choose>
+                    </option>
+                  </xsl:for-each>
+                </select>
+                <input type="submit" name="publishEvent" value="Publish" onclick="changeClass('publishBox','invisible')"/>
+                <xsl:if test="$portalFriendly = 'false'">
+                  <br/>
+                  <span id="calDescriptionsLink">
+                    <a href="javascript:launchSimpleWindow('{$calendar-fetchDescriptions}')">calendar descriptions</a>
+                  </span>
+                </xsl:if>
+              </div>
               <input type="submit" name="updateSubmitEvent" value="Update Event"/>
-              <input type="submit" name="publishEvent" value="Publish Event"/>
+              <input type="button" name="publishEvent" value="Publish Event" onclick="changeClass('publishBox','visible')"/>
               <input type="submit" name="cancel" value="Cancel"/>
             </td>
Index: trunk/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js
===================================================================
--- trunk/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js (revision 1680)
+++ trunk/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js (revision 1690)
@@ -662,4 +662,13 @@
 }
 
+function resetPublishBox(calSelectId) {
+  // User has closed the publish box without publishing.
+  // Reset the calendar select box to default value and hide the publishBox.
+  var calSelect = document.getElementById(calSelectId);
+  calSelect.selectedIndex = 0;
+  changeClass('publishBox','invisible');
+}
+
+
 function init() {
   var untilHolder = dojo.byId("untilHolder");