From c7d986fce2accafa6ebfc6ce79cfd4201c324919 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Wed, 27 Aug 2008 14:25:55 +0000
Subject: [PATCH] Monotone-Parent: 66a1d31248931d6126bf54335f1abba2ee9bf114
 Monotone-Revision: c44206dce55a5d54dc22a2cb7bdebc97ae7716f5

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-08-27T14:25:55
Monotone-Branch: ca.inverse.sogo
---
 UI/Templates/UIxAclEditor.wox          |  8 ++++----
 UI/WebServerResources/UIxAclEditor.css | 25 ++++++++++++++++++-------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/UI/Templates/UIxAclEditor.wox b/UI/Templates/UIxAclEditor.wox
index 3b036c38a..2e8c5ae4d 100644
--- a/UI/Templates/UIxAclEditor.wox
+++ b/UI/Templates/UIxAclEditor.wox
@@ -24,11 +24,11 @@
 	    <span class="value"><strong><var:string value="ownerName"/></strong></span></label><br/>
 	</var:if>
       </div>
-      <input id="defaultRolesBtn" type="button"
-	class="button" label:value="Default Roles"/>
       <div class="userSelector" id="userRoles">
 	<var:if condition="canModifyAcls">
-	  <span id="userSelectorButtons">
+	  <input id="defaultRolesBtn" type="button"
+	    class="button" label:value="Default Roles"/>
+	  <div id="userSelectorButtons">
 	    <a href="#"
 	      class="button"><img rsrc:src="add-contact.gif"
 		label:title="Add..."
@@ -37,7 +37,7 @@
 	      class="button"><img rsrc:src="remove-contact.gif"
 		label:title="Remove"
 		/></a>
-	  </span>
+	  </div>
 	</var:if>
 	<ul id="userList" multiselect="yes">
 	  <var:foreach list="usersForObject" item="currentUser"
diff --git a/UI/WebServerResources/UIxAclEditor.css b/UI/WebServerResources/UIxAclEditor.css
index eb3338386..384c47f71 100644
--- a/UI/WebServerResources/UIxAclEditor.css
+++ b/UI/WebServerResources/UIxAclEditor.css
@@ -14,6 +14,14 @@ DIV.acls LABEL
 { white-space: nowrap;
   width: 100%; }
 
+DIV.userSelector
+{ position: absolute;
+  top: 3em;
+  left: 0px;
+  right: 0px;
+  bottom: 0px;
+  height: 100px; }
+
 DIV#userSelectorHeader
 { margin: 1em 0 0.5em 1em; }
 
@@ -27,14 +35,17 @@ INPUT#defaultRolesBtn
 DIV#userRoles
 { height: 100%; }
 
-DIV#userRoles SPAN#userSelectorButtons
-{ margin-left: 1em; }
+#userSelectorButtons
+{ margin-left: 1em;
+  padding-top: 2px;
+  padding-bottom: 2px; }
 
 UL#userList
-{ height: 100%;
-  width: 100%;
-  cursor: default;
-  margin: 0px;
+{ position: absolute;
+  left: 0px;
+  right: 0px;
+  top: 30px;
+  bottom: 33px;
   padding: 0px;
   white-space: nowrap;
   overflow: auto;
@@ -42,7 +53,7 @@ UL#userList
   border-right: 1px solid #fff;
   border-top: 2px solid #222;
   border-left: 2px solid #222;
-  background: #fff;
+  background-color: #fff;
   -moz-border-top-colors: #9c9a94 #000 transparent;
   -moz-border-left-colors: #9c9a94 #000 transparent;
   list-style-type: none;