From 5cb2f1ad9a3b97d32b2c8d7ec42273ae1201375f Mon Sep 17 00:00:00 2001 From: Mary Evans Date: Sat, 6 Jul 2013 18:53:44 +0100 Subject: [PATCH] MDL-40455: theme_formfactor: Move slash comments to be before code (not after) add missing layouts in formfactor/config,php --- theme/formfactor/config.php | 106 +++++++++++++++++++++++------------- 1 file changed, 67 insertions(+), 39 deletions(-) diff --git a/theme/formfactor/config.php b/theme/formfactor/config.php index 2d4066d752c..229248181ba 100644 --- a/theme/formfactor/config.php +++ b/theme/formfactor/config.php @@ -28,26 +28,23 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ +// Name of the theme, and most likely the name +// of the directory in which this file resides. + $THEME->name = 'formfactor'; -//////////////////////////////////////////////////// -// Name of the theme. Most likely the name of -// the directory in which this file resides. -//////////////////////////////////////////////////// - +// Which existing theme(s) in the /theme/ directory +// do you want this theme to extend? +// A theme can extend any number of themes. So rather +// than creating an entirely new theme and copying all +// of the CSS, you can simply create a new theme, +// by extending the theme you like and just add the +// changes you want to your theme. $THEME->parents = array('canvas','base'); -///////////////////////////////////////////////////// -// Which existing theme(s) in the /theme/ directory -// do you want this theme to extend. A theme can -// extend any number of themes. Rather than -// creating an entirely new theme and copying all -// of the CSS, you can simply create a new theme, -// extend the theme you like and just add the -// changes you want to your theme. -//////////////////////////////////////////////////// - +// Name of the stylesheet(s) you've including in +// this theme's /styles/ directory. $THEME->sheets = array( 'selected', @@ -57,66 +54,72 @@ $THEME->sheets = array( 'blocks' ); -//////////////////////////////////////////////////// -// Name of the stylesheet(s) you've including in -// this theme's /styles/ directory. -//////////////////////////////////////////////////// +// Do you want to use the new navigation dock? $THEME->enable_dock = false; -//////////////////////////////////////////////////// -// Do you want to use the new navigation dock? -//////////////////////////////////////////////////// +// An array of stylesheets to include within the +// body of the editor. $THEME->editor_sheets = array('editor'); -//////////////////////////////////////////////////// -// An array of stylesheets to include within the -// body of the editor. -//////////////////////////////////////////////////// +// These are all of the possible layouts in Moodle. The +// simplest way to do this is to keep the theme and file +// variables the same for every layout. Including them +// all in this way allows some flexibility down the road +// if you want to add a different layout template to a +// specific page. $THEME->layouts = array( + // Most backwards compatible layout without the blocks - this is the layout used by default 'base' => array( 'file' => 'general.php', - 'regions' => array('side-pre', 'side-post'), - 'defaultregion' => 'side-pre', + 'regions' => array(), ), + // Standard layout with blocks, this is recommended for most pages with general information 'standard' => array( 'file' => 'general.php', 'regions' => array('side-pre', 'side-post'), 'defaultregion' => 'side-pre', ), + // Main course page 'course' => array( 'file' => 'general.php', 'regions' => array('side-pre', 'side-post'), - 'defaultregion' => 'side-pre' + 'defaultregion' => 'side-pre', + 'options' => array('langmenu'=>true), ), 'coursecategory' => array( 'file' => 'general.php', 'regions' => array('side-pre', '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-pre', ), + // The site home page. 'frontpage' => array( 'file' => 'frontpage.php', 'regions' => array('side-pre', 'side-post'), 'defaultregion' => 'side-pre', ), + // Server administration scripts. 'admin' => array( 'file' => 'general.php', 'regions' => array('side-pre'), 'defaultregion' => 'side-pre', ), + // My dashboard page 'mydashboard' => array( 'file' => 'general.php', 'regions' => array('side-pre', 'side-post'), 'defaultregion' => 'side-pre', 'options' => array('langmenu'=>true), ), + // My public page 'mypublic' => array( 'file' => 'general.php', 'regions' => array('side-pre', 'side-post'), @@ -127,31 +130,56 @@ $THEME->layouts = array( 'regions' => array(), 'options' => array('langmenu'=>true), ), + + // Pages that appear in pop-up windows - no navigation, no blocks, no header. 'popup' => array( 'file' => 'general.php', 'regions' => array(), - 'options' => array('nofooter'=>true, 'noblocks'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true), + 'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true, 'nologininfo'=>true, 'nocourseheaderfooter'=>true), ), + // No blocks and minimal footer - used for legacy frame layouts only! 'frametop' => array( 'file' => 'general.php', 'regions' => array(), 'options' => array('nofooter'=>true, 'nocoursefooter'=>true), ), - 'maintenance' => array( - 'file' => 'general.php', - 'regions' => array(), - 'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true), - ), + // Embeded pages, like iframe/object embeded in moodleform - it needs as much space as possible 'embedded' => array( 'file' => 'embedded.php', 'regions' => array(), - 'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocourseheaderfooter'=>true), + 'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true, 'nocourseheaderfooter'=>true), + ), + // Used during upgrade and install, and for the 'This site is undergoing maintenance' message. + // This must not have any blocks, and it is good idea if it does not have links to + // other places - for example there should not be a home link in the footer... + 'maintenance' => array( + 'file' => 'general.php', + 'regions' => array(), + 'options' => array('noblocks'=>true, 'nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true, 'nocourseheaderfooter'=>true), ), // Should display the content and basic headers only. 'print' => array( 'file' => 'general.php', 'regions' => array(), - 'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true, 'nocourseheaderfooter'=>true), + 'options' => array('noblocks'=>true, 'nofooter'=>true, 'nonavbar'=>false, 'nocustommenu'=>true, 'nocourseheaderfooter'=>true), ), - -); + // The pagelayout used when a redirection is occuring. + 'redirect' => array( + 'file' => 'embedded.php', + 'regions' => array(), + 'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true, 'nocourseheaderfooter'=>true), + ), + // The pagelayout used for reports. + 'report' => array( + 'file' => 'report.php', + 'regions' => array('side-pre'), + 'defaultregion' => 'side-pre', + ), + // The pagelayout used for safebrowser and securewindow. + 'secure' => array( + 'file' => 'general.php', + 'regions' => array('side-pre', 'side-post'), + 'defaultregion' => 'side-pre', + 'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true, 'nologinlinks'=>true, 'nocourseheaderfooter'=>true), + ), +); \ No newline at end of file