MDL-11917 - Improve the title on the assign/override roles page. Merged from MOODLE_1...

diff --git a/admin/roles/assign.php b/admin/roles/assign.php
index df682f79b946c497d0d639aec634e4a33c206ddf..01f9c3f318f2bc7b8f83d7ba1e6817e0f7986569 100755 (executable)
--- a/admin/roles/assign.php
+++ b/admin/roles/assign.php
@@ -80,7 +80,6 @@
     $strexistingusers = get_string('existingusers', 'role');
     $straction = get_string('assignroles', 'role');
     $strroletoassign = get_string('roletoassign', 'role');
-    $strcurrentcontext = get_string('currentcontext', 'role');
     $strsearch = get_string('search');
     $strshowall = get_string('showall');
     $strparticipants = get_string('participants');
@@ -276,7 +275,7 @@
     if ($context->contextlevel==CONTEXT_COURSE and $context->instanceid == SITEID) {
         print_heading_with_help(get_string('frontpageroles', 'admin'), 'assignroles');
     } else {
-        print_heading_with_help(get_string('assignroles', 'role'), 'assignroles');
+        print_heading_with_help(get_string('assignrolesin', 'role', print_context_name($context)), 'assignroles');
     }
 
     if ($context->contextlevel==CONTEXT_SYSTEM) {
@@ -393,7 +392,7 @@
 
         }
 
-        echo '<div style="text-align:center">'.$strcurrentcontext.': '.print_context_name($context).'<br/>';
+        echo '<div class="selector">';
         $assignableroles = array('0'=>get_string('listallroles', 'role').'...') + $assignableroles;
         popup_form("$CFG->wwwroot/$CFG->admin/roles/assign.php?userid=$userid&amp;courseid=$courseid&amp;contextid=$contextid&amp;roleid=",
             $assignableroles, 'switchrole', $roleid, '', '', '', false, 'self', $strroletoassign);

diff --git a/admin/roles/override.php b/admin/roles/override.php
index 600895cea3643073fda9d53e16d9ffbbeb9a0b41..e153189ed146e1e2189382cd19650c7e221fb4d9 100755 (executable)
--- a/admin/roles/override.php
+++ b/admin/roles/override.php
@@ -60,7 +60,6 @@
     $stroverrideusers  = get_string('overrideusers', 'role');
     $straction         = get_string('overrideroles', 'role');
     $strcurrentrole    = get_string('currentrole', 'role');
-    $strcurrentcontext = get_string('currentcontext', 'role');
     $strparticipants   = get_string('participants');
 
 /// Make sure this user can override that role
@@ -169,12 +168,11 @@
     }
 
 
-    print_heading_with_help(get_string('overrides', 'role'), 'overrides');
+    print_heading_with_help(get_string('overriderolesin', 'role', print_context_name($context)), 'overrides');
 
     if ($roleid) {
     /// prints a form to swap roles
         echo '<div class="selector">';
-        echo $strcurrentcontext.': '.print_context_name($context).'<br/>';
         $overridableroles = array('0'=>get_string('listallroles', 'role').'...') + $overridableroles;
         popup_form("$CFG->wwwroot/$CFG->admin/roles/override.php?userid=$userid&amp;courseid=$courseid&amp;contextid=$contextid&amp;roleid=",
             $overridableroles, 'switchrole', $roleid, '', '', '', false, 'self', $strroletooverride);

diff --git a/lang/en_utf8/role.php b/lang/en_utf8/role.php
index 92a9cf727a5356436eb1160557a530d4ead0252e..58003bd581f65c9da93a86e58f351fee6d484b74 100644 (file)
--- a/lang/en_utf8/role.php
+++ b/lang/en_utf8/role.php
@@ -7,6 +7,7 @@ $string['allow'] = 'Allow';
 $string['allowassign'] = 'Allow role assignments';
 $string['allowoverride'] = 'Allow role overrides';
 $string['assignroles'] = 'Assign roles';
+$string['assignrolesin'] = 'Assign roles in $a';
 $string['assignglobalroles'] = 'Assign global roles';
 $string['blog:create'] = 'Create new blog entries';
 $string['blog:manageentries'] = 'Edit and manage entries';
@@ -90,6 +91,7 @@ $string['my:manageblocks'] = 'Manage myMoodle page blocks';
 $string['nocapabilitiesincontext'] = 'No capabilities available in this context';
 $string['notset'] = 'Not set';
 $string['overrideroles'] = 'Override roles';
+$string['overriderolesin'] = 'Override roles in $a';
 $string['overrides'] = 'Overrides';
 $string['permissions'] = 'Permissions';
 $string['potentialusers'] = '$a potential users';

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index da33152d9ed48fcaa918fead56f35ae59541b943..51ba3a080722074f8aab967d9f2e46fc2250f881 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -956,8 +956,10 @@ body#admin-modules table.generaltable td.c0
 }
 
 #admin-roles-manage .selector,
+#admin-roles-assign .selector,
 #admin-roles-override .selector {
   text-align:center;
+  margin-bottom:1em;
 }
 
 #admin-roles-manage table.roledesc,