From babc5d2d6913443e4c780651fed156e67e47f12f Mon Sep 17 00:00:00 2001
From: wolfgang <wolfgang@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Wed, 3 Jan 2007 21:24:27 +0000
Subject: [PATCH] git-svn-id:
 http://svn.opengroupware.org/SOGo/inverse/trunk@1006
 d1b88da0-ebda-0310-925b-ed51d893ca5b

---
 ChangeLog                              |  10 ++
 UI/Common/UIxAclEditor.h               |   5 +-
 UI/Common/UIxAclEditor.m               |  30 +++-
 UI/Templates/UIxAclEditor.wox          |  16 +-
 UI/WebServerResources/UIxAclEditor.css |   4 +
 UI/WebServerResources/UIxAclEditor.js  | 143 +++++++++++++----
 UI/WebServerResources/generic.js       | 203 +++++++++++--------------
 7 files changed, 255 insertions(+), 156 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c532738d..e22af632 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-01-03  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/Common/UIxAclEditor.m ([UIxAclEditor -assistantsValue]): new
+	accessor that returns the comma-separated list of users with role
+	"Assistant".
+	([UIxAclEditor -delegatesValue]): same as above for "Delegate".
+	([UIxAclEditor -_prepareUsers]): there is no longer a concept of
+	"checkedUsers". Instead, each user is either classified in the
+	list of assistants or the list of delegates.
+
 2006-12-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/MailerUI/UIxMailMainFrame.m ([UIxMailMainFrame
diff --git a/UI/Common/UIxAclEditor.h b/UI/Common/UIxAclEditor.h
index 53f7d299..e1dbaa50 100644
--- a/UI/Common/UIxAclEditor.h
+++ b/UI/Common/UIxAclEditor.h
@@ -31,12 +31,15 @@
   BOOL publishInFreeBusy;
   NSArray *acls;
   NSMutableArray *users;
-  NSMutableArray *checkedUsers;
+  NSMutableArray *assistants;
+  NSMutableArray *delegates;
   NSString *ownerCN;
 }
 
 - (NSArray *) aclsForFolder;
 - (NSString *) ownerCN;
+- (NSString *) assistantsValue;
+- (NSString *) delegatesValue;
 
 @end
 
diff --git a/UI/Common/UIxAclEditor.m b/UI/Common/UIxAclEditor.m
index cb8cdb0b..7b00e62d 100644
--- a/UI/Common/UIxAclEditor.m
+++ b/UI/Common/UIxAclEditor.m
@@ -41,7 +41,8 @@
       prepared = NO;
       publishInFreeBusy = NO;
       users = [NSMutableArray new];
-      checkedUsers = [NSMutableArray new];
+      delegates = [NSMutableArray new];
+      assistants = [NSMutableArray new];
       ownerCN = nil;
     }
 
@@ -51,7 +52,8 @@
 - (void) dealloc
 {
   [users release];
-  [checkedUsers release];
+  [delegates release];
+  [assistants release];
   if (ownerCN)
     [ownerCN release];
   [super dealloc];
@@ -104,7 +106,9 @@
             {
               if ([[currentAcl objectForKey: @"c_role"]
                     isEqualToString: SOGoRole_Delegate])
-                [checkedUsers addObject: currentUser];
+                [delegates addObject: [currentUser cn]];
+              else
+                [assistants addObject: [currentUser cn]];
               [users addObject: currentUser];
             }
         }
@@ -122,12 +126,28 @@
   return users;
 }
 
-- (NSArray *) checkedUsers
+- (NSArray *) delegates
 {
   if (!prepared)
     [self _prepareUsers];
 
-  return checkedUsers;
+  return delegates;
+}
+
+- (NSString *) assistantsValue
+{
+  if (!prepared)
+    [self _prepareUsers];
+
+  return [assistants componentsJoinedByString: @","];
+}
+
+- (NSString *) delegatesValue
+{
+  if (!prepared)
+    [self _prepareUsers];
+
+  return [delegates componentsJoinedByString: @","];
 }
 
 - (BOOL) publishInFreeBusy
diff --git a/UI/Templates/UIxAclEditor.wox b/UI/Templates/UIxAclEditor.wox
index f750aed9..f32d4841 100644
--- a/UI/Templates/UIxAclEditor.wox
+++ b/UI/Templates/UIxAclEditor.wox
@@ -12,18 +12,20 @@
     <form id="aclForm" const:href="saveAcls">
       <div class="acls">
         <input type="hidden" name="action" value="saveAcls" />
-        <input type="hidden" name="delegates" id="delegates" />
-        <input type="hidden" name="assistants" id="assistants" />
+        <input type="hidden" name="delegates" var:value="delegatesValue"
+          id="delegates" />
+        <input type="hidden" name="assistants" var:value="assistantsValue"
+          id="assistants" />
         <label><var:string label:value="Owner:" />
           <span class="value"><strong><var:string value="ownerCN" /></strong></span></label><br />
         <var:component className="UIxContactSelector"
           const:selectorId="userRoles"
-          const:hasCheckBoxes="YES"
           const:checkBoxOnChange="return updateAclStatus(this);"
-          contacts="usersForFolder"
-          checkedBoxes="checkedUsers"
-          />
-        <span class="legend"><var:string label:value="(Unchecked = assistant, checked = delegate)" /></span><br />
+          contacts="usersForFolder" />
+        <select id="userRoleDropDown" name="currentUserRole">
+          <option value="assistant"><var:string label:value="Assistant" /></option>
+          <option value="delegate"><var:string label:value="Delegate" /></option>
+        </select><br />
         <var:if condition="clientIsCalendar"
           ><label id="freeBusyLabel"><input type="checkbox"
               var:checked="publishInFreeBusy"
diff --git a/UI/WebServerResources/UIxAclEditor.css b/UI/WebServerResources/UIxAclEditor.css
index bbce7a5d..bca5e667 100644
--- a/UI/WebServerResources/UIxAclEditor.css
+++ b/UI/WebServerResources/UIxAclEditor.css
@@ -42,6 +42,10 @@ UL#uixselector-userRoles-display > LI._selected
   color: #fff !important;
 }
 
+SELECT#userRoleDropDown
+{ visibility: hidden;
+  margin-left: 2em; }
+
 SPAN.legend
 { margin-left: 1em;
   font-size: smaller; }
diff --git a/UI/WebServerResources/UIxAclEditor.js b/UI/WebServerResources/UIxAclEditor.js
index 0c7c2a09..b10635c6 100644
--- a/UI/WebServerResources/UIxAclEditor.js
+++ b/UI/WebServerResources/UIxAclEditor.js
@@ -10,7 +10,7 @@ function addContact(tag, fullContactName, contactId, contactName,
       addUser(contactName, contactId, true);
 }
 
-function addUser(userName, userId, checked) {
+function addUser(userName, userId, delegate) {
    var uidList = $("uixselector-userRoles-uidList");
    var uids;
 
@@ -23,53 +23,134 @@ function addUser(userName, userId, checked) {
    if (uids.indexOf(userId) < 0) {
       uids.push(userId);
       var ul = $("uixselector-userRoles-display");
-      ul.appendChild(nodeForUser(userName, userId, checked));
+      ul.appendChild(nodeForUser(userName, userId));
       uidList.value = uids.join(",");
+      var roleList;
+      if (delegate)
+        roleList = $("delegates");
+      else
+        roleList = $("assistants");
+      if (roleList.value.length > 0) {
+        uids = roleList.value.split(",");
+        uids.push(userId);
+        roleList.value = uids.join(",");
+      }
+      else
+        roleList.value = userId;
    }
-
-   log("addUser: " + uidList.value);
 }
 
-function nodeForUser(userName, userId, checked) {
+function nodeForUser(userName, userId) {
    var node = document.createElement("li");
    node.setAttribute("uid", userId);
    node.setAttribute("class", "");
    node.addEventListener("mousedown", listRowMouseDownHandler, true);
    node.addEventListener("click", onRowClick, true);
 
-   var checkbox = document.createElement("input");
-   checkbox.setAttribute("type", "checkbox");
-   checkbox.setAttribute("class", "checkBox");
-   checkbox.checked = checked;
-   checkbox.addEventListener("change", updateAclStatus, true);
+   var image = document.createElement("img");
+   image.setAttribute("src", ResourcesURL + "/abcard.gif");
 
-   node.appendChild(checkbox);
-   node.appendChild(document.createTextNode(userName));
+   node.appendChild(image);
+   node.appendChild(document.createTextNode(" " + userName));
 
    return node;
 }
 
-function updateAclStatus() {
+function saveAcls() {
+  $("aclForm").submit();
+
+  return false;
 }
 
-function saveAcls() {
-   var form = $("aclForm");
-   var lis = $("uixselector-userRoles-display").childNodesWithTag("li");
-
-   var assistants = new Array();
-   var delegates = new Array();
-   for (var i = 0; i < lis.length; i++) {
-      var uName = lis[i].getAttribute("uid");
-      var cb = lis[i].childNodesWithTag("input")[0];
-      if (cb.checked)
-         delegates.push(uName);
-      else
-         assistants.push(uName);
-   }
-   $("assistants").value = assistants.join(",");
-   $("delegates").value = delegates.join(",");
+function updateSelectedRole(list) {
+  var select = $("userRoleDropDown");
+  var selection = list.getSelectedRows(); 
+  if (selection.length > 0) {
+    select.style.visibility = "visible;";
+    var selected = selection[0];
+    var assistantsValue = $("assistants");
+    var uid = selected.getAttribute("uid");
+    var regexp = new RegExp("(^|,)" + uid + "(,|$)","i");
+    if (regexp.test(assistantsValue.value))
+      select.selectedIndex = 0;
+    else
+      select.selectedIndex = 1;
+  }
+  else
+    select.style.visibility = "hidden;";
+}
+
+function onAclSelectionChange() {
+  log("selectionchange");
+  updateSelectedRole(this);
+}
 
-   form.submit();
+function onUsersChange(type) {
+  var select = $("userRoleDropDown");
+  if (type == "removal") {
+    var list;
+    if (select.selectedIndex == 0)
+      list = $("assistants");
+    else
+      list = $("delegates");
 
-   return false;
+    var uids = $("uixselector-userRoles-uidList");
+    var listArray = list.value.split(",");
+    var newListArray = new Array();
+    for (var i = 0; i < listArray.length; i++) {
+      var regexp = new RegExp("(^|,)" + listArray[i] + "($|,)");
+      if (regexp.test(uids.value))
+        newListArray.push(listArray[i]);
+    }
+    if (newListArray.length > 0)
+      list.value = newListArray.join(",");
+    else
+      list.value = "";
+  }
+
+  updateSelectedRole($("uixselector-userRoles-display"));
 }
+
+function onUserRoleDropDownChange() {
+  var oldList;
+  var newList;
+
+  if (this.selectedIndex == 0) {
+    oldList = $("delegates");
+    newList = $("assistants");
+  } else {
+    oldList = $("assistants");
+    newList = $("delegates");
+  }
+
+  var uid = $("uixselector-userRoles-display").getSelectedRows()[0].getAttribute("uid");
+  var newListArray;
+  if (newList.value.length > 0) {
+    newListArray = newList.value.split(",");
+    newListArray.push(uid);
+  }
+  else
+    newListArray = new Array(uid);
+  newList.value = newListArray.join(",");
+
+  var oldListArray = oldList.value.split(",").without(uid);
+  if (oldListArray.length > 0)
+    oldList.value = oldListArray.join(",");
+  else
+    oldList.value = "";
+
+  log("assistants: " + $("assistants").value);
+  log("delegates: " + $("delegates").value);
+}
+
+function onAclLoadHandler() {
+  $("userRoles").changeNotification = onUsersChange;
+
+  var ul = $("uixselector-userRoles-display");
+  ul.addEventListener("selectionchange",
+                      onAclSelectionChange, false);
+  var select = $("userRoleDropDown");
+  select.addEventListener("change", onUserRoleDropDownChange, false);
+}
+
+window.addEventListener("load", onAclLoadHandler, false);
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 25e8a488..479b08d0 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -391,8 +391,7 @@ function onRowClick(event) {
 var bodyOnClick = "";
 // var acceptClick = false;
 
-function onMenuClick(event, menuId)
-{
+function onMenuClick(event, menuId) {
   var node = event.target;
 
   if (document.currentPopupMenu)
@@ -427,8 +426,7 @@ function onMenuClick(event, menuId)
   return false;
 }
 
-function setupMenuTarget(menu, target)
-{
+function setupMenuTarget(menu, target) {
   menu.menuTarget = target;
   var menus = document.getElementsByClassName("menu", menu);
   for (var i = 0; i < menus.length; i++) {
@@ -436,8 +434,7 @@ function setupMenuTarget(menu, target)
   }
 }
 
-function getParentMenu(node)
-{
+function getParentMenu(node) {
   var currentNode, menuNode;
 
   menuNode = null;
@@ -454,8 +451,7 @@ function getParentMenu(node)
   return menuNode;
 }
 
-function onBodyClick(event)
-{
+function onBodyClick(event) {
   document.currentPopupMenu.menuTarget = null;
   hideMenu(event, document.currentPopupMenu);
   document.body.setAttribute("onclick", bodyOnClick);
@@ -463,35 +459,31 @@ function onBodyClick(event)
   return false;
 }
 
-function hideMenu(event, menuNode)
-{
+function hideMenu(event, menuNode) {
   var onHide;
 
 //   log('hiding menu "' + menuNode.getAttribute('id') + '"');
-  if (menuNode.submenu)
-    {
-      hideMenu(event, menuNode.submenu);
-      menuNode.submenu = null;
-    }
+  if (menuNode.submenu) {
+    hideMenu(event, menuNode.submenu);
+    menuNode.submenu = null;
+  }
 
   menuNode.style.visibility = "hidden";
-  if (menuNode.parentMenuItem)
-    {
-      menuNode.parentMenuItem.setAttribute('class', 'submenu');
-      menuNode.parentMenuItem = null;
-      menuNode.parentMenu.setAttribute('onmousemove', null);
-      menuNode.parentMenu.submenuItem = null;
-      menuNode.parentMenu.submenu = null;
-      menuNode.parentMenu = null;
-    }
+  if (menuNode.parentMenuItem) {
+    menuNode.parentMenuItem.setAttribute('class', 'submenu');
+    menuNode.parentMenuItem = null;
+    menuNode.parentMenu.setAttribute('onmousemove', null);
+    menuNode.parentMenu.submenuItem = null;
+    menuNode.parentMenu.submenu = null;
+    menuNode.parentMenu = null;
+  }
 
   var onhideEvent = document.createEvent("Event");
   onhideEvent.initEvent("hideMenu", false, true);
   menuNode.dispatchEvent(onhideEvent);
 }
 
-function onMenuEntryClick(event, menuId)
-{
+function onMenuEntryClick(event, menuId) {
   var node = event.target;
 
   id = getParentMenu(node).menuTarget;
@@ -525,8 +517,7 @@ function initLogConsole() {
   }
 }
 
-function onBodyKeyDown(event)
-{
+function onBodyKeyDown(event) {
   if (event.keyCode == 27) {
     toggleLogConsole();
     event.cancelBubble = true;
@@ -534,8 +525,7 @@ function onBodyKeyDown(event)
   }
 }
 
-function onLogDblClick(event)
-{
+function onLogDblClick(event) {
   var logConsole = $("logConsole");
   logConsole.innerHTML = "";
 }
@@ -559,74 +549,68 @@ function log(message) {
     while (logWindow.opener)
       logWindow = logWindow.opener;
   }
-  var logConsole = logWindow.document.getElementById('logConsole');
+  var logConsole = logWindow.document.getElementById("logConsole");
   if (logConsole)
     logConsole.innerHTML += message + '<br />' + "\n";
 }
 
-function dropDownSubmenu(event)
-{
+function dropDownSubmenu(event) {
   var node = event.target;
   var submenu = node.getAttribute("submenu");
-  if (submenu && submenu != "")
-    {
-      var submenuNode = document.getElementById(submenu);
-      var parentNode = getParentMenu(node);
-      if (parentNode.submenu)
-	hideMenu(event, parentNode.submenu);
-      submenuNode.parentMenuItem = node;
-      submenuNode.parentMenu = parentNode;
-      parentNode.submenuItem = node;
-      parentNode.submenu = submenuNode;
-
-      var menuTop = (node.offsetTop - 2);
-      
-      var heightDiff = (window.innerHeight
-			- (menuTop + submenuNode.offsetHeight));
-      if (heightDiff < 0)
-	menuTop += heightDiff;
-
-      var menuLeft = parentNode.offsetWidth - 3;
-      if (window.innerWidth
-          < (menuLeft + submenuNode.offsetWidth
-             + parentNode.cascadeLeftOffset()))
+  if (submenu && submenu != "") {
+    var submenuNode = document.getElementById(submenu);
+    var parentNode = getParentMenu(node);
+    if (parentNode.submenu)
+      hideMenu(event, parentNode.submenu);
+    submenuNode.parentMenuItem = node;
+    submenuNode.parentMenu = parentNode;
+    parentNode.submenuItem = node;
+    parentNode.submenu = submenuNode;
+    
+    var menuTop = (node.offsetTop - 2);
+    
+    var heightDiff = (window.innerHeight
+                      - (menuTop + submenuNode.offsetHeight));
+    if (heightDiff < 0)
+      menuTop += heightDiff;
+    
+    var menuLeft = parentNode.offsetWidth - 3;
+    if (window.innerWidth
+        < (menuLeft + submenuNode.offsetWidth
+           + parentNode.cascadeLeftOffset()))
 	menuLeft = -submenuNode.offsetWidth + 3;
-
-      parentNode.setAttribute('onmousemove', 'checkDropDown(event);');
-      node.setAttribute('class', 'submenu-selected');
-      submenuNode.style.top = menuTop + "px;";
-      submenuNode.style.left = menuLeft + "px;";
-      submenuNode.style.visibility = "visible;";
-    }
+    
+    parentNode.setAttribute('onmousemove', 'checkDropDown(event);');
+    node.setAttribute('class', 'submenu-selected');
+    submenuNode.style.top = menuTop + "px;";
+    submenuNode.style.left = menuLeft + "px;";
+    submenuNode.style.visibility = "visible;";
+  }
 }
 
-function checkDropDown(event)
-{
+function checkDropDown(event) {
   var parentMenu = getParentMenu(event.target);
   var submenuItem = parentMenu.submenuItem;
-  if (submenuItem)
-    {
-      var menuX = event.clientX - parentMenu.cascadeLeftOffset();
-      var menuY = event.clientY - parentMenu.cascadeTopOffset();
-      var itemX = submenuItem.offsetLeft;
-      var itemY = submenuItem.offsetTop - 75;
-
-      if (menuX >= itemX
-          && menuX < itemX + submenuItem.offsetWidth
-          && (menuY < itemY
-              || menuY > (itemY + submenuItem.offsetHeight)))
-	{
-	  hideMenu(event, parentMenu.submenu);
-	  parentMenu.submenu = null;
-	  parentMenu.submenuItem = null;
-	  parentMenu.setAttribute('onmousemove', null);
-	}
+  if (submenuItem) {
+    var menuX = event.clientX - parentMenu.cascadeLeftOffset();
+    var menuY = event.clientY - parentMenu.cascadeTopOffset();
+    var itemX = submenuItem.offsetLeft;
+    var itemY = submenuItem.offsetTop - 75;
+
+    if (menuX >= itemX
+        && menuX < itemX + submenuItem.offsetWidth
+        && (menuY < itemY
+            || menuY > (itemY + submenuItem.offsetHeight))) {
+      hideMenu(event, parentMenu.submenu);
+      parentMenu.submenu = null;
+      parentMenu.submenuItem = null;
+      parentMenu.setAttribute('onmousemove', null);
     }
+  }
 }
 
 /* search field */
-function popupSearchMenu(event, menuId)
-{
+function popupSearchMenu(event, menuId) {
   var node = event.target;
   relX = event.pageX - node.cascadeLeftOffset();
   relY = event.pageY - node.cascadeTopOffset();
@@ -650,33 +634,29 @@ function popupSearchMenu(event, menuId)
   }
 }
 
-function setSearchCriteria(event)
-{
-  searchValue = document.getElementById('searchValue');
-  searchCriteria = document.getElementById('searchCriteria');
+function setSearchCriteria(event) {
+  searchValue = $("searchValue");
+  searchCriteria = $("searchCriteria");
   
   var node = event.target;
   searchValue.setAttribute("ghost-phrase", node.innerHTML);
   searchCriteria = node.getAttribute('id');
 }
 
-function checkSearchValue(event)
-{
+function checkSearchValue(event) {
   var form = event.target;
-  var searchValue = document.getElementById('searchValue');
+  var searchValue = $("searchValue");
   var ghostPhrase = searchValue.getAttribute('ghost-phrase');
 
   if (searchValue.value == ghostPhrase)
     searchValue.value = "";
 }
 
-function onSearchChange()
-{
+function onSearchChange() {
   log ("onSearchChange()...");
 }
 
-function onSearchMouseDown(event, searchValue)
-{
+function onSearchMouseDown(event, searchValue) {
   superNode = searchValue.parentNode.parentNode.parentNode;
   relX = (event.pageX - superNode.offsetLeft - searchValue.offsetLeft);
   relY = (event.pageY - superNode.offsetTop - searchValue.offsetTop);
@@ -687,8 +667,7 @@ function onSearchMouseDown(event, searchValue)
   }
 }
 
-function onSearchFocus(searchValue)
-{
+function onSearchFocus(searchValue) {
   ghostPhrase = searchValue.getAttribute("ghost-phrase");
   if (searchValue.value == ghostPhrase) {
     searchValue.value = "";
@@ -700,8 +679,7 @@ function onSearchFocus(searchValue)
   searchValue.style.color = "#000";
 }
 
-function onSearchBlur(searchValue)
-{
+function onSearchBlur(searchValue) {
   var ghostPhrase = searchValue.getAttribute("ghost-phrase");
 //   log ("search blur: '" + searchValue.value + "'");
   if (!searchValue.value) {
@@ -717,30 +695,31 @@ function onSearchBlur(searchValue)
   }
 }
 
-function onSearchKeyDown(searchValue)
-{
+function onSearchKeyDown(searchValue) {
   if (searchValue.timer)
     clearTimeout(searchValue.timer);
 
   searchValue.timer = setTimeout("onSearchFormSubmit()", 1000);
 }
 
-function initCriteria()
-{
-  var searchCriteria = document.getElementById('searchCriteria');
-  var searchValue = document.getElementById('searchValue');
+function initCriteria() {
+  var searchCriteria = $("searchCriteria");
+  var searchValue = $("searchValue");
   var firstOption;
  
-  firstOption = document.getElementById('searchOptions').childNodes[1];
-  searchCriteria.value = firstOption.getAttribute('id');
-  searchValue.setAttribute('ghost-phrase', firstOption.innerHTML);
-  if (searchValue.value == '') {
-    searchValue.value = firstOption.innerHTML;
-    searchValue.setAttribute("modified", "");
-    searchValue.style.color = "#aaa";
+  var searchOptions = $("searchOptions");
+  if (searchOptions) {
+    firstOption = searchOptions.childNodes[1];
+    searchCriteria.value = firstOption.getAttribute('id');
+    searchValue.setAttribute('ghost-phrase', firstOption.innerHTML);
+    if (searchValue.value == '') {
+      searchValue.value = firstOption.innerHTML;
+      searchValue.setAttribute("modified", "");
+      searchValue.style.color = "#aaa";
+    }
   }
 }
- 
+
 /* contact selector */
 
 function onContactAdd(node)
-- 
2.39.5