Monotone-Parent: b8ad0061e865a522c79c6a19bc8d7841469af81a

Monotone-Revision: 7f2779135e9501efcfbb73fce0b3d244687ecaa4

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-06-03T14:43:38
Monotone-Branch: ca.inverse.sogo

UI/WebServerResources/ContactsUI.js

@@ -3,7 +3,7 @@
 
 var cachedContacts = {};
 
-var usersRightsWindowHeight = 200;
+var usersRightsWindowHeight = 179;
 var usersRightsWindowWidth = 450;
 
 var Contact = {

UI/WebServerResources/UIxAclEditor.css

@@ -59,15 +59,28 @@ UL#userList
 UL#userList LI
 { clear: both;
   cursor: pointer;
-  height: 2em;
+  height: 20px;
   text-align: right;
-  padding-left: 3px; }
+  margin-left: 0px;
+  padding-left: 24px;
+  background-repeat: no-repeat;
+  background-position: 4px center; }
+
+UL#userList LI.normal-user
+{ background-image: url("abcard.png"); }
+
+UL#userList LI.any-user
+{ background-image: url("abcard-anyone.png"); }
+
+UL#userList LI.anonymous-user
+{ background-image: url("abcard-anonymous.png"); }
 
 DIV#userSelectorButtons A.smallToolbarButton
 { float: left; }
 
 SPAN.userFullName
-{ float: left; }
+{ float: left;
+  margin-top: 2px; }
 
 LABEL.subscriptionArea
 { padding-right: 5px; }

UI/WebServerResources/UIxAclEditor.js

@@ -13,7 +13,16 @@ function addUser(userName, userID) {
     var result = false;
     if (!$(userID)) {
         var ul = $("userList");
-        ul.appendChild(nodeForUser(userName, userID));
+        var lis = ul.childNodesWithTag("li");
+        var newNode = nodeForUser(userName, userID, canSubscribeUsers);
+        newNode.addClassName("normal-user");
+        if (lis.length > 1) {
+            var publicNode = lis[lis.length-2];
+            ul.insertBefore(newNode, publicNode);
+        }
+        else  {
+            ul.appendChild(newNode);
+        }
         var url = window.location.href;
         var elements = url.split("/");
         elements[elements.length-1] = ("addUserInAcls?uid="
@@ -56,22 +65,19 @@ function onSubscriptionChange(event) {
     }
 }
 
-function nodeForUser(userName, userId) {
-    var node = $(document.createElement("li"));
-    node.setAttribute("id", userId);
+function nodeForUser(userName, userId, canSubscribe) {
+    var node = createElement("li");
+    node.id = userId;
 
-    var span = $(document.createElement("span"));
+    var span = createElement("span");
     span.addClassName("userFullName");
-    var image = document.createElement("img");
-    image.setAttribute("src", ResourcesURL + "/abcard.png");
-    span.appendChild(image);
     span.appendChild(document.createTextNode(" " + userName));
     node.appendChild(span);
 
-    if (canSubscribeUsers) {
-        var label = $(document.createElement("label"));
+    if (canSubscribe) {
+        var label = createElement("label");
         label.addClassName("subscriptionArea");
-        var cb = document.createElement("input");
+        var cb = createElement("input");
         cb.type = "checkbox";
         label.appendChild(cb);
         label.appendChild(document.createTextNode(_("Subscribe User")));
@@ -131,9 +137,16 @@ function openRightsForUserID(userID) {
     var elements = url.split("/");
     elements[elements.length-1] = "userRights?uid=" + userID;
 
+    var height = AclEditor.userRightsHeight;
+    if (userID == "anonymous") {
+        height -= 42;
+        if (CurrentModule() == "Contacts") {
+            height -= 21;
+        }
+    }
     window.open(elements.join("/"), "",
                 "width=" + AclEditor.userRightsWidth
-                + ",height=" + AclEditor.userRightsHeight
+                + ",height=" + height
                 + ",resizable=0,scrollbars=0,toolbar=0,"
                 + "location=0,directories=0,status=0,menubar=0,copyhistory=0");
 }
@@ -146,28 +159,28 @@ function openRightsForUser(button) {
     return false;
 }
 
-function openRightsForDefaultUser(event) {
-    this.blur(); // required by IE
-    openRightsForUserID(defaultUserID);
-    Event.stop(event);
-}
-
 function onOpenUserRights(event) {
     openRightsForUser();
     preventDefault(event);
 }
 
 function onAclLoadHandler() {
-    defaultUserID = $("defaultUserID").value;
-    var defaultRolesBtn = $("defaultRolesBtn");
-    if (defaultRolesBtn) {
-        defaultRolesBtn.observe("click", openRightsForDefaultUser);
-    }
     var ul = $("userList");
     var lis = ul.childNodesWithTag("li");
     for (var i = 0; i < lis.length; i++)
         setEventsOnUserNode(lis[i]);
 
+    defaultUserID = $("defaultUserID").value;
+    var userNode = nodeForUser(_("Any Authenticated User"),
+                               defaultUserID);
+    userNode.addClassName("any-user");
+    ul.appendChild(userNode);
+    if (CurrentModule() != "Mail") {
+        userNode = nodeForUser(_("Public Access"), "anonymous");
+        userNode.addClassName("anonymous-user");
+        ul.appendChild(userNode);
+    }
+    
     var buttonArea = $("userSelectorButtons");
     if (buttonArea) {
         var buttons = buttonArea.childNodesWithTag("a");

UI/WebServerResources/generic.js

@@ -1497,6 +1497,22 @@ function configureLinkBanner() {
     }
 }
 
+function CurrentModule() {
+    var module = null;
+    if (ApplicationBaseURL) {
+        var parts = ApplicationBaseURL.split("/");
+        var last = parts.length - 1;
+        while (last > -1 && parts[last] == "") {
+            last--;
+        }
+        if (last > -1) {
+            module = parts[last];
+        }
+    }
+
+    return module;
+}
+
 /* accessing another user's data */
 function UserFolderURLForUser(user) {
     var folderArray = UserFolderURL.split("/");