Index: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (revision 572)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (revision 575)
@@ -2115,23 +2115,19 @@
 		<div id="sharingBox">
 			<h3>Sharing</h3>
-			<!--<table class="common">
+			<table class="common">
 				<tr>
 					<th class="commonHeader" colspan="2">Current access:</th>
 				</tr>
 				<tr>
-					<th>Owner:</th>-->
-					<!-- NOTE: we are currently getting the acl information from the
-							 calendar listing NOT from the current calendar (which does not
-							 have the means of producing it out of the action form just now.
-							 We'll fix this soon. -->
-					<!--<td class="fieldval">
-						<xsl:value-of select="name(acl/ace[principal/property/owner]/grant/*)"/>
-					</td>
-				</tr>
-				<xsl:if test="acl/ace/principal/href">
+					<th>Owner:</th>
+					<td class="fieldval">
+						<xsl:value-of select="name(/bedework/access/acl/ace[principal/property/owner]/grant/*)"/>
+					</td>
+				</tr>
+				<xsl:if test="/bedework/access/acl/ace/principal/href">
 					<tr>
 						<th>Users:</th>
 						<td>
-							<xsl:for-each select="acl/ace[principal/href]">
+							<xsl:for-each select="/bedework/access/acl/ace[principal/href]">
 								<xsl:value-of select="principal/href"/> (<xsl:value-of select="name(grant/*)"/>)<br/>
 							</xsl:for-each>
@@ -2139,5 +2135,5 @@
 					</tr>
 				</xsl:if>
-			</table>-->
+			</table>
 			<form name="eventShareForm" action="{$event-setAccess}" id="shareForm">
 				<input type="hidden" name="calPath" value="{$calPath}"/>
Index: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/errors.xsl
===================================================================
--- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/errors.xsl (revision 473)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/errors.xsl (revision 575)
@@ -48,4 +48,7 @@
           <p>Duplicate guid: this event already exists in your calendar.</p>
       </xsl:when>
+      <xsl:when test="id='org.bedework.client.error.nofilename'">
+          <p>You must supply a file name (required).</p>
+      </xsl:when>
       <xsl:when test="id='org.bedework.validation.error.missingfield'">
           <p>You must supply the following field: <em><xsl:value-of select="param"/></em></p>
Index: trunk/calendar3/webclient/war/WEB-INF/struts-config.xml
===================================================================
--- trunk/calendar3/webclient/war/WEB-INF/struts-config.xml (revision 567)
+++ trunk/calendar3/webclient/war/WEB-INF/struts-config.xml (revision 575)
@@ -326,4 +326,5 @@
                validate="false">
       <forward name="baddata" path="/showMain.rdo" redirect="true" />
+      <forward name="retry" path="/initUpload.rdo" redirect="true" />
       <forward name="success" path="/setup.do" redirect="true"/>
     </action>
Index: trunk/calendar3/webclient/war/docs/event/editEvent.jsp
===================================================================
--- trunk/calendar3/webclient/war/docs/event/editEvent.jsp (revision 440)
+++ trunk/calendar3/webclient/war/docs/event/editEvent.jsp (revision 575)
@@ -3,4 +3,5 @@
 <%@ taglib uri='struts-html' prefix='html' %>
 <%@ taglib uri='struts-genurl' prefix='genurl' %>
+<%@ taglib uri='bedework' prefix='bw' %>
 <html:xhtml/>
 
@@ -135,4 +136,7 @@
   </genurl:form>
 </formElements>
+<bean:define id="eventFormatter" name="calForm" property="curEventFmt"/>
+<bw:emitText name="eventFormatter" property="xmlAccess" tagName="access"
+                 filter="no"/>
 
 <%
Index: trunk/calendar3/webclient/war/docs/event/emitEvent.jsp
===================================================================
--- trunk/calendar3/webclient/war/docs/event/emitEvent.jsp (revision 433)
+++ trunk/calendar3/webclient/war/docs/event/emitEvent.jsp (revision 575)
@@ -100,4 +100,6 @@
           the following code should not be produced in the public client
          **************************************************************** --%>
-    <bw:emitCurrentPrivs name="eventInfo" property="currentAccess" />
+    <logic:equal name="calForm" property="guest" value="false">
+      <bw:emitCurrentPrivs name="eventInfo" property="currentAccess" />
+    </logic:equal>
   </event>