Skip to content
Browse files

Merge branch 'MDL-39697-M25' of git://github.com/lazydaisy/moodle int…

…o MOODLE_25_STABLE
  • Loading branch information...
2 parents 6168502 + 9141e05 commit d74f740722baacbe85e7bfcb59446fd8b97713c7 @damyon damyon committed May 22, 2013
Showing with 35 additions and 20 deletions.
  1. +35 −20 theme/bootstrapbase/config.php
View
55 theme/bootstrapbase/config.php
@@ -50,48 +50,56 @@
$THEME->rendererfactory = 'theme_overridden_renderer_factory';
$THEME->layouts = array(
+ // Most backwards compatible layout without the blocks - this is the layout used by default.
'base' => array(
'file' => 'general.php',
- 'regions' => array('side-pre', 'side-post'),
- 'defaultregion' => 'side-pre',
+ 'regions' => array(),
),
+ // Standard layout with blocks, this is recommended for most pages with general information.
'standard' => array(
'file' => 'general.php',
'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-pre',
),
+ // Main course page.
'course' => array(
'file' => 'general.php',
'regions' => array('side-pre', 'side-post'),
- 'defaultregion' => 'side-pre'
+ 'defaultregion' => 'side-pre',
+ 'options' => array('langmenu'=>true),
),
'coursecategory' => array(
'file' => 'general.php',
'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-pre',
),
+ // part of course, typical for modules - default page layout if $cm specified in require_login()
'incourse' => array(
'file' => 'general.php',
'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-pre',
),
+ // The site home page.
'frontpage' => array(
'file' => 'general.php',
- 'regions' => array('side-pre'),
+ 'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-pre',
- 'options' => array('nonavbar'=>true),
+ 'options' => array('nonavbar'=>true),
),
+ // Server administration scripts.
'admin' => array(
'file' => 'general.php',
'regions' => array('side-pre'),
'defaultregion' => 'side-pre',
),
+ // My dashboard page.
'mydashboard' => array(
'file' => 'general.php',
'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-pre',
'options' => array('langmenu'=>true),
),
+ // My public page.
'mypublic' => array(
'file' => 'general.php',
'regions' => array('side-pre', 'side-post'),
@@ -101,39 +109,47 @@
'file' => 'general.php',
'regions' => array(),
'options' => array('langmenu'=>true),
- 'options' => array('nonavbar'=>true, 'noheader'=>true),
),
+
+ // Pages that appear in pop-up windows - no navigation, no blocks, no header.
'popup' => array(
'file' => 'general.php',
'regions' => array(),
- 'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>true),
+ 'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true, 'nologininfo'=>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),
- ),
- 'maintenance' => array(
- 'file' => 'general.php',
- 'regions' => array(),
- 'options' => array('nofooter'=>true, 'nonavbar'=>true),
+ 'options' => array('nofooter'=>true, 'nocoursefooter'=>true),
),
+ // Embeded pages, like iframe/object embeded in moodleform - it needs as much space as possible
'embedded' => array(
- 'theme' => 'canvas',
'file' => 'embedded.php',
'regions' => array(),
- 'options' => array('nofooter'=>true, 'nonavbar'=>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
+ // other places - for example there should not be a home link in the footer...
+ 'maintenance' => array(
+ 'file' => 'general.php',
+ 'regions' => array(),
+ '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('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true),
+ 'options' => array('noblocks'=>true, 'nofooter'=>true, 'nonavbar'=>false, 'nocustommenu'=>true, 'nocourseheaderfooter'=>true),
),
+ // The pagelayout used when a redirection is occuring.
'redirect' => array(
- 'file' => 'general.php',
+ 'file' => 'embedded.php',
'regions' => array(),
- 'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true),
+ 'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true, 'nocourseheaderfooter'=>true),
),
+ // The pagelayout used for reports.
'report' => array(
'file' => 'general.php',
'regions' => array('side-pre'),
@@ -144,8 +160,7 @@
'file' => 'general.php',
'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-pre',
- 'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true,
- 'nologinlinks'=>true, 'nocourseheaderfooter'=>true),
+ 'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true, 'nologinlinks'=>true, 'nocourseheaderfooter'=>true),
),
);

0 comments on commit d74f740

Please sign in to comment.
Something went wrong with that request. Please try again.