mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 08:56:36 +02:00
themes: MDL-19077 - more work on the theme_config class.
* Writing lots more PHPdoc comments for all the settings. * Strip the comments from the standard theme config.php (see below) * Move finding the layout template from moodle_core_renderer to the theme_config class * Move loading meta.php files from moodle_core_renderer to the theme_config class * MDL-19719 Remove support for $THEME->langsheets, and lang/.../styles.php * MDL-19719 Put the Vietnamese-specific code into the standard theme * Support for styles.php in all plugin types (at the theme's discretion). (c/f MDL-16438) * More PHP doc comments for moodle_core_renderer methods. About stripping comments from config.php: I'm not sure if this is a good idea, and I may revert this bit. I am hoping that once http://phpdocs.moodle.org/HEAD/moodlecore/theme_config.html has been updated, that will be better than copying and pasting these comments into every theme. I intend to post in the themes forum to canvas opinions.
This commit is contained in:
parent
87b6851cf9
commit
fdeb7fa192
5 changed files with 652 additions and 561 deletions
|
@ -55,7 +55,7 @@ require_once(dirname(__FILE__) . '/../config.php');
|
|||
|
||||
|
||||
$fortheme = required_param('for', PARAM_FILE);
|
||||
$lang = optional_param('lang', '', PARAM_FILE);
|
||||
$pluginsheets = optional_param('pluginsheets', '', PARAM_BOOL);
|
||||
|
||||
$CACHE_LIFETIME = 1800; // Cache stylesheets for half an hour.
|
||||
$DEFAULT_SHEET_LIST = array('styles_layout', 'styles_fonts', 'styles_color');
|
||||
|
@ -92,9 +92,28 @@ if (!empty($showdeprecatedstylesheetsetupwarning)) {
|
|||
END;
|
||||
}
|
||||
|
||||
// This is a bit tricky, but the following initialisation code may output
|
||||
// notices or debug developer warnings (for example, if the theme uses some
|
||||
// Deprecated settings in it config.php file. Therefore start a CSS comment
|
||||
// so that any debugging output does not break the CSS. This comment is closed
|
||||
// below.
|
||||
echo '/*';
|
||||
|
||||
|
||||
// Load the configuration of the selected theme. (See comment at the top of the file.)
|
||||
$PAGE->force_theme($fortheme);
|
||||
|
||||
// We will build up a list of CSS file path names, then concatenate them all.
|
||||
$files = array();
|
||||
|
||||
// If this theme wants plugin sheets, include them. Do this first, so styles
|
||||
// here can be overridden by theme CSS.
|
||||
if ($pluginsheets) {
|
||||
foreach ($THEME->pluginsheets as $plugintype) {
|
||||
$files += get_sheets_for_plugin_type($plugintype);
|
||||
}
|
||||
}
|
||||
|
||||
// Now work out which stylesheets we shold be serving from this theme.
|
||||
if ($themename == $fortheme) {
|
||||
$themesheets = $THEME->sheets;
|
||||
|
@ -106,8 +125,7 @@ if ($themename == $fortheme) {
|
|||
} else if (!empty($THEME->parentsheets)) {
|
||||
$themesheets = $THEME->parentsheets;
|
||||
} else {
|
||||
echo "/* The current theme does not require anything from the standard theme. */\n\n";
|
||||
exit;
|
||||
$themesheets = array();
|
||||
}
|
||||
|
||||
} else if ($themename == 'standard') {
|
||||
|
@ -117,66 +135,37 @@ if ($themename == $fortheme) {
|
|||
} else if (!empty($THEME->standardsheets)) {
|
||||
$themesheets = $THEME->standardsheets;
|
||||
} else {
|
||||
echo "/* The current theme does not require anything from the standard theme. */\n\n";
|
||||
exit;
|
||||
$themesheets = array();
|
||||
}
|
||||
}
|
||||
|
||||
// Conver the sheet names to file names.
|
||||
$files = array();
|
||||
// Conver the theme stylessheet names to file names.
|
||||
foreach ($themesheets as $sheet) {
|
||||
$files[] = $CFG->themedir . '/' . $themename . '/' . $sheet . '.css';
|
||||
}
|
||||
|
||||
// If this is the standard theme, then also include the styles.php files from
|
||||
// each of the plugins, as determined by the theme settings.
|
||||
if ($themename == 'standard') {
|
||||
if (!empty($THEME->modsheets)) {
|
||||
$files += get_sheets_for_plugin_type('mod');
|
||||
}
|
||||
|
||||
if (!empty($THEME->blocksheets)) {
|
||||
$files += get_sheets_for_plugin_type('block');
|
||||
}
|
||||
|
||||
if (!empty($THEME->courseformatsheets)) {
|
||||
$files += get_sheets_for_plugin_type('format');
|
||||
}
|
||||
|
||||
if (!empty($THEME->gradereportsheets)) {
|
||||
$files += get_sheets_for_plugin_type('gradereport');
|
||||
}
|
||||
|
||||
if (!empty($THEME->langsheets) && $lang) {
|
||||
$file = $CFG->dirroot . '/lang/' . $lang . '/styles.php';
|
||||
if (file_exists($file)) {
|
||||
$files[] = $file;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (empty($files)) {
|
||||
echo "/* The current theme does not require anything from this theme. */\n\n";
|
||||
echo " The $fortheme theme does not require anything from the $themename theme. */\n\n";
|
||||
exit;
|
||||
}
|
||||
|
||||
// Output a commen with a summary of the included files.
|
||||
echo <<<END
|
||||
/*
|
||||
|
||||
* Styles from theme '$themename' for theme '$fortheme'
|
||||
*
|
||||
* Files included here:
|
||||
*
|
||||
|
||||
END;
|
||||
$toreplace = array($CFG->dirroot, $CFG->themedir);
|
||||
$toreplace = array($CFG->dirroot . '/', $CFG->themedir . '/');
|
||||
foreach ($files as $file) {
|
||||
echo ' * ' . str_replace($toreplace, '', $file) . "\n";
|
||||
}
|
||||
echo " */\n\n";
|
||||
|
||||
if (!empty($THEME->cssoutputfunction)) {
|
||||
call_user_func($THEME->cssoutputfunction, $files);
|
||||
call_user_func($THEME->cssoutputfunction, $files, $toreplace);
|
||||
|
||||
} else {
|
||||
foreach ($files as $file) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue