Changeset 1146

Timestamp:

12/12/06 13:42:54

Author:

johnsa

Message:

personal client: continued interface work on recurrence form elements

Files:

• trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.css (modified) (3 diffs)
• trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (modified) (9 diffs)
• trunk/deployment/webuser/webapp/resources/demoskins/resources/dynCalendarWidget.js (modified) (3 diffs)
• trunk/deployment/webuser/webapp/resources/demoskins/resources/includes.js (modified) (3 diffs)

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

@@ -556 +556 @@
-}
-table.common td.fieldname {
-8
+10
-  margin: 0em;
-  vertical-align: top;
@@ -633 +633 @@
-}
-#bwEventCalDisplay {
-font-weight: bold;
+/*font-weight: bold;*/
-  margin-right: 1em;
-}
@@ -676 +676 @@
-#recurrenceFields #recurrenceTable p {
-  margin: 0 0 0.5em 0;
+}
+#recurrenceFields #recurrenceTable .extraByMonthPosFields {
+  margin: 0 0 1em 2em;
+  padding: 0;
-}
-.shown {

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

@@ -1986 +1986 @@
-            </xsl:otherwise>
-          </xsl:choose>
-event
+(anniversary)
-
-          <!-- floating event: no timezone (and not UTC) -->
@@ -2036 +2036 @@
-            <script language="JavaScript" type="text/javascript">
-            <xsl:comment>
-
+,'true'
-            </xsl:comment>
-            </script>
@@ -2096 +2096 @@
-              <script language="JavaScript" type="text/javascript">
-              <xsl:comment>
-
+, 'true'
-              </xsl:comment>
-              </script>
@@ -2217 +2217 @@
-              <tr>
-                <td class="recurrenceFrequency" rowspan="2">
-Recurs
-Flag" value="NEVER" onclick="showRecurrence(this.value)" checked="checked"/>never
-!--<input type="radio" name="freqFlag" value="HOURLY" onclick="showRecurrence(this.value)"/>hourly<br/>--
-Flag
-Flag
-Flag
-Flag
+Frequency
+" value="NONE" onclick="showRecurrence(this.value)" checked="checked"/>once
+input type="radio" name="freq" value="HOURLY" onclick="showRecurrence(this.value)"/>hourly<br/
+
+
+
+
-                </td>
-                <td class="recurrenceRules">
-never
+once
-                    <p>does not recur</p>
-                  </div>
-
-
-
+
+
+
+
-                  <div id="dailyRecurrenceRules" class="invisible">
-                    <p>
-                      <strong>Interval:</strong>
-s
+(s)
-                    </p>
-                  </div>
@@ -2257 +2258 @@
-                    <p>
-                      <strong>Interval:</strong>
- on
+
-                    </p>
-                    <p>
-                      <input type="radio" name="monthrrule" value="bymonthpos" checked="checked"/>
-
-
+ on 
+1
-                        <option value="first">first</option>
-                        <option value="second">second</option>
@@ -2269 +2270 @@
-                        <option value="last">last</option>
-                      </select>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    </p>
-                    <p>
@@ -2282 +2346 @@
-                  <div id="yearlyRecurrenceRules" class="invisible">
-                    <strong>Interval:</strong>
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                  </div>
-                </td>
@@ -2298 +2483 @@
-                     &#160;
-                     <input type="radio" name="rCountUntil" value="count"/>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                   </div>
-                </td>
@@ -2487 +2702 @@
-    <xsl:param name="end"/>
-    <xsl:param name="name"/>
-8
+10
-    <span class="chkBoxListItem">
-      <input type="checkbox"/>

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

@@ -31 +31 @@
-* @param string OPTIONAL     Optional layer name
-*/
-
+, hideBwFields
-        {
-    /**
@@ -376 +376 @@
-
-    // for Bedework event editing; reveal time fields when cal widget is hidden
-
-
+
+
+
+
-        }
-
@@ -392 +394 @@
-    // to avoid IE rendering oddities (IE always displays the "windowed" layer
-    // above everything else -- that includes select boxes.
-
-
+
+
+
+
-        }
-

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

@@ -19 +19 @@
-    allDayStartDateField.value = "off";
-    allDayEndDateField.value = "off";
-  }
-}
-function swapRecurrence(obj) {
-  if (obj.checked) {
-    changeClass('recurrenceFields','dateStartEndBox');
-  } else {
-    changeClass('recurrenceFields','invisible');
-  }
-}
-function showRecurrence(freq) {
-
-  changeClass('recurrenceUntilRules','shown');
-
-  /*if (freq == 'HOURLY') {
-    changeClass('hourlyRecurrenceRules','shown');
-  } else {
-    changeClass('hourlyRecurrenceRules','invisible');
-  }*/
-  if (freq == 'DAILY') {
-    changeClass('dailyRecurrenceRules','shown');
-  } else {
-    changeClass('dailyRecurrenceRules','invisible');
-  }
-  if (freq == 'WEEKLY') {
-    changeClass('weeklyRecurrenceRules','shown');
-  } else {
-    changeClass('weeklyRecurrenceRules','invisible');
-  }
-  if (freq == 'MONTHLY') {
-    changeClass('monthlyRecurrenceRules','shown');
-  } else {
-    changeClass('monthlyRecurrenceRules','invisible');
-  }
-  if (freq == 'YEARLY') {
-    changeClass('yearlyRecurrenceRules','shown');
-  } else {
-    changeClass('yearlyRecurrenceRules','invisible');
-  }
-  if (freq == 'NEVER') {
-    changeClass('neverRecurrenceRules','shown');
-    changeClass('recurrenceUntilRules','invisible');
-  } else {
-    changeClass('neverRecurrenceRules','invisible');
-  }
-}
@@ -118 +75 @@
-  }
-}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-// launch a simple window for displaying information; no header or status bar
-function launchSimpleWindow(URL) {
@@ -161 +167 @@
-  document.eventForm['eventEndDate.day'].value = date;
-  document.eventForm['eventEndDate.year'].value = year;
+}
+function untilDateCalWidgetCallback(date, month, year) {
+  if (String(month).length == 1) {
+      month = '0' + month;
+  }
+  if (String(date).length == 1) {
+      date = '0' + date;
+  }
+
+  document.eventForm['untilMonth'].value = month;
+  document.eventForm['untilDay'].value = date;
+  document.eventForm['untilYear'].value = year;
-}
-