Changeset 404

Timestamp:

04/20/06 17:18:53

Author:

johnsa

Message:

sharing available for free/busy

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) (4 diffs)
• trunk/calendar3/webclient/war/WEB-INF/struts-config.xml (modified) (3 diffs)
• trunk/calendar3/webclient/war/docs/header.jsp (modified) (1 diff)

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

@@ -947 +947 @@
-  font-size: 0.8em;
-  font-style: italic;
+}
+#freeBusyWho {
+  background-color: #666;
+  color: #eee;
+  padding: 0.2em 0.5em;
+  text-align: left;
+  font-weight: normal;
-}
-#freeBusy {

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

@@ -59 +59 @@
-  <xsl:variable name="initUpload" select="/bedework/urlPrefixes/initUpload"/>
-  <xsl:variable name="upload" select="/bedework/urlPrefixes/upload"/>
-
+
+
-  <!-- calendars -->
-  <xsl:variable name="fetchPublicCalendars" select="/bedework/urlPrefixes/fetchPublicCalendars"/>
@@ -336 +337 @@
-    <h3>options</h3>
-    <ul id="sideBarMenu">
-getFreeBusy
+freeBusy-fetch
-      <li><a href="{$manageLocations}">Manage Locations</a></li>
-      <li>Preferences</li>
@@ -1974 +1975 @@
-  <xsl:template match="freebusy">
-    <h2>Free / Busy</h2>
+    <div id="freeBusyWho">for <xsl:value-of select="day/who"/></div>
-    <table id="freeBusy">
-      <tr>
@@ -2023 +2025 @@
-        <td class="busy">*</td>
-        <td>busy</td>
+        <td>&#160;</td>
+        <td>
+          <form name="calendarShareForm" action="{$freeBusy-fetch}">
+            View user's free/busy:<br/>
+            <input type="text" name="userid" size="20"/>
+            <input type="submit" name="submit" value="Submit"/>
+          </form>
+        </td>
-      </tr>
-    </table>
+
+    <div id="sharingBox">
+      <h3>Sharing</h3>
+      <table class="common">
+        <tr>
+          <th class="commonHeader" colspan="2">Current access:</th>
+        </tr>
+        <tr>
+          <th>Users:</th>
+          <td>
+            <xsl:choose>
+              <xsl:when test="/bedework/myCalendars/calendars/calendar/acl/ace/principal/href">
+                <xsl:for-each select="/bedework/myCalendars/calendars/calendar/acl/ace[principal/href]">
+                  <xsl:value-of select="principal/href"/> (<xsl:value-of select="name(grant/*)"/>)<br/>
+                </xsl:for-each>
+              </xsl:when>
+              <xsl:otherwise>
+                free/busy not shared
+              </xsl:otherwise>
+            </xsl:choose>
+          </td>
+        </tr>
+      </table>
+      <form name="calendarShareForm" action="{$freeBusy-setAccess}" id="shareForm">
+        <xsl:variable name="calId" select="/bedework/myCalendars/calendars/calendar/id"/>
+        <input type="hidden" name="calId" value="{$calId}"/>
+        <p>
+          Share my free/busy 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="f" name="how" checked="checked"/> view my free/busy<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/war/WEB-INF/struts-config.xml

@@ -110 +110 @@
-    </action>
-
-    <action    path="/showFreeBusy"
-               type="org.bedework.webclient.BwRenderAction"
-               name="calForm"
-               scope="session"
-               validate="false">
-      <forward name="success" path="/docs/freeBusy.jsp" />
-    </action>
-
-    <action    path="/showManageLocations"
-               type="org.bedework.webclient.BwRenderAction"
@@ -299 +291 @@
-    </action>
-
-    <action    path="/getFreeBusy"
-               type="org.bedework.webclient.BwFreeBusyAction"
-               name="calForm"
-               scope="session"
-               validate="false">
-      <forward name="success" path="/showFreeBusy.rdo" redirect="true" />
-    </action>
-
-    <action    path="/manageLocations"
-               type="org.bedework.webclient.BwAction"
@@ -339 +323 @@
-      <forward name="referenced" path="/showManageLocations.rdo" redirect="true" />
-      <forward name="success" path="/showManageLocations.rdo" redirect="true" />
+    </action>
+
+   <!-- ===============================================================
+                         Free / Busy
+         =============================================================== -->
+
+    <action    path="/freeBusy/showFreeBusy"
+               type="org.bedework.webclient.BwRenderAction"
+               name="calForm"
+               scope="session"
+               validate="false">
+      <forward name="success" path="/docs/freeBusy.jsp" />
+    </action>
+
+    <action    path="/freeBusy/getFreeBusy"
+               type="org.bedework.webclient.BwFreeBusyAction"
+               name="calForm"
+               scope="session"
+               validate="false">
+      <forward name="success" path="/freeBusy/showFreeBusy.rdo" redirect="true" />
+      <forward name="noAccess" path="/freeBusy/showFreeBusy.rdo" redirect="true" />
+      <forward name="notFound" path="/freeBusy/showFreeBusy.rdo" redirect="true" />
+    </action>
+
+    <action    path="/freeBusy/setAccess"
+               type="org.bedework.webcommon.access.AccessAction"
+               name="calForm"
+               scope="session"
+               validate="false">
+      <forward name="success" path="/freeBusy/showFreeBusy.rdo" redirect="true" />
+      <forward name="error" path="/freeBusy/showFreeBusy.rdo" redirect="true" />
+      <forward name="notFound" path="/freeBusy/showFreeBusy.rdo" redirect="true" />
+      <forward name="doNothing" path="/freeBusy/showFreeBusy.rdo" redirect="true" />
-    </action>
-

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

@@ -142 +142 @@
-      </event>
-
-
+
+
+
+
-
-      <calendar>