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( 'standard' => array(
'file' => 'default.php', 'file' => 'default.php',
'regions' => array('side-pre', 'side-post'), 'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post', 'defaultregion' => 'side-pre',
), ),
// Main course page // Main course page
'course' => array( 'course' => array(
'file' => 'default.php', 'file' => 'default.php',
'regions' => array('side-pre', 'side-post'), 'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post', 'defaultregion' => 'side-pre',
'options' => array('langmenu'=>true), 'options' => array('langmenu'=>true),
), ),
'coursecategory' => array( 'coursecategory' => array(
'file' => 'default.php', 'file' => 'default.php',
'regions' => array('side-pre', 'side-post'), '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() // part of course, typical for modules - default page layout if $cm specified in require_login()
'incourse' => array( 'incourse' => array(
'file' => 'default.php', 'file' => 'default.php',
'regions' => array('side-pre', 'side-post'), 'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post', 'defaultregion' => 'side-pre',
), ),
// The site home page. // The site home page.
'frontpage' => array( 'frontpage' => array(
'file' => 'default.php', 'file' => 'default.php',
'regions' => array('side-pre', 'side-post'), 'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post', 'defaultregion' => 'side-pre',
'options' => array('langmenu'=>true), 'options' => array('langmenu'=>true),
), ),
// Server administration scripts. // Server administration scripts.

View file

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

View file

@ -64,31 +64,31 @@ $THEME->layouts = array(
'standard' => array( 'standard' => array(
'file' => 'general.php', 'file' => 'general.php',
'regions' => array('side-pre', 'side-post'), 'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post', 'defaultregion' => 'side-pre',
), ),
// Main course page // Main course page
'course' => array( 'course' => array(
'file' => 'general.php', 'file' => 'general.php',
'regions' => array('side-pre', 'side-post'), 'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post', 'defaultregion' => 'side-pre',
'options' => array('langmenu'=>true), 'options' => array('langmenu'=>true),
), ),
'coursecategory' => array( 'coursecategory' => array(
'file' => 'general.php', 'file' => 'general.php',
'regions' => array('side-pre', 'side-post'), '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() // part of course, typical for modules - default page layout if $cm specified in require_login()
'incourse' => array( 'incourse' => array(
'file' => 'general.php', 'file' => 'general.php',
'regions' => array('side-pre', 'side-post'), 'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post', 'defaultregion' => 'side-pre',
), ),
// The site home page. // The site home page.
'frontpage' => array( 'frontpage' => array(
'file' => 'frontpage.php', 'file' => 'frontpage.php',
'regions' => array('side-pre', 'side-post'), 'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post', 'defaultregion' => 'side-pre',
), ),
// Server administration scripts. // Server administration scripts.
'admin' => array( 'admin' => array(
@ -100,14 +100,14 @@ $THEME->layouts = array(
'mydashboard' => array( 'mydashboard' => array(
'file' => 'general.php', 'file' => 'general.php',
'regions' => array('side-pre', 'side-post'), 'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post', 'defaultregion' => 'side-pre',
'options' => array('langmenu'=>true), 'options' => array('langmenu'=>true),
), ),
// My public page // My public page
'mypublic' => array( 'mypublic' => array(
'file' => 'general.php', 'file' => 'general.php',
'regions' => array('side-pre', 'side-post'), 'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post', 'defaultregion' => 'side-pre',
), ),
'login' => array( 'login' => array(
'file' => 'general.php', 'file' => 'general.php',

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -53,29 +53,29 @@ $THEME->layouts = array(
'standard' => array( 'standard' => array(
'file' => 'general.php', 'file' => 'general.php',
'regions' => array('side-pre', 'side-post'), 'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post' 'defaultregion' => 'side-pre'
), ),
// Course page // Course page
'course' => array( 'course' => array(
'file' => 'general.php', 'file' => 'general.php',
'regions' => array('side-pre', 'side-post'), 'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post' 'defaultregion' => 'side-pre'
), ),
// Course page // Course page
'coursecategory' => array( 'coursecategory' => array(
'file' => 'general.php', 'file' => 'general.php',
'regions' => array('side-pre', 'side-post'), 'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post' 'defaultregion' => 'side-pre'
), ),
'incourse' => array( 'incourse' => array(
'file' => 'general.php', 'file' => 'general.php',
'regions' => array('side-pre', 'side-post'), 'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post' 'defaultregion' => 'side-pre'
), ),
'frontpage' => array( 'frontpage' => array(
'file' => 'general.php', 'file' => 'general.php',
'regions' => array('side-pre', 'side-post'), 'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post' 'defaultregion' => 'side-pre'
), ),
'admin' => array( 'admin' => array(
'file' => 'general.php', 'file' => 'general.php',
@ -85,12 +85,12 @@ $THEME->layouts = array(
'mydashboard' => array( 'mydashboard' => array(
'file' => 'general.php', 'file' => 'general.php',
'regions' => array('side-pre', 'side-post'), 'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post' 'defaultregion' => 'side-pre'
), ),
'mypublic' => array( 'mypublic' => array(
'file' => 'general.php', 'file' => 'general.php',
'regions' => array('side-pre', 'side-post'), 'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post' 'defaultregion' => 'side-pre'
), ),
'login' => array( 'login' => array(
'file' => 'general.php', 'file' => 'general.php',

View file

@ -54,31 +54,31 @@ $THEME->layouts = array(
'standard' => array( 'standard' => array(
'file' => 'general.php', 'file' => 'general.php',
'regions' => array('side-pre', 'side-post'), 'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post', 'defaultregion' => 'side-pre',
), ),
// Main course page // Main course page
'course' => array( 'course' => array(
'file' => 'general.php', 'file' => 'general.php',
'regions' => array('side-pre', 'side-post'), 'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post', 'defaultregion' => 'side-pre',
'options' => array('langmenu'=>true), 'options' => array('langmenu'=>true),
), ),
'coursecategory' => array( 'coursecategory' => array(
'file' => 'general.php', 'file' => 'general.php',
'regions' => array('side-pre', 'side-post'), '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() // part of course, typical for modules - default page layout if $cm specified in require_login()
'incourse' => array( 'incourse' => array(
'file' => 'general.php', 'file' => 'general.php',
'regions' => array('side-pre', 'side-post'), 'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post', 'defaultregion' => 'side-pre',
), ),
// The site home page. // The site home page.
'frontpage' => array( 'frontpage' => array(
'file' => 'frontpage.php', 'file' => 'frontpage.php',
'regions' => array('side-pre', 'side-post'), 'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post', 'defaultregion' => 'side-pre',
), ),
// Server administration scripts. // Server administration scripts.
'admin' => array( 'admin' => array(
@ -90,14 +90,14 @@ $THEME->layouts = array(
'mydashboard' => array( 'mydashboard' => array(
'file' => 'general.php', 'file' => 'general.php',
'regions' => array('side-pre', 'side-post'), 'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post', 'defaultregion' => 'side-pre',
'options' => array('langmenu'=>true), 'options' => array('langmenu'=>true),
), ),
// My public page // My public page
'mypublic' => array( 'mypublic' => array(
'file' => 'general.php', 'file' => 'general.php',
'regions' => array('side-pre', 'side-post'), 'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post', 'defaultregion' => 'side-pre',
), ),
'login' => array( 'login' => array(
'file' => 'general.php', 'file' => 'general.php',