Adding calendars by default --- later we need a course option to control

visibility

diff --git a/course/format/social/format.php b/course/format/social/format.php
index fbb5cffef873cf1f5228842d1a27c3165b896ef7..787144e9629f032980b19f07d50c534dec3f2173 100644 (file)
--- a/course/format/social/format.php
+++ b/course/format/social/format.php
@@ -46,6 +46,9 @@
       $searchform = "<div align=\"center\">$searchform</div>";
       print_side_block(get_string("search","forum"), $searchform, "", "", "", $leftwidth);
 
+/// Print the calendar
+      calendar_print_side_blocks();
+
 
 /// Then, print all the available resources (Section 0)
       print_section_block(get_string("activities"), $course, $sections[0], 

diff --git a/course/format/topics/format.php b/course/format/topics/format.php
index e27d08cb0b08c0de5d04a33d79fedc7d6783c934..634674a55ddf4458ac4c4957284d70ab6dbfc5b9 100644 (file)
--- a/course/format/topics/format.php
+++ b/course/format/topics/format.php
@@ -94,6 +94,9 @@
     }
     print_side_block($stractivities, "", $moddata, $modicon);
 
+/// Print the calendar
+    calendar_print_side_blocks();
+
 /// Print a form to search forums
     $searchform = forum_print_search_form($course, "", true);
     $searchform = "<div align=\"center\">$searchform</div>";

diff --git a/course/format/weeks/format.php b/course/format/weeks/format.php
index fca6ac4c1826efb4d780f94e1d25c37b6514d3d7..d243ec50d689abcda1ffa2716804ffffe1d0aa15 100644 (file)
--- a/course/format/weeks/format.php
+++ b/course/format/weeks/format.php
@@ -82,11 +82,13 @@
     }
     print_side_block($stractivities, "", $moddata, $modicon);
 
+/// Print the calendar
+    calendar_print_side_blocks();
+
 /// Print a form to search forums
     $searchform = forum_print_search_form($course, "", true);
     $searchform = "<div align=\"center\">$searchform</div>";
     print_side_block(get_string("search","forum"), $searchform);
-    
 
 /// Admin links and controls
     print_course_admin_links($course);

diff --git a/course/view.php b/course/view.php
index 134fe3fbfd2f17bc1431589e479fbd603dacdca5..bc4b858c73ab3bd6cfe216b122493f6a79fa06a9 100644 (file)
--- a/course/view.php
+++ b/course/view.php
@@ -4,6 +4,7 @@
 
     require_once("../config.php");
     require_once("lib.php");
+    require_once('../calendar/lib.php');
 
     optional_variable($id);
     optional_variable($name);