From 4e9bc9ffbf06a56ee41245325c040199c1dc747c Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Mon, 20 Feb 2012 21:26:42 +0000
Subject: [PATCH] Monotone-Parent: 5066f4418986dc6df8b207002b41f82bc9e2bb8b
 Monotone-Revision: 78e21f4d868126d413a1b1a4924181b29cb18052

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-02-20T21:26:42
Monotone-Branch: ca.inverse.sogo
---
 .../Toolbars/SOGoAppointmentObject.toolbar    |  2 +-
 UI/Scheduler/Toolbars/SOGoTaskObject.toolbar  |  2 +-
 UI/Scheduler/UIxComponentEditor.h             | 10 +++----
 UI/Scheduler/UIxComponentEditor.m             | 18 ++++++------
 .../SchedulerUI/UIxComponentEditor.wox        | 16 +++++------
 UI/WebServerResources/UIxComponentEditor.js   | 28 +++++++++----------
 6 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/UI/Scheduler/Toolbars/SOGoAppointmentObject.toolbar b/UI/Scheduler/Toolbars/SOGoAppointmentObject.toolbar
index 17cb06445..b7946fbb3 100644
--- a/UI/Scheduler/Toolbars/SOGoAppointmentObject.toolbar
+++ b/UI/Scheduler/Toolbars/SOGoAppointmentObject.toolbar
@@ -10,7 +10,7 @@
     { link = "#";
       hasMenu = YES;
       label = "Privacy";
-      onclick = "return onSelectPrivacy(event);";
+      onclick = "return onSelectClassification(event);";
       image = "tb-compose-security-flat-24x24.png"; },
     { link = "#";
       label = "Attach";
diff --git a/UI/Scheduler/Toolbars/SOGoTaskObject.toolbar b/UI/Scheduler/Toolbars/SOGoTaskObject.toolbar
index 79fa4a5c5..28ea48756 100644
--- a/UI/Scheduler/Toolbars/SOGoTaskObject.toolbar
+++ b/UI/Scheduler/Toolbars/SOGoTaskObject.toolbar
@@ -6,7 +6,7 @@
     { link = "#";
       hasMenu = YES;
       label = "Privacy";
-      onclick = "return onSelectPrivacy(event);";
+      onclick = "return onSelectClassification(event);";
       image = "tb-compose-security-flat-24x24.png"; },
     { link = "#";
       label = "Attach";
diff --git a/UI/Scheduler/UIxComponentEditor.h b/UI/Scheduler/UIxComponentEditor.h
index e9378320d..a38fb7126 100644
--- a/UI/Scheduler/UIxComponentEditor.h
+++ b/UI/Scheduler/UIxComponentEditor.h
@@ -54,7 +54,7 @@
   NSString *comment;
   NSString *attachUrl;
   NSString *priority;
-  NSString *privacy;
+  NSString *classification;
   NSString *status;
   NSString *category;
   NSArray *categories;
@@ -119,10 +119,10 @@
 - (NSString *) priority;
 - (NSString *) itemPriorityText;
 
-- (NSArray *) privacyClasses;
-- (void) setPrivacy: (NSString *) _privacy;
-- (NSString *) privacy;
-- (NSString *) itemPrivacyText;
+- (NSArray *) classificationClasses;
+- (void) setClassification: (NSString *) _classification;
+- (NSString *) classification;
+- (NSString *) itemClassificationText;
 
 - (void) setStatus: (NSString *) _status;
 - (NSString *) status;
diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m
index c6841a5a4..517dcb563 100644
--- a/UI/Scheduler/UIxComponentEditor.m
+++ b/UI/Scheduler/UIxComponentEditor.m
@@ -167,7 +167,7 @@ iRANGE(2);
 
       component = nil;
       componentCalendar = nil;
-      [self setPrivacy: @"PUBLIC"];
+      [self setClassification: @"PUBLIC"];
       [self setIsCycleEndNever];
       componentOwner = @"";
       organizer = nil;
@@ -629,7 +629,7 @@ iRANGE(2);
 	  ASSIGN (location, [component location]);
 	  ASSIGN (comment, [component comment]);
 	  ASSIGN (attachUrl, [[component attach] absoluteString]);
-	  ASSIGN (privacy, [component accessClass]);
+	  ASSIGN (classification, [component accessClass]);
 	  ASSIGN (priority, [component priority]);
 	  ASSIGN (status, [component status]);
           ASSIGN (categories, [component categories]);
@@ -701,7 +701,7 @@ iRANGE(2);
   return [self labelForKey: [NSString stringWithFormat: @"prio_%@", item]];
 }
 
-- (NSString *) itemPrivacyText
+- (NSString *) itemClassificationText
 {
   NSString *tag;
 
@@ -1380,7 +1380,7 @@ iRANGE(2);
   return [priority length] > 0;
 }
 
-- (NSArray *) privacyClasses
+- (NSArray *) classificationClasses
 {
   static NSArray *priorities = nil;
 
@@ -1394,14 +1394,14 @@ iRANGE(2);
   return priorities;
 }
 
-- (void) setPrivacy: (NSString *) _privacy
+- (void) setClassification: (NSString *) _classification
 {
-  ASSIGN (privacy, _privacy);
+  ASSIGN (classification, _classification);
 }
 
-- (NSString *) privacy
+- (NSString *) classification
 {
-  return privacy;
+  return classification;
 }
 
 - (void) setStatus: (NSString *) _status
@@ -2149,7 +2149,7 @@ RANGE(2);
   [component setLocation: location];
   [component setComment: comment];
   [component setAttach: attachUrl];
-  [component setAccessClass: privacy];
+  [component setAccessClass: classification];
   [component setCategories: categories];
   [self _handleAttendeesEdition];
   [self _handleOrganizer];
diff --git a/UI/Templates/SchedulerUI/UIxComponentEditor.wox b/UI/Templates/SchedulerUI/UIxComponentEditor.wox
index c715278fe..dffe9ce22 100644
--- a/UI/Templates/SchedulerUI/UIxComponentEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxComponentEditor.wox
@@ -28,11 +28,11 @@
   ></script>
 
   <var:if condition="eventIsReadOnly" const:negate="YES">
-  <div class="menu" id="privacy-menu">
-    <ul id="itemPrivacyList" class="choiceMenu">
-      <var:foreach list="privacyClasses" item="item">
+  <div class="menu" id="classification-menu">
+    <ul id="itemClassificationList" class="choiceMenu">
+      <var:foreach list="classificationClasses" item="item">
 	<li var:classification="item"><var:string
-	    var:value="itemPrivacyText" /></li>
+	    var:value="itemClassificationText" /></li>
       </var:foreach>
     </ul>
   </div>
@@ -111,8 +111,8 @@
 
       <!-- hidden -->
       <input type="hidden" name="attach" id="attach" var:value="attach"/>
-      <input type="hidden" name="privacy" id="privacy"
-	var:value="privacy"/>
+      <input type="hidden" name="classification" id="classification"
+	var:value="classification"/>
       <input type="hidden" name="attendees" id="attendees" />
       <input type="hidden" name="calendarFoldersList"
 	id="calendarFoldersList"
@@ -279,8 +279,8 @@
   </var:if>
 
       <input type="hidden" name="attach" id="attach" var:value="attach"/>
-      <input type="hidden" name="privacy" id="privacy"
-	var:value="privacy"/>
+      <input type="hidden" name="classification" id="classification"
+	var:value="classification"/>
       <input type="hidden" name="attendeesNames" id="attendeesNames"
 	var:value="attendeesNames"/>
       <input type="hidden" name="attendeesUIDs" id="attendeesUIDs"
diff --git a/UI/WebServerResources/UIxComponentEditor.js b/UI/WebServerResources/UIxComponentEditor.js
index 5d4b0af39..664ca2f65 100644
--- a/UI/WebServerResources/UIxComponentEditor.js
+++ b/UI/WebServerResources/UIxComponentEditor.js
@@ -41,12 +41,12 @@ function onPopupAttendeesWindow(event) {
     return false;
 }
 
-function onSelectPrivacy(event) {
+function onSelectClassification(event) {
     if (event.button == 0 || (isWebKit() && event.button == 1)) {
         var node = getTarget(event);
         if (node.tagName != 'A')
             node = $(node).up("A");
-        popupToolbarMenu(node, "privacy-menu");
+        popupToolbarMenu(node, "classification-menu");
         Event.stop(event);
     }
 }
@@ -97,8 +97,8 @@ function onMenuSetClassification(event) {
     this.addClassName("_chosen");
     this.parentNode.chosenNode = this;
 
-    var privacyInput = $("privacy");
-    privacyInput.value = classification;
+    var classificationInput = $("classification");
+    classificationInput.value = classification;
 }
 
 function onChangeCalendar(event) {
@@ -135,19 +135,19 @@ function initializeDocumentHref() {
         changeUrlButton.observe("click", onPopupAttachWindow, false);
 }
 
-function initializePrivacyMenu() {
-    if ($("privacy-menu")) {
-        var privacy = $("privacy").value.toUpperCase();
-        var privacyMenu = $("privacy-menu").childNodesWithTag("ul")[0];
-        var menuEntries = $(privacyMenu).childNodesWithTag("li");
+function initializeClassificationMenu() {
+    if ($("classification-menu")) {
+        var classification = $("classification").value.toUpperCase();
+        var classificationMenu = $("classification-menu").childNodesWithTag("ul")[0];
+        var menuEntries = $(classificationMenu).childNodesWithTag("li");
         var chosenNode;
-        if (privacy == "CONFIDENTIAL")
+        if (classification == "CONFIDENTIAL")
             chosenNode = menuEntries[1];
-        else if (privacy == "PRIVATE")
+        else if (classification == "PRIVATE")
             chosenNode = menuEntries[2];
         else
             chosenNode = menuEntries[0];
-        privacyMenu.chosenNode = chosenNode;
+        classificationMenu.chosenNode = chosenNode;
         $(chosenNode).addClassName("_chosen");
     }
 }
@@ -190,14 +190,14 @@ function findDelegateAddress() {
 
 function onComponentEditorLoad(event) {
     initializeDocumentHref();
-    initializePrivacyMenu();
+    initializeClassificationMenu();
     var list = $("calendarList");
     if (list) {
         list.observe("change", onChangeCalendar, false);
         list.fire("mousedown");
     }
     
-    var tmp = $("itemPrivacyList");
+    var tmp = $("itemClassificationList");
     if (tmp) {
         var menuItems = tmp.childNodesWithTag("li");
         for (var i = 0; i < menuItems.length; i++)