Skip to content

Commit

Permalink
Merge branch 'MDL-32879' of git://github.com/lazydaisy/moodle
Browse files Browse the repository at this point in the history 
Conflicts:
	theme/magazine/config.php
  • Loading branch information
Sam Hemelryk committed May 28, 2012
2 parents 9757d47 + 96e0e91 commit bb0eaec
Show file tree
Hide file tree
Showing 12 changed files with 93 additions and 93 deletions.
10 changes: 5 additions & 5 deletions theme/afterburner/config.php
View file
Expand Up @@ -34,31 +34,31 @@
'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.
Expand Down
14 changes: 7 additions & 7 deletions theme/anomaly/config.php
View file
Expand Up @@ -32,33 +32,33 @@
'standard' => array(
'file' => 'general.php',
'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post',
'defaultregion' => 'side-pre',
'options' => array('langmenu' => true)
),
// Course page
'course' => array(
'file' => 'general.php',
'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post',
'defaultregion' => 'side-pre',
'options' => array('langmenu' => true)
),
// Course page
'coursecategory' => array(
'file' => 'general.php',
'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post',
'defaultregion' => 'side-pre',
'options' => array('langmenu' => true)
),
'incourse' => array(
'file' => 'general.php',
'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post',
'defaultregion' => 'side-pre',
'options' => array('langmenu' => true)
),
'frontpage' => array(
'file' => 'general.php',
'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post',
'defaultregion' => 'side-pre',
'options' => array('langmenu' => true)
),
'admin' => array(
Expand All @@ -70,13 +70,13 @@
'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',
'options' => array('langmenu' => true)
),
'login' => array(
Expand Down
26 changes: 13 additions & 13 deletions theme/arialist/config.php
View file
Expand Up @@ -38,8 +38,8 @@


$THEME->parents = array(
'canvas',
'base',
'canvas',
'base',
);

/////////////////////////////////////////////////////
Expand All @@ -55,8 +55,8 @@

$THEME->sheets = array(
'pagelayout',
'core',
'settings',
'core',
'settings',
);

////////////////////////////////////////////////////
Expand All @@ -65,12 +65,12 @@
////////////////////////////////////////////////////

$THEME->parents_exclude_sheets = array(
'base'=>array(
'pagelayout',
),
'canvas'=>array(
'pagelayout',
),
'base'=>array(
'pagelayout',
),
'canvas'=>array(
'pagelayout',
),
);


Expand Down Expand Up @@ -156,7 +156,7 @@
'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true),
),
'embedded' => array(
'theme' => 'canvas',
'theme' => 'canvas',
'file' => 'embedded.php',
'regions' => array(),
'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true),
Expand Down Expand Up @@ -209,14 +209,14 @@
// As above but will be included in the page footer.
////////////////////////////////////////////////////

$THEME->larrow = '⟨';
$THEME->larrow = '⟨';

////////////////////////////////////////////////////
// Overrides the left arrow image used throughout
// Moodle
////////////////////////////////////////////////////

$THEME->rarrow = '⟩';
$THEME->rarrow = '⟩';

////////////////////////////////////////////////////
// Overrides the right arrow image used throughout Moodle
Expand Down
14 changes: 7 additions & 7 deletions theme/base/config.php
View file
Expand Up @@ -64,31 +64,31 @@
'standard' => array(
'file' => 'general.php',
'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post',
'defaultregion' => 'side-pre',
),
// Main course page
'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',
),
// 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-post',
'defaultregion' => 'side-pre',
),
// The site home page.
'frontpage' => array(
'file' => 'frontpage.php',
'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post',
'defaultregion' => 'side-pre',
),
// Server administration scripts.
'admin' => array(
Expand All @@ -100,14 +100,14 @@
'mydashboard' => array(
'file' => 'general.php',
'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post',
'defaultregion' => 'side-pre',
'options' => array('langmenu'=>true),
),
// My public page
'mypublic' => array(
'file' => 'general.php',
'regions' => array('side-pre', 'side-post'),
'defaultregion' => 'side-post',
'defaultregion' => 'side-pre',
),
'login' => array(
'file' => 'general.php',
Expand Down
16 changes: 8 additions & 8 deletions theme/boxxie/config.php
View file
Expand Up @@ -69,32 +69,32 @@
'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'
),
'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',
),
'admin' => array(
'file' => 'general.php',
Expand All @@ -104,13 +104,13 @@
'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',
Expand Down
16 changes: 8 additions & 8 deletions theme/canvas/config.php
View file
Expand Up @@ -89,32 +89,32 @@
'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'
),
'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',
),
'admin' => array(
'file' => 'general.php',
Expand All @@ -124,13 +124,13 @@
'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',
Expand Down
16 changes: 8 additions & 8 deletions theme/formal_white/config.php
View file
Expand Up @@ -91,33 +91,33 @@
'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(
Expand All @@ -128,13 +128,13 @@
'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',
Expand Down

0 comments on commit bb0eaec

Please sign in to comment.