see changelog

Monotone-Parent: 0f4484bf642d11bc96f9672226ec495c99e2301f
Monotone-Revision: b7b4b1f3f729de477db90d41fee55b91ea781b02

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2008-01-14T13:57:28
Monotone-Branch: ca.inverse.sogo

UI/Templates/SchedulerUI/UIxAppointmentEditor.wox

@@ -40,18 +40,4 @@
         const:dayStartHour="0"
         const:dayEndHour="23"
         /></span></span>
-  <hr />
-  <label><var:string label:value="Repeat:" />
-    <span class="content"><var:popup list="repeatList" item="item"
-        label:noSelectionString="repeat_NEVER"
-        const:disabledValue="-"
-        string="itemRepeatText" selection="repeat"
-        /></span></label>
-  <hr />
-  <label><var:string label:value="Reminder:" />
-    <span class="content"><var:popup list="reminderList" item="item"
-        const:disabledValue="-"
-        label:noSelectionString="reminder_NONE"
-        string="itemReminderText" selection="reminder"
-        /></span></label>
 </var:component>

UI/Templates/SchedulerUI/UIxComponentEditor.wox

@@ -72,6 +72,21 @@
       <hr />
       <var:component-content />
       <hr />
+      <label><var:string label:value="Repeat:" />
+       <span class="content"><var:popup list="repeatList" item="item"
+          label:noSelectionString="repeat_NEVER"
+          const:disabledValue="-"
+	  const:id="repeatList"
+          string="itemRepeatText" selection="repeat"
+          /></span></label>
+      <hr />
+      <label><var:string label:value="Reminder:" />
+      <span class="content"><var:popup list="reminderList" item="item"
+         const:disabledValue="-"
+         label:noSelectionString="reminder_NONE"
+         string="itemReminderText" selection="reminder"
+         /></span></label>
+      <hr />
       <label id="commentArea"><var:string label:value="Description:"
 	  /><textarea rows="20" name="comment" var:value="comment" /></label>
       <label id="documentLabel" style="display: none;"><var:string label:value="Document:"
@@ -96,6 +111,40 @@
       <input type="hidden" name="calendarFoldersList"
 	id="calendarFoldersList"
 	var:value="calendarsFoldersList"/>
+
+      <input type="hidden" name="repeatType"
+	id="repeatType"
+	var:value="repeatType"/>
+      <input type="hidden" name="repeat1"
+	id="repeat1"
+	var:value="repeat1"/>
+      <input type="hidden" name="repeat2"
+	id="repeat2"
+	var:value="repeat2"/>
+      <input type="hidden" name="repeat3"
+	id="repeat3"
+	var:value="repeat3"/>
+      <input type="hidden" name="repeat4"
+	id="repeat4"
+	var:value="repeat4"/>
+      <input type="hidden" name="repeat5"
+	id="repeat5"
+	var:value="repeat5"/>
+      <input type="hidden" name="repeat6"
+	id="repeat6"
+	var:value="repeat6"/>
+      <input type="hidden" name="repeat7"
+	id="repeat7"
+	var:value="repeat7"/>
+
+     <input type="hidden" name="range1"
+	id="range1"
+	var:value="range1"/>
+     <input type="hidden" name="range2"
+	id="range2"
+	var:value="range2"/>
+
+
     </div>
   </form>
 </var:component>

UI/Templates/SchedulerUI/UIxRecurrenceEditor.wox

@@ -0,0 +1,154 @@
+<?xml version='1.0' standalone='yes'?>
+<!DOCTYPE var:component>
+<var:component
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:var="http://www.skyrix.com/od/binding"
+  xmlns:const="http://www.skyrix.com/od/constant"
+  xmlns:uix="OGo:uix"
+  xmlns:rsrc="OGo:url"
+  xmlns:label="OGo:label"
+  className="UIxPageFrame"
+  const:toolbar="none"
+  const:popup="YES"
+  const:jsFiles="skycalendar.js">
+
+  <form id="recurrence_form">
+  <div id="recurrence_pattern">
+
+    <var:string label:value="Recurrence pattern"/>
+    <br />
+    <br />	
+    <var:string label:value="Repeat"/>
+    <var:popup list="repeatList" const:id="repeatType" item="item"
+       	string="itemText" selection="repeatType"
+    />
+
+    <hr />
+
+    <div id="recurrenceDaily">
+      <var:radio-button-list list="dailyRadioList" const:id="dailyRadioButton" item="item"
+	const:name="dailyRadioButtonName" value="item" />
+	<input type="text" name="dailyDaysFieldName" const:id="dailyDaysField"
+            class="textField"
+            var:value="title"
+         />
+	<var:string label:value="Days"/>
+    </div>
+ 
+    <hr />
+
+    <div id="recurrenceWeekly">
+     	<var:string label:value="Every"/>
+	<input type="text" name="weeklyWeeksFieldName" const:id="weeklyWeeksField"
+            class="textField"
+            var:value="title"
+         />
+     	<var:string label:value="Week(s)"/>
+	<br />
+	<var:string label:value="On"/>
+	<var:checkbox-list list="weeklyCheckBoxList" const:id="weeklyCheckBox" item="item"
+		const:name="weeklyCheckBoxName" value="item" />
+    </div>
+
+    <hr />
+
+    <div id="recurrenceMonthly">
+	<var:string label:value="Every"/>
+	<input type="text" name="monthlyMonthsFieldName" const:id="monthlyMonthsField"
+            class="textField"
+            var:value="title"
+         />
+     	<var:string label:value="Month(s)"/>
+	<br />
+	<var:radio-button-list list="monthlyRadioList" const:id="monthlyRadioButton" item="item"
+		const:name="monthlyRadioButtonName" value="item" />
+	<br />
+	<var:popup list="monthlyRepeatList" const:id="monthlyRepeat" item="item"
+        	label:noSelectionString="FIRST"
+        	string="itemText" selection="FIRST"
+        />
+	<var:popup list="monthlyDayList" const:id="monthlyDay" item="item"
+        	label:noSelectionString="MONDAY"
+        	string="itemText" selection="MONDAY"
+        />
+	<br />
+	<var:checkbox-list list="dayMonthList" const:id="monthlyCheckBox" item="item"
+		const:name="monthlyCheckBoxName" value="item" />
+    </div>
+
+    <hr />
+
+    <div id="recurrenceYearly">
+	<var:string label:value="Every"/>
+	<input type="text" name="yearlyYearsFieldName" const:id="yearlyYearsField"
+            class="textField"
+            var:value="title"
+         />
+     	<var:string label:value="Year(s)"/>
+	<br />
+	<var:radio-button-list list="yearlyRadioList" const:id="yearlyRadioButton" item="item"
+		const:name="yearlyRadioButtonName" value="item" />
+	<br />
+	<input type="text" name="yearlyDayFieldName" const:id="yearlyDayField"
+            class="textField"
+            var:value="title"
+         />
+	<var:popup list="yearlyMonthList" const:id="yearlyMonth1" item="item"
+        	label:noSelectionString="JANUARY"
+        	string="itemText" selection="JANUARY"
+        />
+  	<br />
+	<var:popup list="monthlyRepeatList" const:id="yearlyRepeat" item="item"
+        	label:noSelectionString="FIRST"
+        	string="itemText" selection="FIRST"
+        />
+	<var:popup list="yearlyDayList" const:id="yearlyDay" item="item"
+        	label:noSelectionString="MONDAY"
+        	string="itemText" selection="MONDAY"
+        />
+     	<var:string label:value="of"/>
+	<var:popup list="yearlyMonthList" const:id="yearlyMonth2" item="item"
+        	label:noSelectionString="JANUARY"
+        	string="itemText" selection="JANUARY"
+        />
+    </div>
+
+  </div>
+
+  <br />
+  <br />
+  <hr />
+  <br />
+  <br />
+
+  <div id="range_of_recurrence">
+    <var:string label:value="Range of recurrence"/>
+    <br />
+    <br />
+    <var:radio-button-list list="rangeRadioList" const:id="rangeRadioButton" item="item"
+	const:name="rangeRadioButtonName" value="item" />
+    <br />
+    <input type="text" name="rangeAppointmentsFieldName" const:id="rangeAppointmentsField"
+           class="textField"
+           var:value="title"
+     />
+    <var:string label:value="Appointments(s)"/>
+    <br />
+    <var:component className="UIxDatePicker"
+                   const:dateID="endDate"
+                   day="endDateDay"
+                   month="endDateMonth"
+                   year="endDateYear"
+                   label:label="browse end date"
+    />
+  </div>
+
+  <div id="windowButtons">
+	<hr />
+	<a id="cancelButton" href="#" class="button"
+	  ><var:string label:value="Cancel"/></a>
+	<a id="okButton" href="#" class="button"
+	  ><var:string label:value="OK"/></a>
+      </div>
+  </form>
+</var:component>

UI/Templates/SchedulerUI/UIxTaskEditor.wox

@@ -51,11 +51,4 @@
 	var:disabled="statusPercentDisabled"
 	/><var:string label:value="% complete"
 	/></span></span>
-  <hr />
-  <label><var:string label:value="Repeat:" />
-    <span class="content"><var:popup list="repeatList" item="item"
-        label:noSelectionString="repeat_NEVER"
-        const:disabledValue="-"
-        string="itemRepeatText" selection="repeat"
-        /></span></label>
 </var:component>