diff --git a/theme/splash/config.php b/theme/splash/config.php index 6601892a163..41ba3bcd107 100644 --- a/theme/splash/config.php +++ b/theme/splash/config.php @@ -1,5 +1,4 @@ name = 'splash'; -//////////////////////////////////////////////////// -// Name of the theme. -//////////////////////////////////////////////////// - - $THEME->parents = array( 'canvas', 'base', ); -///////////////////////////////////////////////////// -// List exsisting theme(s) to use as parents. -//////////////////////////////////////////////////// - - $THEME->sheets = array( - 'sl', + 'pagelayout', + 'core', + 'menus', + 'red', 'green', 'blue', 'orange', - 'ie', + 'settings', ); -//////////////////////////////////////////////////// -// Name of the stylesheet(s) you are including in -// this new theme's /styles/ directory. -//////////////////////////////////////////////////// +$THEME->editor_sheets = array('editor'); $THEME->enable_dock = true; -//////////////////////////////////////////////////// -// Do you want to use the new navigation dock? -//////////////////////////////////////////////////// - - $THEME->layouts = array( // Most pages - if we encounter an unknown or a missing page type, this one is used. 'base' => array( @@ -126,7 +110,6 @@ $THEME->layouts = array( ), // Embeded pages, like iframe embeded in moodleform 'embedded' => array( - 'theme' => 'canvas', 'file' => 'embedded.php', 'regions' => array(), 'options' => array('nofooter'=>true, 'nonavbar'=>true), @@ -145,6 +128,12 @@ $THEME->layouts = array( 'regions' => array(), 'options' => array('nofooter'=>true, 'nonavbar'=>false, 'noblocks'=>true), ), + // The pagelayout used when a redirection is occuring. + 'redirect' => array( + 'file' => 'embedded.php', + 'regions' => array(), + 'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true), + ), 'report' => array( 'file' => 'report.php', 'regions' => array('side-pre'), @@ -152,19 +141,4 @@ $THEME->layouts = array( ), ); - -/////////////////////////////////////////////////////////////// -// These are all of the possible layouts in Moodle. -/////////////////////////////////////////////////////////////// - - $THEME->csspostprocess = 'splash_process_css'; - - - -/////////////////////////////////////////////////////////////// -// Splash Theme Specific settings for Administrators to customise -// css. -/////////////////////////////////////////////////////////////// - -$THEME->editor_sheets = array('editor'); \ No newline at end of file diff --git a/theme/splash/lang/en/theme_splash.php b/theme/splash/lang/en/theme_splash.php index 36c02ecc8e0..bb3412dc8f1 100644 --- a/theme/splash/lang/en/theme_splash.php +++ b/theme/splash/lang/en/theme_splash.php @@ -1,5 +1,4 @@

Splash

Theme Discussion Forum:

http://moodle.org/mod/forum/view.php?id=46

Theme Credits

http://docs.moodle.org/en/Theme_credits

Theme Documentation:

http://docs.moodle.org/en/Themes

Report a bug:

http://tracker.moodle.org

About

Splash is a fluid-width, three-column theme for Moodle 2.0.

Tweaks

This theme is built upon both Base and Canvas, two parent themes included in the Moodle core. If you want to modify this theme, we recommend that you first duplicate it then rename it before making your changes. This will prevent your customized theme from being overwritten by future Moodle upgrades, and you\'ll still have the original files if you make a mess. More information on modifying themes can be found in the MoodleDocs.

Credits

This theme was coded and is maintained by Caroline Kennedy of Synergy Learning. She can be contacted by email at caroline.kennedy@synergy-learningw.com.

License

This, and all other themes included in the Moodle core, are licensed under the GNU General Public License.

'; +$string['choosereadme'] = '

Splash

Theme Discussion Forum:

http://moodle.org/mod/forum/view.php?id=46

Theme Credits

http://docs.moodle.org/en/Theme_credits

Theme Documentation:

http://docs.moodle.org/en/Themes

Report a bug:

http://tracker.moodle.org

About

Splash is a fluid-width, three-column theme for Moodle 2.0.

Tweaks

This theme is built upon both Base and Canvas, two parent themes included in the Moodle core. If you want to modify this theme, we recommend that you first duplicate it then rename it before making your changes. This will prevent your customized theme from being overwritten by future Moodle upgrades, and you\'ll still have the original files if you make a mess. More information on modifying themes can be found in the MoodleDocs.

Credits

This theme was coded and is maintained by Caroline Kennedy of Synergy Learning. She can be contacted by email at caroline.kennedy@synergy-learningw.com.

License

This, and all other themes included in the Moodle core, are licensed under the GNU General Public License.

'; $string['configtitle'] = 'Splash Theme settings'; $string['customcss'] = 'Custom CSS'; $string['customcssdesc'] = 'Any CSS you enter here will be added to every page allowing your to easily customise this theme.'; diff --git a/theme/splash/layout/general.php b/theme/splash/layout/general.php index 47a457f444e..bf855ef4c17 100644 --- a/theme/splash/layout/general.php +++ b/theme/splash/layout/general.php @@ -1,4 +1,27 @@ . + +/** + * General layout for the mymobile theme + * + * @package theme + * @subpackage splash + * @copyright 2012 Caroline Kennedy - Synergy Learning + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ $hasheading = ($PAGE->heading); $hasnavbar = (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar()); @@ -41,74 +64,101 @@ echo $OUTPUT->doctype() ?> standard_head_html() ?> - standard_top_of_body_html() ?> -
- - - +
@@ -147,10 +199,12 @@ echo $OUTPUT->doctype() ?> @@ -131,10 +187,12 @@ echo $OUTPUT->doctype() ?>