diff --git a/calendar/renderer.php b/calendar/renderer.php index 03a84d7c8a5..7ba62b074fc 100644 --- a/calendar/renderer.php +++ b/calendar/renderer.php @@ -286,7 +286,7 @@ class core_calendar_renderer extends plugin_renderer_base { $output .= html_writer::tag('div', $source, array('class' => 'subscription')); } if (!empty($event->courselink)) { - $output .= html_writer::tag('div', $event->courselink, array('class' => 'course')); + $output .= html_writer::tag('div', $event->courselink); } if (!empty($event->time)) { $output .= html_writer::tag('span', $event->time, array('class' => 'date pull-xs-right m-r-1')); @@ -296,7 +296,8 @@ class core_calendar_renderer extends plugin_renderer_base { } if (!empty($event->actionurl)) { - $output .= html_writer::tag('div', html_writer::link(new moodle_url($event->actionurl), $event->actionname)); + $actionlink = html_writer::link(new moodle_url($event->actionurl), $event->actionname); + $output .= html_writer::tag('div', $actionlink, ['class' => 'action']); } $output .= $this->output->box_end(); diff --git a/theme/bootstrapbase/less/moodle/calendar.less b/theme/bootstrapbase/less/moodle/calendar.less index dcbee01b3cc..96922d53bd0 100644 --- a/theme/bootstrapbase/less/moodle/calendar.less +++ b/theme/bootstrapbase/less/moodle/calendar.less @@ -165,14 +165,14 @@ margin-right: 0.5rem; } .name, - .course { + .action { margin-bottom: 5px; } .date { float: right; } - .course, - .subscription { + .subscription, + .action { float: left; clear: left; } diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css index a9c078a2774..09911c93394 100644 --- a/theme/bootstrapbase/style/moodle.css +++ b/theme/bootstrapbase/style/moodle.css @@ -5686,14 +5686,14 @@ img.iconsmall { margin-right: 0.5rem; } .path-calendar .maincalendar .eventlist .event .name, -.path-calendar .maincalendar .eventlist .event .course { +.path-calendar .maincalendar .eventlist .event .action { margin-bottom: 5px; } .path-calendar .maincalendar .eventlist .event .date { float: right; } -.path-calendar .maincalendar .eventlist .event .course, -.path-calendar .maincalendar .eventlist .event .subscription { +.path-calendar .maincalendar .eventlist .event .subscription, +.path-calendar .maincalendar .eventlist .event .action { float: left; clear: left; }