Changeset 391

Timestamp:

04/19/06 16:51:25

Author:

johnsa

Message:

added sharing information to edit event for personal client user interface. Needs some implementation on back-end (xml output, etc).

Files:

• trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css (modified) (1 diff)
• trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (modified) (6 diffs)
• trunk/calendar3/webclient/src/org/bedework/webclient/BwInitEventAction.java (modified) (1 diff)
• trunk/calendar3/webclient/war/WEB-INF/struts-config.xml (modified) (1 diff)
• trunk/calendar3/webclient/war/docs/header.jsp (modified) (2 diffs)

trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css

@@ -1010 +1010 @@
-}
-#sharingBox h3 {
-
+.5em
-}
-#sharingBox h5 {

trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

@@ -44 +44 @@
-  <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 +1265 @@
-          </td>
-          <td class="fieldval">
-endar
+
-              <option value="-1">
-                Select:
@@ -1611 +1612 @@
-  <!--==== 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 +1625 @@
-          <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 +1649 @@
-          </td>
-          <td class="fieldval">
-endar
+
-              <option value="-1">
-                Select:
@@ -1921 +1922 @@
-      </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>
-

trunk/calendar3/webclient/src/org/bedework/webclient/BwInitEventAction.java

@@ -64 +64 @@
- *      <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>
- *

trunk/calendar3/webclient/war/WEB-INF/struts-config.xml

@@ -264 +264 @@
-    </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"

trunk/calendar3/webclient/war/docs/header.jsp

@@ -122 +122 @@
-    <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 +133 @@
-    <!-- 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>