Changeset 1163

Timestamp:

12/15/06 17:20:40

Author:

johnsa

Message:

personal and public clients: finishing off calendar export; updating event action links

Files:

• trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl (modified) (1 diff)
• trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/images/calIconDeleted-sm.gif (added)
• trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/images/calIconExport-sm.gif (added)
• trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/images/calIconDeleted-sm.gif (added)
• trunk/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/images/calIconExport-sm.gif (added)
• trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css (modified) (4 diffs)
• trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (modified) (13 diffs)
• trunk/deployment/webuser/webapp/resources/demoskins/resources/calIconDeleted-sm.gif (added)
• trunk/deployment/webuser/webapp/resources/demoskins/resources/calIconExport-sm.gif (added)
• trunk/deployment/webuser/webapp/resources/demoskins/resources/std-ical_iconLinkDkGray.gif (added)

trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl

@@ -1183 +1183 @@
-        <xsl:variable name="calPath" select="encodedPath"/>
-        <span class="exportCalLink">
-
+
+
+
-          <!--export
-          <a href="{$export}&amp;calPath={$calPath}&amp;dateLimits=active&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$name}.ics" title="export calendar as iCal (excluding past events)">current</a> |

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

@@ -548 +548 @@
-table.common td.leftBorder {
-  border-left: 1px solid #999;
+  border-top: 1px solid #999;
-  padding-left: 1em;
-}
@@ -592 +593 @@
-table.common .borderRight {
-  border-right: 1px solid #999;
+}
+table.common tr#exportDateRange td.dates {
+  border-bottom: 1px solid #999;
+  padding: 0.5em;
-}
-table.common .dateFields {
@@ -705 +710 @@
-  display: inline;
-}
+.visible {
+  /* like shown, but apply no styles to this class */
+}
-.invisible {
-  display: none !important;
@@ -1249 +1257 @@
-.calendarTree li.trash {
-  list-style-image: url(../../resources/trashIcon.gif);
+}
+.calendarTree li.deleted {
+  list-style-image: url(../../resources/calIconDeleted-sm.gif);
-}
-.calendarTree li.selected {

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

@@ -334 +334 @@
-    </xsl:if>
-    <xsl:if test="/bedework/page='addEvent' or
-
+
+
-      <script type="text/javascript" src="{$resourcesRoot}/resources/bwClock.js"></script>
-      <link rel="stylesheet" href="{$resourcesRoot}/resources/bwClock.css"/>
@@ -978 +979 @@
-    <xsl:variable name="recurrenceId" select="recurrenceId"/>
-    <xsl:if test="currentAccess/current-user-privilege-set/privilege/write-content">
+      <xsl:variable name="editTitle">
+        <xsl:choose>
+          <xsl:when test="isAnnotation">Annotate</xsl:when>
+          <xsl:otherwise>Edit</xsl:otherwise>
+        </xsl:choose>
+      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="recurring='true'">
-Edit
-
-
+<xsl:value-of select="$editTitle"/>
+ title="{$editTitle} master (recurring event)"
+ title="{$editTitle} instance (recurring event)"
-          <br/>
-        </xsl:when>
-        <xsl:otherwise>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-          </a>
-          |
@@ -1011 +1000 @@
-      </xsl:choose>
-    </xsl:if>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      <xsl:variable name="subname" select="subscription/name"/>
-
+ title="manage/view subscription"
-        Subscription
-      </a>
@@ -1021 +1024 @@
-      <xsl:when test="recurring='true'">
-        Delete:
-
-
-
-
-
-
+
+
-      </xsl:when>
-      <xsl:otherwise>
-
+ title="delete event"
-          Delete
-        </a>
@@ -1324 +1323 @@
-            </a>
-            <xsl:if test="currentAccess/current-user-privilege-set/privilege/write-content">
+              <xsl:variable name="editTitle">
+                <xsl:choose>
+                  <xsl:when test="isAnnotation">Annotate</xsl:when>
+                  <xsl:otherwise>Edit</xsl:otherwise>
+                </xsl:choose>
+              </xsl:variable>
-             |
-              <xsl:choose>
-                <xsl:when test="recurring='true'">
-                  <img src="{$resourcesRoot}/resources/std-ical_iconEditDkGray.gif" width="12" height="16" border="0" alt="edit master"/>
-Edit
->master</a>,<a href="{$editEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}
+<xsl:value-of select="$editTitle"/>
+ title="{$editTitle} master (recurring event)">master</a>,<a href="{$editEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="{$editTitle} instance (recurring event)
-                </xsl:when>
-                <xsl:otherwise>
-
-edit
-Edit
+ title="{$editTitle} event"
+{$editTitle}
+<xsl:value-of select="$editTitle"/>
-                  </a>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:if>
-            <xsl:if test="owner != /bedework/userid">
-              |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-              |
-              <xsl:variable name="subname" select="subscription/name"/>
-
-
+ title="manage/view subscription"
+/view
-                Subscription
-              </a>
@@ -1366 +1369 @@
-            <xsl:choose>
-              <xsl:when test="recurring='true'">
- all
+
-                Delete:
->all</a>,<a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}
+ title="delete master (recurring event)">all</a>,<a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" title="delete instance (recurring event)
-              </xsl:when>
-              <xsl:otherwise>
-
+ title="delete event"
-                  <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/>
-                  Delete
@@ -3904 +3907 @@
-  <xsl:template match="calendars" mode="exportCalendars">
-    <h2>Export Calendars as iCal</h2>
-xportCalendar
+vent
-      <input type="hidden" name="calPath" value=""/>
-      <input type="hidden" name="nocache" value="no"/>
@@ -3914 +3917 @@
-        <tr>
-          <th class="commonHeader" colspan="3">
-D
-/> active
-/> all (includes past events)
-!--<input type="radio" name="dateLimits" value="limited"/> limited to:-->
+Event d
+ onclick="changeClass('exportDateRange','invisible')"/> today forward
+ onclick="changeClass('exportDateRange','invisible')"/> all dates
+input type="radio" name="dateLimits" value="limited" onclick="changeClass('exportDateRange','visible')"/> date range
-          </th>
+        </tr>
+        <tr id="exportDateRange" class="invisible">
+          <td colspan="3" class="dates">
+            <strong>Start:</strong>
+            <div class="dateFields">
+              <xsl:copy-of select="/bedework/formElements/form/start/month/*"/>
+              <xsl:copy-of select="/bedework/formElements/form/start/day/*"/>
+              <xsl:copy-of select="/bedework/formElements/form/start/yearText/*"/>
+            </div>
+            <script language="JavaScript" type="text/javascript">
+            <xsl:comment>
+              startDateDynCalWidget = new dynCalendar('startDateDynCalWidget', <xsl:value-of select="number(/bedework/formElements/form/start/yearText/input/@value)"/>, <xsl:value-of select="number(/bedework/formElements/form/start/month/select/option[@selected='selected']/@value)-1"/>, <xsl:value-of select="number(/bedework/formElements/form/start/day/select/option[@selected='selected']/@value)"/>, 'startDateCalWidgetCallback',false,'<xsl:value-of select="$resourcesRoot"/>/resources/');
+            </xsl:comment>
+            </script>
+            &#160;&#160;
+            <strong>End:</strong>
+            <div class="dateFields">
+              <xsl:copy-of select="/bedework/formElements/form/end/month/*"/>
+              <xsl:copy-of select="/bedework/formElements/form/end/day/*"/>
+               <xsl:copy-of select="/bedework/formElements/form/end/yearText/*"/>
+            </div>
+            <script language="JavaScript" type="text/javascript">
+            <xsl:comment>
+              endDateDynCalWidget = new dynCalendar('endDateDynCalWidget', <xsl:value-of select="number(/bedework/formElements/form/start/yearText/input/@value)"/>, <xsl:value-of select="number(/bedework/formElements/form/start/month/select/option[@selected='selected']/@value)-1"/>, <xsl:value-of select="number(/bedework/formElements/form/start/day/select/option[@selected='selected']/@value)"/>, 'endDateCalWidgetCallback',false,'<xsl:value-of select="$resourcesRoot"/>/resources/');
+            </xsl:comment>
+            </script>
+          </td>
-        </tr>
-        <tr>
@@ -3925 +3955 @@
-          </th>
-          <th class="borderRight">
-
+ (underlying calendars)
-          </th>
-          <th>
@@ -3934 +3964 @@
-          <td class="borderRight">
-            <!-- My Calendars -->
-
+ class="calendarTree"
-              <!-- list normal calendars first -->
-              <xsl:for-each select="/bedework/myCalendars/calendars/calendar//calendar[calendarCollection='true' and calType &lt; 2]">
-
+ class="calendar"
-                  <xsl:variable name="calPath" select="path"/>
-                  <xsl:variable name="name" select="name"/>
@@ -3946 +3976 @@
-              </xsl:for-each>
-            </ul>
-
+ class="calendarTree"
-              <!-- list special calendars next -->
-              <xsl:for-each select="/bedework/myCalendars/calendars/calendar//calendar[calendarCollection='true' and calType &gt; 1]">
-
+ class="calendar"
-                  <xsl:variable name="calPath" select="path"/>
-                  <xsl:variable name="name" select="name"/>
@@ -3961 +3991 @@
-          <td class="borderRight">
-            <!-- My Subscriptions (underlying calendars) -->
-
+ class="calendarTree"
-              <xsl:variable name="userPath">user/<xsl:value-of select="/bedework/userid"/></xsl:variable>
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-              </xsl:for-each>
-            </ul>
-          </td>
-          <td>
-
+ class="calendarTree"
-              <xsl:for-each select=".//calendar[calendarCollection='true']">
-
+ class="calendar"
-                  <xsl:variable name="calPath" select="path"/>
-                  <xsl:variable name="name" select="name"/>
@@ -4080 +4138 @@
-            <input type="hidden" value="" name="calUri"/>
-            <input type="text" value="" name="userId" size="20"/>
-douglm
-
-
-
-Use
+janedoe
+
+
+
+Calenda
-          <td>
-            <input type="text" value="" name="userPath" size="20"/>
-
+
+
+
+
-          </td>
-        </tr>