From c8f9faba0cc89d41cec1b287935bb86915c6d94d Mon Sep 17 00:00:00 2001
From: Marina Glancy <marina@moodle.com>
Date: Wed, 28 Nov 2012 16:40:19 +0800
Subject: [PATCH] MDL-36339 Modify themes to add course headers and footers
 provided by course format

---
 theme/formal_white/config.php         | 10 +++++-----
 theme/formal_white/layout/general.php | 23 ++++++++++++++++++++++
 theme/formal_white/layout/report.php  | 24 +++++++++++++++++++++++
 theme/formfactor/config.php           | 10 +++++-----
 theme/formfactor/layout/general.php   | 20 +++++++++++++++++++
 theme/formfactor/style/core.css       |  3 +++
 theme/fusion/config.php               | 10 +++++-----
 theme/fusion/layout/general.php       | 20 +++++++++++++++++++
 theme/fusion/style/core.css           |  4 ++++
 theme/leatherbound/config.php         | 10 +++++-----
 theme/leatherbound/layout/general.php | 28 ++++++++++++++++++++++-----
 theme/leatherbound/layout/report.php  | 28 ++++++++++++++++++++++-----
 theme/magazine/config.php             | 10 +++++-----
 theme/magazine/layout/general.php     | 22 +++++++++++++++++++--
 theme/magazine/style/core.css         | 14 ++++++++++++++
 theme/mymobile/config.php             | 12 ++++++------
 theme/mymobile/layout/general.php     | 19 ++++++++++++++++++
 theme/nimble/config.php               | 10 +++++-----
 theme/nimble/layout/general.php       | 21 +++++++++++++++++++-
 theme/nonzero/config.php              | 10 +++++-----
 theme/nonzero/layout/general.php      | 24 +++++++++++++++++++++--
 theme/overlay/config.php              |  8 ++++----
 theme/overlay/layout/general.php      | 20 ++++++++++++++++++-
 theme/overlay/style/pagelayout.css    |  3 +++
 theme/sky_high/config.php             | 12 ++++++------
 theme/sky_high/layout/general.php     | 18 +++++++++++++++++
 theme/sky_high/layout/report.php      | 18 +++++++++++++++++
 theme/splash/config.php               | 12 ++++++------
 theme/splash/layout/general.php       | 18 +++++++++++++++++
 theme/splash/layout/report.php        | 18 +++++++++++++++++
 theme/standardold/config.php          | 10 +++++-----
 theme/standardold/layout/general.php  | 18 +++++++++++++++++
 32 files changed, 409 insertions(+), 78 deletions(-)

diff --git a/theme/formal_white/config.php b/theme/formal_white/config.php
index f537c482087..e6ea9211faa 100644
--- a/theme/formal_white/config.php
+++ b/theme/formal_white/config.php
@@ -145,19 +145,19 @@ $THEME->layouts = array(
     'popup' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
     ),
     // No blocks and minimal footer - used for legacy frame layouts only!
     'frametop' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true),
+        'options' => array('nofooter'=>true, 'nocoursefooter'=>true),
     ),
     // Embeded pages, like iframe embeded in moodleform (chat)
     'embedded' => array(
         'file' => 'embedded.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true, 'nocourseheaderfooter'=>true),
     ),
     // Used during upgrade and install, and for the 'This site is undergoing maintenance' message.
     // This must not have any blocks, and it is good idea if it does not have links to
@@ -165,13 +165,13 @@ $THEME->layouts = array(
     'maintenance' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
     ),
     // Should display the content and basic headers only.
     'print' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true, 'nocourseheaderfooter'=>true),
     ),
     'report' => array(
         'file' => 'report.php',
diff --git a/theme/formal_white/layout/general.php b/theme/formal_white/layout/general.php
index 1024307d936..b7fbcfe31fc 100644
--- a/theme/formal_white/layout/general.php
+++ b/theme/formal_white/layout/general.php
@@ -15,6 +15,16 @@ $showsidepost = $hassidepost && !$PAGE->blocks->region_completely_docked('side-p
 $custommenu = $OUTPUT->custom_menu();
 $hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu));
 
+$courseheader = $coursecontentheader = $coursecontentfooter = $coursefooter = '';
+if (empty($PAGE->layout_options['nocourseheaderfooter'])) {
+    $courseheader = $OUTPUT->course_header();
+    $coursecontentheader = $OUTPUT->course_content_header();
+    if (empty($PAGE->layout_options['nocoursefooter'])) {
+        $coursecontentfooter = $OUTPUT->course_content_footer();
+        $coursefooter = $OUTPUT->course_footer();
+    }
+}
+
 $bodyclasses = array();
 if ($showsidepre && !$showsidepost) {
     $bodyclasses[] = 'side-pre-only';
@@ -91,6 +101,12 @@ echo $OUTPUT->doctype() ?>
                             <?php } ?>
 <!-- end of page-header -->
 
+<!-- begin of course header -->
+                            <?php if (!empty($courseheader)) { ?>
+                            <div id="course-header"><?php echo $courseheader; ?></div>
+                            <?php } ?>
+<!-- end of course header -->
+
 <!-- begin of custom menu -->
                             <?php if ($hascustommenu) { ?>
                             <div id="custommenu"><?php echo $custommenu; ?></div>
@@ -115,7 +131,9 @@ echo $OUTPUT->doctype() ?>
                                         <div id="region-main-wrap">
                                             <div id="region-main">
                                                 <div class="region-content">
+                                                    <?php echo $coursecontentheader; ?>
                                                     <?php echo $OUTPUT->main_content() ?>
+                                                    <?php echo $coursecontentfooter; ?>
                                                 </div>
                                             </div>
                                         </div>
@@ -146,6 +164,11 @@ echo $OUTPUT->doctype() ?>
                             </div>
 <!-- end of moodle content -->
 
+<!-- begin of course footer -->
+                            <?php if (!empty($coursefooter)) { ?>
+                            <div id="course-footer"><?php echo $coursefooter; ?></div>
+                            <?php } ?>
+<!-- end of course footer -->
                             <div class="clearfix"></div>
 
 <?php if ($hasframe) { ?>
diff --git a/theme/formal_white/layout/report.php b/theme/formal_white/layout/report.php
index 05551e94978..04c2cff3aa9 100644
--- a/theme/formal_white/layout/report.php
+++ b/theme/formal_white/layout/report.php
@@ -14,6 +14,16 @@ $showsidepre = ($hassidepre && !$PAGE->blocks->region_completely_docked('side-pr
 $custommenu = $OUTPUT->custom_menu();
 $hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu));
 
+$courseheader = $coursecontentheader = $coursecontentfooter = $coursefooter = '';
+if (empty($PAGE->layout_options['nocourseheaderfooter'])) {
+    $courseheader = $OUTPUT->course_header();
+    $coursecontentheader = $OUTPUT->course_content_header();
+    if (empty($PAGE->layout_options['nocoursefooter'])) {
+        $coursecontentfooter = $OUTPUT->course_content_footer();
+        $coursefooter = $OUTPUT->course_footer();
+    }
+}
+
 $bodyclasses = array();
 if (!$showsidepre) {
     $bodyclasses[] = 'content-only';
@@ -86,6 +96,12 @@ echo $OUTPUT->doctype() ?>
                             <?php } ?>
 <!-- end of page-header -->
 
+<!-- begin of course header -->
+                            <?php if (!empty($courseheader)) { ?>
+                            <div id="course-header"><?php echo $courseheader; ?></div>
+                            <?php } ?>
+<!-- end of course header -->
+
 <!-- begin of custom menu -->
                             <?php if ($hascustommenu) { ?>
                             <div id="custommenu"><?php echo $custommenu; ?></div>
@@ -107,7 +123,9 @@ echo $OUTPUT->doctype() ?>
                                 <!-- main mandatory content of the moodle page  -->
                                 <div id="report-main-content">
                                     <div class="region-content">
+                                        <?php echo $coursecontentheader; ?>
                                         <?php echo $OUTPUT->main_content() ?>
+                                        <?php echo $coursecontentfooter; ?>
                                     </div>
                                 </div>
                                 <!-- end of main mandatory content of the moodle page -->
@@ -127,6 +145,12 @@ echo $OUTPUT->doctype() ?>
                             </div>
 <!-- end of moodle content -->
 
+<!-- begin of course footer -->
+<?php if (!empty($coursefooter)) { ?>
+<div id="course-footer"><?php echo $coursefooter; ?></div>
+<?php } ?>
+<!-- end of course footer -->
+
                             <div class="clearfix"></div>
 
 <?php if ($hasframe) { ?>
diff --git a/theme/formfactor/config.php b/theme/formfactor/config.php
index ddc32e8c6d2..0ec27f93187 100644
--- a/theme/formfactor/config.php
+++ b/theme/formfactor/config.php
@@ -127,28 +127,28 @@ $THEME->layouts = array(
     'popup' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
     ),
     'frametop' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true),
+        'options' => array('nofooter'=>true, 'nocoursefooter'=>true),
     ),
     'maintenance' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
     ),
     'embedded' => array(
         'file' => 'embedded.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
     ),
     // Should display the content and basic headers only.
     'print' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true, 'nocourseheaderfooter'=>true),
     ),
 
 );
diff --git a/theme/formfactor/layout/general.php b/theme/formfactor/layout/general.php
index 7d4b5196354..a33ecd3b0b1 100644
--- a/theme/formfactor/layout/general.php
+++ b/theme/formfactor/layout/general.php
@@ -9,6 +9,16 @@ $hassidepost = $PAGE->blocks->region_has_content('side-post', $OUTPUT);
 $custommenu = $OUTPUT->custom_menu();
 $hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu));
 
+$courseheader = $coursecontentheader = $coursecontentfooter = $coursefooter = '';
+if (empty($PAGE->layout_options['nocourseheaderfooter'])) {
+    $courseheader = $OUTPUT->course_header();
+    $coursecontentheader = $OUTPUT->course_content_header();
+    if (empty($PAGE->layout_options['nocoursefooter'])) {
+        $coursecontentfooter = $OUTPUT->course_content_footer();
+        $coursefooter = $OUTPUT->course_footer();
+    }
+}
+
 $bodyclasses = array();
 if ($hassidepre && !$hassidepost) {
     $bodyclasses[] = 'side-pre-only';
@@ -61,6 +71,10 @@ echo $OUTPUT->doctype() ?>
       <?php } ?>
 	<?php } ?>
 
+    <?php if (!empty($courseheader)) { ?>
+    <div id="course-header"><?php echo $courseheader; ?></div>
+    <?php } ?>
+
     <?php if ($hasnavbar) { ?>
 	    <div class="navbar clearfix">
     	    <div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
@@ -79,7 +93,9 @@ echo $OUTPUT->doctype() ?>
                 <div id="region-main-wrap">
                     <div id="region-main">
                         <div class="region-content">
+                            <?php echo $coursecontentheader; ?>
                             <?php echo $OUTPUT->main_content() ?>
+                            <?php echo $coursecontentfooter; ?>
                         </div>
                     </div>
                 </div>
@@ -105,6 +121,10 @@ echo $OUTPUT->doctype() ?>
     </div>
 </div>
 
+<?php if (!empty($coursefooter)) { ?>
+<div id="course-footer"><?php echo $coursefooter; ?></div>
+<?php } ?>
+
 <!-- START OF FOOTER -->
     <?php if ($hasfooter) { ?>
     <div id="page-footer" class="clearfix">
diff --git a/theme/formfactor/style/core.css b/theme/formfactor/style/core.css
index da7ca5de97c..460426835b8 100644
--- a/theme/formfactor/style/core.css
+++ b/theme/formfactor/style/core.css
@@ -11,6 +11,7 @@ body,h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea { font-family: "Trebuchet MS",
 
 
 #page-site-index .headermain { margin:0.85em 0;font-size:2.5em; }
+#course-header { margin:0 50px; }
 
 /* Menu Navigation 
 --------------------------*/
@@ -54,6 +55,8 @@ body,h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea { font-family: "Trebuchet MS",
 #page-footer { margin:25px 0; }
 #page-footer .logininfo  { margin: 1em 0; }
 
+#course-footer { margin:0 50px; }
+
 /* custum menu */
 #custommenu {
     margin:0 50px;
diff --git a/theme/fusion/config.php b/theme/fusion/config.php
index 8c2c89c6983..3d66e022213 100644
--- a/theme/fusion/config.php
+++ b/theme/fusion/config.php
@@ -143,29 +143,29 @@ $THEME->layouts = array(
     'popup' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
     ),
     'frametop' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true),
+        'options' => array('nofooter'=>true, 'nocoursefooter'=>true),
     ),
     'maintenance' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
     ),
     'embedded' => array(
         'theme' => 'canvas',
         'file' => 'embedded.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
     ),
     // Should display the content and basic headers only.
     'print' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true, 'nocourseheaderfooter'=>true),
     ),
     'report' => array(
         'file' => 'general.php',
diff --git a/theme/fusion/layout/general.php b/theme/fusion/layout/general.php
index a75c3d9cc58..dadf25b0e56 100644
--- a/theme/fusion/layout/general.php
+++ b/theme/fusion/layout/general.php
@@ -10,6 +10,16 @@ $showsidepost = ($hassidepost && !$PAGE->blocks->region_completely_docked('side-
 $custommenu = $OUTPUT->custom_menu();
 $hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu));
 
+$courseheader = $coursecontentheader = $coursecontentfooter = $coursefooter = '';
+if (empty($PAGE->layout_options['nocourseheaderfooter'])) {
+    $courseheader = $OUTPUT->course_header();
+    $coursecontentheader = $OUTPUT->course_content_header();
+    if (empty($PAGE->layout_options['nocoursefooter'])) {
+        $coursecontentfooter = $OUTPUT->course_content_footer();
+        $coursefooter = $OUTPUT->course_footer();
+    }
+}
+
 $bodyclasses = array();
   if ($showsidepost) {
     $bodyclasses[] = 'side-post-only';
@@ -77,6 +87,10 @@ echo $OUTPUT->doctype() ?>
 
 	<?php } ?>
 
+    <?php if (!empty($courseheader)) { ?>
+    <div id="course-header"><?php echo $courseheader; ?></div>
+    <?php } ?>
+
 
 <!-- START OF CONTENT -->
 
@@ -106,7 +120,9 @@ echo $OUTPUT->doctype() ?>
 							    	    </div>
 						        	<?php } ?>
 
+                                    <?php echo $coursecontentheader; ?>
             	            	    <?php echo $OUTPUT->main_content() ?>
+                                    <?php echo $coursecontentfooter; ?>
 	                	        </div>
     	                	</div>
 	    	            </div>
@@ -130,6 +146,10 @@ echo $OUTPUT->doctype() ?>
 
 <!-- END OF CONTENT -->
 
+    <?php if (!empty($coursefooter)) { ?>
+    <div id="course-footer"><?php echo $coursefooter; ?></div>
+    <?php } ?>
+
 	<?php if ($hasheading || $hasnavbar) { ?>
 		</div>
 
diff --git a/theme/fusion/style/core.css b/theme/fusion/style/core.css
index 7e94997cb79..47bb5635ef1 100644
--- a/theme/fusion/style/core.css
+++ b/theme/fusion/style/core.css
@@ -189,6 +189,10 @@ h6{
     padding: 2px 5px 0 0;
 }
 
+#course-header, #course-footer {
+    margin:5px 20px 0 0;
+}
+
 /* Navbar
 ----------------------------*/
 
diff --git a/theme/leatherbound/config.php b/theme/leatherbound/config.php
index 992a3388c01..3e2d9d126ba 100644
--- a/theme/leatherbound/config.php
+++ b/theme/leatherbound/config.php
@@ -131,29 +131,29 @@ $THEME->layouts = array(
     'popup' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
     ),
     'frametop' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true),
+        'options' => array('nofooter'=>true, 'nocoursefooter'=>true),
     ),
     'maintenance' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
     ),
     'embedded' => array(
         'theme' => 'canvas',
         'file' => 'embedded.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
     ),
     // Should display the content and basic headers only.
     'print' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true, 'nocourseheaderfooter'=>true),
     ),
     'report' => array(
         'file' => 'report.php',
diff --git a/theme/leatherbound/layout/general.php b/theme/leatherbound/layout/general.php
index c0f4daad085..1d259d0d579 100644
--- a/theme/leatherbound/layout/general.php
+++ b/theme/leatherbound/layout/general.php
@@ -8,6 +8,16 @@ $hassidepost = $PAGE->blocks->region_has_content('side-post', $OUTPUT);
 $custommenu = $OUTPUT->custom_menu();
 $hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu));
 
+$courseheader = $coursecontentheader = $coursecontentfooter = $coursefooter = '';
+if (empty($PAGE->layout_options['nocourseheaderfooter'])) {
+    $courseheader = $OUTPUT->course_header();
+    $coursecontentheader = $OUTPUT->course_content_header();
+    if (empty($PAGE->layout_options['nocoursefooter'])) {
+        $coursecontentfooter = $OUTPUT->course_content_footer();
+        $coursefooter = $OUTPUT->course_footer();
+    }
+}
+
 $bodyclasses = array();
 if ($hassidepre && !$hassidepost) {
     $bodyclasses[] = 'side-pre-only';
@@ -32,10 +42,9 @@ echo $OUTPUT->doctype() ?>
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
-<?php if ($hasheading || $hasnavbar) { ?>
+<?php if ($hasheading) { ?>
     <div id="page-header">
         <div id="page-header-wrapper" class="wrapper clearfix">
-            <?php if ($hasheading) { ?>
                 <h1 class="headermain inside"><?php echo $PAGE->heading ?></h1>
                 <div class="headermenu"><?php
                     echo $OUTPUT->login_info();
@@ -44,12 +53,16 @@ echo $OUTPUT->doctype() ?>
                         }
                     echo $PAGE->headingmenu ?>
                 </div>
-            <?php } ?>
         </div>
     </div>
+<?php } ?>
 
 <?php if ($hascustommenu) { ?>
-<div id="custommenuwrap"><div id="custommenu"><?php echo $custommenu; ?></div></div>
+    <div id="custommenuwrap"><div id="custommenu"><?php echo $custommenu; ?></div></div>
+<?php } ?>
+
+<?php if (!empty($courseheader)) { ?>
+    <div id="course-header"><?php echo $courseheader; ?></div>
 <?php } ?>
 
         <?php if ($hasnavbar) { ?>
@@ -61,7 +74,6 @@ echo $OUTPUT->doctype() ?>
             </div>
         <?php } ?>
 
-<?php } ?>
 <!-- END OF HEADER -->
 <div id="page-content-wrapper" class="wrapper clearfix">
     <div id="page-content">
@@ -71,7 +83,9 @@ echo $OUTPUT->doctype() ?>
                 <div id="region-main-wrap">
                     <div id="region-main">
                         <div class="region-content">
+                            <?php echo $coursecontentheader; ?>
                             <?php echo $OUTPUT->main_content() ?>
+                            <?php echo $coursecontentfooter; ?>
                         </div>
                     </div>
                 </div>
@@ -97,6 +111,10 @@ echo $OUTPUT->doctype() ?>
     </div>
 </div>
 
+    <?php if (!empty($coursefooter)) { ?>
+    <div id="course-footer"><?php echo $coursefooter; ?></div>
+    <?php } ?>
+
 <!-- START OF FOOTER -->
     <?php if ($hasfooter) { ?>
     <div id="page-footer" class="wrapper">
diff --git a/theme/leatherbound/layout/report.php b/theme/leatherbound/layout/report.php
index 11baaf024f5..481ac473b60 100644
--- a/theme/leatherbound/layout/report.php
+++ b/theme/leatherbound/layout/report.php
@@ -8,6 +8,16 @@ $hassidepost = $PAGE->blocks->region_has_content('side-post', $OUTPUT);
 $custommenu = $OUTPUT->custom_menu();
 $hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu));
 
+$courseheader = $coursecontentheader = $coursecontentfooter = $coursefooter = '';
+if (empty($PAGE->layout_options['nocourseheaderfooter'])) {
+    $courseheader = $OUTPUT->course_header();
+    $coursecontentheader = $OUTPUT->course_content_header();
+    if (empty($PAGE->layout_options['nocoursefooter'])) {
+        $coursecontentfooter = $OUTPUT->course_content_footer();
+        $coursefooter = $OUTPUT->course_footer();
+    }
+}
+
 $bodyclasses = array();
 if ($hassidepre && !$hassidepost) {
     $bodyclasses[] = 'side-pre-only';
@@ -32,10 +42,9 @@ echo $OUTPUT->doctype() ?>
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
-<?php if ($hasheading || $hasnavbar) { ?>
+<?php if ($hasheading) { ?>
     <div id="page-header">
         <div id="page-header-wrapper" class="wrapper clearfix">
-            <?php if ($hasheading) { ?>
                 <h1 class="headermain inside"><?php echo $PAGE->heading ?></h1>
                 <div class="headermenu"><?php
                     echo $OUTPUT->login_info();
@@ -44,12 +53,16 @@ echo $OUTPUT->doctype() ?>
                         }
                     echo $PAGE->headingmenu ?>
                 </div>
-            <?php } ?>
         </div>
     </div>
+<?php } ?>
 
 <?php if ($hascustommenu) { ?>
-<div id="custommenuwrap"><div id="custommenu"><?php echo $custommenu; ?></div></div>
+    <div id="custommenuwrap"><div id="custommenu"><?php echo $custommenu; ?></div></div>
+<?php } ?>
+
+<?php if (!empty($courseheader)) { ?>
+    <div id="course-header"><?php echo $courseheader; ?></div>
 <?php } ?>
 
         <?php if ($hasnavbar) { ?>
@@ -61,14 +74,15 @@ echo $OUTPUT->doctype() ?>
             </div>
         <?php } ?>
 
-<?php } ?>
 <!-- END OF HEADER -->
 
 <div id="page-content-wrapper" class="wrapper clearfix">
     <div id="page-content">
         <div id="report-main-content">
             <div class="region-content">
+                <?php echo $coursecontentheader; ?>
                 <?php echo $OUTPUT->main_content() ?>
+                <?php echo $coursecontentfooter; ?>
             </div>
         </div>
         <?php if ($hassidepre) { ?>
@@ -83,6 +97,10 @@ echo $OUTPUT->doctype() ?>
     </div>
 </div>
 
+<?php if (!empty($coursefooter)) { ?>
+<div id="course-footer"><?php echo $coursefooter; ?></div>
+<?php } ?>
+
 <!-- START OF FOOTER -->
     <?php if ($hasfooter) { ?>
     <div id="page-footer" class="wrapper">
diff --git a/theme/magazine/config.php b/theme/magazine/config.php
index 39e79c4021a..1e4fc8a8b52 100644
--- a/theme/magazine/config.php
+++ b/theme/magazine/config.php
@@ -104,28 +104,28 @@ $THEME->layouts = array(
     'popup' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
     ),
     'frametop' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true),
+        'options' => array('nofooter'=>true, 'nocoursefooter'=>true),
     ),
     'maintenance' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
     ),
     'embedded' => array(
         'file' => 'embedded.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
     ),
     // Should display the content and basic headers only.
     'print' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true, 'nocourseheaderfooter'=>true),
     ),
     'report' => array(
         'file' => 'general.php',
diff --git a/theme/magazine/layout/general.php b/theme/magazine/layout/general.php
index 5fc452d8f6b..7afc75d76b6 100644
--- a/theme/magazine/layout/general.php
+++ b/theme/magazine/layout/general.php
@@ -10,6 +10,16 @@ $showsidepost = $hassidepost && !$PAGE->blocks->region_completely_docked('side-p
 $custommenu = $OUTPUT->custom_menu();
 $hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu));
 
+$courseheader = $coursecontentheader = $coursecontentfooter = $coursefooter = '';
+if (empty($PAGE->layout_options['nocourseheaderfooter'])) {
+    $courseheader = $OUTPUT->course_header();
+    $coursecontentheader = $OUTPUT->course_content_header();
+    if (empty($PAGE->layout_options['nocoursefooter'])) {
+        $coursecontentfooter = $OUTPUT->course_content_footer();
+        $coursefooter = $OUTPUT->course_footer();
+    }
+}
+
 $bodyclasses = array();
 if ($showsidepre && !$showsidepost) {
     $bodyclasses[] = 'side-pre-only';
@@ -85,6 +95,10 @@ echo $OUTPUT->doctype() ?>
 		</div>
 	</div>
 
+    <?php if (!empty($courseheader)) { ?>
+    <div id="course-header"><?php echo $courseheader; ?></div>
+    <?php } ?>
+
 <!-- end of logo and menu section -->
 
 
@@ -119,8 +133,9 @@ echo $OUTPUT->doctype() ?>
                 				<div id="region-main-wrap">
                     				<div id="region-main">
                         				<div class="region-content">
-
-                            			<?php echo $OUTPUT->main_content() ?>
+                                            <?php echo $coursecontentheader; ?>
+                                            <?php echo $OUTPUT->main_content() ?>
+                                            <?php echo $coursecontentfooter; ?>
                         				</div>
                     				</div>
                 				</div>
@@ -159,6 +174,9 @@ echo $OUTPUT->doctype() ?>
 	</div>
 
 <!-- START OF FOOTER -->
+    <?php if (!empty($coursefooter)) { ?>
+    <div id="course-footer"><?php echo $coursefooter; ?></div>
+    <?php } ?>
 	<div id="page-footer">
 		<div id="footer-container">
 			<div id="footer">
diff --git a/theme/magazine/style/core.css b/theme/magazine/style/core.css
index bb572dbe9e9..ebf73216826 100644
--- a/theme/magazine/style/core.css
+++ b/theme/magazine/style/core.css
@@ -160,6 +160,13 @@ div.rightinfo {
     margin-top: 40px;
 }
 
+#course-header {
+    width: 93%;
+    min-width: 910px;
+    margin: 0 auto;
+    overflow: hidden;
+}
+
 /** main content wraps **/
 
 #outercontainer {
@@ -237,6 +244,13 @@ div.jcontrolsright div.singlebutton, div.jcontrolsright div.forumsearch {
 
 /** foot wraps and inner divs **/
 
+#course-footer {
+    width: 93%;
+    min-width: 910px;
+    margin: 0 auto;
+    overflow: hidden;
+}
+
 #footer {
     width: 91%;
     height: 35px;
diff --git a/theme/mymobile/config.php b/theme/mymobile/config.php
index a28f6b1cd91..780428b2ed5 100644
--- a/theme/mymobile/config.php
+++ b/theme/mymobile/config.php
@@ -105,34 +105,34 @@ $THEME->layouts = array(
     'popup' => array(
         'file' => 'embedded.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
     ),
     'frametop' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true),
+        'options' => array('nofooter'=>true, 'nocoursefooter'=>true),
     ),
     'maintenance' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
     ),
     'embedded' => array(
         'file' => 'embedded.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
     ),
     // Should display the content and basic headers only.
     'print' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true, 'nocourseheaderfooter'=>true),
     ),
      // The pagelayout used when a redirection is occuring.
     'redirect' => array(
         'file' => 'embedded.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true, 'nocourseheaderfooter'=>true),
     ),
      // The pagelayout used for reports
     'report' => array(
diff --git a/theme/mymobile/layout/general.php b/theme/mymobile/layout/general.php
index c862738f5c6..d956b853f3b 100644
--- a/theme/mymobile/layout/general.php
+++ b/theme/mymobile/layout/general.php
@@ -89,6 +89,16 @@ $hasnavbar = (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar());
 $hasfooter = (empty($PAGE->layout_options['nofooter']));
 $hasmyblocks = $PAGE->blocks->region_has_content('myblocks', $OUTPUT);
 
+$courseheader = $coursecontentheader = $coursecontentfooter = $coursefooter = '';
+if (empty($PAGE->layout_options['nocourseheaderfooter'])) {
+    $courseheader = $OUTPUT->course_header();
+    $coursecontentheader = $OUTPUT->course_content_header();
+    if (empty($PAGE->layout_options['nocoursefooter'])) {
+        $coursecontentfooter = $OUTPUT->course_content_footer();
+        $coursefooter = $OUTPUT->course_footer();
+    }
+}
+
 $bodyclasses = array();
 $bodyclasses[] = (string)$hasithumb;
 $bodyclasses[] = (string)$showsitetopic;
@@ -129,6 +139,9 @@ echo $OUTPUT->doctype() ?>
             <?php } else if (!isloggedin()) {
                 echo $OUTPUT->login_info();
             } ?>
+            <?php if (!empty($courseheader)) { ?>
+            <div data-role="course-header"><?php echo $courseheader; ?></div>
+            <?php } ?>
             <!-- start navbar -->
             <div data-role="navbar">
                 <ul>
@@ -173,7 +186,9 @@ echo $OUTPUT->doctype() ?>
                     <?php if ($hasshowmobileintro && $mypagetype == 'site-index') { ?>
                         <?php echo $PAGE->theme->settings->showmobileintro; ?>
                     <?php } ?>
+                    <?php echo $coursecontentheader; ?>
                     <?php echo $OUTPUT->main_content(); ?>
+                    <?php echo $coursecontentfooter; ?>
                 <?php } ?>
                 </div>
             </div>
@@ -237,6 +252,10 @@ echo $OUTPUT->doctype() ?>
         <!-- end main content -->
 
         <!-- start footer -->
+        <?php if (!empty($coursefooter)) { ?>
+        <div data-role="course-footer"><?php echo $coursefooter; ?></div>
+        <?php } ?>
+
         <div data-role="footer" class="mobilefooter" <?php echo $datatheme;?>>
             <div data-role="navbar" class="jnav" >
                 <ul>
diff --git a/theme/nimble/config.php b/theme/nimble/config.php
index a7fb9e3ebf6..bccc74ade2e 100644
--- a/theme/nimble/config.php
+++ b/theme/nimble/config.php
@@ -143,29 +143,29 @@ $THEME->layouts = array(
     'popup' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
     ),
     'frametop' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true),
+        'options' => array('nofooter'=>true, 'nocoursefooter'=>true),
     ),
     'maintenance' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
     ),
     'embedded' => array(
         'theme' => 'canvas',
         'file' => 'embedded.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
     ),
     // Should display the content and basic headers only.
     'print' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true, 'nocourseheaderfooter'=>true),
     ),
     'report' => array(
         'file' => 'general.php',
diff --git a/theme/nimble/layout/general.php b/theme/nimble/layout/general.php
index 7ea0d47de63..13b33bdcacf 100644
--- a/theme/nimble/layout/general.php
+++ b/theme/nimble/layout/general.php
@@ -10,6 +10,16 @@ $showsidepost = ($hassidepost && !$PAGE->blocks->region_completely_docked('side-
 $custommenu = $OUTPUT->custom_menu();
 $hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu));
 
+$courseheader = $coursecontentheader = $coursecontentfooter = $coursefooter = '';
+if (empty($PAGE->layout_options['nocourseheaderfooter'])) {
+    $courseheader = $OUTPUT->course_header();
+    $coursecontentheader = $OUTPUT->course_content_header();
+    if (empty($PAGE->layout_options['nocoursefooter'])) {
+        $coursecontentfooter = $OUTPUT->course_content_footer();
+        $coursefooter = $OUTPUT->course_footer();
+    }
+}
+
 $bodyclasses = array();
   if ($showsidepost) {
     $bodyclasses[] = 'side-post-only';
@@ -94,6 +104,10 @@ echo $OUTPUT->doctype() ?>
 							    	    <h1 class="headermain"><?php echo $PAGE->heading ?></h1>
 							    	</div>
 
+                                    <?php if (!empty($courseheader)) { ?>
+                                        <div id="course-header"><?php echo $courseheader; ?></div>
+                                    <?php } ?>
+
 						    	    <?php if ($hasnavbar) { ?>
 						        	    <div class="navbar">
 						            		<div class="wrapper clearfix">
@@ -106,8 +120,9 @@ echo $OUTPUT->doctype() ?>
 								    	    </div>
 							    	    </div>
 						        	<?php } ?>
-
+                                    <?php echo $coursecontentheader; ?>
             	            	    <?php echo $OUTPUT->main_content() ?>
+                                    <?php echo $coursecontentfooter; ?>
 	                	        </div>
     	                	</div>
 	    	            </div>
@@ -141,6 +156,10 @@ echo $OUTPUT->doctype() ?>
 	<?php } ?>
 
 <!-- START OF FOOTER -->
+        <?php if (!empty($coursefooter)) { ?>
+            <div id="course-footer" class="shrinkwrapper"><?php echo $coursefooter; ?></div>
+        <?php } ?>
+
 
     	<?php if ($hasfooter) { ?>
 		    <div id="page-footer" class="wrapper">
diff --git a/theme/nonzero/config.php b/theme/nonzero/config.php
index c5c6acef77e..fa73b94a988 100644
--- a/theme/nonzero/config.php
+++ b/theme/nonzero/config.php
@@ -142,29 +142,29 @@ $THEME->layouts = array(
     'popup' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
     ),
     'frametop' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true),
+        'options' => array('nofooter'=>true, 'nocoursefooter'=>true),
     ),
     'maintenance' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
     ),
     'embedded' => array(
         'theme' => 'canvas',
         'file' => 'embedded.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
     ),
     // Should display the content and basic headers only.
     'print' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true, 'nocourseheaderfooter'=>true),
     ),
     'report' => array(
         'file' => 'general.php',
diff --git a/theme/nonzero/layout/general.php b/theme/nonzero/layout/general.php
index d5aeff59f96..097a21fce60 100644
--- a/theme/nonzero/layout/general.php
+++ b/theme/nonzero/layout/general.php
@@ -13,6 +13,16 @@ $showsidepost = ($hassidepost && !$PAGE->blocks->region_completely_docked('side-
 $custommenu = $OUTPUT->custom_menu();
 $hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu));
 
+$courseheader = $coursecontentheader = $coursecontentfooter = $coursefooter = '';
+if (empty($PAGE->layout_options['nocourseheaderfooter'])) {
+    $courseheader = $OUTPUT->course_header();
+    $coursecontentheader = $OUTPUT->course_content_header();
+    if (empty($PAGE->layout_options['nocoursefooter'])) {
+        $coursecontentfooter = $OUTPUT->course_content_footer();
+        $coursefooter = $OUTPUT->course_footer();
+    }
+}
+
 $bodyclasses = array();
 if ($showsidepre && !$showsidepost) {
     $bodyclasses[] = 'side-pre-only';
@@ -39,7 +49,7 @@ echo $OUTPUT->doctype() ?>
 <?php echo $OUTPUT->standard_top_of_body_html() ?>
 
 <div id="page">
-<?php if ($hasheading || $hasnavbar) { ?>
+<?php if ($hasheading || $hasnavbar || !empty($courseheader)) { ?>
     <div id="page-header" >
 		<div id="page-header-wrapper" class="wrapper clearfix">
 	        <?php if ($hasheading) { ?>
@@ -59,6 +69,10 @@ echo $OUTPUT->doctype() ?>
 
 <div id="top">
 
+        <?php if (!empty($courseheader)) { ?>
+            <div id="course-header" class="wrapper"><?php echo $courseheader; ?></div>
+        <?php } ?>
+
         <?php if ($hasnavbar) { ?>
             <div class="navbar">
             	<div class="wrapper clearfix">
@@ -79,7 +93,9 @@ echo $OUTPUT->doctype() ?>
 	                <div id="region-main-wrap">
     	                <div id="region-main">
         	                <div class="region-content">
+                                <?php echo $coursecontentheader; ?>
             	                <?php echo $OUTPUT->main_content() ?>
+                                <?php echo $coursecontentfooter; ?>
                 	        </div>
                     	</div>
 	                </div>
@@ -105,10 +121,14 @@ echo $OUTPUT->doctype() ?>
     	</div>
     </div>
 
-<?php if ($hasheading || $hasnavbar) { ?>
+<?php if ($hasheading || $hasnavbar || !empty($courseheader)) { ?>
 </div>
 <?php } ?>
 
+<?php if (!empty($coursefooter)) { ?>
+    <div id="course-footer" class="wrapper"><?php echo $coursefooter; ?></div>
+<?php } ?>
+
 <!-- START OF FOOTER -->
     <?php if ($hasfooter) { ?>
     <div id="page-footer" class="wrapper">
diff --git a/theme/overlay/config.php b/theme/overlay/config.php
index 84d80a4b66b..757bacd1742 100644
--- a/theme/overlay/config.php
+++ b/theme/overlay/config.php
@@ -143,23 +143,23 @@ $THEME->layouts = array(
     'popup' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
     ),
     'frametop' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true),
+        'options' => array('nofooter'=>true, 'nocoursefooter'=>true),
     ),
     'maintenance' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
     ),
     'embedded' => array(
         'theme' => 'canvas',
         'file' => 'embedded.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
     ),
     'report' => array(
         'file' => 'general.php',
diff --git a/theme/overlay/layout/general.php b/theme/overlay/layout/general.php
index 8fc6d8b8e5d..1534590240c 100644
--- a/theme/overlay/layout/general.php
+++ b/theme/overlay/layout/general.php
@@ -13,6 +13,16 @@ $showsidepost = ($hassidepost && !$PAGE->blocks->region_completely_docked('side-
 $custommenu = $OUTPUT->custom_menu();
 $hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu));
 
+$courseheader = $coursecontentheader = $coursecontentfooter = $coursefooter = '';
+if (empty($PAGE->layout_options['nocourseheaderfooter'])) {
+    $courseheader = $OUTPUT->course_header();
+    $coursecontentheader = $OUTPUT->course_content_header();
+    if (empty($PAGE->layout_options['nocoursefooter'])) {
+        $coursecontentfooter = $OUTPUT->course_content_footer();
+        $coursefooter = $OUTPUT->course_footer();
+    }
+}
+
 $bodyclasses = array();
 if ($showsidepre && !$showsidepost) {
     $bodyclasses[] = 'side-pre-only';
@@ -80,6 +90,10 @@ echo $OUTPUT->doctype() ?>
 
                     	    </div>
 
+                            <?php if (!empty($courseheader)) { ?>
+                            <div id="course-header"><?php echo $courseheader; ?></div>
+                            <?php } ?>
+
                     	     <?php if ($hasnavbar) { ?>
             <div class="navbar">
             	<div class="wrapper clearfix">
@@ -92,8 +106,9 @@ echo $OUTPUT->doctype() ?>
                     	    <div class="region-content">
 
 
-
+                                <?php echo $coursecontentheader; ?>
                         	    <?php echo $OUTPUT->main_content() ?>
+                                <?php echo $coursecontentfooter; ?>
 	                        </div>
     	                </div>
         	        </div>
@@ -122,6 +137,9 @@ echo $OUTPUT->doctype() ?>
 </div>
 <!-- END OF CONTENT -->
 
+<?php if (!empty($coursefooter)) { ?>
+<div id="course-footer" class="wrapper"><?php echo $coursefooter; ?></div>
+<?php } ?>
 
 </div>
 <!-- START OF FOOTER -->
diff --git a/theme/overlay/style/pagelayout.css b/theme/overlay/style/pagelayout.css
index 22f1792e187..95b8fb56c29 100644
--- a/theme/overlay/style/pagelayout.css
+++ b/theme/overlay/style/pagelayout.css
@@ -57,6 +57,9 @@ body {margin:auto 0px;
     padding: 20px 20px 20px 0;
     min-height: 100%;
 }
+#page-content #course-header {
+    padding-right: 20px;
+}
 .pagelayout-report #page-content #region-main .region-content {
     overflow: auto;
     padding-bottom: 0;
diff --git a/theme/sky_high/config.php b/theme/sky_high/config.php
index e8c203477ac..99e6e3cacd1 100644
--- a/theme/sky_high/config.php
+++ b/theme/sky_high/config.php
@@ -144,36 +144,36 @@ $THEME->layouts = array(
     'popup' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
     ),
     'frametop' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true),
+        'options' => array('nofooter'=>true, 'nocoursefooter'=>true),
     ),
     'maintenance' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
     ),
     'embedded' => array(
         'theme' => 'canvas',
         'file' => 'embedded.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
     ),
     // The pagelayout used when a redirection is occuring.
     'redirect' => array(
         'theme' => 'canvas',
         'file' => 'embedded.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true, 'nocourseheaderfooter'=>true),
     ),
     // Should display the content and basic headers only.
     'print' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true, 'nocourseheaderfooter'=>true),
     ),
     'report' => array(
         'file' => 'report.php',
diff --git a/theme/sky_high/layout/general.php b/theme/sky_high/layout/general.php
index 76a97d16576..c9b4d983692 100644
--- a/theme/sky_high/layout/general.php
+++ b/theme/sky_high/layout/general.php
@@ -13,6 +13,16 @@ $showsidepost = ($hassidepost && !$PAGE->blocks->region_completely_docked('side-
 $custommenu = $OUTPUT->custom_menu();
 $hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu));
 
+$courseheader = $coursecontentheader = $coursecontentfooter = $coursefooter = '';
+if (empty($PAGE->layout_options['nocourseheaderfooter'])) {
+    $courseheader = $OUTPUT->course_header();
+    $coursecontentheader = $OUTPUT->course_content_header();
+    if (empty($PAGE->layout_options['nocoursefooter'])) {
+        $coursecontentfooter = $OUTPUT->course_content_footer();
+        $coursefooter = $OUTPUT->course_footer();
+    }
+}
+
 $bodyclasses = array();
 if ($showsidepre && !$showsidepost) {
     $bodyclasses[] = 'side-pre-only';
@@ -82,6 +92,9 @@ echo $OUTPUT->doctype() ?>
 <?php if ($hascustommenu) { ?>
       <div id="custommenu"><?php echo $custommenu; ?></div>
 <?php } ?>
+<?php if (!empty($courseheader)) { ?>
+<div id="course-header"><?php echo $courseheader; ?></div>
+<?php } ?>
 <div class="navbar clearfix">
     <?php if ($hasnavbar) { ?>
     <div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
@@ -97,7 +110,9 @@ echo $OUTPUT->doctype() ?>
                 <div id="region-main-wrap">
                     <div id="region-main">
                         <div class="region-content">
+                            <?php echo $coursecontentheader; ?>
                             <?php echo $OUTPUT->main_content() ?>
+                            <?php echo $coursecontentfooter; ?>
                         </div>
                     </div>
                 </div>
@@ -122,6 +137,9 @@ echo $OUTPUT->doctype() ?>
         </div>
     </div>
 </div>
+<?php if (!empty($coursefooter)) { ?>
+<div id="course-footer"><?php echo $coursefooter; ?></div>
+<?php } ?>
 
 <!-- END OF CONTENT -->
 
diff --git a/theme/sky_high/layout/report.php b/theme/sky_high/layout/report.php
index 68cc55b10cc..562c76c9b2c 100644
--- a/theme/sky_high/layout/report.php
+++ b/theme/sky_high/layout/report.php
@@ -8,6 +8,16 @@ $showsidepre = ($hassidepre && !$PAGE->blocks->region_completely_docked('side-pr
 $custommenu = $OUTPUT->custom_menu();
 $hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu));
 
+$courseheader = $coursecontentheader = $coursecontentfooter = $coursefooter = '';
+if (empty($PAGE->layout_options['nocourseheaderfooter'])) {
+    $courseheader = $OUTPUT->course_header();
+    $coursecontentheader = $OUTPUT->course_content_header();
+    if (empty($PAGE->layout_options['nocoursefooter'])) {
+        $coursecontentfooter = $OUTPUT->course_content_footer();
+        $coursefooter = $OUTPUT->course_footer();
+    }
+}
+
 $bodyclasses = array();
 if ($showsidepre) {
     $bodyclasses[] = 'side-pre-only';
@@ -71,6 +81,9 @@ echo $OUTPUT->doctype() ?>
 <?php if ($hascustommenu) { ?>
       <div id="custommenu"><?php echo $custommenu; ?></div>
 <?php } ?>
+<?php if (!empty($courseheader)) { ?>
+<div id="course-header"><?php echo $courseheader; ?></div>
+<?php } ?>
 <div class="navbar clearfix">
     <?php if ($hasnavbar) { ?>
     <div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
@@ -85,7 +98,9 @@ echo $OUTPUT->doctype() ?>
 
                 <div id="report-region-main">
                     <div class="region-content">
+                        <?php echo $coursecontentheader; ?>
                         <?php echo $OUTPUT->main_content() ?>
+                        <?php echo $coursecontentfooter; ?>
                     </div>
                 </div>
 
@@ -101,6 +116,9 @@ echo $OUTPUT->doctype() ?>
         </div>
     </div>
 </div>
+<?php if (!empty($coursefooter)) { ?>
+<div id="course-footer"><?php echo $coursefooter; ?></div>
+<?php } ?>
 
 <!-- END OF CONTENT -->
 
diff --git a/theme/splash/config.php b/theme/splash/config.php
index c428ce5a167..3dea47d296a 100644
--- a/theme/splash/config.php
+++ b/theme/splash/config.php
@@ -109,19 +109,19 @@ $THEME->layouts = array(
     'popup' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'noblocks'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'noblocks'=>true, 'nocourseheaderfooter'=>true),
     ),
     // No blocks and minimal footer - used for legacy frame layouts only!
     'frametop' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter', 'noblocks'=>true),
+        'options' => array('nofooter', 'noblocks'=>true, 'nocoursefooter'=>true),
     ),
     // Embeded pages, like iframe embeded in moodleform
     'embedded' => array(
         'file' => 'embedded.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true),
     ),
     // Used during upgrade and install, and for the 'This site is undergoing maintenance' message.
     // This must not have any blocks, and it is good idea if it does not have links to
@@ -129,19 +129,19 @@ $THEME->layouts = array(
     'maintenance' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'noblocks'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'noblocks'=>true, 'nocourseheaderfooter'=>true),
     ),
     // Should display the content and basic headers only.
     'print' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true, 'nocourseheaderfooter'=>true),
     ),
     // The pagelayout used when a redirection is occuring.
     'redirect' => array(
         'file' => 'embedded.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true, 'nocourseheaderfooter'=>true),
     ),
     'report' => array(
         'file' => 'report.php',
diff --git a/theme/splash/layout/general.php b/theme/splash/layout/general.php
index 3def7ed9012..29f9ea778d5 100644
--- a/theme/splash/layout/general.php
+++ b/theme/splash/layout/general.php
@@ -34,6 +34,16 @@ $hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custom
 splash_check_colourswitch();
 splash_initialise_colourswitcher($PAGE);
 
+$courseheader = $coursecontentheader = $coursecontentfooter = $coursefooter = '';
+if (empty($PAGE->layout_options['nocourseheaderfooter'])) {
+    $courseheader = $OUTPUT->course_header();
+    $coursecontentheader = $OUTPUT->course_content_header();
+    if (empty($PAGE->layout_options['nocoursefooter'])) {
+        $coursecontentfooter = $OUTPUT->course_content_footer();
+        $coursefooter = $OUTPUT->course_footer();
+    }
+}
+
 $bodyclasses = array();
 $bodyclasses[] = 'splash-'.splash_get_colour();
 if ($hassidepre && !$hassidepost) {
@@ -148,6 +158,9 @@ echo $OUTPUT->doctype() ?>
         <?php
     } ?>
     <!-- END CUSTOMMENU -->
+    <?php if (!empty($courseheader)) { ?>
+    <div id="course-header"><?php echo $courseheader; ?></div>
+    <?php } ?>
     <div class="navbar">
     <div class="wrapper clearfix">
     <div class="breadcrumb">
@@ -171,7 +184,9 @@ echo $OUTPUT->doctype() ?>
                     <div id="region-main-wrap">
                         <div id="region-main">
                             <div class="region-content">
+                                <?php echo $coursecontentheader; ?>
                                 <?php echo $OUTPUT->main_content() ?>
+                                <?php echo $coursecontentfooter; ?>
                             </div>
                         </div>
                     </div>
@@ -197,6 +212,9 @@ echo $OUTPUT->doctype() ?>
             </div>
         </div>
         <!-- END OF CONTENT -->
+        <?php if (!empty($coursefooter)) { ?>
+        <div id="course-footer"><?php echo $coursefooter; ?></div>
+        <?php } ?>
         <div class="clearfix"></div>
     <!-- END OF #Page -->
     </div>
diff --git a/theme/splash/layout/report.php b/theme/splash/layout/report.php
index 10d73901f02..2c8b0eab69f 100644
--- a/theme/splash/layout/report.php
+++ b/theme/splash/layout/report.php
@@ -34,6 +34,16 @@ $hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custom
 splash_check_colourswitch();
 splash_initialise_colourswitcher($PAGE);
 
+$courseheader = $coursecontentheader = $coursecontentfooter = $coursefooter = '';
+if (empty($PAGE->layout_options['nocourseheaderfooter'])) {
+    $courseheader = $OUTPUT->course_header();
+    $coursecontentheader = $OUTPUT->course_content_header();
+    if (empty($PAGE->layout_options['nocoursefooter'])) {
+        $coursecontentfooter = $OUTPUT->course_content_footer();
+        $coursefooter = $OUTPUT->course_footer();
+    }
+}
+
 $bodyclasses = array();
 $bodyclasses[] = 'splash-'.splash_get_colour();
 if ($hassidepre && !$hassidepost) {
@@ -148,6 +158,9 @@ echo $OUTPUT->doctype() ?>
         <?php
     } ?>
     <!-- END CUSTOMMENU -->
+    <?php if (!empty($courseheader)) { ?>
+    <div id="course-header"><?php echo $courseheader; ?></div>
+    <?php } ?>
     <div class="navbar">
     <div class="wrapper clearfix">
     <div class="breadcrumb">
@@ -169,7 +182,9 @@ echo $OUTPUT->doctype() ?>
         <div id="page-content" class="clearfix">
             <div id="report-main-content">
                 <div class="region-content">
+                    <?php echo $coursecontentheader; ?>
                     <?php echo $OUTPUT->main_content() ?>
+                    <?php echo $coursecontentfooter; ?>
                 </div>
             </div>
             <?php if ($hassidepre) { ?>
@@ -185,6 +200,9 @@ echo $OUTPUT->doctype() ?>
         </div>
 
         <!-- END OF CONTENT -->
+        <?php if (!empty($coursefooter)) { ?>
+        <div id="course-footer"><?php echo $coursefooter; ?></div>
+        <?php } ?>
         <div class="clearfix"></div>
     <!-- END OF #Page -->
     </div>
diff --git a/theme/standardold/config.php b/theme/standardold/config.php
index 0d81929b9db..5c8e910b1fe 100644
--- a/theme/standardold/config.php
+++ b/theme/standardold/config.php
@@ -109,19 +109,19 @@ $THEME->layouts = array(
     'popup' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true, 'nocourseheaderfooter'=>true),
     ),
     // No blocks and minimal footer - used for legacy frame layouts only!
     'frametop' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true),
+        'options' => array('nofooter'=>true, 'nocoursefooter'=>true),
     ),
     // Embeded pages, like iframe/object embeded in moodleform - it needs as much space as possible
     'embedded' => array(
         'file' => 'embedded.php',
         'regions' => array(),
-        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true),
+        'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true, 'nocourseheaderfooter'=>true),
     ),
     // Used during upgrade and install, and for the 'This site is undergoing maintenance' message.
     // This must not have any blocks, and it is good idea if it does not have links to
@@ -129,13 +129,13 @@ $THEME->layouts = array(
     'maintenance' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('noblocks'=>true, 'nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true),
+        'options' => array('noblocks'=>true, 'nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true, 'nocourseheaderfooter'=>true),
     ),
     // Should display the content and basic headers only.
     'print' => array(
         'file' => 'general.php',
         'regions' => array(),
-        'options' => array('noblocks'=>true, 'nofooter'=>true, 'nonavbar'=>false, 'nocustommenu'=>true),
+        'options' => array('noblocks'=>true, 'nofooter'=>true, 'nonavbar'=>false, 'nocustommenu'=>true, 'nocourseheaderfooter'=>true),
     ),
 );
 
diff --git a/theme/standardold/layout/general.php b/theme/standardold/layout/general.php
index d0df495b846..561ece539c2 100644
--- a/theme/standardold/layout/general.php
+++ b/theme/standardold/layout/general.php
@@ -12,6 +12,16 @@ $showsidepost = ($hassidepost && !$PAGE->blocks->region_completely_docked('side-
 $custommenu = $OUTPUT->custom_menu();
 $hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu));
 
+$courseheader = $coursecontentheader = $coursecontentfooter = $coursefooter = '';
+if (empty($PAGE->layout_options['nocourseheaderfooter'])) {
+    $courseheader = $OUTPUT->course_header();
+    $coursecontentheader = $OUTPUT->course_content_header();
+    if (empty($PAGE->layout_options['nocoursefooter'])) {
+        $coursecontentfooter = $OUTPUT->course_content_footer();
+        $coursefooter = $OUTPUT->course_footer();
+    }
+}
+
 $bodyclasses = array();
 if ($showsidepre && !$showsidepost) {
     $bodyclasses[] = 'side-pre-only';
@@ -48,6 +58,9 @@ echo $OUTPUT->doctype() ?>
         <?php if ($hascustommenu) { ?>
         <div id="custommenu"><?php echo $custommenu; ?></div>
         <?php } ?>
+        <?php if (!empty($courseheader)) { ?>
+        <div id="course-header"><?php echo $courseheader; ?></div>
+        <?php } ?>
         <?php if ($hasnavbar) { ?>
             <div class="navbar clearfix">
                 <div class="breadcrumb"><?php echo $OUTPUT->navbar(); ?></div>
@@ -71,7 +84,9 @@ echo $OUTPUT->doctype() ?>
                 <td id="region-main-wrap">
                     <div id="region-main">
                         <div class="region-content">
+                            <?php echo $coursecontentheader; ?>
                             <?php echo $OUTPUT->main_content() ?>
+                            <?php echo $coursecontentfooter; ?>
                         </div>
                     </div>
                 </td>
@@ -85,6 +100,9 @@ echo $OUTPUT->doctype() ?>
             </tr>
         </table>
     </div>
+    <?php if (!empty($coursefooter)) { ?>
+    <div id="course-footer"><?php echo $coursefooter; ?></div>
+    <?php } ?>
 
 <!-- START OF FOOTER -->
     <?php if ($hasfooter) { ?>