Merged new help links from stable

diff --git a/admin/roles/manage.php b/admin/roles/manage.php
index a589cb912875dc1ac1d702836f68eb094fb07e87..9036301b52fe1e9ecae5408de23dc9f724b9e246 100755 (executable)
--- a/admin/roles/manage.php
+++ b/admin/roles/manage.php
@@ -281,13 +281,13 @@
 
         switch ($action) {
             case 'add':
-                print_heading(get_string('addrole', 'role'));
+                print_heading_with_help(get_string('addrole', 'role'), 'role');
                 break;
             case 'view':
-                print_heading(get_string('viewrole', 'role'));
+                print_heading_with_help(get_string('viewrole', 'role'), 'role');
                 break;
             case 'edit':
-                print_heading(get_string('editrole', 'role'));
+                print_heading_with_help(get_string('editrole', 'role'), 'role');
                 break;
         }
 

diff --git a/admin/roles/managetabs.php b/admin/roles/managetabs.php
index 563ef9aabdacd02f29e8673e03bc15b6d0ba1c8b..97b429c0fa09994d2f6d565abd87e680d2659442 100755 (executable)
--- a/admin/roles/managetabs.php
+++ b/admin/roles/managetabs.php
@@ -1,7 +1,7 @@
 <?php
 // this page deals with the 2 tabs for manage.php and grant.php
 
-    $toprow[] = new tabobject('manage', $CFG->wwwroot.'/'.$CFG->admin.'/roles/manage.php', get_string('manageroles', 'role'));
+    $toprow[] = new tabobject('manage', $CFG->wwwroot.'/'.$CFG->admin.'/roles/manage.php', get_string('manageroles', 'role'),'', true);
 
     $toprow[] = new tabobject('allowassign', $CFG->wwwroot.'/'.$CFG->admin.'/roles/allowassign.php', get_string('allowassign', 'role'));