MDL-36622 usability: Adaptations following new icons

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)) {

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 '<a title="'.$str->cohorts.'" href="'.$CFG->wwwroot.'/cohort/index.php?contextid='.$category->context->id.'"><img'.
-                     ' src="'.$OUTPUT->pix_url('i/cohort') . '" class="iconsmall" alt="'.$str->cohorts.'" /></a> ';
+                     ' src="'.$OUTPUT->pix_url('t/cohort') . '" class="iconsmall" alt="'.$str->cohorts.'" /></a> ';
             }
 
             if ($up) {

course/search.php

@@ -336,7 +336,7 @@ if ($courses) {
             // checks whether user can do role assignment
             if (has_capability('moodle/course:enrolreview', $coursecontext)) {
                 echo'<a title="'.get_string('enrolledusers', 'enrol').'" href="'.$CFG->wwwroot.'/enrol/users.php?id='.$course->id.'">';
-                echo '<img src="'.$OUTPUT->pix_url('i/users') . '" class="iconsmall" alt="'.get_string('enrolledusers', 'enrol').'" /></a> ' . "\n";
+                echo '<img src="'.$OUTPUT->pix_url('i/enrolusers') . '" class="iconsmall" alt="'.get_string('enrolledusers', 'enrol').'" /></a> ' . "\n";
             }
 
             // checks whether user can delete course

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));

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

pix/i/enrolusers.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"
+	 xml:space="preserve">
+<defs>
+</defs>
+<path style="fill:#999999;" d="M16,11.9V16h-4.6l-0.9-3.6l0.6-0.6L10.3,11H9.7l-0.8,0.9l0.6,0.6L8.6,16H4v-4l3.2-1.7
+	C7.7,10,7.8,9.5,7.5,9C7.5,9,6,7.2,6,5.2C6,2.3,7.8,0,10,0s4,2.3,4,5.2c0,2-1.4,3.8-1.4,3.8c-0.3,0.4-0.2,1,0.3,1.2L16,11.9z
+	 M6.1,8.7C5.6,7.9,5,6.9,5,5.2c0-2.1,0.8-3.9,2-5C6.7,0.1,6.4,0,6,0C3.8,0,2,2.3,2,5.2C2,7.2,3.4,9,3.4,9c0.3,0.4,0.2,1-0.3,1.3
+	L0,12v4h3v-4.6c0,0,2.6-1.3,2.8-1.4C6.2,9.7,6.6,9.6,6.1,8.7z"/>
+</svg>

pix/i/users.svg

@@ -9,8 +9,8 @@
 	 xml:space="preserve">
 <defs>
 </defs>
-<path style="fill:#999999;" d="M16,11.9V16h-4.6l-0.9-3.6l0.6-0.6L10.3,11H9.7l-0.8,0.9l0.6,0.6L8.6,16H4v-4l3.2-1.7
-	C7.7,10,7.8,9.5,7.5,9C7.5,9,6,7.2,6,5.2C6,2.3,7.8,0,10,0s4,2.3,4,5.2c0,2-1.4,3.8-1.4,3.8c-0.3,0.4-0.2,1,0.3,1.2L16,11.9z
-	 M6.1,8.7C5.6,7.9,5,6.9,5,5.2c0-2.1,0.8-3.9,2-5C6.7,0.1,6.4,0,6,0C3.8,0,2,2.3,2,5.2C2,7.2,3.4,9,3.4,9c0.3,0.4,0.2,1-0.3,1.3
-	L0,12v4h3v-4.6c0,0,2.6-1.3,2.8-1.4C6.2,9.7,6.6,9.6,6.1,8.7z"/>
+<path style="fill:#999999;" d="M3,16H0v-4l3.2-1.7C3.6,10,3.8,9.5,3.4,9C3.4,9,2,7.2,2,5.2C2,2.3,3.8,0,6,0c0.4,0,0.7,0.1,1.1,0.2
+	c-1.2,1.1-2,3-2,5c0,1.7,0.6,2.7,1,3.5c0.6,0.9,0.1,1-0.3,1.3C5.6,10.1,3,11.4,3,11.4V16z M16,11.9l-3.1-1.6
+	C12.4,10,12.3,9.4,12.6,9c0,0,1.4-1.8,1.4-3.8C14,2.3,12.2,0,10,0S6,2.3,6,5.2C6,7.2,7.5,9,7.5,9c0.3,0.4,0.2,1-0.3,1.3L4,12v4h12
+	V11.9z"/>
 </svg>

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 ===