From 2a3623da3390f0118660d541928ae8c635631b3d Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 17 Nov 2007 16:57:40 +0100 Subject: ACL Manager rewritten This patch replaces the old ACL manager plugin with a new, completely rewritten one. The ACL manager is now independent of the page from which it was called, instead all pages and namespaces are selectable from an AJAX enhanced list similar to the one used in the media manager. This should take care of a major complain by new users. Another major confusion was that the old manager only showed relevant rules. This new manager always shows *all* defined ACL rules. darcs-hash:20071117155740-7ad00-1de71e396d5dbc117bf5788fb5667af828d5c20f.gz --- lib/plugins/acl/lang/en/intro.txt | 12 ------------ lib/plugins/acl/lang/en/lang.php | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 12 deletions(-) delete mode 100644 lib/plugins/acl/lang/en/intro.txt (limited to 'lib/plugins/acl/lang/en') diff --git a/lib/plugins/acl/lang/en/intro.txt b/lib/plugins/acl/lang/en/intro.txt deleted file mode 100644 index ff5442e24..000000000 --- a/lib/plugins/acl/lang/en/intro.txt +++ /dev/null @@ -1,12 +0,0 @@ -====== Access Control List Management ====== - -On this page you can add and remove permissions for the current -page and all the [[doku>wiki:namespaces|namespaces]] it is in. -You should read the [[doku>wiki:acl|official documentation on ACL]] -to fully understand how access control works. - -The page displays all permissions that are significant for the -current page. Permissions regarding other pages are not shown -- to -edit them [[this>doku.php?do=index|browse]] to the according page -first, then change to the ACL Administration. - diff --git a/lib/plugins/acl/lang/en/lang.php b/lib/plugins/acl/lang/en/lang.php index 8f52e7bb6..918451305 100644 --- a/lib/plugins/acl/lang/en/lang.php +++ b/lib/plugins/acl/lang/en/lang.php @@ -15,10 +15,29 @@ $lang['acl_perms'] = 'Permissions for'; $lang['page'] = 'Page'; $lang['namespace'] = 'Namespace'; +$lang['p_user_id'] = 'User %s currently has the following permissions on page %s: %s.'; +$lang['p_user_ns'] = 'User %s currently has the following permissions in namespace %s: %s.'; +$lang['p_group_id'] = 'Members of group %s currently have the following permissions on page %s: %s.'; +$lang['p_group_ns'] = 'Members of group %s currently have the following permissions in namespace %s: %s.'; + +$lang['p_choose_id'] = 'Please enter a user or group in the form above to view or edit the permissions set for the page %s.'; +$lang['p_choose_ns'] = 'Please enter a user or group in the form above to view or edit the permissions set for the namespace %s.'; + + +$lang['p_inherited'] = 'Note: Those permissions were not set explicitly but were inherited from other groups or higher namespaces.'; +$lang['p_isadmin'] = 'Note: The selected group or user has always full permissions because it is configured as superuser.'; + +$lang['current'] = 'Current ACL Rules'; +$lang['where'] = 'Page/Namespace'; +$lang['who'] = 'User/Group'; +$lang['perm'] = 'Permissions'; + +$lang['acl_perm0'] = 'None'; $lang['acl_perm1'] = 'Read'; $lang['acl_perm2'] = 'Edit'; $lang['acl_perm4'] = 'Create'; $lang['acl_perm8'] = 'Upload'; $lang['acl_perm16'] = 'Delete'; $lang['acl_new'] = 'Add new Entry'; +$lang['acl_mod'] = 'Modify Entry'; //Setup VIM: ex: et ts=2 enc=utf-8 : -- cgit v1.2.3