diff --git a/course/category.php b/course/category.php index e363e4139fd..43b11320327 100644 --- a/course/category.php +++ b/course/category.php @@ -368,7 +368,7 @@ if (!$courses) { // role assignment link if (has_capability('moodle/course:enrolreview', $coursecontext)) { $url = new moodle_url('/enrol/users.php', array('id' => $acourse->id)); - echo $OUTPUT->action_icon($url, new pix_icon('i/users', get_string('enrolledusers', 'enrol'))); + echo $OUTPUT->action_icon($url, new pix_icon('t/enrolusers', get_string('enrolledusers', 'enrol'))); } if (can_delete_course($acourse->id)) { diff --git a/course/index.php b/course/index.php index 209e2800f5d..a1a5e569957 100644 --- a/course/index.php +++ b/course/index.php @@ -340,7 +340,7 @@ function print_category_edit($category, $displaylist, $parentslist, $depth=-1, $ if (has_capability('moodle/cohort:manage', $category->context) or has_capability('moodle/cohort:view', $category->context)) { echo ' '; + ' src="'.$OUTPUT->pix_url('t/cohort') . '" class="iconsmall" alt="'.$str->cohorts.'" /> '; } if ($up) { diff --git a/course/search.php b/course/search.php index 8c9f85cd156..393ab0b6faa 100644 --- a/course/search.php +++ b/course/search.php @@ -336,7 +336,7 @@ if ($courses) { // checks whether user can do role assignment if (has_capability('moodle/course:enrolreview', $coursecontext)) { echo''; - echo ''.get_string('enrolledusers', 'enrol').' ' . "\n"; + echo ''.get_string('enrolledusers', 'enrol').' ' . "\n"; } // checks whether user can delete course diff --git a/enrol/manual/lib.php b/enrol/manual/lib.php index ee17fa97016..94b89dceff4 100644 --- a/enrol/manual/lib.php +++ b/enrol/manual/lib.php @@ -113,7 +113,7 @@ class enrol_manual_plugin extends enrol_plugin { if (has_capability('enrol/manual:manage', $context)) { $managelink = new moodle_url("/enrol/manual/manage.php", array('enrolid'=>$instance->id)); - $icons[] = $OUTPUT->action_icon($managelink, new pix_icon('i/users', get_string('enrolusers', 'enrol_manual'), 'core', array('class'=>'iconsmall'))); + $icons[] = $OUTPUT->action_icon($managelink, new pix_icon('t/enrolusers', get_string('enrolusers', 'enrol_manual'), 'core', array('class'=>'iconsmall'))); } if (has_capability('enrol/manual:config', $context)) { $editlink = new moodle_url("/enrol/manual/edit.php", array('courseid'=>$instance->courseid)); diff --git a/lib/enrollib.php b/lib/enrollib.php index 835a07a4b14..6295a108f07 100644 --- a/lib/enrollib.php +++ b/lib/enrollib.php @@ -401,7 +401,7 @@ function enrol_add_course_navigation(navigation_node $coursenode, $course) { // list all participants - allows assigning roles, groups, etc. if (has_capability('moodle/course:enrolreview', $coursecontext)) { $url = new moodle_url('/enrol/users.php', array('id'=>$course->id)); - $usersnode->add(get_string('enrolledusers', 'enrol'), $url, navigation_node::TYPE_SETTING, null, 'review', new pix_icon('i/users', '')); + $usersnode->add(get_string('enrolledusers', 'enrol'), $url, navigation_node::TYPE_SETTING, null, 'review', new pix_icon('i/enrolusers', '')); } // manage enrol plugin instances diff --git a/pix/i/cohort.png b/pix/i/cohort.png new file mode 100644 index 00000000000..d9c15bdbe23 Binary files /dev/null and b/pix/i/cohort.png differ diff --git a/pix/i/cohort.svg b/pix/i/cohort.svg new file mode 100644 index 00000000000..c573e940a2a --- /dev/null +++ b/pix/i/cohort.svg @@ -0,0 +1,18 @@ + + + +]> + + + + + diff --git a/pix/i/enrolusers.png b/pix/i/enrolusers.png new file mode 100644 index 00000000000..23d78326e36 Binary files /dev/null and b/pix/i/enrolusers.png differ diff --git a/pix/i/enrolusers.svg b/pix/i/enrolusers.svg new file mode 100644 index 00000000000..28ce5f478c2 --- /dev/null +++ b/pix/i/enrolusers.svg @@ -0,0 +1,16 @@ + + + +]> + + + + + diff --git a/pix/i/permissions.png b/pix/i/permissions.png new file mode 100644 index 00000000000..7c1c8ec388e Binary files /dev/null and b/pix/i/permissions.png differ diff --git a/pix/i/permissions.svg b/pix/i/permissions.svg new file mode 100644 index 00000000000..935d811b8b8 --- /dev/null +++ b/pix/i/permissions.svg @@ -0,0 +1,15 @@ + + + +]> + + + + + diff --git a/pix/i/users.png b/pix/i/users.png index 23d78326e36..393371b021a 100644 Binary files a/pix/i/users.png and b/pix/i/users.png differ diff --git a/pix/i/users.svg b/pix/i/users.svg index 28ce5f478c2..837e63d0079 100644 --- a/pix/i/users.svg +++ b/pix/i/users.svg @@ -9,8 +9,8 @@ xml:space="preserve"> - + diff --git a/pix/i/withsubcat.png b/pix/i/withsubcat.png index e0fd2e14318..2e5c33b7a0a 100644 Binary files a/pix/i/withsubcat.png and b/pix/i/withsubcat.png differ diff --git a/pix/i/withsubcat.svg b/pix/i/withsubcat.svg new file mode 100644 index 00000000000..86ff2ef228b --- /dev/null +++ b/pix/i/withsubcat.svg @@ -0,0 +1,14 @@ + + + +]> + + + + + diff --git a/pix/t/backup.png b/pix/t/backup.png new file mode 100644 index 00000000000..27fb5290a28 Binary files /dev/null and b/pix/t/backup.png differ diff --git a/pix/t/backup.svg b/pix/t/backup.svg new file mode 100644 index 00000000000..4513122ee8c --- /dev/null +++ b/pix/t/backup.svg @@ -0,0 +1,16 @@ + + + +]> + + + + + diff --git a/pix/t/cohort.png b/pix/t/cohort.png new file mode 100644 index 00000000000..77b26b69736 Binary files /dev/null and b/pix/t/cohort.png differ diff --git a/pix/t/cohort.svg b/pix/t/cohort.svg new file mode 100644 index 00000000000..49b1c74986a --- /dev/null +++ b/pix/t/cohort.svg @@ -0,0 +1,17 @@ + + + +]> + + + + + diff --git a/pix/t/enrolusers.png b/pix/t/enrolusers.png new file mode 100644 index 00000000000..4f41e91fa31 Binary files /dev/null and b/pix/t/enrolusers.png differ diff --git a/pix/t/enrolusers.svg b/pix/t/enrolusers.svg new file mode 100644 index 00000000000..13fd1675a5a --- /dev/null +++ b/pix/t/enrolusers.svg @@ -0,0 +1,16 @@ + + + +]> + + + + + diff --git a/pix/t/restore.png b/pix/t/restore.png new file mode 100644 index 00000000000..86e52f5e292 Binary files /dev/null and b/pix/t/restore.png differ diff --git a/pix/t/restore.svg b/pix/t/restore.svg new file mode 100644 index 00000000000..092073a36da --- /dev/null +++ b/pix/t/restore.svg @@ -0,0 +1,16 @@ + + + +]> + + + + + diff --git a/theme/upgrade.txt b/theme/upgrade.txt index ce15db20614..105f4258541 100644 --- a/theme/upgrade.txt +++ b/theme/upgrade.txt @@ -16,6 +16,8 @@ optional changes: * new icons i/export and i/import (sized 16x16). Previously export and import actions used i/backup and i/restore. * new icon i/assignroles (sized 16x16), to prevent the use of i/roles which is 12x12. * new icon i/switchrole (sized 16x16), was previously using i/roles. Now is a copy of the new i/assignroles icon. +* new icons i/enrolusers and t/enrolusers, previsouly i/users was used. +* new icon t/cohorts (sized 12x12), to prevent the use of i/cohorts which is 16x16. === 2.3 ===