mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-15 05:25:08 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-32309-master' of git://github.com/FMCorz/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2012-09-19 16:10:50 +08:00
commit 99a0936f62
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blocks/calendar_month/block_calendar_month.php
View File

@ -50,7 +50,7 @@ class block_calendar_month extends block_base {
$this->content->text .= calendar_top_controls('course', array('id' => $courseid, 'm' => $cal_m, 'y' => $cal_y));
$this->content->text .= calendar_get_mini($courses, $group, $user, $cal_m, $cal_y);
$this->content->text .= '<h3 class="eventskey">'.get_string('eventskey', 'calendar').'</h3>';
$this->content->text .= '<div class="filters">'.calendar_filter_controls($this->page->url).'</div>';
$this->content->text .= '<div class="filters calendar_filters">'.calendar_filter_controls($this->page->url).'</div>';
}
return $this->content;

14
theme/afterburner/style/afterburner_calendar.css
View File

@ -133,32 +133,36 @@ Modules: Calendar
.block .content h3.eventskey {
margin-top:0.5em;
margin-bottom:0;
margin-left:0.5em;
}
.block .calendar_filters li { padding: 0; }
/*
Colors for Calendar Events
-----------------------*/
#calendar .event_global,
.minicalendar .event_global,
.block_calendar_month .event_global {
.block_calendar_month .event_global,
.calendar_event_global {
border-color:#def2ba !important;
background-color:#def2ba;
}
#calendar .event_course,
.minicalendar .event_course,
.block_calendar_month .event_course {
.block_calendar_month .event_course,
.calendar_event_course {
border-color:#c6dfeb !important;
background-color:#c6dfeb;
}
#calendar .event_group,
.minicalendar .event_group,
.block_calendar_month .event_group {
.block_calendar_month .event_group,
.calendar_event_group {
border-color:#feffc2 !important;
background-color:#feffc2;
}
#calendar .event_user,
.minicalendar .event_user,
.block_calendar_month .event_user {
.block_calendar_month .event_user,
.calendar_event_user {
border-color:#d9c6e2 !important;
background-color:#d9c6e2;
}

2
theme/base/style/calendar.css
View File

@ -48,4 +48,4 @@
.block .calendar_filters li { margin-bottom: .2em;}
.block .calendar_filters li span img { padding: 0 .2em;}
.block .calendar_filters .eventname { padding-left: .2em;}
.block .content h3.eventskey {margin-top:0.5em;margin-bottom:0;margin-left:0.5em;}
.block .content h3.eventskey {margin-top:0.5em;}