merge of '80314eb2f15e5d1fc369f56a8001f005ba7e0f5f'

and 'c44cce7c2e022aab27ce96484383b17671de3791'

Monotone-Parent: 80314eb2f15e5d1fc369f56a8001f005ba7e0f5f
Monotone-Parent: c44cce7c2e022aab27ce96484383b17671de3791
Monotone-Revision: 61fe4e19b18d4fbce396bf9e5434da7d4e74519d

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2007-11-20T17:11:53
Monotone-Branch: ca.inverse.sogo

UI/WebServerResources/UIxAclEditor.css

@@ -21,15 +21,14 @@ DIV#userSelector SPAN
 { display: block; }
 
 INPUT#defaultRolesBtn
-{ no_position: absolute;
-  margin-left: 1em;
+{ margin-left: 1em;
   margin-top: 1em;
   left: 1em; }
 
 DIV#userRoles
 { position: absolute;
   left: 1em;
-  top: 8em;
+  top: 7.6em;
   right: 1em;
   bottom: 0px; }
 

UI/WebServerResources/UIxAclEditor.js

@@ -2,8 +2,10 @@
 
 var contactSelectorAction = 'acls-contacts';
 var defaultUserID = '';
-var userRightsHeight;
-var userRightsWidth;
+var AclEditor = {
+ userRightsHeight: null,
+ userRightsWidth: null
+};
 
 function addUser(userName, userID) {
    if (!$(userID)) {
@@ -100,8 +102,8 @@ function openRightsForUserID(userID) {
    elements[elements.length-1] = "userRights?uid=" + userID;
 
    window.open(elements.join("/"), "",
-	       "width=" + userRightsWidth
-	       + ",height=" + userRightsHeight
+	       "width=" + AclEditor['userRightsWidth']
+	       + ",height=" + AclEditor['userRightsHeight']
 	       + ",resizable=0,scrollbars=0,toolbar=0,"
 	       + "location=0,directories=0,status=0,menubar=0,copyhistory=0");
 }
@@ -141,8 +143,8 @@ function onAclLoadHandler() {
       Event.observe(buttons[1], "click", onUserRemove);
    }
 
-   userRightsHeight = window.opener.getUsersRightsWindowHeight();
-   userRightsWidth = window.opener.getUsersRightsWindowWidth();
+   AclEditor['userRightsHeight'] = window.opener.getUsersRightsWindowHeight();
+   AclEditor['userRightsWidth'] = window.opener.getUsersRightsWindowWidth();
 }
 
 FastInit.addOnLoad(onAclLoadHandler);

UI/WebServerResources/generic.css

@@ -595,6 +595,9 @@ A[class~="_disabled"].button:active
   text-decoration: none;
   color: inherit; }
 
+A.button
+{ padding: 4px; }
+
 A.button IMG
 { vertical-align: middle; }
 

UI/WebServerResources/iefixes.css

@@ -23,6 +23,25 @@ TD.tbtv_navcell
   border-right: 1px solid #666;
   border-bottom: 1px solid #666; }
 
+A.button,
+INPUT.button
+{ border: 1px solid #fff;
+  border-right: 1px solid #666;
+  border-bottom: 1px solid #666;
+  margin: 0px;
+  padding: 0px; }
+
+A.button IMG
+{ margin: 1px; }
+
+/* UIxAclEditor */
+
+DIV#userRoles
+{  }
+
+UL#userList
+{ top: 3em; }
+
 /* MailerUI */
 IMG.dragMessage
 { filter: alpha(opacity=70); }