diff --git a/theme/splash/config.php b/theme/splash/config.php index f9bca28d4b852..fbdedaf9169a4 100644 --- a/theme/splash/config.php +++ b/theme/splash/config.php @@ -33,10 +33,10 @@ 'pagelayout', 'core', 'menus', - 'red', - 'green', - 'blue', 'orange', + 'blue', + 'green', + 'red', 'settings', ); @@ -53,48 +53,57 @@ 'standard' => array( 'file' => 'general.php', 'regions' => array('side-pre', 'side-post'), - 'defaultregion' => 'side-pre' + 'defaultregion' => 'side-pre', + 'options' => array('langmenu'=>true), ), // Course page 'course' => array( 'file' => 'general.php', 'regions' => array('side-pre', 'side-post'), - 'defaultregion' => 'side-pre' + 'defaultregion' => 'side-pre', + 'options' => array('langmenu'=>true), ), // Course page 'coursecategory' => array( 'file' => 'general.php', 'regions' => array('side-pre', 'side-post'), - 'defaultregion' => 'side-pre' + 'defaultregion' => 'side-pre', + 'options' => array('langmenu'=>true), ), 'incourse' => array( 'file' => 'general.php', 'regions' => array('side-pre', 'side-post'), - 'defaultregion' => 'side-pre' + 'defaultregion' => 'side-pre', + 'options' => array('langmenu'=>true), ), 'frontpage' => array( 'file' => 'general.php', 'regions' => array('side-pre', 'side-post'), - 'defaultregion' => 'side-pre' + 'defaultregion' => 'side-pre', + 'options' => array('langmenu'=>true), ), 'admin' => array( 'file' => 'general.php', 'regions' => array('side-pre'), - 'defaultregion' => 'side-pre' + 'defaultregion' => 'side-pre', + 'options' => array('langmenu'=>true), ), 'mydashboard' => array( 'file' => 'general.php', 'regions' => array('side-pre', 'side-post'), - 'defaultregion' => 'side-pre' + 'defaultregion' => 'side-pre', + 'options' => array('langmenu'=>true), ), 'mypublic' => array( 'file' => 'general.php', 'regions' => array('side-pre', 'side-post'), - 'defaultregion' => 'side-pre' + 'defaultregion' => 'side-pre', + 'options' => array('langmenu'=>true), ), 'login' => array( 'file' => 'general.php', - 'regions' => array() + 'regions' => array(), + 'options' => array('langmenu'=>true), ), // Pages that appear in pop-up windows - no navigation, no blocks, no header. 'popup' => array( @@ -137,7 +146,8 @@ 'report' => array( 'file' => 'report.php', 'regions' => array('side-pre'), - 'defaultregion' => 'side-pre' + 'defaultregion' => 'side-pre', + 'options' => array('langmenu'=>true), ), ); diff --git a/theme/splash/layout/general.php b/theme/splash/layout/general.php index 4763983db91d8..0b940830dbf20 100644 --- a/theme/splash/layout/general.php +++ b/theme/splash/layout/general.php @@ -32,7 +32,6 @@ $hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu)); splash_check_colourswitch(); -splash_initialise_colourswitcher($PAGE); $bodyclasses = array(); $bodyclasses[] = 'splash-'.splash_get_colour(); @@ -107,7 +106,12 @@ class="styleswitch colour-orange"> - lang_menu();?> + layout_options['langmenu'])) { + echo $OUTPUT->lang_menu(); + } + echo $PAGE->headingmenu + ?>