Merge branch 'MDL-32879' of git://github.com/lazydaisy/moodle

Conflicts:
	theme/magazine/config.php
This commit is contained in:
Sam Hemelryk 2012-05-28 14:49:12 +12:00
commit bb0eaec490
12 changed files with 93 additions and 93 deletions

View file

@ -34,31 +34,31 @@ $THEME->layouts = array(
'standard' => array(
'file' => 'default.php',
'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post',
'defaultregion' => 'side-pre',
),
// Main course page
'course' => array(
'file' => 'default.php',
'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post',
'defaultregion' => 'side-pre',
'options' => array('langmenu'=>true),
),
'coursecategory' => array(
'file' => 'default.php',
'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post',
'defaultregion' => 'side-pre',
),
// part of course, typical for modules - default page layout if $cm specified in require_login()
'incourse' => array(
'file' => 'default.php',
'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post',
'defaultregion' => 'side-pre',
),
// The site home page.
'frontpage' => array(
'file' => 'default.php',
'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post',
'defaultregion' => 'side-pre',
'options' => array('langmenu'=>true),
),
// Server administration scripts.