MDL-10048 Separate events key and monthly view in right side panel

diff --git a/calendar/view.php b/calendar/view.php
index 5ec03b5c569f98227c1bdb2e9997bc2757a43feb..6b6cc440abb093aa558689781cd42f1569e3af7d 100644 (file)
--- a/calendar/view.php
+++ b/calendar/view.php
@@ -182,17 +182,21 @@
 
     // START: Last column (3-month display)
     echo '<td class="sidecalendar">';
-    echo '<div class="header">'.get_string('monthlyview', 'calendar').'</div>';
-
     list($prevmon, $prevyr) = calendar_sub_month($mon, $yr);
     list($nextmon, $nextyr) = calendar_add_month($mon, $yr);
     $getvars = 'cal_d='.$day.'&amp;cal_m='.$mon.'&amp;cal_y='.$yr; // For filtering
 
+    echo '<div class="sideblock">';
+    echo '<div class="header">'.get_string('eventskey', 'calendar').'</div>';
     echo '<div class="filters">';
-    echo calendar_filter_controls($view, $getvars);
+    echo calendar_filter_controls($view, $getvars, NULL, $courses);
+    echo '</div>';
     echo '</div>';
 
-    echo '<div class="minicalendarblock">';
+    echo '<div class="sideblock">';
+    echo '<div class="header">'.get_string('monthlyview', 'calendar').'</div>';
+
+    echo '<div class="minicalendarblock minicalendartop">';
     echo calendar_top_controls('display', array('m' => $prevmon, 'y' => $prevyr));
     echo calendar_get_mini($courses, $groups, $users, $prevmon, $prevyr);
     echo '</div><div class="minicalendarblock">';
@@ -202,6 +206,7 @@
     echo calendar_top_controls('display', array('m' => $nextmon, 'y' => $nextyr));
     echo calendar_get_mini($courses, $groups, $users, $nextmon, $nextyr);
     echo '</div>';
+    echo '</div>';
 
     echo '</td>';
 

diff --git a/lang/en_utf8/calendar.php b/lang/en_utf8/calendar.php
index 3f5e9944676b7828d9485961322d276326af512b..eb9679c399d1a3f8afaddb46e9f2f9a970681a4f 100644 (file)
--- a/lang/en_utf8/calendar.php
+++ b/lang/en_utf8/calendar.php
@@ -8,6 +8,7 @@ $string['clickhide'] = 'click to hide';
 $string['clickshow'] = 'click to show';
 $string['commontasks'] = 'Options';
 $string['confirmeventdelete'] = 'Are you sure you want to delete this event?';
+$string['course'] = 'Course';
 $string['courseevent'] = 'Course event';
 $string['courseevents'] = 'Course events';
 $string['dayview'] = 'Day View';
@@ -36,6 +37,7 @@ $string['eventnone'] = 'No events';
 $string['eventrepeat'] = 'Repeats';
 $string['eventsall'] = 'All events';
 $string['eventsfor'] = '$a events';
+$string['eventskey'] = 'Events Key';
 $string['eventsrelatedtocourses'] = 'Events related to courses';
 $string['eventstarttime'] = 'Start time';
 $string['eventtime'] = 'Time';
@@ -54,9 +56,11 @@ $string['for'] = 'for';
 $string['fri'] = 'Fri';
 $string['friday'] = 'Friday';
 $string['generateurlbutton'] = 'Get calendar URL';
+$string['global'] = 'Global';
 $string['globalevent'] = 'Global event';
 $string['globalevents'] = 'Global events';
 $string['gotocalendar'] = 'Go to calendar';
+$string['group'] = 'Group';
 $string['groupevent'] = 'Group event';
 $string['groupevents'] = 'Group events';
 $string['hidden'] = 'hidden';
@@ -115,6 +119,7 @@ $string['typesite'] = 'Site event';
 $string['typeuser'] = 'User event';
 $string['upcomingevents'] = 'Upcoming Events';
 $string['urlforical'] = 'URL for iCalendar export, for subscribing to calendar';
+$string['user'] = 'User';
 $string['userevent'] = 'User event';
 $string['userevents'] = 'User events';
 $string['wed'] = 'Wed';

diff --git a/theme/standard/styles_color.css b/theme/standard/styles_color.css
index beec21e3bbb98d31655faa7ae91d24c744fa2f2b..88ed19d7c73077557fddb2fd26c3bc9262be55ea 100644 (file)
--- a/theme/standard/styles_color.css
+++ b/theme/standard/styles_color.css
@@ -463,6 +463,34 @@ table.minicalendar {
   background-color:#FFD3BD;
 }
 
+#calendar .event_course0,
+.minicalendar .event_course0,
+.block_calendar_month .event_course0 {
+  border-color:#FFD3BD !important; /* #EEC2AC */
+  background-color:#FFD3BD;
+}
+
+#calendar .event_course1,
+.minicalendar .event_course1,
+.block_calendar_month .event_course1 {
+  border-color:#99CCFF !important; /* #EEC2AC */
+  background-color:#99CCFF;
+}
+
+#calendar .event_course2,
+.minicalendar .event_course2,
+.block_calendar_month .event_course2 {
+  border-color:#FFFFCC !important; /* #EEC2AC */
+  background-color:#FFFFCC;
+}
+
+#calendar .event_course3,
+.minicalendar .event_course3,
+.block_calendar_month .event_course3 {
+  border-color:#FF6699 !important; /* #EEC2AC */
+  background-color:#FF6699;
+}
+
 #calendar .event_group,
 .minicalendar .event_group,
 .block_calendar_month .event_group {
@@ -489,6 +517,30 @@ table.minicalendar {
   border-bottom-color:#FF9966 !important;
 }
 
+#calendar .duration_course0,
+.minicalendar .duration_course0 {
+  border-top-color:#FF9966 !important;
+  border-bottom-color:#FF9966 !important;
+}
+
+#calendar .duration_course1,
+.minicalendar .duration_course1 {
+  border-top-color:#0099FF !important;
+  border-bottom-color:#0099FF !important;
+}
+
+#calendar .duration_course2,
+.minicalendar .duration_course2 {
+  border-top-color:#FFFF00 !important;
+  border-bottom-color:#FFFF00 !important;
+}
+
+#calendar .duration_course3,
+.minicalendar .duration_course3 {
+  border-top-color:#FF0033 !important;
+  border-bottom-color:#FF0033 !important;
+}
+
 #calendar .duration_group,
 .minicalendar .duration_group {
   border-top-color:#FBBB23 !important;
@@ -511,6 +563,11 @@ table.minicalendar {
   border-color:#444444;
 }
 
+#calendar .nottoday,
+.minicalendar .nottoday {
+  border-color:#eeeeee;
+}
+
 .cal_popup_fg {
   background-color:#FFFFFF;
 }
@@ -526,6 +583,9 @@ table.minicalendar {
   background-color: #EEEEEE;
 }
 
+#calendar td.sidecalendar .sideblock {
+  border-color: #DDDDDD;
+}
 
 
 /***

diff --git a/theme/standard/styles_fonts.css b/theme/standard/styles_fonts.css
index f8722a72b372fe9d2610416de5cc1dfff8ab7be1..f38f58e64b8935a1fcc6da50dc95906e0aca356b 100644 (file)
--- a/theme/standard/styles_fonts.css
+++ b/theme/standard/styles_fonts.css
@@ -867,3 +867,7 @@ body#mod-forum-index .generalbox .cell {
   background-color: #cccccc;
   color: #000000;
 }
+
+.sideblock .content h3.eventskey {
+    font-size:0.8em;
+}

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 95a9002b01dca6f7873827d210a40bcba7581817..a67059064d232598507dfd0931d4ae82e4a7aac1 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -1543,6 +1543,11 @@ table.minicalendar th {
   border:2px solid;
 }
 
+#calendar .nottoday,
+.minicalendar .today {
+  border:1px solid;
+}
+
 .cal_popup_bg {
   padding:0px;
   margin:0px;
@@ -1591,6 +1596,26 @@ table.minicalendar th {
   padding-left: 20px;
 }
 
+#calendar td.sidecalendar {
+border-width:0px;
+padding-top:1px;
+}
+
+#calendar td.sidecalendar .sideblock {
+  border: 1px solid;
+  margin-bottom:10px;
+}
+
+#calendar td.sidecalendar .minicalendartop {
+  padding-top:10px;
+}
+
+.sideblock .content h3.eventskey {
+    margin-top:0.5em;
+    margin-bottom:0;
+    margin-left:0.5em;
+}
+
 /***
  *** Course
  ***/

diff --git a/theme/standard/styles_moz.css b/theme/standard/styles_moz.css
index 57a07adac4b5fbe7bc23ca148214d56dc780a872..51b0e2cb08aaa92ab3f57c6e7702fb7ae9f60965 100644 (file)
--- a/theme/standard/styles_moz.css
+++ b/theme/standard/styles_moz.css
@@ -160,6 +160,11 @@
   -moz-border-radius-bottomleft:20px;
 }
 
+#calendar td.sidecalendar .sideblock {
+  -moz-border-radius-bottomright:20px;
+  -moz-border-radius-bottomleft:20px;
+}
+
 #calendar .maincalendar .filters table,
 #calendar .sidecalendar .filters table,
 .sideblock.block_calendar_month .filters table