From 1854f578d8b28fd2ef9116818a468450312dbcaf Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 22 May 2007 18:34:02 +0000
Subject: [PATCH] Monotone-Parent: d581866eeb3e11ed3f8c8583be73f14f00325d7e
 Monotone-Revision: 733898f2b6e525ffa05bcf6a3544671572ece02b

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-05-22T18:34:02
Monotone-Branch: ca.inverse.sogo
---
 .../MailerUI/UIxMailUserRightsEditor.wox      | 57 ++++++++++++-------
 UI/WebServerResources/MailerUI.js             |  4 +-
 2 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/UI/Templates/MailerUI/UIxMailUserRightsEditor.wox b/UI/Templates/MailerUI/UIxMailUserRightsEditor.wox
index aa83c752e..998f5b6f7 100644
--- a/UI/Templates/MailerUI/UIxMailUserRightsEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailUserRightsEditor.wox
@@ -22,45 +22,60 @@
 	      /></span></label></var:if>
     </div>
     <div class="calendarUserRights">
+      <label><input type="checkbox" class="checkBox"
+	  const:name="ObjectViewer"
+	  var:checked="userCanSeeFolder"/><var:string
+	  label:value="List and see this folder"/></label>
+      <br/>
       <label><input type="checkbox" class="checkBox"
 	  const:name="ObjectReader"
 	  var:checked="userCanReadMails"/><var:string
-	  label:value="This person can read mails from this folder."/></label>
-      <br/>
-      <label><input type="checkbox" class="checkBox"
-	  const:name="MailWriter"
-	  var:checked="userCanWriterMails"/><var:string
-	  label:value="This person can modify the flags of the mails in this folder."/></label>
-      <br/>
-      <label><input type="checkbox" class="checkBox"
-	  const:name="ObjectCreator"
-	  var:checked="userCanInsertMails"/><var:string
-	  label:value="This person can insert, copy and move mails into this folder."/></label>
+	  label:value="Read mails from this folder"/></label>
       <br/>
       <label><input type="checkbox" class="checkBox"
 	  const:name="MailSeenKeeper"
 	  var:checked="userCanMarkMailsRead"/><var:string
-	  label:value="This person can mark mails read and unread."/></label>
+	  label:value="Mark mails read and unread"/></label>
       <br/>
       <label><input type="checkbox" class="checkBox"
-	  const:name="ObjectEraser"
-	  var:checked="userCanEraseMails"/><var:string
-	  label:value="This person can delete mails from this folder."/></label>
+	  const:name="MailWriter"
+	  var:checked="userCanWriteMails"/><var:string
+	  label:value="Modify the flags of the mails in this folder"/></label>
       <br/>
       <label><input type="checkbox" class="checkBox"
-	  const:name="FolderCreator"
-	  var:checked="userCanCreateSubfolders"/><var:string
-	  label:value="This person can create subfolders."/></label>
+	  const:name="ObjectCreator"
+	  var:checked="userCanInsertMails"/><var:string
+	  label:value="Insert, copy and move mails into this folder"/></label>
       <br/>
       <label><input type="checkbox" class="checkBox"
 	  const:name="MailPoster"
 	  var:checked="userCanPostMails"/><var:string
-	  label:value="This person can post mails."/></label>
+	  label:value="Post mails"/></label>
       <br/>
       <label><input type="checkbox" class="checkBox"
-	  const:name="Administrator"
+	  const:name="FolderCreator"
+	  var:checked="userCanCreateSubfolders"/><var:string
+	  label:value="Add subfolders to this folder"/></label>
+      <br/>
+      <label><input type="checkbox" class="checkBox"
+	  const:name="ObjectEraser"
+	  var:checked="userCanRemoveFolder"/><var:string
+	  label:value="Remove this folder"/></label>
+      <br/>
+      <label><input type="checkbox" class="checkBox"
+	  const:name="MailMessageEraser"
+	  var:checked="userCanEraseMails"/><var:string
+	  label:value="Erase mails from this folder"/></label>
+      <br/>
+      <label><input type="checkbox" class="checkBox"
+	  const:name="MailExpunger"
+	  var:checked="userCanExpungeFolder"/><var:string
+	  label:value="Expunge this folder"/></label>
+      <br/>
+      <label><input type="checkbox" class="checkBox"
+	  const:name="MailAdministrator"
 	  var:checked="userIsAdministrator"/><var:string
-	  label:value="This person can modify the acl of this folder."/></label>
+	  label:value="Modify the acl of this folder"/></label>
       <br/>
     </div>
     <div class="buttons">
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 0c5629e7a..075d020ce 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -5,8 +5,8 @@ var maxCachedMessages = 20;
 var cachedMessages = new Array();
 var currentMailbox = '';
 
-var usersRightsWindowHeight = 250;
-var usersRightsWindowWidth = 502;
+var usersRightsWindowHeight = 320;
+var usersRightsWindowWidth = 400;
 
 /* mail list */