Changeset 1408

Timestamp:

06/08/07 17:04:57

Author:

johnsa

Message:

user client: add freebusy display to attendees & recipients selection (beginning stages)

Files:

• trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css (modified) (2 diffs)
• trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (modified) (3 diffs)

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

@@ -931 +931 @@
-  padding: 0;
-}
-
+
+
+
+
+
+
-  padding: 0 2em 0.1em 0;
-white
+#ddd
-  color: black;
-  border-bottom: 1px dotted #333;
-  font-size: 0.9em;
-}
-#attendees
- 2em 0.1em 0
-
-
-#attendees
-table#attendees
+.widget
+.1em 1em
+
+
+.widget
+#bedework table.widget
-  text-transform: lowercase;
-}
-#attendees
+
-  border: 1px solid #999;
-}
-
-
-
-
-
-
+
+
+
+
+
-  width: 15px;
+  padding: 4px 6px 4px 4px;
-}
-#bedework #recipientsAndAttendees {
-  margin: 0;
-
+ 0 
-}
-/* dialog box - popup, most likely deprectaed */
@@ -1566 +1571 @@
-  right: 20px;
-  width: 300px;
+}
+#freeBusyAgg {
+  clear: both;
+  margin: 1em;
+}
+#freeBusyAgg td {
+  vertical-align: middle;
+  text-align: center;
+  padding: 0;
+  margin: 0;
+}
+#freeBusyAgg th.left {
+  text-align: left;
+}
+#freeBusyAgg td.morning {
+  color: black;
+  background: #ddf;
+}
+#freeBusyAgg td.evening {
+  color: black;
+  background: #dde;
+}
+#freeBusyAgg td.timeLabels {
+  vertical-align: middle;
+  text-align: center;
+  font-size: 0.8em;
+  font-weight: normal;
+  padding: 0;
+  margin: 0;
+}
+#freeBusyAgg td.dayDate {
+  white-space: nowrap;
+}
+#freeBusyAgg td.free,
+#freeBusyAggKey td.free {
+  color: #A3BAEA;
+  background-color: #A3BAEA;
+}
+#freeBusyAgg td.busy,
+#freeBusyAggKey td.busy {
+  color: #fbb;
+  background-color: #fbb;
+}
+#freeBusyAgg td.tentative,
+#freeBusyAggKey td.tentative {
+  color: #ddd;
+  background: #ddd url('../../resources/tentativeLines.gif') top;
+}
+#freeBusyAggKey {
+  margin: 0.5em auto 0 auto;
+}
+#freeBusyAggKey td {
+  padding: 5px;
+}
+#freeBusyAgg td.free a {
+  color: #A3BAEA;
+  background-color: transparent;
+  display: block;
+  padding: 3px 3px;
+  width: 10px;
+  height: 10px;
+  text-decoration: none;
+}
+#freeBusyAgg td.tentative a  {
+  color: #333;
+  background-color: transparent;
+  display: block;
+  padding: 3px 3px;
+  width: 10px;
+  height: 10px;
+  text-decoration: none;
+}
+#freeBusyAgg td.busy a {
+  color: #333;
+  background-color: transparent;
+  display: block;
+  padding: 3px 3px;
+  width: 10px;
+  height: 10px;
+  text-decoration: none;
+}
+#freeBusyAgg td.busy a:hover,
+#freeBusyAgg td.free a:hover,
+#freeBusyAgg td.tentative a:hover  {
+  color: black;
+  background-color: yellow;
+  text-decoration: none;
+}
+#freeBusyAgg a:hover {
+  /* required for eventTip to hover correctly;
+     apply only to the hover pseudo class, or
+     the other anchors nearby will cover the eventTip in IE */
+  position: relative;
+}
+#freeBusyAgg a span.eventTip {
+  display: none;
+}
+#freeBusyAgg a:hover span.eventTip {
+  display: block;
+  position: absolute;
+  width: 8em;
+  top: 3em;
+  left: -4em;
+  background-color: #ffe;
+  color: black;
+  padding: 4px;
+  border: 1px solid #333;
+}
+#freeBusyAgg #timezonesDropDown {
+  width: 14em;
+  font-size: 8pt;
+  margin: 0 0 0 2em;
+}
+#freeBusyAgg #timezonesButton {
+  font-size: 8pt;
-}
-#bedework #sharingBox {

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

@@ -1866 +1866 @@
-          <input name="cancelled" type="submit" value="cancel"/>
-        </span>
-
+
+
+
+
+
-      </h2>
-      <xsl:apply-templates select="." mode="eventForm"/>
@@ -3296 +3300 @@
-    </h2>
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    <div id="recipientsAndAttendees">
-
-
-
+
+
-        <div id="raContent">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-              <tr>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-              </tr>
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                <tr>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                </tr>
-              </xsl:for-each>
-            </table>
-
-
-
-
+
+
-              <tr>
-
+
+
+
+
+
+
+
+
-              </tr>
-              <xsl:for-each select="/bedework/recipients/recipient">
-                <xsl:variable name="recipientUri" select="."/>
-                <tr>
-                  <td class="trash">
-                    <a href="{$event-attendeesForEvent}&amp;uri={$recipientUri}&amp;recipient=true&amp;delete=true" title="remove">
-                      <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="remove"/>
-                    </a>
-                  </td>
-                  <td>
-                    <a href="{$recipientUri}">
-                      <xsl:value-of select="."/>
-                    </a>
-                  </td>
-                </tr>
-              </xsl:for-each>
-            </table>
-if
+for-each
-
-          <p><input type="button" value="continue" onclick="window.location='{$gotoEditEvent}'"/></p>
@@ -7173 +7295 @@
-  <!--==== UTILITY TEMPLATES ====-->
-
+  <!-- time formatter (should be extended as needed) -->
+  <xsl:template name="timeFormatter">
+    <xsl:param name="timeString"/><!-- required -->
+    <xsl:param name="showMinutes">yes</xsl:param>
+    <xsl:param name="showAmPm">yes</xsl:param>
+    <xsl:param name="hour24">no</xsl:param>
+    <xsl:variable name="hour" select="number(substring($timeString,1,2))"/>
+    <xsl:variable name="minutes" select="substring($timeString,3,2)"/>
+    <xsl:variable name="AmPm">
+      <xsl:choose>
+        <xsl:when test="$hour &lt; 12">AM</xsl:when>
+        <xsl:otherwise>PM</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:choose>
+      <xsl:when test="hour24 = 'yes'">
+        <xsl:value-of select="$hour"/><!--
+     --><xsl:if test="$showMinutes = 'yes'">:<xsl:value-of select="$minutes"/></xsl:if>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:choose>
+          <xsl:when test="$hour = 0">12</xsl:when>
+          <xsl:when test="$hour &lt; 13"><xsl:value-of select="$hour"/></xsl:when>
+          <xsl:otherwise><xsl:value-of select="$hour - 12"/></xsl:otherwise>
+        </xsl:choose><!--
+     --><xsl:if test="$showMinutes = 'yes'">:<xsl:value-of select="$minutes"/></xsl:if>
+        <xsl:if test="$showAmPm = 'yes'">
+          <xsl:text> </xsl:text>
+          <xsl:value-of select="$AmPm"/>
+        </xsl:if>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  
-  <!-- search and replace template taken from
-       http://www.biglist.com/lists/xsl-list/archives/200211/msg00337.html -->