Monotone-Parent: b8ad0061e865a522c79c6a19bc8d7841469af81a
Monotone-Revision: 7f2779135e9501efcfbb73fce0b3d244687ecaa4 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-06-03T14:43:38 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
ba2b9aad81
commit
0959a88ea9
27
ChangeLog
27
ChangeLog
|
@ -1,3 +1,30 @@
|
|||
2010-06-03 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* UI/WebServerResources/generic.js (CurrentModule): new function
|
||||
that returns the name of the currently active module.
|
||||
|
||||
* UI/WebServerResources/UIxAclEditor.js (addUser): take into
|
||||
account the fact that the "default roles" button has been replaced
|
||||
with a new "authenticated users" entry and that we want to keep
|
||||
that entry at the end of the list.
|
||||
(nodeForUser): added a "canSubscribe" parameter that determines
|
||||
whether the "subcribe user" button should be displayed.
|
||||
(openRightsForUserId): when the user id is "anonymous", the acl
|
||||
window is reduced by 42 pixels. If the window to display is the
|
||||
one pertaining to contacts rights, 21 pixels are substracted again.
|
||||
(openRightsForDefaultUser): removed function.
|
||||
|
||||
* UI/Scheduler/UIxCalUserRightsEditor.m (-objectRights): the list
|
||||
of rights must be limited to the immutative ones whe the active
|
||||
user is "anonymous".
|
||||
|
||||
* UI/Common/UIxUserRightsEditor.m (-userIsAnonymousUser): new
|
||||
accessor that returns whether the selected user is "anonymous", in
|
||||
which case certain UI elements need to be adapted.
|
||||
|
||||
* UI/Common/UIxAclEditor.m (-_prepareUsers): added support for
|
||||
"anonymous" user id.
|
||||
|
||||
2010-06-02 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* UI/WebServerResources/*.js: replaced all remaining calls to
|
||||
|
|
|
@ -28,9 +28,11 @@
|
|||
"Add..." = "Adicionar...";
|
||||
"Remove" = "Remover";
|
||||
|
||||
"Default Roles" = "Papéis Padrão";
|
||||
"Subscribe User" = "Subscribe User";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"Sorry, the user rights can not be configured for that object." = "Desculpe, os direitos de usuário não podem ser modificados para este objeto.";
|
||||
|
||||
/* generic.js */
|
||||
|
|
|
@ -28,9 +28,11 @@
|
|||
"Add..." = "Přidat...";
|
||||
"Remove" = "Odebrat";
|
||||
|
||||
"Default Roles" = "Výchozí role";
|
||||
"Subscribe User" = "Subscribe User";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"Sorry, the user rights can not be configured for that object." = "Omlouváme se, ale uživatelská práva pro tento objekt nemohou být nastavena.";
|
||||
|
||||
/* generic.js */
|
||||
|
|
|
@ -28,9 +28,11 @@
|
|||
"Add..." = "Toevoegen...";
|
||||
"Remove" = "Verwijderen";
|
||||
|
||||
"Default Roles" = "Standaardmachtigingen";
|
||||
"Subscribe User" = "Gebruiker abonneren";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"Sorry, the user rights can not be configured for that object." = "De machtigingen kunnen niet worden ingesteld voor dit object.";
|
||||
|
||||
/* generic.js */
|
||||
|
|
|
@ -28,9 +28,11 @@
|
|||
"Add..." = "Add...";
|
||||
"Remove" = "Remove";
|
||||
|
||||
"Default Roles" = "Default Roles";
|
||||
"Subscribe User" = "Subscribe User";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"Sorry, the user rights can not be configured for that object." = "Sorry, the user rights can not be configured for that object.";
|
||||
|
||||
/* generic.js */
|
||||
|
|
|
@ -28,9 +28,11 @@
|
|||
"Add..." = "Ajouter...";
|
||||
"Remove" = "Enlever";
|
||||
|
||||
"Default Roles" = "Rôles par défaut";
|
||||
"Subscribe User" = "Abonner l'utilisateur";
|
||||
|
||||
"Any Authenticated User" = "Tout utilisateur identifié";
|
||||
"Public Access" = "Accès public";
|
||||
|
||||
"Sorry, the user rights can not be configured for that object." = "Sorry, the user rights can not be configured for that object.";
|
||||
|
||||
/* generic.js */
|
||||
|
|
|
@ -28,9 +28,11 @@
|
|||
"Add..." = "Hinzufügen...";
|
||||
"Remove" = "Löschen";
|
||||
|
||||
"Default Roles" = "Standardrechte";
|
||||
"Subscribe User" = "Subscribe User";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"Sorry, the user rights can not be configured for that object." = "Leider können die Benutzerrechte für dieses Objekt nicht konfiguriert werden.";
|
||||
|
||||
/* generic.js */
|
||||
|
|
|
@ -28,9 +28,11 @@
|
|||
"Add..." = "Hozzáadás...";
|
||||
"Remove" = "Törlés";
|
||||
|
||||
"Default Roles" = "Alapértelmezett jogok";
|
||||
"Subscribe User" = "Subscribe User";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"Sorry, the user rights can not be configured for that object." = "Sajnálom, erre az objektumra nem állíthatók be felhasználói jogosultságok.";
|
||||
|
||||
/* generic.js */
|
||||
|
|
|
@ -28,9 +28,11 @@
|
|||
"Add..." = "Aggiungi...";
|
||||
"Remove" = "Rimuovi";
|
||||
|
||||
"Default Roles" = "Permessi predefiniti";
|
||||
"Subscribe User" = "Subscribe User";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"Sorry, the user rights can not be configured for that object." = "Non è possibile configurare i permessi per questo oggetto.";
|
||||
|
||||
/* generic.js */
|
||||
|
|
|
@ -28,9 +28,11 @@
|
|||
"Add..." = "Add...";
|
||||
"Remove" = "Remove";
|
||||
|
||||
"Default Roles" = "Контроль доступа для всех";
|
||||
"Subscribe User" = "Subscribe User";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"Sorry, the user rights can not be configured for that object." = "Извините, для данного объекта невозможно настроить права доступа.";
|
||||
|
||||
/* generic.js */
|
||||
|
|
|
@ -28,9 +28,11 @@
|
|||
"Add..." = "Añadir...";
|
||||
"Remove" = "Borrar";
|
||||
|
||||
"Default Roles" = "Roles por defecto";
|
||||
"Subscribe User" = "Subscribe User";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"Sorry, the user rights can not be configured for that object." = "Sorry, the user rights can not be configured for that object.";
|
||||
|
||||
/* generic.js */
|
||||
|
|
|
@ -28,9 +28,11 @@
|
|||
"Add..." = "Lägg till...";
|
||||
"Remove" = "Ta bort";
|
||||
|
||||
"Default Roles" = "Standardroller";
|
||||
"Subscribe User" = "Subscribe User";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"Sorry, the user rights can not be configured for that object." = "Tyvärr, användarrättigheterna kan inte konfigureras för objektet.";
|
||||
|
||||
/* generic.js */
|
||||
|
|
|
@ -128,7 +128,8 @@
|
|||
// NOTE: don't remove the prefix if we want to identify the lists visually
|
||||
currentUID = [currentUID substringFromIndex: 1];
|
||||
if (!([currentUID isEqualToString: ownerLogin]
|
||||
|| [currentUID isEqualToString: defaultUserID]))
|
||||
|| [currentUID isEqualToString: defaultUserID]
|
||||
|| [currentUID isEqualToString: @"anonymous"]))
|
||||
[users addObjectUniquely: currentUID];
|
||||
currentUID = [aclsEnum nextObject];
|
||||
}
|
||||
|
|
|
@ -70,6 +70,11 @@
|
|||
return [uid isEqualToString: defaultUserID];
|
||||
}
|
||||
|
||||
- (BOOL) userIsAnonymousUser
|
||||
{
|
||||
return [uid isEqualToString: @"anonymous"];
|
||||
}
|
||||
|
||||
- (NSString *) userDisplayName
|
||||
{
|
||||
SOGoUserManager *um;
|
||||
|
@ -99,6 +104,7 @@
|
|||
|
||||
um = [SOGoUserManager sharedUserManager];
|
||||
if ([newUID isEqualToString: defaultUserID]
|
||||
|| [newUID isEqualToString: @"anonymous"]
|
||||
|| [[um getEmailForUID: newUID] length] > 0)
|
||||
{
|
||||
if (![newUID hasPrefix: @"@"])
|
||||
|
|
|
@ -28,9 +28,11 @@
|
|||
"Add..." = "Ychwanegu...";
|
||||
"Remove" = "Dileu";
|
||||
|
||||
"Default Roles" = "Rolau Gwreiddiol";
|
||||
"Subscribe User" = "Subscribe User";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"Sorry, the user rights can not be configured for that object." = "Sori, ni all hawliau'r defnyddiwr cael ei newid ar gyfer y gwrthrych hwn.";
|
||||
|
||||
/* generic.js */
|
||||
|
|
|
@ -143,9 +143,11 @@
|
|||
"Unable to subscribe to that folder!"
|
||||
= "Não foi possível inscrever-se a esta pasta.";
|
||||
|
||||
"Default Roles" = "Papéis Padrão";
|
||||
"User rights for:" = "Direitos de:";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"This person can add cards to this addressbook."
|
||||
= "Essa pessoa pode adicionar contatos ao meu catálogo.";
|
||||
"This person can edit the cards of this addressbook."
|
||||
|
|
|
@ -143,9 +143,11 @@
|
|||
"Unable to subscribe to that folder!"
|
||||
= "Nemůžete se přihlásit k odběru této složky!";
|
||||
|
||||
"Default Roles" = "Výchozí role";
|
||||
"User rights for:" = "Uživatelská práva pro:";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"This person can add cards to this addressbook."
|
||||
= "Tato osoba může přidávat kontakty do této složky.";
|
||||
"This person can edit the cards of this addressbook."
|
||||
|
|
|
@ -143,9 +143,11 @@
|
|||
"Unable to subscribe to that folder!"
|
||||
= "Abonneren op deze map mislukt!";
|
||||
|
||||
"Default Roles" = "Standaardmachtigingen";
|
||||
"User rights for:" = "Machtigingen voor:";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"This person can add cards to this addressbook."
|
||||
= "Deze persoon mag contactpersonen toevoegen aan dit adresboek.";
|
||||
"This person can edit the cards of this addressbook."
|
||||
|
|
|
@ -143,9 +143,11 @@
|
|||
"Unable to subscribe to that folder!"
|
||||
= "Unable to subscribe to that folder.";
|
||||
|
||||
"Default Roles" = "Default Roles";
|
||||
"User rights for:" = "User rights for:";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"This person can add cards to this addressbook."
|
||||
= "This person can add cards to this addressbook.";
|
||||
"This person can edit the cards of this addressbook."
|
||||
|
|
|
@ -143,9 +143,11 @@
|
|||
"Unable to subscribe to that folder!"
|
||||
= "Impossible de vous inscrire à ce dossier.";
|
||||
|
||||
"Default Roles" = "Rôles par défaut";
|
||||
"User rights for:" = "Autorisations pour :";
|
||||
|
||||
"Any Authenticated User" = "Tout utilisateur identifié";
|
||||
"Public Access" = "Accès public";
|
||||
|
||||
"This person can add cards to this addressbook."
|
||||
= "Cette personne peut ajouter des fiches à ce carnet d'adresses.";
|
||||
"This person can edit the cards of this addressbook."
|
||||
|
|
|
@ -143,9 +143,11 @@
|
|||
"Unable to subscribe to that folder!"
|
||||
= "Abonnieren des Ordners nicht möglich!";
|
||||
|
||||
"Default Roles" = "Standardrechte";
|
||||
"User rights for:" = "Benutzerrechte für:";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"This person can add cards to this addressbook."
|
||||
= "Diese Person kann neue Karten zu diesem Adressbuch hinzufügen.";
|
||||
"This person can edit the cards of this addressbook."
|
||||
|
|
|
@ -143,9 +143,11 @@
|
|||
"Unable to subscribe to that folder!"
|
||||
= "Erre a mappára nem lehet feliratkozni.";
|
||||
|
||||
"Default Roles" = "Alapértelmezett jogok";
|
||||
"User rights for:" = "Felhasználói jogosultságok:";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"This person can add cards to this addressbook."
|
||||
= "Az alábbi személy hozzáadhat névjegyeket ehhez a címjegyzékhez.";
|
||||
"This person can edit the cards of this addressbook."
|
||||
|
|
|
@ -143,9 +143,11 @@
|
|||
"Unable to subscribe to that folder!"
|
||||
= "Non puoi sottoscrivere la cartella!";
|
||||
|
||||
"Default Roles" = "Permessi predefiniti";
|
||||
"User rights for:" = "Permessi per:";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"This person can add cards to this addressbook."
|
||||
= "Questa persona può aggiungere contatti a questa rubrica.";
|
||||
"This person can edit the cards of this addressbook."
|
||||
|
|
|
@ -128,9 +128,11 @@
|
|||
"Unable to subscribe to that folder!"
|
||||
= "Unable to subscribe to that folder.";
|
||||
|
||||
"Default Roles" = "Default Roles";
|
||||
"User rights for:" = "User rights for:";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"This person can add cards to this addressbook."
|
||||
= "This person can add cards to this addressbook.";
|
||||
"This person can edit the cards of this addressbook."
|
||||
|
|
|
@ -143,9 +143,11 @@
|
|||
"Unable to subscribe to that folder!"
|
||||
= "No puede suscribirse a esta carpeta.";
|
||||
|
||||
"Default Roles" = "Roles por defecto";
|
||||
"User rights for:" = "Permisos para:";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"This person can add cards to this addressbook."
|
||||
= "Esta persona puede añadir nuevos contactos a esta libreta.";
|
||||
"This person can edit the cards of this addressbook."
|
||||
|
|
|
@ -143,9 +143,11 @@
|
|||
"Unable to subscribe to that folder!"
|
||||
= "Du kan inte prenumrera på mappen.";
|
||||
|
||||
"Default Roles" = "Standardroller";
|
||||
"User rights for:" = "Användarrättigheter för:";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"This person can add cards to this addressbook."
|
||||
= "Personen kan lägga till addresskort i adressboken.";
|
||||
"This person can edit the cards of this addressbook."
|
||||
|
|
|
@ -127,9 +127,11 @@
|
|||
"Unable to subscribe to that folder!"
|
||||
= "Methu tanysgrifio i'r ffolder yna.";
|
||||
|
||||
"Default Roles" = "Rolau Gwreiddiol";
|
||||
"User rights for:" = "Hawliau defnyddiwr i:";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"This person can add cards to this addressbook."
|
||||
= "Gall y person hwn ychwanegu cardiau i'r llyfr cyfeiriadau yma.";
|
||||
"This person can edit the cards of this addressbook."
|
||||
|
|
|
@ -131,9 +131,11 @@
|
|||
|
||||
/* acls */
|
||||
|
||||
"Default Roles" = "Papéis Padrão";
|
||||
"User rights for:" = "Direitos de:";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"label_Public" = "Público";
|
||||
"label_Private" = "Privado";
|
||||
"label_Confidential" = "Confidencial";
|
||||
|
|
|
@ -131,9 +131,11 @@
|
|||
|
||||
/* acls */
|
||||
|
||||
"Default Roles" = "Výchozí role";
|
||||
"User rights for:" = "Uživatelská práva pro:";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"label_Public" = "Veřejné";
|
||||
"label_Private" = "Soukromé";
|
||||
"label_Confidential" = "Důvěrné";
|
||||
|
|
|
@ -131,9 +131,11 @@
|
|||
|
||||
/* acls */
|
||||
|
||||
"Default Roles" = "Standaardmachtigingen";
|
||||
"User rights for:" = "Machtigingen voor:";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"label_Public" = "Publiek";
|
||||
"label_Private" = "Privaat";
|
||||
"label_Confidential" = "Vertrouwelijk";
|
||||
|
|
|
@ -131,9 +131,11 @@
|
|||
|
||||
/* acls */
|
||||
|
||||
"Default Roles" = "Default Roles";
|
||||
"User rights for:" = "User rights for:";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"label_Public" = "Public";
|
||||
"label_Private" = "Private";
|
||||
"label_Confidential" = "Confidential";
|
||||
|
|
|
@ -131,9 +131,11 @@
|
|||
|
||||
/* acls */
|
||||
|
||||
"Default Roles" = "Rôles par défaut";
|
||||
"User rights for:" = "Autorisations pour :";
|
||||
|
||||
"Any Authenticated User" = "Tout utilisateur identifié";
|
||||
"Public Access" = "Accès public";
|
||||
|
||||
"label_Public" = "Public";
|
||||
"label_Private" = "Privé";
|
||||
"label_Confidential" = "Confidentiel";
|
||||
|
|
|
@ -131,9 +131,11 @@
|
|||
|
||||
/* acls */
|
||||
|
||||
"Default Roles" = "Standardrechte";
|
||||
"User rights for:" = "Benutzerrechte für:";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"label_Public" = "Öffentlich";
|
||||
"label_Private" = "Privat";
|
||||
"label_Confidential" = "Vertraulich";
|
||||
|
|
|
@ -131,9 +131,11 @@
|
|||
|
||||
/* acls */
|
||||
|
||||
"Default Roles" = "Alapértelmezett jogok";
|
||||
"User rights for:" = "Felhasználói jogosultságok:";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"label_Public" = "Nyilvános";
|
||||
"label_Private" = "Magán";
|
||||
"label_Confidential" = "Bizalmas";
|
||||
|
|
|
@ -131,9 +131,11 @@
|
|||
|
||||
/* acls */
|
||||
|
||||
"Default Roles" = "Permessi predefiniti";
|
||||
"User rights for:" = "Permessi per:";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"label_Public" = "Pubblico";
|
||||
"label_Private" = "Privato";
|
||||
"label_Confidential" = "Confidenziale";
|
||||
|
|
|
@ -131,9 +131,11 @@
|
|||
|
||||
/* acls */
|
||||
|
||||
"Default Roles" = "Роли по умолчанию";
|
||||
"User rights for:" = "Права пользователя для:";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"label_Public" = "Публичное событие";
|
||||
"label_Private" = "Личное событие";
|
||||
"label_Confidential" = "Показывать только время и дату";
|
||||
|
|
|
@ -131,9 +131,11 @@
|
|||
|
||||
/* acls */
|
||||
|
||||
"Default Roles" = "Roles por defecto";
|
||||
"User rights for:" = "Permisos para:";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"label_Public" = "Público";
|
||||
"label_Private" = "Privado";
|
||||
"label_Confidential" = "Confidencial";
|
||||
|
|
|
@ -131,9 +131,11 @@
|
|||
|
||||
/* acls */
|
||||
|
||||
"Default Roles" = "Standardroller";
|
||||
"User rights for:" = "Användarrättigheter för:";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"label_Public" = "Publikt";
|
||||
"label_Private" = "Privat";
|
||||
"label_Confidential" = "Konfidentiellt";
|
||||
|
|
|
@ -85,16 +85,11 @@
|
|||
NSEnumerator *commonRights;
|
||||
NSString *currentCommonRight;
|
||||
|
||||
rightsForType = [NSMutableArray new];
|
||||
[rightsForType autorelease];
|
||||
rightsForType = [NSMutableArray arrayWithCapacity: 5];
|
||||
commonRights = [[self objectRights] objectEnumerator];
|
||||
currentCommonRight = [commonRights nextObject];
|
||||
while (currentCommonRight)
|
||||
{
|
||||
while ((currentCommonRight = [commonRights nextObject]))
|
||||
[rightsForType addObject: [NSString stringWithFormat: @"%@%@",
|
||||
type, currentCommonRight]];
|
||||
currentCommonRight = [commonRights nextObject];
|
||||
}
|
||||
|
||||
return rightsForType;
|
||||
}
|
||||
|
@ -137,9 +132,11 @@
|
|||
|
||||
- (NSArray *) objectRights
|
||||
{
|
||||
return
|
||||
[NSArray arrayWithObjects:
|
||||
@"Viewer", @"DAndTViewer", @"Modifier", @"Responder", @"None", nil];
|
||||
return ([uid isEqualToString: @"anonymous"]
|
||||
? [NSArray arrayWithObjects: @"Viewer", @"DAndTViewer", @"None",
|
||||
nil]
|
||||
: [NSArray arrayWithObjects: @"Viewer", @"DAndTViewer", @"Modifier",
|
||||
@"Responder", @"None", nil]);
|
||||
}
|
||||
|
||||
- (void) setCurrentRight: (NSString *) newCurrentRight
|
||||
|
|
|
@ -131,9 +131,11 @@
|
|||
|
||||
/* acls */
|
||||
|
||||
"Default Roles" = "Rolau gwreiddiol";
|
||||
"User rights for:" = "hawliau defnyddiwr i:";
|
||||
|
||||
"Any Authenticated User" = "Any Authenticated User";
|
||||
"Public Access" = "Public Access";
|
||||
|
||||
"label_Public" = "Cyhoeddus";
|
||||
"label_Private" = "Preifat";
|
||||
"label_Confidential" = "Cyfrinachol";
|
||||
|
|
|
@ -14,25 +14,35 @@
|
|||
<input type="hidden" name="uid" var:value="uid"/>
|
||||
<div class="title">
|
||||
<var:if condition="userIsDefaultUser">
|
||||
<label><span class="value"><var:string label:value="Default Roles"
|
||||
<label><span class="value"
|
||||
><var:string label:value="Any Authenticated User"
|
||||
/></span></label>
|
||||
</var:if><var:if condition="userIsDefaultUser" const:negate="YES">
|
||||
<label><var:string label:value="User rights for:"/><br/>
|
||||
</var:if><var:if condition="userIsDefaultUser" const:negate="YES"
|
||||
><var:if condition="userIsAnonymousUser"
|
||||
><label><span class="value"
|
||||
><var:string label:value="Public Access"
|
||||
/></span></label
|
||||
></var:if
|
||||
><var:if condition="userIsAnonymousUser" const:negate="YES"
|
||||
><label><var:string label:value="User rights for:"/><br/>
|
||||
<span class="value"><var:string value="userDisplayName"
|
||||
/></span></label></var:if>
|
||||
</var:if>
|
||||
</div>
|
||||
<div class="calendarUserRights">
|
||||
<label><input type="checkbox" class="checkBox"
|
||||
<var:if condition="userIsAnonymousUser" const:negate="YES"
|
||||
><label><input type="checkbox" class="checkBox"
|
||||
const:name="ObjectCreator"
|
||||
var:checked="userCanCreateObjects"/><var:string
|
||||
label:value="This person can add cards to this addressbook."/></label>
|
||||
<br/>
|
||||
<br/></var:if>
|
||||
<label><input type="checkbox" class="checkBox"
|
||||
const:name="ObjectViewer"
|
||||
var:checked="userCanViewObjects"/><var:string
|
||||
label:value="This person can read the cards of this addressbook."/></label>
|
||||
<br/>
|
||||
<label><input type="checkbox" class="checkBox"
|
||||
<var:if condition="userIsAnonymousUser" const:negate="YES"
|
||||
><label><input type="checkbox" class="checkBox"
|
||||
const:name="ObjectEditor"
|
||||
var:checked="userCanEditObjects"/><var:string
|
||||
label:value="This person can edit the cards of this addressbook."/></label>
|
||||
|
@ -40,7 +50,7 @@
|
|||
<label><input type="checkbox" class="checkBox"
|
||||
const:name="ObjectEraser"
|
||||
var:checked="userCanEraseObjects"/><var:string
|
||||
label:value="This person can erase cards from this addressbook."/></label>
|
||||
label:value="This person can erase cards from this addressbook."/></label></var:if>
|
||||
</div>
|
||||
<div class="buttons">
|
||||
<a href="#" const:name="updateButton" id="updateButton"
|
||||
|
|
|
@ -14,12 +14,18 @@
|
|||
<input type="hidden" name="uid" var:value="uid"/>
|
||||
<div class="title">
|
||||
<var:if condition="userIsDefaultUser">
|
||||
<label><span class="value"><var:string label:value="Default Roles"
|
||||
<label><span class="value"><var:string label:value="Any Authenticated User"
|
||||
/></span></label>
|
||||
</var:if><var:if condition="userIsDefaultUser" const:negate="YES">
|
||||
<label><var:string label:value="User rights for:"/><br/>
|
||||
</var:if><var:if condition="userIsDefaultUser" const:negate="YES"
|
||||
><var:if condition="userIsAnonymousUser"
|
||||
><label><span class="value"><var:string label:value="Public Access"
|
||||
/></span></label
|
||||
></var:if
|
||||
><var:if condition="userIsAnonymousUser" const:negate="YES"
|
||||
><label><var:string label:value="User rights for:"/><br/>
|
||||
<span class="value"><var:string value="userDisplayName"
|
||||
/></span></label></var:if>
|
||||
</var:if>
|
||||
</div>
|
||||
<div class="calendarUserRights">
|
||||
<var:foreach list="rightTypes" item="currentRightType">
|
||||
|
@ -32,17 +38,20 @@
|
|||
/><hr/>
|
||||
</var:foreach>
|
||||
</div>
|
||||
<div class="basicUserRights">
|
||||
<var:if condition="userIsAnonymousUser" const:negate="YES"
|
||||
><div class="basicUserRights">
|
||||
<label><input type="checkbox" class="checkBox"
|
||||
const:name="ObjectCreator"
|
||||
var:checked="userCanCreateObjects"/><var:string
|
||||
label:value="This person can create objects in my calendar."/></label>
|
||||
label:value="This person can create objects in my calendar."
|
||||
/></label>
|
||||
<br/>
|
||||
<label><input type="checkbox" class="checkBox"
|
||||
const:name="ObjectEraser"
|
||||
var:checked="userCanEraseObjects"/><var:string
|
||||
label:value="This person can erase objects from my calendar."/></label>
|
||||
</div>
|
||||
label:value="This person can erase objects from my calendar."
|
||||
/></label>
|
||||
</div></var:if>
|
||||
<div class="buttons">
|
||||
<a href="#" const:name="updateButton" id="updateButton"
|
||||
class="button actionButton">
|
||||
|
|
|
@ -35,8 +35,6 @@
|
|||
<div class="userSelector" id="userRoles">
|
||||
<var:if condition="canModifyAcls">
|
||||
<div id="userSelectorButtons">
|
||||
<a href="#" id="defaultRolesBtn" class="button"><span>
|
||||
<var:string label:value="Default Roles" /></span></a>
|
||||
<a href="#" id="aclAddUser" class="smallToolbarButton"><span>
|
||||
<img rsrc:src="add-contact.gif" label:title="Add..." /></span></a>
|
||||
<a href="#" id="aclDeleteUser" class="smallToolbarButton"><span>
|
||||
|
@ -45,9 +43,9 @@
|
|||
</var:if>
|
||||
<ul id="userList" multiselect="yes">
|
||||
<var:foreach list="usersForObject" item="currentUser"
|
||||
><li var:id="currentUser">
|
||||
<span class="userFullName"><img rsrc:src="abcard.gif"/>
|
||||
<var:string value="currentUserDisplayName"
|
||||
><li var:id="currentUser" class="normal-user">
|
||||
<span class="userFullName"
|
||||
><var:string value="currentUserDisplayName"
|
||||
/></span>
|
||||
<var:if condition="canSubscribeUsers"
|
||||
><label class="subscriptionArea"><input type="checkbox"
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
var cachedContacts = {};
|
||||
|
||||
var usersRightsWindowHeight = 200;
|
||||
var usersRightsWindowHeight = 179;
|
||||
var usersRightsWindowWidth = 450;
|
||||
|
||||
var Contact = {
|
||||
|
|
|
@ -59,15 +59,28 @@ UL#userList
|
|||
UL#userList LI
|
||||
{ clear: both;
|
||||
cursor: pointer;
|
||||
height: 2em;
|
||||
height: 20px;
|
||||
text-align: right;
|
||||
padding-left: 3px; }
|
||||
margin-left: 0px;
|
||||
padding-left: 24px;
|
||||
background-repeat: no-repeat;
|
||||
background-position: 4px center; }
|
||||
|
||||
UL#userList LI.normal-user
|
||||
{ background-image: url("abcard.png"); }
|
||||
|
||||
UL#userList LI.any-user
|
||||
{ background-image: url("abcard-anyone.png"); }
|
||||
|
||||
UL#userList LI.anonymous-user
|
||||
{ background-image: url("abcard-anonymous.png"); }
|
||||
|
||||
DIV#userSelectorButtons A.smallToolbarButton
|
||||
{ float: left; }
|
||||
|
||||
SPAN.userFullName
|
||||
{ float: left; }
|
||||
{ float: left;
|
||||
margin-top: 2px; }
|
||||
|
||||
LABEL.subscriptionArea
|
||||
{ padding-right: 5px; }
|
||||
|
|
|
@ -13,7 +13,16 @@ function addUser(userName, userID) {
|
|||
var result = false;
|
||||
if (!$(userID)) {
|
||||
var ul = $("userList");
|
||||
ul.appendChild(nodeForUser(userName, userID));
|
||||
var lis = ul.childNodesWithTag("li");
|
||||
var newNode = nodeForUser(userName, userID, canSubscribeUsers);
|
||||
newNode.addClassName("normal-user");
|
||||
if (lis.length > 1) {
|
||||
var publicNode = lis[lis.length-2];
|
||||
ul.insertBefore(newNode, publicNode);
|
||||
}
|
||||
else {
|
||||
ul.appendChild(newNode);
|
||||
}
|
||||
var url = window.location.href;
|
||||
var elements = url.split("/");
|
||||
elements[elements.length-1] = ("addUserInAcls?uid="
|
||||
|
@ -56,22 +65,19 @@ function onSubscriptionChange(event) {
|
|||
}
|
||||
}
|
||||
|
||||
function nodeForUser(userName, userId) {
|
||||
var node = $(document.createElement("li"));
|
||||
node.setAttribute("id", userId);
|
||||
function nodeForUser(userName, userId, canSubscribe) {
|
||||
var node = createElement("li");
|
||||
node.id = userId;
|
||||
|
||||
var span = $(document.createElement("span"));
|
||||
var span = createElement("span");
|
||||
span.addClassName("userFullName");
|
||||
var image = document.createElement("img");
|
||||
image.setAttribute("src", ResourcesURL + "/abcard.png");
|
||||
span.appendChild(image);
|
||||
span.appendChild(document.createTextNode(" " + userName));
|
||||
node.appendChild(span);
|
||||
|
||||
if (canSubscribeUsers) {
|
||||
var label = $(document.createElement("label"));
|
||||
if (canSubscribe) {
|
||||
var label = createElement("label");
|
||||
label.addClassName("subscriptionArea");
|
||||
var cb = document.createElement("input");
|
||||
var cb = createElement("input");
|
||||
cb.type = "checkbox";
|
||||
label.appendChild(cb);
|
||||
label.appendChild(document.createTextNode(_("Subscribe User")));
|
||||
|
@ -131,9 +137,16 @@ function openRightsForUserID(userID) {
|
|||
var elements = url.split("/");
|
||||
elements[elements.length-1] = "userRights?uid=" + userID;
|
||||
|
||||
var height = AclEditor.userRightsHeight;
|
||||
if (userID == "anonymous") {
|
||||
height -= 42;
|
||||
if (CurrentModule() == "Contacts") {
|
||||
height -= 21;
|
||||
}
|
||||
}
|
||||
window.open(elements.join("/"), "",
|
||||
"width=" + AclEditor.userRightsWidth
|
||||
+ ",height=" + AclEditor.userRightsHeight
|
||||
+ ",height=" + height
|
||||
+ ",resizable=0,scrollbars=0,toolbar=0,"
|
||||
+ "location=0,directories=0,status=0,menubar=0,copyhistory=0");
|
||||
}
|
||||
|
@ -146,28 +159,28 @@ function openRightsForUser(button) {
|
|||
return false;
|
||||
}
|
||||
|
||||
function openRightsForDefaultUser(event) {
|
||||
this.blur(); // required by IE
|
||||
openRightsForUserID(defaultUserID);
|
||||
Event.stop(event);
|
||||
}
|
||||
|
||||
function onOpenUserRights(event) {
|
||||
openRightsForUser();
|
||||
preventDefault(event);
|
||||
}
|
||||
|
||||
function onAclLoadHandler() {
|
||||
defaultUserID = $("defaultUserID").value;
|
||||
var defaultRolesBtn = $("defaultRolesBtn");
|
||||
if (defaultRolesBtn) {
|
||||
defaultRolesBtn.observe("click", openRightsForDefaultUser);
|
||||
}
|
||||
var ul = $("userList");
|
||||
var lis = ul.childNodesWithTag("li");
|
||||
for (var i = 0; i < lis.length; i++)
|
||||
setEventsOnUserNode(lis[i]);
|
||||
|
||||
defaultUserID = $("defaultUserID").value;
|
||||
var userNode = nodeForUser(_("Any Authenticated User"),
|
||||
defaultUserID);
|
||||
userNode.addClassName("any-user");
|
||||
ul.appendChild(userNode);
|
||||
if (CurrentModule() != "Mail") {
|
||||
userNode = nodeForUser(_("Public Access"), "anonymous");
|
||||
userNode.addClassName("anonymous-user");
|
||||
ul.appendChild(userNode);
|
||||
}
|
||||
|
||||
var buttonArea = $("userSelectorButtons");
|
||||
if (buttonArea) {
|
||||
var buttons = buttonArea.childNodesWithTag("a");
|
||||
|
|
Binary file not shown.
After Width: | Height: | Size: 546 B |
Binary file not shown.
After Width: | Height: | Size: 489 B |
|
@ -1497,6 +1497,22 @@ function configureLinkBanner() {
|
|||
}
|
||||
}
|
||||
|
||||
function CurrentModule() {
|
||||
var module = null;
|
||||
if (ApplicationBaseURL) {
|
||||
var parts = ApplicationBaseURL.split("/");
|
||||
var last = parts.length - 1;
|
||||
while (last > -1 && parts[last] == "") {
|
||||
last--;
|
||||
}
|
||||
if (last > -1) {
|
||||
module = parts[last];
|
||||
}
|
||||
}
|
||||
|
||||
return module;
|
||||
}
|
||||
|
||||
/* accessing another user's data */
|
||||
function UserFolderURLForUser(user) {
|
||||
var folderArray = UserFolderURL.split("/");
|
||||
|
|
Loading…
Reference in New Issue