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

@ -91,33 +91,33 @@ $THEME->layouts = array(
'base' => array(
'file' => 'general.php',
'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post',
'defaultregion' => 'side-pre',
),
'standard' => array(
'file' => 'general.php',
'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post',
'defaultregion' => 'side-pre',
),
'course' => array(
'file' => 'general.php',
'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post',
'defaultregion' => 'side-pre',
'options' => array('langmenu'=>true),
),
'coursecategory' => array(
'file' => 'general.php',
'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post',
'defaultregion' => 'side-pre',
),
'incourse' => array(
'file' => 'general.php',
'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post',
'defaultregion' => 'side-pre',
),
'frontpage' => array(
'file' => 'frontpage.php',
'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post',
'defaultregion' => 'side-pre',
'options' => array('langmenu'=>true),
),
'admin' => array(
@ -128,13 +128,13 @@ $THEME->layouts = array(
'mydashboard' => array(
'file' => 'general.php',
'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post',
'defaultregion' => 'side-pre',
'options' => array('langmenu'=>true),
),
'mypublic' => array(
'file' => 'general.php',
'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post',
'defaultregion' => 'side-pre',
),
'login' => array(
'file' => 'general.php',