moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 17:06:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-77105 block_timeline: Add 'nofilter' class when necessary

Browse source 
Add the `.nofilter` class for activity icons when the icon URL's
`filtericon` parameter is not set, so they get rendered as they are on
the timeline block.
This commit is contained in:
Jun Pataleta 2023-02-10 18:43:25 +08:00
parent 18703b71ac
commit 28d8c9c1e7
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
blocks/timeline/templates/event-list-item.mustache
View file

@ -57,7 +57,7 @@
<div class="activityiconcontainer small {{purpose}} courseicon align-self-top align-self-center mx-3 mb-1 mb-sm-0 text-nowrap"> <div class="activityiconcontainer small {{purpose}} courseicon align-self-top align-self-center mx-3 mb-1 mb-sm-0 text-nowrap">
{{#icon}} {{#icon}}
{{#iconurl}} {{#iconurl}}
<img alt="{{alttext}}" title="{{alttext}}" src="{{{ iconurl }}}" class="icon "> <img alt="{{alttext}}" title="{{alttext}}" src="{{{ iconurl }}}" class="icon {{iconclass}}">
{{/iconurl}} {{/iconurl}}
{{^iconurl}} {{^iconurl}}
{{#pix}} {{key}}, {{component}}, {{alttext}} {{/pix}} {{#pix}} {{key}}, {{component}}, {{alttext}} {{/pix}}

7
calendar/classes/external/event_icon_exporter.php vendored
View file

@ -62,12 +62,15 @@ class event_icon_exporter extends exporter {
$isgroupevent = ($group && !empty($groupid)); $isgroupevent = ($group && !empty($groupid));
$isuserevent = ($user && !empty($userid)); $isuserevent = ($user && !empty($userid));
$iconurl = ''; $iconurl = '';
$iconclass = '';
if ($isactivityevent) { if ($isactivityevent) {
$key = 'monologo'; $key = 'monologo';
$component = $coursemodule->get('modname'); $component = $coursemodule->get('modname');
$iconurl = get_fast_modinfo($courseid)->get_cm($coursemodule->get('id'))->get_icon_url()->out(false); $iconurl = get_fast_modinfo($courseid)->get_cm($coursemodule->get('id'))->get_icon_url();
$iconclass = $iconurl->get_param('filtericon') ? '' : 'nofilter';
$iconurl = $iconurl->out(false);
if (get_string_manager()->string_exists($event->get_type(), $component)) { if (get_string_manager()->string_exists($event->get_type(), $component)) {
$alttext = get_string($event->get_type(), $component); $alttext = get_string($event->get_type(), $component);
} else { } else {
@ -121,6 +124,7 @@ class event_icon_exporter extends exporter {
$data->component = $component; $data->component = $component;
$data->alttext = $alttext; $data->alttext = $alttext;
$data->iconurl = $iconurl; $data->iconurl = $iconurl;
$data->iconclass = $iconclass;
parent::__construct($data, $related); parent::__construct($data, $related);
} }
@ -136,6 +140,7 @@ class event_icon_exporter extends exporter {
'component' => ['type' => PARAM_TEXT], 'component' => ['type' => PARAM_TEXT],
'alttext' => ['type' => PARAM_TEXT], 'alttext' => ['type' => PARAM_TEXT],
'iconurl' => ['type' => PARAM_TEXT], 'iconurl' => ['type' => PARAM_TEXT],
'iconclass' => ['type' => PARAM_TEXT],
]; ];
} }