From 5cc7e345437ff0c8ad65d1297126cbc9a15023a5 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Thu, 3 Jun 2010 19:49:23 +0000
Subject: [PATCH] Monotone-Parent: 76b40deecb2e5b69e47348707c29710d2db05142
 Monotone-Revision: 0b16679c7ebbd6003625c562d6ce3bc585654ca4

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-06-03T19:49:23
Monotone-Branch: ca.inverse.sogo
---
 UI/Common/GNUmakefile                       |  4 +---
 UI/Common/Toolbars/SOGoAclAssistant.toolbar |  7 -------
 UI/Common/Toolbars/SOGoAclOwner.toolbar     | 12 ------------
 UI/Templates/UIxAclEditor.wox               |  2 --
 UI/WebServerResources/UIxAclEditor.css      |  2 +-
 5 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 UI/Common/Toolbars/SOGoAclAssistant.toolbar
 delete mode 100644 UI/Common/Toolbars/SOGoAclOwner.toolbar

diff --git a/UI/Common/GNUmakefile b/UI/Common/GNUmakefile
index 5289c528a..a785c2fd0 100644
--- a/UI/Common/GNUmakefile
+++ b/UI/Common/GNUmakefile
@@ -24,9 +24,7 @@ CommonUI_OBJC_FILES +=		\
 
 CommonUI_RESOURCE_FILES += \
 	Version			\
-	product.plist		\
-	Toolbars/SOGoAclOwner.toolbar \
-	Toolbars/SOGoAclAssistant.toolbar \
+	product.plist
 
 
 CommonUI_LOCALIZED_RESOURCE_FILES +=	\
diff --git a/UI/Common/Toolbars/SOGoAclAssistant.toolbar b/UI/Common/Toolbars/SOGoAclAssistant.toolbar
deleted file mode 100644
index 6e08205d8..000000000
--- a/UI/Common/Toolbars/SOGoAclAssistant.toolbar
+++ /dev/null
@@ -1,7 +0,0 @@
-( /* the toolbar groups -*-cperl-*- */
-  ( { link = "#";
-      isSafe = NO;
-      label = "Close";
-      onclick = "window.close();";
-      image = "tb-mail-stop-flat-24x24.png"; } )
-)
diff --git a/UI/Common/Toolbars/SOGoAclOwner.toolbar b/UI/Common/Toolbars/SOGoAclOwner.toolbar
deleted file mode 100644
index 6af766a40..000000000
--- a/UI/Common/Toolbars/SOGoAclOwner.toolbar
+++ /dev/null
@@ -1,12 +0,0 @@
-( /* the toolbar groups -*-cperl-*- */
-  ( { link = "#";
-      isSafe = NO;
-      label = "Close";
-      onclick = "window.close();";
-      image = "tb-mail-stop-flat-24x24.png"; } ),
-  ( { link = "#";
-      isSafe = NO;
-      label = "Edit User Rights";
-      onclick = "return openRightsForUser();";
-      image = "edit.png"; } ),
-)
diff --git a/UI/Templates/UIxAclEditor.wox b/UI/Templates/UIxAclEditor.wox
index 2a6dd62a6..75ff5c8d0 100644
--- a/UI/Templates/UIxAclEditor.wox
+++ b/UI/Templates/UIxAclEditor.wox
@@ -8,9 +8,7 @@
   xmlns:rsrc="OGo:url"
   className="UIxPageFrame"
   title="title"
-  const:toolbar="SOGoAclOwner.toolbar"
   const:popup="YES">
-
   <script type="text/javascript"
     ><var:if condition="canSubscribeUsers">
       var canSubscribeUsers = true;
diff --git a/UI/WebServerResources/UIxAclEditor.css b/UI/WebServerResources/UIxAclEditor.css
index e307ad574..d1b86ece3 100644
--- a/UI/WebServerResources/UIxAclEditor.css
+++ b/UI/WebServerResources/UIxAclEditor.css
@@ -1,6 +1,6 @@
 DIV.acls
 { position: absolute;
-  top: 4em;
+  top: 0px;
   left: 0px;
   right: 0px;
   bottom: 0px;