Improved ACLs editor window

Monotone-Parent: da6b5b0b22738692fb0aafb95b28a58d2a16855e
Monotone-Revision: 18e33d0c1964c0a62a8a43c69d2300477fb492b5

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-12-23T15:51:12
Monotone-Branch: ca.inverse.sogo

SoObjects/Appointments/SOGoAppointmentFolder.m

@@ -2157,7 +2157,8 @@ static Class sogoAppointmentFolderKlass = Nil;
 - (NSArray *) subscriptionRoles
 {
   return [NSArray arrayWithObjects:
-		    SOGoRole_ObjectCreator, SOGoRole_ObjectEraser,
+		  SOGoRole_ObjectCreator,
+		  SOGoRole_ObjectEraser,
 		  SOGoCalendarRole_PublicResponder,
 		  SOGoCalendarRole_PublicModifier,
 		  SOGoCalendarRole_PublicViewer,

SoObjects/Appointments/SOGoCalendarComponent.m

@@ -577,7 +577,8 @@ _occurenceHasID (iCalRepeatableEntityObject *occurence, NSString *recID)
 		  subject = [p getSubject];
 		  text = [p getBody];
 		  NSLog(@"Template: %@", pageName);
-		  NSLog(@"Email: %@ => %@ (%@)", senderEmail, recipient, subject);
+		  NSLog(@"Sender => Recipient: %@ => %@", senderEmail, recipient);
+		  NSLog(@"Subject: %@", subject);
 
 		  /* construct message */
 		  headerMap = [NGMutableHashMap hashMapWithCapacity: 5];

UI/Common/Dutch.lproj/Localizable.strings

@@ -43,3 +43,5 @@
 
 "You are not allowed to access this module or this system. Please contact your system administrator."
 = "You are not allowed to access this module or this system. Please contact your system administrator.";
+"You don't have the required privileges to perform the operation."
+= "You don't have the required privileges to perform the operation.";

UI/Common/English.lproj/Localizable.strings

@@ -44,3 +44,5 @@
 
 "You are not allowed to access this module or this system. Please contact your system administrator."
 = "You are not allowed to access this module or this system. Please contact your system administrator.";
+"You don't have the required privileges to perform the operation."
+= "You don't have the required privileges to perform the operation.";

UI/Common/French.lproj/Localizable.strings

@@ -41,3 +41,5 @@
 
 "You are not allowed to access this module or this system. Please contact your system administrator."
 = "Vous n'êtes pas autorisé à accéder à ce module ou ce système. Veuillez contacter votre administrateur système.";
+"You don't have the required privileges to perform the operation."
+= "Vous n'avez pas les privilèges requis pour compléter l'opération.";

UI/Common/German.lproj/Localizable.strings

@@ -44,3 +44,5 @@
 
 "You are not allowed to access this module or this system. Please contact your system administrator."
 = "You are not allowed to access this module or this system. Please contact your system administrator.";
+"You don't have the required privileges to perform the operation."
+= "Sie haben nicht die benötigte Berechtigung für diesen Befehl.";

UI/Common/Italian.lproj/Localizable.strings

@@ -38,3 +38,5 @@
 
 "You are not allowed to access this module or this system. Please contact your system administrator."
 = "You are not allowed to access this module or this system. Please contact your system administrator.";
+"You don't have the required privileges to perform the operation."
+= "You don't have the required privileges to perform the operation.";

UI/Common/Spanish.lproj/Localizable.strings

@@ -48,3 +48,5 @@
 
 "You are not allowed to access this module or this system. Please contact your system administrator."
 = "You are not allowed to access this module or this system. Please contact your system administrator.";
+"You don't have the required privileges to perform the operation."
+= "You don't have the required privileges to perform the operation.";

UI/Contacts/English.lproj/Localizable.strings

@@ -116,8 +116,6 @@
 "Are you sure you want to delete the selected contacts?"
 = "Are you sure you want to delete the selected contacts?";
 
-"You don't have the required privileges to perform the operation."
-= "You don't have the required privileges to perform the operation.";
 "You cannot delete the card of \"%{0}\"."
 = "You cannot delete the card of \"%{0}\".";
 

UI/Contacts/French.lproj/Localizable.strings

@@ -129,8 +129,6 @@
 "Are you sure you want to delete the selected contacts?"
 = "Voulez-vous vraiment supprimer les contacts sélectionnés ?";
 
-"You don't have the required privileges to perform the operation."
-= "Vous n'avez pas les privilèges requis pour compléter l'opération.";
 "You cannot delete the card of \"%{0}\"."
 = "Vous ne pouvez pas supprimer la fiche de \"%{0}\".";
 

UI/Contacts/German.lproj/Localizable.strings

@@ -128,8 +128,6 @@
 "Are you sure you want to delete the selected contacts?"
 = "Wollen Sie wirklich die ausgewählte Karten löschen?";
 
-"You don't have the required privileges to perform the operation."
-= "Sie haben nicht die benötigte Berechtigung für diesen Befehl.";
 "You cannot delete the selected contact(s)"
 = "Ausgewählte Karten können nicht gelöscht werden.";
 "You cannot delete the card of \"%{0}\"."

UI/Scheduler/Dutch.lproj/Localizable.strings

@@ -96,16 +96,26 @@
 "Forbidden" = "Toegang geweigerd";
 
 /* acls */
+
 "Default Roles" = "Standaardmachtigingen";
 "User rights for:" = "Machtigingen voor:";
+
 "label_Public" = "Publiek";
 "label_Private" = "Privé";
 "label_Confidential" = "Vertrouwelijk";
+
+"label_Viewer" = "Alles inzien";
+"label_DAndTViewer" = "Alleen Datum & tijd inzien";
+"label_Modifier" = "Aanpassen";
+"label_Responder" = "Reageren op";
+"label_None" = "Geen toegang";
+
 "View All" = "Alles inzien";
 "View the Date & Time" = "Alleen Datum & tijd inzien";
 "Modify" = "Aanpassen";
 "Respond To" = "Reageren op";
 "None" = "Geen toegang";
+
 "This person can create objects in my calendar."
 = "Deze persoon mag afspraken in mijn agenda plaatsen.";
 "This person can erase objects from my calendar."

UI/Scheduler/English.lproj/Localizable.strings

@@ -110,16 +110,26 @@
 "Forbidden" = "Forbidden";
 
 /* acls */
+
 "Default Roles" = "Default Roles";
 "User rights for:" = "User rights for:";
+
 "label_Public" = "Public";
 "label_Private" = "Private";
 "label_Confidential" = "Confidential";
+
+"label_Viewer" = "View All";
+"label_DAndTViewer" = "View the Date & Time";
+"label_Modifier" = "Modify";
+"label_Responder" = "Respond To";
+"label_None" = "None";
+
 "View All" = "View All";
 "View the Date & Time" = "View the Date & Time";
 "Modify" = "Modify";
 "Respond To" = "Respond To";
 "None" = "None";
+
 "This person can create objects in my calendar."
 = "This person can create objects in my calendar.";
 "This person can erase objects from my calendar."

UI/Scheduler/French.lproj/Localizable.strings

@@ -111,16 +111,26 @@
 "Forbidden" = "Accès non autorisée";
 
 /* acls */
+
 "Default Roles" = "Rôles par défaut";
 "User rights for:" = "Autorisations pour :";
-"label_Public" = "Public";
+
+"label_Public" = "Voir tout";
 "label_Private" = "Privé";
 "label_Confidential" = "Confidentiel";
+
+"label_Viewer" = "Voir tout";
+"label_DAndTViewer" = "Voir la date & l'heure";
+"label_Modifier" = "Modifier";
+"label_Responder" = "Répondre";
+"label_None" = "Aucun";
+
 "View All" = "Voir tout";
 "View the Date & Time" = "Voir la date & l'heure";
 "Modify" = "Modifier";
 "Respond To" = "Répondre";
 "None" = "Aucun";
+
 "This person can create objects in my calendar."
 = "Cette personne peut ajouter des objets à mon agenda.";
 "This person can erase objects from my calendar."

UI/Scheduler/German.lproj/Localizable.strings

@@ -110,16 +110,26 @@
 "Forbidden" = "Zugriff verboten";
 
 /* acls */
+
 "Default Roles" = "Standard-Rollen";
 "User rights for:" = "Benutzerrechte für:";
+
 "label_Public" = "Öffentlich";
 "label_Private" = "Privat";
 "label_Confidential" = "Vertraulich";
+
+"label_Viewer" = "Alles sehen";
+"label_DAndTViewer" = "Datum & Uhrzeit sehen";
+"label_Modifier" = "Ändern";
+"label_Responder" = "Antworten";
+"label_None" = "Keine";
+
 "View All" = "Alles sehen";
 "View the Date & Time" = "Datum & Uhrzeit sehen";
 "Modify" = "Ändern";
 "Respond To" = "Antworten";
 "None" = "Keine";
+
 "This person can create objects in my calendar."
 = "Diese Person kann Termine in meinem Kalender hinzufügen.";
 "This person can erase objects from my calendar."

UI/Scheduler/Italian.lproj/Localizable.strings

@@ -110,16 +110,26 @@
 "Forbidden" = "Vietato";
 
 /* acls */
+
 "Default Roles" = "Permessi predefiniti";
 "User rights for:" = "Permessi per:";
+
 "label_Public" = "Pubblico";
 "label_Private" = "Privato";
 "label_Confidential" = "Confidenziale";
+
+"label_Viewer" = "Tutto";
+"label_DAndTViewer" = "Data e ora";
+"label_Modifier" = "Modifica";
+"label_Responder" = "Rispondi a";
+"label_None" = "Nessuno";
+
 "View All" = "Tutto";
 "View the Date & Time" = "Data e ora";
 "Modify" = "Modifica";
 "Respond To" = "Rispondi a";
 "None" = "Nessuno";
+
 "This person can create objects in my calendar." = "Questa persona può inserire elementi nel mio calendario.";
 "This person can erase objects from my calendar." = "Questa persona può rimuovere elementi dal mio calendario.";
 

UI/Scheduler/Spanish.lproj/Localizable.strings

@@ -114,16 +114,26 @@
 "Forbidden" = "Prohibido"; 
 
 /* acls */
+
 "Default Roles" = "Roles por defecto";
 "User rights for:" = "Permisos para:";
+
 "label_Public" = "Público";
 "label_Private" = "Privado";
 "label_Confidential" = "Confidencial";
+
+"label_Viewer" = "Ver todo";
+"label_DAndTViewer" = "Ver fecha y hora";
+"label_Modifier" = "Modificar";
+"label_Responder" = "Responder a";
+"label_None" = "Ninguno";
+
 "View All" = "Ver todo";
 "View the Date & Time" = "Ver fecha y hora";
 "Modify" = "Modificar";
 "Respond To" = "Responder a";
 "None" = "Ninguno";
+
 "This person can create objects in my calendar."
         = "Esta persona puede crear elementos en mi calendario.";
 "This person can erase objects from my calendar."

UI/Scheduler/UIxCalUserRightsEditor.m

@@ -167,6 +167,12 @@
   return currentRightType;
 }
 
+- (NSString *) currentRightLabel
+{
+  return [self labelForKey:
+		 [NSString stringWithFormat: @"label_%@", currentRight]];
+}
+
 - (NSString *) currentRightTypeLabel
 {
   return [self labelForKey:

UI/Templates/SchedulerUI/UIxCalUserRightsEditor.wox

@@ -22,27 +22,15 @@
 	      /></span></label></var:if>
     </div>
     <div class="calendarUserRights">
-      <table>
+      <var:foreach list="rightTypes" item="currentRightType">
-	<tr class="permissions">
+	<span><var:string value="currentRightTypeLabel"/></span>
-	  <th class="eventType"><!-- space --></th>
+	<var:popup list="objectRights" item="currentRight"
-	  <th><var:string label:value="View All"/></th>
+		   var:name="currentRightTypeName"
-	  <th><var:string label:value="View the Date &amp; Time"/></th>
+		   var:value="currentRight"
-	  <th><var:string label:value="Modify"/></th>
+		   string="currentRightLabel"
-	  <th><var:string label:value="Respond To"/></th>
+		   selection="currentRightSelection"
-	  <th><var:string label:value="None"/></th>
+		   />
-	</tr
+      </var:foreach>
-	  ><var:foreach list="rightTypes" item="currentRightType">
-	  <tr>
-	    <td class="eventType"><var:string
-		value="currentRightTypeLabel"/></td
-	      ><var:foreach list="objectRights" item="currentRight">
-	      <td><input type="radio"
-		  var:name="currentRightTypeName"
-		  var:value="currentRight"
-		  var:selection="currentRightSelection"/></td
-		></var:foreach>
-	  </tr></var:foreach>
-      </table>
     </div>
     <div class="basicUserRights">
       <label><input type="checkbox" class="checkBox"
@@ -56,10 +44,10 @@
 	  label:value="This person can erase objects from my calendar."/></label>
     </div>
     <div class="buttons">
-      <input const:name="updateButton" id="updateButton"
-	class="button" type="submit" label:value="Update"/>
       <input const:name="cancelButton" id="cancelButton"
 	class="button" type="button" label:value="Cancel"/>
+      <input const:name="updateButton" id="updateButton"
+	class="button" type="submit" label:value="Update"/>
     </div>
   </form>
 </var:component>

UI/WebServerResources/SchedulerUI.js

@@ -19,7 +19,7 @@ var contactSelectorAction = 'calendars-contacts';
 var eventsToDelete = [];
 var calendarsOfEventsToDelete = [];
 
-var usersRightsWindowHeight = 250;
+var usersRightsWindowHeight = 215;
 var usersRightsWindowWidth = 502;
 
 var calendarEvents = null;
@@ -282,8 +282,10 @@ function deleteEventCallback(http) {
 				document.deleteEventAjaxRequest = null;
       }
     }
-    else
+		else if (parseInt(http.status) == 403)
-      log ("deleteEventCallback Ajax error");
+			window.alert(clabels["You don't have the required privileges to perform the operation."]);
+		else
+      log ("deleteEventCallback Ajax error (" + http.status + ")");
   }
 }
 

UI/WebServerResources/UIxCalUserRightsEditor.css

@@ -13,30 +13,15 @@ DIV.title SPAN.value
   font-weight: bold; }
 
 DIV.calendarUserRights
-{ margin: 1em;}
+{ margin: 1em; }
 
-DIV.calendarUserRights > TABLE
+DIV.calendarUserRights SPAN
-{ background-color: #fff;
+{ float: left;
-  width: 480px;
+  clear: right;
-  color: #999;
+  line-height: 2em;
-  border-collapse: collapse;
+  margin-right: 1em;
-  border: 1px solid #222; }
+  text-align: right;
-
+  width: 200px; }
-DIV.calendarUserRights > TABLE TR.permissions TH
-{ color: #00f;
-/*   background-color: #ddd;
- */  border-bottom: 1px solid #999; }
-
-DIV.calendarUserRights > TABLE TH
-{ width: 70px; }
-
-DIV.calendarUserRights > TABLE TD.eventType
-{ text-align: right;
-  border-right: 1px solid #999; }
-
-DIV.calendarUserRights > TABLE TD
-{ text-align: center;
-  border-top: 1px solid #cecbff; }
 
 DIV.buttons
 { text-align: right;