L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-59846-33' of git://github.com/lameze/moodle into MOODLE_33_STABLE

Browse Source
This commit is contained in:
David Monllao
2017-09-07 11:01:03 +02:00
parent 1b9cafb3e8 2fb9bb8eac
commit cf6d37c10a
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
calendar/renderer.php
+3 -2
View File
@@ -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();
theme/bootstrapbase/less/moodle/calendar.less
+3 -3
View File
@@ -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;
}
theme/bootstrapbase/style/moodle.css
+3 -3
View File
@@ -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;
}