Changeset 1229

Timestamp:

01/18/07 04:38:11

Author:

johnsa

Message:

personal client:

- completing most of recurring events
admin client:
- porting recurrence changes into admin client
- porting event form widgets into admin client

still need work on rdates

Files:

• trunk/deployment/webadmin/webapp/resources/default/default/default.css (modified) (10 diffs)
• trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (modified) (14 diffs)
• trunk/deployment/webadmin/webapp/resources/resources/bedework.js (added)
• trunk/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js (added)
• trunk/deployment/webadmin/webapp/resources/resources/bwClock.js (modified) (2 diffs)
• trunk/deployment/webadmin/webapp/resources/resources/glassFill-02.gif (added)
• trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css (modified) (2 diffs)
• trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (modified) (5 diffs)
• trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkEventForm.js (modified) (3 diffs)

trunk/deployment/webadmin/webapp/resources/default/default/default.css

@@ -26 +26 @@
-}
-#messages {
-inherit
+#333
-  color: #ff0;
-  font-weight: bold;
@@ -35 +35 @@
-}
-#errors {
-inherit
+#333
-  color: #f99;
-  font-weight: bold;
@@ -41 +41 @@
-}
-#errors em {
-inherit
+#333
-  color: #ff9;
-}
@@ -297 +297 @@
-  padding: 0.2em;
-}
-table.eventFormTable 
+
-  display: inline;
-}
-table.eventFormTable 
+
-  display: inline;
-  margin-left: 1em;
@@ -312 +312 @@
-  margin-bottom: 0.5em;
-}
-table.eventFormTable 
+
-  border: 1px solid #ccb;
-  margin: 4px;
@@ -318 +318 @@
-  white-space: nowrap;
-}
-table.eventFormTable 
+
-  display: block;
-}
@@ -328 +328 @@
-  width: 160px;
-}
-table.eventFormTable 
+
-  display: inline;
-}
-table.eventFormTable .invisible,
-.invisible {
-  display: none !important;
@@ -428 +427 @@
-}
-#clock {
-
+
+
+
+
+
+
+
-}
-#tztable {
@@ -436 +441 @@
-  padding: 2px 4px;
-}
+#recurringSwitch {
+  margin: 0;
+}
-#recurrenceInfo {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  display: inline;
-}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-  width: 100%;
-  padding: 0.5em 0 0 1em;
-  border-left: 1px solid #ddd;
-}
-#recurrenceFields #recurrenceTable td.recurrenceRules #advancedRecurrenceRules {
-  display: block;
-  border-bottom: 1px solid #ddd;
-}
-#recurrenceFields #recurrenceTable td.recurrenceRules .rruleBlock {
-  margin: 0 0 0.5em 2em;
-}
-.chkBoxListItem {
@@ -468 +483 @@
-  width: 3em;
-}
-ecurrenceFields #recurrence
+rules
-  clear: both;
-}
-ecurrenceFields #recurrence
+rules
-  margin: 0 0 0.5em 0;
-}
-ecurrenceFields #recurrence
+rules
-  margin: 1em 0 1em 0;
-}
-ecurrenceFields #recurrence
+rules
-  margin: 0 0 1em 2em;
-  padding: 0;
-}
-ecurrenceFields
-ecurrenceFields
+rulesTable
+rulesTable
-  display: block;
-  margin: 0 0 0.5em 0;
-}
-ecurrenceFields
-ecurrenceFields
-ecurrenceFields
-ecurrenceFields
-ecurrenceFields
-ecurrenceFields
+rulesTable
+rulesTable
+rulesTable
+rulesTable
+rulesTable
+rulesTable
-  margin: 0.5em 0 0.5em 2em;
-  display: block;
-  clear: both;
+  white-space: nowrap !important;
+}
+#recurrenceDatesButton input {
+  margin: 0;
+  font-size: 0.8em;
+}
+#rdatesFormFields {
+  font-size: 0.9em;
+  text-align: center;
+}
+#rdatesTable {
+  font-size: 0.9em;
+  border: 1px solid #ddd;
+}
+#rdatesTable td {
+  padding: 0.5em 1em;
+}
+#rdatesTable td.trash {
+  text-align: right;
+}
+#bwDialogBox {
+  margin: 0;
+  background: white;
+  color: black;
+}
+#bwDialogBox h4 {
+  padding: 4px;
+  margin: 0;
+  text-align: center;
+  color: #eee;
+  background: #233979 url(../../resources/glassFill-02.gif) repeat-x bottom;
+  border: 2px solid #233979;
+}
+#bwDialogBox #errors,
+#bwDialogBox #messages {
+  margin: 0;
+}
+#bwDialogBox table {
+  width: 100%;
+  margin: 1em 0;
+}
+#bwDialogBox table th {
+  padding: 2px;
+  text-align: center;
+  color: black;
+  background: #eee;
-}
-#contactEmailAlert {

trunk/deployment/webadmin/webapp/resources/default/default/default.xsl

@@ -82 +82 @@
-  <xsl:variable name="event-update" select="/bedeworkadmin/urlPrefixes/event/update/a/@href"/>
-  <xsl:variable name="event-selectCalForEvent" select="/bedeworkadmin/urlPrefixes/event/selectCalForEvent/a/@href"/>
+  <xsl:variable name="event-showRdates" select="/bedeworkadmin/urlPrefixes/event/showRdates"/>
+  <xsl:variable name="event-setRdate" select="/bedeworkadmin/urlPrefixes/event/setRdate"/>
-  <xsl:variable name="event-initUpload" select="/bedeworkadmin/urlPrefixes/event/initUpload/a/@href"/>
-  <xsl:variable name="event-upload" select="/bedeworkadmin/urlPrefixes/event/upload/a/@href"/>
@@ -192 +194 @@
-        <link rel="stylesheet" href="{$resourcesRoot}/default/default/default.css"/>
-        <link rel="stylesheet" href="{$resourcesRoot}/default/default/subColors.css"/>
-
-
-
+
+
+
+
-          <link rel="stylesheet" href="{$resourcesRoot}/resources/bwClock.css"/>
-
-
-
+
+
-        </xsl:if>
-        <xsl:if test="/bedeworkadmin/page='upload' or /bedeworkadmin/page='selectCalForEvent'">
-includes.js">
+bedework.js">&#160;
-        </xsl:if>
-        <xsl:if test="/bedeworkadmin/page='calendarDescriptions' or /bedeworkadmin/page='displayCalendar'">
@@ -224 +226 @@
-          <xsl:when test="/bedeworkadmin/page='selectCalForEvent'">
-            <xsl:call-template name="selectCalForEvent"/>
+          </xsl:when>
+          <xsl:when test="/bedeworkadmin/page='rdates'">
+            <xsl:call-template name="messagesAndErrors"/>
+            <xsl:call-template name="rdates"/>
-          </xsl:when>
-          <xsl:otherwise>
@@ -434 +440 @@
-      </h1>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-    </div>
@@ -484 +477 @@
-      CALENDAR of EVENTS
-    </div>
+  </xsl:template>
+
+  <xsl:template name="messagesAndErrors">
+    <xsl:if test="/bedeworkadmin/message">
+      <ul id="messages">
+        <xsl:for-each select="/bedeworkadmin/message">
+          <li><xsl:apply-templates select="."/></li>
+        </xsl:for-each>
+      </ul>
+    </xsl:if>
+    <xsl:if test="/bedeworkadmin/error">
+      <ul id="errors">
+        <xsl:for-each select="/bedeworkadmin/error">
+          <li><xsl:apply-templates select="."/></li>
+        </xsl:for-each>
+      </ul>
+    </xsl:if>
-  </xsl:template>
-
@@ -768 +778 @@
-
-    <xsl:variable name="modEventAction" select="form/@action"/>
-peForm" method="post" action="{$modEventAction}" onsubmit="setRecurrence
+eventForm" method="post" action="{$modEventAction}" onsubmit="setEventFields
-      <table class="eventFormTable">
-        <tr>
@@ -868 +878 @@
-              <div class="dateFields">
-                <span class="startDateLabel">Date </span>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                <xsl:copy-of select="form/start/day/*"/>
-                <xsl:choose>
@@ -877 +900 @@
-                    <xsl:copy-of select="form/start/yearText/*"/>
-                  </xsl:otherwise>
-
+-->
-              </div>
+              <!--
-              <script language="JavaScript" type="text/javascript">
-                <xsl:comment>
-                startDateDynCalWidget = new dynCalendar('startDateDynCalWidget', <xsl:value-of select="number(form/start/yearText/input/@value)"/>, <xsl:value-of select="number(form/start/month/select/option[@selected='selected']/@value)-1"/>, <xsl:value-of select="number(form/start/day/select/option[@selected='selected']/@value)"/>, 'startDateCalWidgetCallback',true,'<xsl:value-of select="$resourcesRoot"/>/resources/');
-                </xsl:comment>
-
-
+
-              <div class="{$timeFieldsClass}" id="startTimeFields">
-                <span id="calWidgetStartTimeHider" class="show">
@@ -929 +952 @@
-              <div class="{$endDateTimeClass}" id="endDateTime">
-                <div class="dateFields">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                  <xsl:copy-of select="form/end/dateTime/day/*"/>
-                  <xsl:choose>
@@ -938 +974 @@
-                      <xsl:copy-of select="form/end/dateTime/yearText/*"/>
-                    </xsl:otherwise>
-
+-->
-                </div>
-
+!--<
-                  <xsl:comment>
-                  endDateDynCalWidget = new dynCalendar('endDateDynCalWidget', <xsl:value-of select="number(form/start/yearText/input/@value)"/>, <xsl:value-of select="number(form/start/month/select/option[@selected='selected']/@value)-1"/>, <xsl:value-of select="number(form/start/day/select/option[@selected='selected']/@value)"/>, 'endDateCalWidgetCallback',true,'<xsl:value-of select="$resourcesRoot"/>/resources/');
-                </xsl:comment>
-
-
+
-                <div class="{$timeFieldsClass}" id="endTimeFields">
-                  <span id="calWidgetEndTimeHider" class="show">
@@ -1065 +1100 @@
-          </td>
-          <td>
-            <!-- Output descriptive recurrence information.  Probably not
-               complete yet. Replace all freq strings so can be internationalized. -->
-          <xsl:if test="form/recurrence">
-            <div id="recurrenceInfo">
-              Every
-              <xsl:choose>
-                <xsl:when test="form/recurrence/interval &gt; 1">
-                  <xsl:value-of select="form/recurrence/interval"/>
-                </xsl:when>
-              </xsl:choose>
-              <xsl:text> </xsl:text>
-              <xsl:choose>
-                <xsl:when test="form/recurrence/freq = 'HOURLY'">hour</xsl:when>
-                <xsl:when test="form/recurrence/freq = 'DAILY'">day</xsl:when>
-                <xsl:when test="form/recurrence/freq = 'WEEKLY'">week</xsl:when>
-                <xsl:when test="form/recurrence/freq = 'MONTHLY'">month</xsl:when>
-                <xsl:when test="form/recurrence/freq = 'YEARLY'">year</xsl:when>
-              </xsl:choose><xsl:if test="form/recurrence/interval &gt; 1">s</xsl:if>
-              <xsl:text> </xsl:text>
-
-              <xsl:if test="form/recurrence/byday">
-                <xsl:for-each select="form/recurrence/byday/pos">
-                  <xsl:if test="position() != 1"> and </xsl:if>
-                  on
-                  <xsl:choose>
-                    <xsl:when test="@val='1'">
-                      the first
-                    </xsl:when>
-                    <xsl:when test="@val='2'">
-                      the second
-                    </xsl:when>
-                    <xsl:when test="@val='3'">
-                      the third
-                    </xsl:when>
-                    <xsl:when test="@val='4'">
-                      the fourth
-                    </xsl:when>
-                    <xsl:when test="@val='5'">
-                      the fifth
-                    </xsl:when>
-                    <xsl:when test="@val='-1'">
-                      the last
-                    </xsl:when>
-                    <!-- don't output "every" -->
-                    <!--<xsl:otherwise>
-                      every
-                    </xsl:otherwise>-->
-                  </xsl:choose>
-                  <xsl:for-each select="day">
-                    <xsl:if test="position() != 1 and position() = last()"> and </xsl:if>
-                    <xsl:variable name="dayVal" select="."/>
-                    <xsl:variable name="dayPos">
-                      <xsl:for-each select="/bedeworkadmin/recurdayvals/val">
-                        <xsl:if test="node() = $dayVal"><xsl:value-of select="position()"/></xsl:if>
-                      </xsl:for-each>
-                    </xsl:variable>
-                    <xsl:value-of select="/bedeworkadmin/shortdaynames/val[position() = $dayPos]"/>
-                    <xsl:if test="position() != last()">, </xsl:if>
-                  </xsl:for-each>
-                </xsl:for-each>
-              </xsl:if>
-
-              <xsl:if test="form/recurrence/bymonth">
-                in
-                <xsl:for-each select="form/recurrence/bymonth/val">
-                  <xsl:if test="position() != 1 and position() = last()"> and </xsl:if>
-                  <xsl:variable name="monthNum" select="number(.)"/>
-                  <xsl:value-of select="/bedeworkadmin/monthlabels/val[position() = $monthNum]"/>
-                  <xsl:if test="position() != last()">, </xsl:if>
-                </xsl:for-each>
-              </xsl:if>
-
-              <xsl:if test="form/recurrence/bymonthday">
-                on the
-                <xsl:apply-templates select="form/recurrence/bymonthday/val" mode="weekMonthYearNumbers"/>
-                day<xsl:if test="form/recurrence/bymonthday/val[position()=2]">s</xsl:if> of the month
-              </xsl:if>
-
-              <xsl:if test="form/recurrence/byyearday">
-                on the
-                <xsl:apply-templates select="form/recurrence/byyearday/val" mode="weekMonthYearNumbers"/>
-                day<xsl:if test="form/recurrence/byyearday/val[position()=2]">s</xsl:if> of the year
-              </xsl:if>
-
-              <xsl:if test="form/recurrence/byweekno">
-                in the
-                <xsl:apply-templates select="form/recurrence/byweekno/val" mode="weekMonthYearNumbers"/>
-                week<xsl:if test="form/recurrence/byweekno/val[position()=2]">s</xsl:if> of the year
-              </xsl:if>
-
-              repeating
-              <xsl:choose>
-                <xsl:when test="form/recurrence/count = '-1'">forever</xsl:when>
-                <xsl:when test="form/recurrence/until">
-                  <xsl:value-of select="form/recurrence/until"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:value-of select="form/recurrence/count"/>
-                  time<xsl:if test="form/recurrence/count &gt; 1">s</xsl:if>
-                </xsl:otherwise>
-              </xsl:choose>
-            </div>
-          </xsl:if>
-
-
-          <!-- recurrence rules -->
-            <xsl:choose>
-              <xsl:when test="recurrenceId != ''">
@@ -1180 +1109 @@
-              <xsl:otherwise>
-                <!-- has recurrenceId, so is master -->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                <div id="recurrenceFields" class="invisible">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    <tr>
-class
+id
-                        <strong>Frequency:</strong><br/>
-
-
-
-
-
-
-
+
+
+
+
+
+
-                      </td>
-td class="recurrenceRules"
-  <!-- none --
+!-- recurrence count, until, forever --
+<td id="recurrenceUntil"
-                        <div id="noneRecurrenceRules">
-<p>does not recur</p>
+no recurrence rules
-                        </div>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                              </xsl:call-template>
-                            </div>
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                          </div>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                              </xsl:call-template>
-                            </div>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                              </select>
-
+
+
+
+
+
+
+
-                          </div>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                      </td>
-                    </tr>
-                  </table>
+                  <!-- recurrence dates (rdates) -->
+                  <div id="recurrenceDatesButton">
+                    <input type="button" value="add/remove recurrence dates" onclick="launchSizedWindow('{$event-showRdates}','560','400')"/>
+                  </div>
-                </div>
-              </xsl:otherwise>
@@ -1952 +1982 @@
-        <area shape="poly" alt="minute 00:15" title="minute 00:15" coords="216,178, 216,196, 261,206, 261,159" href="javascript:bwClockUpdateDateTimeForm('minute','15')" />
-        <area shape="poly" alt="minute 00:10" title="minute 00:10" coords="209,164, 216,178, 261,159, 240,126" href="javascript:bwClockUpdateDateTimeForm('minute','10')" />
-0
-0
+
+
-        <area shape="poly" alt="11 PM, 2300 hour" title="11 PM, 2300 hour" coords="150,102, 172,96, 158,1, 114,14" href="javascript:bwClockUpdateDateTimeForm('hour','23')" />
-        <area shape="poly" alt="10 PM, 2200 hour" title="10 PM, 2200 hour" coords="131,114, 150,102, 114,14, 74,36" href="javascript:bwClockUpdateDateTimeForm('hour','22')" />
@@ -1968 +1998 @@
-        <area shape="poly" alt="11 AM, 1100 hour" title="11 AM, 1100 hour" coords="214,270, 193,273, 210,363, 252,352" href="javascript:bwClockUpdateDateTimeForm('hour','11')" />
-        <area shape="poly" alt="10 AM, 1000 hour" title="10 AM, 1000 hour" coords="232,259, 214,270, 252,352, 291,330" href="javascript:bwClockUpdateDateTimeForm('hour','10')" />
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
+
+
+
+
+
+
+
+
+
+
-      </map>
+    </div>
+  </xsl:template>
+
+  <xsl:template name="rdates">
+    <div id="bwDialogBox">
+      <form name="rdatesForm" id="rdates" action="{$event-setRdate}" method="post" onsubmit="setRdateDatetime(this)">
+        <h4 id="dialogTitle">
+          Add / Remove Recurrence Dates
+        </h4>
+        <div id="raContent">
+
+            <div class="dateStartEndBox" id="rdatesFormFields">
+              <div class="dateFields">
+                <input name="datetime"
+                       dojoType="dropdowndatepicker"
+                       formatLength="medium"
+                       value="today"
+                       saveFormat="yyyyMMdd"
+                       id="bwEventWidgeRdate"
+                       iconURL="{$resourcesRoot}/resources/calIcon.gif"/>
+              </div>
+              <div id="rdateTimeFields">
+                <xsl:attribute name="class">
+                  <xsl:choose>
+                    <xsl:when test="form/allDay/input/@checked='checked'">invisible</xsl:when>
+                    <xsl:otherwise>timeFields</xsl:otherwise>
+                  </xsl:choose>
+                </xsl:attribute>
+                <input name="rdateTime"
+                       dojoType="dropdowntimepicker"
+                       formatLength="short"
+                       saveFormat="hhmmss"
+                       id="bwEventWidgeRdateTime"
+                       iconURL="{$resourcesRoot}/resources/clockIcon.gif"/>
+                <xsl:text> </xsl:text>
+
+                <select name="tzid" id="rdateTzid" class="timezones">
+                  <xsl:if test="form/floating/input/@checked='checked'"><xsl:attribute name="disabled">disabled</xsl:attribute></xsl:if>
+                  <option value="-1">select timezone...</option>
+                  <xsl:variable name="rdateTzId" select="/bedeworkadmin/rdates/tzid"/>
+                  <xsl:for-each select="/bedeworkadmin/timezones/timezone">
+                    <option>
+                      <xsl:attribute name="value"><xsl:value-of select="id"/></xsl:attribute>
+                      <xsl:if test="$rdateTzId = id"><xsl:attribute name="selected">selected</xsl:attribute></xsl:if>
+                      <xsl:value-of select="name"/>
+                    </option>
+                  </xsl:for-each>
+                </select>
+              </div>
+              <xsl:text> </xsl:text>
+              <input type="submit" value="add"/>
+              <br/>
+              <!-- floating event: no timezone (and not UTC) -->
+              <input type="checkbox" name="floating" id="rdateFloating" onclick="swapRdateFloatingTime(this)" value="off"/>
+              floating
+              <!-- store time as coordinated universal time (UTC) -->
+              <input type="checkbox" name="storeUTC" id="rdateStoreUTC" onclick="swapRdateStoreUTC(this)" value="off"/>
+              store as UTC
+            </div>
+
+            <table cellspacing="0" id="rdatesTable">
+              <tr>
+                <th colspan="2">Recurrence Dates</th>
+              </tr>
+              <xsl:for-each select="/bedeworkadmin/rdates/rdate">
+                <tr>
+                  <td>
+                    <xsl:value-of select="longdate"/>
+                    <xsl:if test="allday='false'">
+                      <xsl:value-of select="time"/>
+                      <xsl:if test="floating='false'">
+                        <xsl:value-of select="timezone/id"/>
+                      </xsl:if>
+                    </xsl:if>
+                  </td>
+                  <td class="trash">
+                    <xsl:variable name="datetime"><xsl:value-of select="fourdigityear"/><xsl:value-of select="twodigitmonth"/><xsl:value-of select="twodigitday"/>T<xsl:value-of select="twodigithour"/><xsl:value-of select="twodigitminute"/>00</xsl:variable>
+                    <xsl:variable name="tzid" select="timezone/id"/>
+                    <xsl:variable name="floating" select="floating"/>
+                    <a href="{$event-setRdate}&amp;datetime={$datetime}&amp;floating={$floating}&amp;tzid={$tzid}&amp;delete=true" title="remove">
+                      <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="remove"/>
+                    </a>
+                  </td>
+                </tr>
+              </xsl:for-each>
+            </table>
+
+          <input type="button" value="done" onclick="window.close()"/>
+        </div>
+      </form>
-    </div>
-  </xsl:template>

trunk/deployment/webadmin/webapp/resources/resources/bwClock.js

@@ -9 +9 @@
-    // if the clock with the same type is visible, toggle it off
-    changeClass("clock","invisible");
-
+
+
+
-    bwClockRequestedType = type;
-    bwClockCurrentType = type;
-    changeClass("clock","shown");
-    // reset hours and minutes to null
-    bwClockHour = null;
-    bwClockMinute = null;
-   changeClass("eventFormPrefLocationList","hidden");
-   changeClass("eventFormLocationList","hidden");
-   changeClass("eventFormContactList","hidden");
-   changeClass("eventFormPrefContactList","hidden");
-    bwClockIndicator = document.getElementById("bwClockDateTypeIndicator");
-    bwClockSwitch = document.getElementById("bwClockSwitch");
@@ -35 +32 @@
-function bwClockClose() {
-  changeClass("clock","invisible");
-  changeClass("eventFormPrefLocationList","shown");
-  changeClass("eventFormLocationList","shown");
-  changeClass("eventFormContactList","shown");
-  changeClass("eventFormPrefContactList","shown");
-}
-

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

@@ -721 +721 @@
-}
-#recurrenceInfo {
-
-
+
+
+
+
-}
-#rrulesSwitch,
@@ -789 +791 @@
-  margin: 2em 0 0 0;
-  font-size: 0.8em;
+}
+#rdatesFormFields {
+  font-size: 0.9em;
+  text-align: center;
+}
+#rdatesTable {
+  font-size: 0.9em;
+  border: 1px solid #ddd;
+}
+#rdatesTable td {
+  padding: 0.5em 1em;
+}
+#rdatesTable td.trash {
+  text-align: right;
-}
-.shown {

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

@@ -2338 +2338 @@
-          </div>
-
-          <xsl:if test="form/recurrence">
-            <!-- Output descriptive recurrence information.  Probably not
-                 complete yet. Replace all strings so can be
-                 more easily internationalized. -->
-            <strong>Recurrence:</strong>
-            <div id="recurrenceInfo">
-              Every
-              <xsl:choose>
-                <xsl:when test="form/recurrence/interval &gt; 1">
-                  <xsl:value-of select="form/recurrence/interval"/>
-                </xsl:when>
-              </xsl:choose>
-              <xsl:text> </xsl:text>
-              <xsl:choose>
-                <xsl:when test="form/recurrence/freq = 'HOURLY'">hour</xsl:when>
-                <xsl:when test="form/recurrence/freq = 'DAILY'">day</xsl:when>
-                <xsl:when test="form/recurrence/freq = 'WEEKLY'">week</xsl:when>
-                <xsl:when test="form/recurrence/freq = 'MONTHLY'">month</xsl:when>
-                <xsl:when test="form/recurrence/freq = 'YEARLY'">year</xsl:when>
-              </xsl:choose><xsl:if test="form/recurrence/interval &gt; 1">s</xsl:if>
-              <xsl:text> </xsl:text>
-
-              <xsl:if test="form/recurrence/byday">
-                <xsl:for-each select="form/recurrence/byday/pos">
-                  <xsl:if test="position() != 1"> and </xsl:if>
-                  on
-                  <xsl:choose>
-                    <xsl:when test="@val='1'">
-                      the first
-                    </xsl:when>
-                    <xsl:when test="@val='2'">
-                      the second
-                    </xsl:when>
-                    <xsl:when test="@val='3'">
-                      the third
-                    </xsl:when>
-                    <xsl:when test="@val='4'">
-                      the fourth
-                    </xsl:when>
-                    <xsl:when test="@val='5'">
-                      the fifth
-                    </xsl:when>
-                    <xsl:when test="@val='-1'">
-                      the last
-                    </xsl:when>
-                    <!-- don't output "every" -->
-                    <!--<xsl:otherwise>
-                      every
-                    </xsl:otherwise>-->
-                  </xsl:choose>
-                  <xsl:for-each select="day">
-                    <xsl:if test="position() != 1 and position() = last()"> and </xsl:if>
-                    <xsl:variable name="dayVal" select="."/>
-                    <xsl:variable name="dayPos">
-                      <xsl:for-each select="/bedework/recurdayvals/val">
-                        <xsl:if test="node() = $dayVal"><xsl:value-of select="position()"/></xsl:if>
-                      </xsl:for-each>
-                    </xsl:variable>
-                    <xsl:value-of select="/bedework/shortdaynames/val[position() = $dayPos]"/>
-                    <xsl:if test="position() != last()">, </xsl:if>
-                  </xsl:for-each>
-                </xsl:for-each>
-              </xsl:if>
-
-              <xsl:if test="form/recurrence/bymonth">
-                in
-                <xsl:for-each select="form/recurrence/bymonth/val">
-                  <xsl:if test="position() != 1 and position() = last()"> and </xsl:if>
-                  <xsl:variable name="monthNum" select="number(.)"/>
-                  <xsl:value-of select="/bedework/monthlabels/val[position() = $monthNum]"/>
-                  <xsl:if test="position() != last()">, </xsl:if>
-                </xsl:for-each>
-              </xsl:if>
-
-              <xsl:if test="form/recurrence/bymonthday">
-                on the
-                <xsl:apply-templates select="form/recurrence/bymonthday/val" mode="weekMonthYearNumbers"/>
-                day<xsl:if test="form/recurrence/bymonthday/val[position()=2]">s</xsl:if> of the month
-              </xsl:if>
-
-              <xsl:if test="form/recurrence/byyearday">
-                on the
-                <xsl:apply-templates select="form/recurrence/byyearday/val" mode="weekMonthYearNumbers"/>
-                day<xsl:if test="form/recurrence/byyearday/val[position()=2]">s</xsl:if> of the year
-              </xsl:if>
-
-              <xsl:if test="form/recurrence/byweekno">
-                in the
-                <xsl:apply-templates select="form/recurrence/byweekno/val" mode="weekMonthYearNumbers"/>
-                week<xsl:if test="form/recurrence/byweekno/val[position()=2]">s</xsl:if> of the year
-              </xsl:if>
-
-              repeating
-              <xsl:choose>
-                <xsl:when test="form/recurrence/count = '-1'">forever</xsl:when>
-                <xsl:when test="form/recurrence/until">
-                  <xsl:value-of select="form/recurrence/until"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:value-of select="form/recurrence/count"/>
-                  time<xsl:if test="form/recurrence/count &gt; 1">s</xsl:if>
-                </xsl:otherwise>
-              </xsl:choose>
-            </div>
-          </xsl:if>
-
-          <!-- set these dynamically when form is submitted -->
-          <input type="hidden" name="interval" value=""/>
-          <input type="hidden" name="count" value=""/>
-          <input type="hidden" name="until" value=""/>
-          <input type="hidden" name="byday" value=""/>
-          <input type="hidden" name="bymonthday" value=""/>
-          <input type="hidden" name="bymonth" value=""/>
-          <input type="hidden" name="byweekno" value=""/>
-          <input type="hidden" name="byyearday" value=""/>
-          <input type="hidden" name="wkst" value=""/>
-          <input type="hidden" name="setpos" value=""/>
-
-          <!-- wrapper for all recurrence fields (rrules and rdates): -->
-          <div id="recurrenceFields" class="invisible">
+            <xsl:if test="form/recurrence"><xsl:attribute name="class">visible</xsl:attribute></xsl:if>
-
-            <!-- show or hide rrules fields: -->
@@ -2475 +2358 @@
-              show advanced recurrence rules
-            </span>
+
+            <xsl:if test="form/recurrence">
+              <!-- Output descriptive recurrence information.  Probably not
+                   complete yet. Replace all strings so can be
+                   more easily internationalized. -->
+              <div id="recurrenceInfo">
+                Every
+                <xsl:choose>
+                  <xsl:when test="form/recurrence/interval &gt; 1">
+                    <xsl:value-of select="form/recurrence/interval"/>
+                  </xsl:when>
+                </xsl:choose>
+                <xsl:text> </xsl:text>
+                <xsl:choose>
+                  <xsl:when test="form/recurrence/freq = 'HOURLY'">hour</xsl:when>
+                  <xsl:when test="form/recurrence/freq = 'DAILY'">day</xsl:when>
+                  <xsl:when test="form/recurrence/freq = 'WEEKLY'">week</xsl:when>
+                  <xsl:when test="form/recurrence/freq = 'MONTHLY'">month</xsl:when>
+                  <xsl:when test="form/recurrence/freq = 'YEARLY'">year</xsl:when>
+                </xsl:choose><xsl:if test="form/recurrence/interval &gt; 1">s</xsl:if>
+                <xsl:text> </xsl:text>
+
+                <xsl:if test="form/recurrence/byday">
+                  <xsl:for-each select="form/recurrence/byday/pos">
+                    <xsl:if test="position() != 1"> and </xsl:if>
+                    on
+                    <xsl:choose>
+                      <xsl:when test="@val='1'">
+                        the first
+                      </xsl:when>
+                      <xsl:when test="@val='2'">
+                        the second
+                      </xsl:when>
+                      <xsl:when test="@val='3'">
+                        the third
+                      </xsl:when>
+                      <xsl:when test="@val='4'">
+                        the fourth
+                      </xsl:when>
+                      <xsl:when test="@val='5'">
+                        the fifth
+                      </xsl:when>
+                      <xsl:when test="@val='-1'">
+                        the last
+                      </xsl:when>
+                      <!-- don't output "every" -->
+                      <!--<xsl:otherwise>
+                        every
+                      </xsl:otherwise>-->
+                    </xsl:choose>
+                    <xsl:for-each select="day">
+                      <xsl:if test="position() != 1 and position() = last()"> and </xsl:if>
+                      <xsl:variable name="dayVal" select="."/>
+                      <xsl:variable name="dayPos">
+                        <xsl:for-each select="/bedework/recurdayvals/val">
+                          <xsl:if test="node() = $dayVal"><xsl:value-of select="position()"/></xsl:if>
+                        </xsl:for-each>
+                      </xsl:variable>
+                      <xsl:value-of select="/bedework/shortdaynames/val[position() = $dayPos]"/>
+                      <xsl:if test="position() != last()">, </xsl:if>
+                    </xsl:for-each>
+                  </xsl:for-each>
+                </xsl:if>
+
+                <xsl:if test="form/recurrence/bymonth">
+                  in
+                  <xsl:for-each select="form/recurrence/bymonth/val">
+                    <xsl:if test="position() != 1 and position() = last()"> and </xsl:if>
+                    <xsl:variable name="monthNum" select="number(.)"/>
+                    <xsl:value-of select="/bedework/monthlabels/val[position() = $monthNum]"/>
+                    <xsl:if test="position() != last()">, </xsl:if>
+                  </xsl:for-each>
+                </xsl:if>
+
+                <xsl:if test="form/recurrence/bymonthday">
+                  on the
+                  <xsl:apply-templates select="form/recurrence/bymonthday/val" mode="weekMonthYearNumbers"/>
+                  day<xsl:if test="form/recurrence/bymonthday/val[position()=2]">s</xsl:if> of the month
+                </xsl:if>
+
+                <xsl:if test="form/recurrence/byyearday">
+                  on the
+                  <xsl:apply-templates select="form/recurrence/byyearday/val" mode="weekMonthYearNumbers"/>
+                  day<xsl:if test="form/recurrence/byyearday/val[position()=2]">s</xsl:if> of the year
+                </xsl:if>
+
+                <xsl:if test="form/recurrence/byweekno">
+                  in the
+                  <xsl:apply-templates select="form/recurrence/byweekno/val" mode="weekMonthYearNumbers"/>
+                  week<xsl:if test="form/recurrence/byweekno/val[position()=2]">s</xsl:if> of the year
+                </xsl:if>
+
+                repeating
+                <xsl:choose>
+                  <xsl:when test="form/recurrence/count = '-1'">forever</xsl:when>
+                  <xsl:when test="form/recurrence/until">
+                    <xsl:value-of select="form/recurrence/until"/>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <xsl:value-of select="form/recurrence/count"/>
+                    time<xsl:if test="form/recurrence/count &gt; 1">s</xsl:if>
+                  </xsl:otherwise>
+                </xsl:choose>
+              </div>
+            </xsl:if>
+
+            <!-- set these dynamically when form is submitted -->
+            <input type="hidden" name="interval" value=""/>
+            <input type="hidden" name="count" value=""/>
+            <input type="hidden" name="until" value=""/>
+            <input type="hidden" name="byday" value=""/>
+            <input type="hidden" name="bymonthday" value=""/>
+            <input type="hidden" name="bymonth" value=""/>
+            <input type="hidden" name="byweekno" value=""/>
+            <input type="hidden" name="byyearday" value=""/>
+            <input type="hidden" name="wkst" value=""/>
+            <input type="hidden" name="setpos" value=""/>
-
-            <!-- wrapper for rrules: -->
@@ -2931 +2931 @@
-  <xsl:template name="rdates">
-    <div id="bwDialogBox">
-
+ onsubmit="setRdateDatetime(this)"
-        <h4 id="dialogTitle">
-
+Add / Remove 
-        </h4>
-        <div id="raContent">
-
-
-
+
-              <div class="dateFields">
-
+
+
+
+
+
+
+
-              </div>
-              <div id="rdateTimeFields">
@@ -2949 +2954 @@
-                  </xsl:choose>
-                </xsl:attribute>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-                <xsl:text> </xsl:text>
-
-start
+rdate
-                  <xsl:if test="form/floating/input/@checked='checked'"><xsl:attribute name="disabled">disabled</xsl:attribute></xsl:if>
-                  <option value="-1">select timezone...</option>
@@ -3007 +2975 @@
-                </select>
-              </div>
+              <xsl:text> </xsl:text>
-              <input type="submit" value="add"/>
+              <br/>
+              <!-- floating event: no timezone (and not UTC) -->
+              <input type="checkbox" name="floating" id="rdateFloating" onclick="swapRdateFloatingTime(this)" value="off"/>
+              floating
+              <!-- store time as coordinated universal time (UTC) -->
+              <input type="checkbox" name="storeUTC" id="rdateStoreUTC" onclick="swapRdateStoreUTC(this)" value="off"/>
+              store as UTC
-            </div>
+
+            <table cellspacing="0" id="rdatesTable">
+              <tr>
+                <th colspan="2">Recurrence Dates</th>
+              </tr>
+              <xsl:for-each select="/bedework/rdates/rdate">
+                <tr>
+                  <td>
+                    <xsl:value-of select="longdate"/>
+                    <xsl:if test="allday='false'">
+                      <xsl:value-of select="time"/>
+                      <xsl:if test="floating='false'">
+                        <xsl:value-of select="timezone/id"/>
+                      </xsl:if>
+                    </xsl:if>
+                  </td>
+                  <td class="trash">
+                    <xsl:variable name="datetime"><xsl:value-of select="fourdigityear"/><xsl:value-of select="twodigitmonth"/><xsl:value-of select="twodigitday"/>T<xsl:value-of select="twodigithour"/><xsl:value-of select="twodigitminute"/>00</xsl:variable>
+                    <xsl:variable name="tzid" select="timezone/id"/>
+                    <xsl:variable name="floating" select="floating"/>
+                    <a href="{$event-setRdate}&amp;datetime={$datetime}&amp;floating={$floating}&amp;tzid={$tzid}&amp;delete=true" title="remove">
+                      <img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="remove"/>
+                    </a>
+                  </td>
+                </tr>
+              </xsl:for-each>
+            </table>
-
-          <input type="button" value="done" onclick="window.close()"/>

trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkEventForm.js

@@ -71 +71 @@
-    startStoreUTC.value = "false";
-    endStoreUTC.value = "false";
+  }
+}
+function swapRdateFloatingTime(obj) {
+  rdateTimezone = document.getElementById("rdateTzid");
+  rdateFloating = document.getElementById("rdateFloating");
+  if (obj.checked) {
+    document.getElementById("rdateStoreUTC").checked = false;
+    rdateTimezone.disabled = true;
+  } else {
+    rdateTimezone.disabled = false;
+    rdateFloating.value = "false";
+  }
+}
+function swapRdateStoreUTC(obj) {
+  rdateTimezone = document.getElementById("rdateTzid");
+  rdateStoreUTC = document.getElementById("rdateStoreUTC");
+  if (obj.checked) {
+    document.getElementById("rdateFloating").checked = false;
+    rdateTimezone.disabled = false;
+    rdateStoreUTC.value = "true";
+  } else {
+    rdateStoreUTC.value = "false";
-  }
-}
@@ -106 +128 @@
-    changeClass('rrulesTable','visible');
-    changeClass('rrulesUiSwitch','visible');
+    if (document.getElementById('recurrenceInfo')) {
+      changeClass('recurrenceInfo','invisible');
+    }
-  } else {
-    changeClass('rrulesTable','invisible');
-    changeClass('rrulesUiSwitch','invisible');
+    if (document.getElementById('recurrenceInfo')) {
+      changeClass('recurrenceInfo','visible');
+    }
-  }
-}
@@ -292 +320 @@
-}
-
+function setRdateDateTime(formObj) {
+  var rdateTime = dojo.byId("bwEventWidgeRdateTime");
+  alert (rdateTime.getValue());
+  if (rdateTime.getValue() != "") {
+    /*var rdateTimeObj = rdateTime.getTime();
+    var timeString = rdateTimeObj.
+    formOjb.datetime.value += "T" +*/
+  }
+}
+
-function untilClickHandler(evt) {
-   selectRecurCountUntil('recurUntil');