From 5b15f9e9e9f6c494a526f660de675e0dd27f9d7d Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Wed, 13 Oct 2010 04:12:59 +0000 Subject: [PATCH] MINOR Improved help texts around permissions (from r100783) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112167 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/CMSMain.php | 15 ++++++++++++--- code/SecurityAdmin.php | 4 ++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/code/CMSMain.php b/code/CMSMain.php index 742673e1..192e433d 100755 --- a/code/CMSMain.php +++ b/code/CMSMain.php @@ -1306,10 +1306,10 @@ JS; foreach($classes as $i => $class) { $title = _t("{$class}.MENUTITLE", LeftAndMain::menu_title_for_class($class)); - $perms["CMS_ACCESS_" . $class] = array( + $perms["CMS_ACCESS_" . $class] = array( 'name' => sprintf(_t( 'CMSMain.ACCESS', - "Access to %s", + "Access to '%s' section", PR_MEDIUM, "Item in permission selection identifying the admin section. Example: Access to 'Files & Images'" ), $title, null), @@ -1322,7 +1322,16 @@ JS; 'help' => _t('CMSMain.ACCESSALLINTERFACESHELP', 'Overrules more specific access settings.'), 'sort' => -100 ); - + + $perms['CMS_ACCESS_CMSMain']['help'] = _t( + 'CMSMain.ACCESS_HELP', + 'Allow viewing of the section containing page tree and content. View and edit permissions can be handled through page specific dropdowns, as well as the separate "Content permissions".' + ); + $perms['CMS_ACCESS_SecurityAdmin']['help'] = _t( + 'SecurityAdmin.ACCESS_HELP', + 'Allow viewing, adding and editing users, as well as assigning permissions and roles to them.' + ); + if (isset($perms['CMS_ACCESS_ModelAdmin'])) unset($perms['CMS_ACCESS_ModelAdmin']); return $perms; diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php index f45298fa..dd4e94d4 100644 --- a/code/SecurityAdmin.php +++ b/code/SecurityAdmin.php @@ -391,13 +391,13 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider { 'EDIT_PERMISSIONS' => array( 'name' => _t('SecurityAdmin.EDITPERMISSIONS', 'Manage permissions for groups'), 'category' => _t('Permissions.PERMISSIONS_CATEGORY', 'Roles and access permissions'), - 'help' => _t('SecurityAdmin.EDITPERMISSIONS_HELP', 'Ability to edit Permissions and IP Addresses for a group. Requires "Access to Security".'), + 'help' => _t('SecurityAdmin.EDITPERMISSIONS_HELP', 'Ability to edit Permissions and IP Addresses for a group. Requires the "Access to \'Security\' section" permission.'), 'sort' => 0 ), 'APPLY_ROLES' => array( 'name' => _t('SecurityAdmin.APPLY_ROLES', 'Apply roles to groups'), 'category' => _t('Permissions.PERMISSIONS_CATEGORY', 'Roles and access permissions'), - 'help' => _t('SecurityAdmin.APPLY_ROLES_HELP', 'Ability to edit the roles assigned to a group. Requires "Access to Security.".'), + 'help' => _t('SecurityAdmin.APPLY_ROLES_HELP', 'Ability to edit the roles assigned to a group. Requires the "Access to \'Security\' section" permission.'), 'sort' => 0 ) );