From c42651d682ab7e8adbee3521ae366a0a1fa71270 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Thu, 15 Nov 2012 19:30:16 +0800 Subject: [PATCH] MDL-36622 usability: Adaptations following new icons --- course/category.php | 2 +- course/index.php | 2 +- course/search.php | 2 +- enrol/manual/lib.php | 2 +- lib/enrollib.php | 2 +- pix/i/enrolusers.png | Bin 0 -> 349 bytes pix/i/enrolusers.svg | 16 ++++++++++++++++ pix/i/users.png | Bin 349 -> 327 bytes pix/i/users.svg | 8 ++++---- theme/upgrade.txt | 2 ++ 10 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 pix/i/enrolusers.png create mode 100644 pix/i/enrolusers.svg 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/enrolusers.png b/pix/i/enrolusers.png new file mode 100644 index 0000000000000000000000000000000000000000..23d78326e366fa1ff18a5f7fe27337d322ff6059 GIT binary patch literal 349 zcmV-j0iyniP) + + +]> + + + + + diff --git a/pix/i/users.png b/pix/i/users.png index 23d78326e366fa1ff18a5f7fe27337d322ff6059..393371b021a2f86b822b5e554c9e9cb9456b40bb 100644 GIT binary patch delta 262 zcmV+h0r~#j0>=W7Nq^}{L_t(|+Qd@95rRMrJg9&Yumei41EB)-#S^T6p@PFFFR=qk zpaeUR5-7oqlf!V_G0ymKXEM1!c9Y8`Py%h+CU6?IhfS~yR&h)iV3$14ABGbMas>B; zMf@pau~;oZ!aInNSE2Z!1(_-(4zl7LZ2~Efit`cpgf6q?8vpC>6AFJ&yHh92{cU;U@5^1ID!$FvrXv1ERN&P6yu0s56c(y z_$XpAUoAnxCy3ChTyar~V9FF2f))FelOY8{v44R#WklZenR%36Z@-X>*!2PEX4lKjkKXy32;f3a0)bgLc1Cy9-ia7%D<0&gDebu5^ZCi{)v^dIpb%pUMwA|NL#c*elT6F5Df# j1D^ILkN5&V0Tu=T%&tK}1qKSi00000NkvXXu0mjf0Q-Gg 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/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 ===