mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 04:22:07 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-44323-master' of git://github.com/danpoltawski/moodle

Browse Source 
Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Sam Hemelryk 2014-05-20 15:42:32 +12:00
commit 46921d74a6
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/roles/assign.php
View File

@ -176,7 +176,7 @@ if ($roleid) {
// Show UI for assigning a particular role to users.
// Print a warning if we are assigning system roles.
if ($context->contextlevel == CONTEXT_SYSTEM) {
echo $OUTPUT->box(get_string('globalroleswarning', 'core_role'));
echo $OUTPUT->notification(get_string('globalroleswarning', 'core_role'));
}
// Print the form.
@ -251,7 +251,7 @@ if ($roleid) {
// Print a warning if we are assigning system roles.
if ($context->contextlevel == CONTEXT_SYSTEM) {
echo $OUTPUT->box(get_string('globalroleswarning', 'core_role'));
echo $OUTPUT->notification(get_string('globalroleswarning', 'core_role'));
}
// Print instruction.

6
theme/bootstrapbase/less/moodle/admin.less
View File

@ -747,12 +747,6 @@ img.iconsmall {
padding-bottom: 0;
}
// Hacks for badly marked up admin warnings.
#page-admin-roles-assign div.box.generalbox {
.alert;
.alert-danger;
}
.maintenancewarning {
padding: 3px 1em;
text-align: center;

2
theme/bootstrapbase/style/moodle.css
View File

File diff suppressed because one or more lines are too long