From 01a95b86cda1210faeb90d01d8cb9cb928b59ef3 Mon Sep 17 00:00:00 2001 From: Damyon Wiese Date: Fri, 24 Mar 2017 14:02:17 +0800 Subject: [PATCH] MDL-55611 icons: Remove pix_url Change to image_url because these are not "pix icons". --- blocks/myoverview/classes/output/main.php | 4 ++-- calendar/classes/api.php | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/blocks/myoverview/classes/output/main.php b/blocks/myoverview/classes/output/main.php index 193540fb496..bdc92d8968e 100644 --- a/blocks/myoverview/classes/output/main.php +++ b/blocks/myoverview/classes/output/main.php @@ -59,8 +59,8 @@ class main implements renderable, templatable { $coursesummary = new course_summary($courses, $coursesprogress); $coursesview = new courses_view($courses, $coursesprogress); - $nocoursesurl = $output->pix_url('courses', 'block_myoverview')->out(); - $noeventsurl = $output->pix_url('activities', 'block_myoverview')->out(); + $nocoursesurl = $output->image_url('courses', 'block_myoverview')->out(); + $noeventsurl = $output->image_url('activities', 'block_myoverview')->out(); return [ 'courses' => $coursesummary->export_for_template($output), diff --git a/calendar/classes/api.php b/calendar/classes/api.php index efe57bd7073..8b05c1d2075 100644 --- a/calendar/classes/api.php +++ b/calendar/classes/api.php @@ -632,7 +632,7 @@ class api { } else { $eventtype = ''; } - $icon = $OUTPUT->pix_url('icon', $event->modulename) . ''; + $icon = $OUTPUT->image_url('icon', $event->modulename) . ''; $event->icon = '' . $eventtype . ''; $event->referer = 'pix_url('i/siteevent') . '" alt="' . + $event->icon = '' .
                 get_string('globalevent', 'calendar') . ''; $event->cssclass = 'calendar_event_global'; } else if ($event->courseid != 0 && $event->courseid != SITEID && $event->groupid == 0) { // Course event. - $event->icon = '' .
+            $event->icon = '<img src=image_url('i/courseevent') . '" alt="' . get_string('courseevent', 'calendar') . '" class="icon" />'; $event->courselink = self::get_courselink($event->courseid); $event->cssclass = 'calendar_event_course'; @@ -654,12 +654,12 @@ class api { } else { $groupname = ''; } - $event->icon = \html_writer::empty_tag('image', array('src' => $OUTPUT->pix_url('i/groupevent'), + $event->icon = \html_writer::empty_tag('image', array('src' => $OUTPUT->image_url('i/groupevent'), 'alt' => get_string('groupevent', 'calendar'), 'title' => $groupname, 'class' => 'icon')); $event->courselink = self::get_courselink($event->courseid) . ', ' . $groupname; $event->cssclass = 'calendar_event_group'; } else if ($event->userid) { // User event. - $event->icon = '' .
+            $event->icon = '<img src=image_url('i/userevent') . '" alt="' . get_string('userevent', 'calendar') . '" class="icon" />'; $event->cssclass = 'calendar_event_user'; }