[Bedework-commit] r404 - in trunk/calendar3:
deployment/webuser/webapp/resources/demoskins/default/default
webclient/war/WEB-INF webclient/war/docs
svnadmin at bedework.org
svnadmin at bedework.org
Thu Apr 20 17:18:54 EDT 2006
Author: johnsa
Date: 2006-04-20 17:18:53 -0400 (Thu, 20 Apr 2006)
New Revision: 404
Modified:
trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css
trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
trunk/calendar3/webclient/war/WEB-INF/struts-config.xml
trunk/calendar3/webclient/war/docs/header.jsp
Log:
sharing available for free/busy
Modified: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css
===================================================================
--- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css 2006-04-20 20:54:36 UTC (rev 403)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.css 2006-04-20 21:18:53 UTC (rev 404)
@@ -947,6 +947,13 @@
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 {
margin: 1em;
}
Modified: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl 2006-04-20 20:54:36 UTC (rev 403)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl 2006-04-20 21:18:53 UTC (rev 404)
@@ -58,7 +58,8 @@
<xsl:variable name="setAlarm" select="/bedework/urlPrefixes/setAlarm"/>
<xsl:variable name="initUpload" select="/bedework/urlPrefixes/initUpload"/>
<xsl:variable name="upload" select="/bedework/urlPrefixes/upload"/>
- <xsl:variable name="getFreeBusy" select="/bedework/urlPrefixes/getFreeBusy/a/@href"/>
+ <xsl:variable name="freeBusy-fetch" select="/bedework/urlPrefixes/freeBusy/fetch/a/@href"/>
+ <xsl:variable name="freeBusy-setAccess" select="/bedework/urlPrefixes/freeBusy/setAccess/a/@href"/>
<!-- calendars -->
<xsl:variable name="fetchPublicCalendars" select="/bedework/urlPrefixes/fetchPublicCalendars"/>
<xsl:variable name="calendar-fetch" select="/bedework/urlPrefixes/calendar/fetch/a/@href"/><!-- used -->
@@ -335,7 +336,7 @@
<h3>options</h3>
<ul id="sideBarMenu">
- <li><a href="{$getFreeBusy}">Show Free/Busy</a></li>
+ <li><a href="{$freeBusy-fetch}">Show Free/Busy</a></li>
<li><a href="{$manageLocations}">Manage Locations</a></li>
<li>Preferences</li>
</ul>
@@ -1973,6 +1974,7 @@
<!--+++++++++++++++ Free / Busy ++++++++++++++++++++-->
<xsl:template match="freebusy">
<h2>Free / Busy</h2>
+ <div id="freeBusyWho">for <xsl:value-of select="day/who"/></div>
<table id="freeBusy">
<tr>
<td> </td>
@@ -2022,8 +2024,56 @@
<td> </td>
<td class="busy">*</td>
<td>busy</td>
+ <td> </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>
<xsl:template match="start" mode="timeDisplay">
Modified: trunk/calendar3/webclient/war/WEB-INF/struts-config.xml
===================================================================
--- trunk/calendar3/webclient/war/WEB-INF/struts-config.xml 2006-04-20 20:54:36 UTC (rev 403)
+++ trunk/calendar3/webclient/war/WEB-INF/struts-config.xml 2006-04-20 21:18:53 UTC (rev 404)
@@ -109,14 +109,6 @@
<forward name="success" path="/docs/exportData.jsp" />
</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"
name="calForm"
@@ -298,14 +290,6 @@
<forward name="success" path="/docs/showPage.jsp" />
</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"
name="calForm"
@@ -340,6 +324,39 @@
<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>
+
<!-- ===============================================================
Calendar Actions
=============================================================== -->
Modified: trunk/calendar3/webclient/war/docs/header.jsp
===================================================================
--- trunk/calendar3/webclient/war/docs/header.jsp 2006-04-20 20:54:36 UTC (rev 403)
+++ trunk/calendar3/webclient/war/docs/header.jsp 2006-04-20 21:18:53 UTC (rev 404)
@@ -141,7 +141,10 @@
<setAccess><genurl:link page="/event/setAccess.do?b=de"/></setAccess>
</event>
- <getFreeBusy><genurl:link page="/getFreeBusy.do?b=de"/></getFreeBusy>
+ <freeBusy>
+ <fetch><genurl:link page="/freeBusy/getFreeBusy.do?b=de"/></fetch>
+ <setAccess><genurl:link page="/freeBusy/setAccess.do?b=de"/></setAccess>
+ </freeBusy>
<calendar>
<fetch><genurl:link page="/calendar/showUpdateList.rdo?b=de"/></fetch><!-- keep -->
More information about the Bedework-commit
mailing list