Index: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css
===================================================================
--- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css (revision 387)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css (revision 391)
@@ -1010,5 +1010,5 @@
 }
 #sharingBox h3 {
-  padding: 1em 0 0.5em 0;
+  padding: 1em 0 0.5em 0.5em;
 }
 #sharingBox h5 {
Index: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (revision 387)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (revision 391)
@@ -44,4 +44,5 @@
   <xsl:variable name="addEvent" select="/bedework/urlPrefixes/addEvent"/>
   <xsl:variable name="addEventUsingPage" select="/bedework/urlPrefixes/addEventUsingPage"/>
+  <xsl:variable name="event-setAccess" select="/bedework/urlPrefixes/event/setAccess/a/@href"/>
   <xsl:variable name="editEvent" select="/bedework/urlPrefixes/editEvent"/>
   <xsl:variable name="delEvent" select="/bedework/urlPrefixes/delEvent"/>
@@ -1264,5 +1265,5 @@
           </td>
           <td class="fieldval">
-            <select name="calendarId">
+            <select name="calId">
               <option value="-1">
                 Select:
@@ -1611,4 +1612,8 @@
   <!--==== EDIT EVENT ====-->
   <xsl:template match="formElements" mode="editEvent">
+    <xsl:variable name="subscriptionId" select="subscriptionId"/>
+    <xsl:variable name="calendarId" select="calendarId"/>
+    <xsl:variable name="guid" select="guid"/>
+    <xsl:variable name="recurrenceId" select="recurrenceId"/>
     <form name="eventForm" method="post" action="{$editEvent}" id="standardForm">
       <input type="hidden" name="updateEvent" value="true"/>
@@ -1620,8 +1625,4 @@
           <th colspan="2" class="commonHeader">
             <div id="eventActions">
-              <xsl:variable name="subscriptionId" select="subscriptionId"/>
-              <xsl:variable name="calendarId" select="calendarId"/>
-              <xsl:variable name="guid" select="guid"/>
-              <xsl:variable name="recurrenceId" select="recurrenceId"/>
               <a href="{$eventView}?subid={$subscriptionId}&amp;calid={$calendarId}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">
                 View Event
@@ -1648,5 +1649,5 @@
           </td>
           <td class="fieldval">
-            <select name="calendarId">
+            <select name="calId">
               <option value="-1">
                 Select:
@@ -1921,4 +1922,52 @@
       </table>
     </form>
+
+    <div id="sharingBox">
+      <h3>Sharing</h3>
+      <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">
+          <tr>
+            <th>Users:</th>
+            <td>
+              <xsl:for-each select="acl/ace[principal/href]">
+                <xsl:value-of select="principal/href"/> (<xsl:value-of select="name(grant/*)"/>)<br/>
+              </xsl:for-each>
+            </td>
+          </tr>
+        </xsl:if>
+      </table>
+      <form name="eventShareForm" action="{$event-setAccess}" id="shareForm">
+        <input type="hidden" name="calId" value="{$calendarId}"/>
+        <input type="hidden" name="guid" value="{$guid}"/>
+        <input type="hidden" name="recurid" value="{$recurrenceId}"/>
+        <p>
+          Share this event with:<br/>
+          <input type="text" name="who" size="20"/>
+          <input type="radio" value="user" name="whoType" checked="checked"/> user
+          <input type="radio" value="group" name="whoType"/> group
+        </p>
+        <p>
+          Access rights:<br/>
+          <input type="radio" value="r" name="how" checked="checked"/> read<br/>
+          <input type="radio" value="w" name="how"/> write<br/>
+          <input type="radio" value="f" name="how"/> free/busy only<br/>
+          <input type="radio" value="d" name="how"/> default (reset access)
+        </p>
+        <input type="submit" name="submit" value="Submit"/>
+      </form>
+    </div>
   </xsl:template>
 
Index: trunk/calendar3/webclient/src/org/bedework/webclient/BwInitEventAction.java
===================================================================
--- trunk/calendar3/webclient/src/org/bedework/webclient/BwInitEventAction.java (revision 390)
+++ trunk/calendar3/webclient/src/org/bedework/webclient/BwInitEventAction.java (revision 391)
@@ -64,4 +64,6 @@
  *      <li>"startdate"              Optional start date for the event
                                      as yymmdd or yymmddTHHmmss</li>
+        <li>"enddate"                Optional end date for the event
+                                     as yymmdd or yymmddTHHmmss</li>
  * </ul>
  *
Index: trunk/calendar3/webclient/war/WEB-INF/struts-config.xml
===================================================================
--- trunk/calendar3/webclient/war/WEB-INF/struts-config.xml (revision 386)
+++ trunk/calendar3/webclient/war/WEB-INF/struts-config.xml (revision 391)
@@ -264,4 +264,15 @@
     </action>
 
+    <action    path="/event/setAccess"
+               type="org.bedework.webcommon.access.AccessAction"
+               name="calForm"
+               scope="session"
+               validate="false">
+      <forward name="success" path="/showEditEvent.rdo" redirect="true" />
+      <forward name="error" path="/showEditEvent.rdo" redirect="true" />
+      <forward name="notFound" path="/showEditEvent.rdo" redirect="true" />
+      <forward name="doNothing" path="/showEditEvent.rdo" redirect="true" />
+    </action>
+
     <action    path="/upload"
                type="org.bedework.webcommon.misc.UploadAction"
Index: trunk/calendar3/webclient/war/docs/header.jsp
===================================================================
--- trunk/calendar3/webclient/war/docs/header.jsp (revision 386)
+++ trunk/calendar3/webclient/war/docs/header.jsp (revision 391)
@@ -122,7 +122,4 @@
     <setViewPeriod><genurl:rewrite action="setViewPeriod.do"/></setViewPeriod>
     <eventView><genurl:rewrite action="eventView.do"/></eventView>
-    <initEvent><genurl:rewrite action="initEvent.do"/></initEvent>
-    <addEvent><genurl:rewrite action="addEvent.do"/></addEvent>
-    <addEventUsingPage><genurl:rewrite action="addEventUsingPage.do"/></addEventUsingPage>
     <mailEvent><genurl:rewrite action="mailEvent.do"/></mailEvent>
     <showPage><genurl:rewrite action="showPage.do"/></showPage>
@@ -136,6 +133,12 @@
     <!-- The following URLs are used only in the personal client -->
     <logic:equal name="calForm" property="guest" value="false">
+      <initEvent><genurl:rewrite action="initEvent.do"/></initEvent>
+      <addEvent><genurl:rewrite action="addEvent.do"/></addEvent>
+      <addEventUsingPage><genurl:rewrite action="addEventUsingPage.do"/></addEventUsingPage>
       <editEvent><genurl:rewrite action="editEvent.do"/></editEvent>
       <delEvent><genurl:rewrite action="delEvent.do"/></delEvent>
+      <event>
+        <setAccess><genurl:link page="/event/setAccess.do?b=de"/></setAccess>
+      </event>
 
       <getFreeBusy><genurl:link page="/getFreeBusy.do?b=de"/></getFreeBusy>