define roles: MDL-16966 etc. more UI polishing

* Remove inconistently placed and unnecessary heading, moving help icon.

diff --git a/admin/roles/manage.php b/admin/roles/manage.php
index e95faa5c165533bec65da04f2e69b9bfc2ac2c54..c016f30bab785e2e5fa290b1f03dbb65cbd6c021 100755 (executable)
--- a/admin/roles/manage.php
+++ b/admin/roles/manage.php
@@ -194,8 +194,6 @@
     $currenttab = 'manage';
     include_once('managetabs.php');
 
-    print_heading_with_help(get_string('manageroles', 'role'), 'roles');
-
 /// Initialise table.
     $table = new object;
     $table->tablealign = 'center';
@@ -203,7 +201,7 @@
     $table->wrap = array('nowrap', '', 'nowrap','nowrap');
     $table->width = '90%';
     $table->head = array(
-        get_string('role'),
+        get_string('role') . ' ' . helpbutton('roles', get_string('roles'), 'moodle', true, false, '', true),
         get_string('description'),
         get_string('shortname'),
         get_string('edit')

diff --git a/admin/settings/users.php b/admin/settings/users.php
index 8c440c09acbf0006bda26ca7b68fa2f9f3fb33cd..f703294c9ddd632129f4615c01e22f6f7936d416 100644 (file)
--- a/admin/settings/users.php
+++ b/admin/settings/users.php
@@ -169,7 +169,7 @@ if ($hassiteconfig
     }
     $ADMIN->add('roles', $temp);
 
-    $ADMIN->add('roles', new admin_externalpage('defineroles', get_string('defineroles', 'role'), "$CFG->wwwroot/$CFG->admin/roles/manage.php", 'moodle/role:manage'));
+    $ADMIN->add('roles', new admin_externalpage('defineroles', get_string('manageroles', 'role'), "$CFG->wwwroot/$CFG->admin/roles/manage.php", 'moodle/role:manage'));
     $ADMIN->add('roles', new admin_externalpage('assignroles', get_string('assignglobalroles', 'role'), "$CFG->wwwroot/$CFG->admin/roles/assign.php?contextid=".$systemcontext->id, 'moodle/role:assign'));
     $ADMIN->add('roles', new admin_externalpage('checkpermissions', get_string('checkglobalpermissions', 'role'), "$CFG->wwwroot/$CFG->admin/roles/check.php?contextid=".$systemcontext->id, array('moodle/role:assign', 'moodle/role:safeoverride', 'moodle/role:override', 'moodle/role:manage')));