From d1a910c6fb28808bd307c8c346e12b6c3f4de664 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 3 Nov 2006 19:38:23 +0000
Subject: [PATCH] Monotone-Parent: 12e535603dd09ceb52e98c9e06e74080d1a1eaff
 Monotone-Revision: cd8296d46bb1d0a2657836c7d9b185a97c8a2bf2

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-11-03T19:38:23
Monotone-Branch: ca.inverse.sogo
---
 .../SchedulerUI/UIxAppointmentEditor.wox         | 16 ++++++++++------
 UI/Templates/SchedulerUI/UIxTaskEditor.wox       | 16 ++++++++++------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox b/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
index d434b45f6..f1b41f73e 100644
--- a/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
@@ -71,22 +71,26 @@
             <span class="content"><var:popup list="availableCalendars" item="item"
                 const:onChange="onChangeCalendar(this);"
                 string="item" selection="componentOwner" /></span></label>
+          <label><var:string label:value="Privacy" />
+            <span class="content"><var:popup list="privacyClasses" item="item"
+                string="itemPrivacyText" selection="privacy"
+                /></span></label>
           <label><var:string label:value="Priority" />
             <span class="content"><var:popup list="priorities" item="item"
                 string="itemPriorityText" selection="priority"
                 /></span></label>
-          <span id="categoriesCB" class="checkBoxList"
+          <label><var:string label:value="Status" />
+            <span class="content"><var:popup list="statusTypes" item="item"
+                string="itemStatusText" selection="status"
+                /></span></label>
+<!--          <span id="categoriesCB" class="checkBoxList"
             ><var:string label:value="Categories"
               /><span class="content categoriesContent"><var:checkbox-list
                 list="categoryItems"
                 item="item"
                 suffix="itemCategoryText"
                 selections="categories"
-                /></span></span>
-
-          <label><var:string label:value="Priority" />
-            <span class="content"><var:popup list="priorities" item="item"
-                string="itemPriorityText" selection="priority" /></span></label>
+                /></span></span> -->
           <hr />
           <label id="commentArea"><var:string label:value="Description"
               /><textarea name="comment" var:value="comment" /></label> 
diff --git a/UI/Templates/SchedulerUI/UIxTaskEditor.wox b/UI/Templates/SchedulerUI/UIxTaskEditor.wox
index ef3f271e2..0ca563efb 100644
--- a/UI/Templates/SchedulerUI/UIxTaskEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxTaskEditor.wox
@@ -77,22 +77,26 @@
             <span class="content"><var:popup list="availableCalendars" item="item"
                 const:onChange="onChangeCalendar(this);"
                 string="item" selection="componentOwner" /></span></label>
+          <label><var:string label:value="Privacy" />
+            <span class="content"><var:popup list="privacyClasses" item="item"
+                string="itemPrivacyText" selection="privacy"
+                /></span></label>
           <label><var:string label:value="Priority" />
             <span class="content"><var:popup list="priorities" item="item"
                 string="itemPriorityText" selection="priority"
                 /></span></label>
-          <span id="categoriesCB" class="checkBoxList"
+          <label><var:string label:value="Status" />
+            <span class="content"><var:popup list="statusTypes" item="item"
+                string="itemStatusText" selection="status"
+                /></span></label>
+<!--          <span id="categoriesCB" class="checkBoxList"
             ><var:string label:value="Categories"
               /><span class="content categoriesContent"><var:checkbox-list
                 list="categoryItems"
                 item="item"
                 suffix="itemCategoryText"
                 selections="categories"
-                /></span></span>
-
-          <label><var:string label:value="Priority" />
-            <span class="content"><var:popup list="priorities" item="item"
-                string="itemPriorityText" selection="priority" /></span></label>
+                /></span></span> -->
           <hr />
           <label id="commentArea"><var:string label:value="Description"
               /><textarea name="comment" var:value="comment" /></label>