From 35db9b49313b757cccb8e125e56e70cebe435633 Mon Sep 17 00:00:00 2001 From: Gareth J Barnard Date: Sat, 11 Jul 2015 21:28:58 +0100 Subject: [PATCH] V2.9.0.6 --- README.txt | 4 ++++ classes/core_renderer.php | 11 +++++++++++ essentials/classes/core_renderer.php | 8 ++++++++ essentials/config.php | 1 + essentials/layout/includes/footer.php | 3 --- essentials/lib.php | 4 +++- layout/includes/footer.php | 3 --- less/essential/alternative/alternative1.less | 1 + less/essential/alternative/alternative2.less | 1 + less/essential/alternative/alternative3.less | 1 + style/essential-alternative.css | 3 +++ style/essential-rtl_ie9.css | 2 +- style/essential_ie9.css | 2 +- version.php | 4 ++-- 14 files changed, 37 insertions(+), 11 deletions(-) diff --git a/README.txt b/README.txt index a4a08011..deb09a79 100644 --- a/README.txt +++ b/README.txt @@ -187,6 +187,10 @@ It is essential that you provide as much information as possible, the critical i 'version.php' file. Other version information such as specific Moodle version, theme name and version also helps. A screen shot can be really useful in visualising the issue along with any files you consider to be relevant. +New in 2.9.0.6 +============== +- FIX: #adminsettings h3 colour in alternative colours. + New in 2.9.0.5 ============== - FIX: Forum submit area background colour for alternative colours. diff --git a/classes/core_renderer.php b/classes/core_renderer.php index 57af47e0..a2c108fa 100644 --- a/classes/core_renderer.php +++ b/classes/core_renderer.php @@ -1212,6 +1212,17 @@ protected function essential_blocks_for_region($region, $blocksperrow, $editing) return $output; } + public function standard_footer_html() { + $output = parent::standard_footer_html(); + $url = new moodle_url('//about.me/gjbarnard'); + $output .= html_writer::start_tag('div', array ('class' => 'themecredit')). + get_string('credit', 'theme_essential'). + html_writer::link($url, 'Gareth J Barnard', array('target' => '_blank')). + html_writer::end_tag('div'); + + return $output; + } + // Essential custom bits. public function essential_edit_button($section) { global $CFG; diff --git a/essentials/classes/core_renderer.php b/essentials/classes/core_renderer.php index 9e8ace80..93f3c102 100644 --- a/essentials/classes/core_renderer.php +++ b/essentials/classes/core_renderer.php @@ -39,4 +39,12 @@ public function navbar() $breadcrumbs .= html_writer::end_tag('ul'); return $breadcrumbs; } + + /** + * Outputs the alternative colours menu + * @return custom_menu object + */ + public function custom_menu_themecolours() { + return ''; + } } diff --git a/essentials/config.php b/essentials/config.php index ea0a3ca7..09d42dcb 100644 --- a/essentials/config.php +++ b/essentials/config.php @@ -34,6 +34,7 @@ out and look at 'theme_essentials_process_css' in lib.php for more information. */ $THEME->parents_exclude_sheets = array( 'essential' => array( + 'essential-alternative', 'essential-settings', 'custom' ) diff --git a/essentials/layout/includes/footer.php b/essentials/layout/includes/footer.php index 6d58d470..a5f20e8d 100644 --- a/essentials/layout/includes/footer.php +++ b/essentials/layout/includes/footer.php @@ -60,9 +60,6 @@
standard_footer_html(); ?>
-
- Gareth J Barnard -
diff --git a/essentials/lib.php b/essentials/lib.php index 0f02974d..95d900b6 100644 --- a/essentials/lib.php +++ b/essentials/lib.php @@ -24,7 +24,9 @@ */ function theme_essentials_process_css($css, $theme) { - // Change to 'true' if you want to use Essential's settings after removing the '$THEME->parents_exclude_sheets' in config.php. + /* Change to 'true' if you want to use Essential's settings after removing the '$THEME->parents_exclude_sheets' in config.php. + Then to get the alternive colours back, renove the overridden method 'custom_menu_themecolours' in the 'theme_essentials_core_renderer' + class in the 'core_renderer.php' file in the 'classes' folder. */ $usingessentialsettings = false; if ($usingessentialsettings) { diff --git a/layout/includes/footer.php b/layout/includes/footer.php index adf8ff53..6bacde01 100755 --- a/layout/includes/footer.php +++ b/layout/includes/footer.php @@ -58,9 +58,6 @@
standard_footer_html(); ?>
-
- Gareth J Barnard -
diff --git a/less/essential/alternative/alternative1.less b/less/essential/alternative/alternative1.less index 686a7902..4f0781c2 100644 --- a/less/essential/alternative/alternative1.less +++ b/less/essential/alternative/alternative1.less @@ -3,6 +3,7 @@ .essential-colours-alternative1 { color: ~"[[setting:alternativethemetextcolor1]]"; h1, h2, h3, h4, h5, h6, + #adminsettings h3, .color, h1#title, select, diff --git a/less/essential/alternative/alternative2.less b/less/essential/alternative/alternative2.less index 61472f59..5b3f2bcf 100644 --- a/less/essential/alternative/alternative2.less +++ b/less/essential/alternative/alternative2.less @@ -3,6 +3,7 @@ .essential-colours-alternative2 { color: ~"[[setting:alternativethemetextcolor2]]"; h1, h2, h3, h4, h5, h6, + #adminsettings h3, .color, h1#title, select, diff --git a/less/essential/alternative/alternative3.less b/less/essential/alternative/alternative3.less index 3315c972..b35bd580 100644 --- a/less/essential/alternative/alternative3.less +++ b/less/essential/alternative/alternative3.less @@ -3,6 +3,7 @@ .essential-colours-alternative3 { color: ~"[[setting:alternativethemetextcolor3]]"; h1, h2, h3, h4, h5, h6, + #adminsettings h3, .color, h1#title, select, diff --git a/style/essential-alternative.css b/style/essential-alternative.css index ea2c82ec..22a02fd9 100644 --- a/style/essential-alternative.css +++ b/style/essential-alternative.css @@ -41,6 +41,7 @@ .essential-colours-alternative1 h4, .essential-colours-alternative1 h5, .essential-colours-alternative1 h6, +.essential-colours-alternative1 #adminsettings h3, .essential-colours-alternative1 .color, .essential-colours-alternative1 h1#title, .essential-colours-alternative1 select, @@ -572,6 +573,7 @@ .essential-colours-alternative2 h4, .essential-colours-alternative2 h5, .essential-colours-alternative2 h6, +.essential-colours-alternative2 #adminsettings h3, .essential-colours-alternative2 .color, .essential-colours-alternative2 h1#title, .essential-colours-alternative2 select, @@ -1103,6 +1105,7 @@ .essential-colours-alternative3 h4, .essential-colours-alternative3 h5, .essential-colours-alternative3 h6, +.essential-colours-alternative3 #adminsettings h3, .essential-colours-alternative3 .color, .essential-colours-alternative3 h1#title, .essential-colours-alternative3 select, diff --git a/style/essential-rtl_ie9.css b/style/essential-rtl_ie9.css index ca3b3cc3..d7c47dc8 100644 --- a/style/essential-rtl_ie9.css +++ b/style/essential-rtl_ie9.css @@ -1,4 +1,4 @@ -@import url('essential-rtl_ie9-blessed1.css?z=1436643616160'); +@import url('essential-rtl_ie9-blessed1.css?z=1436645614308'); .yui-skin-sam .yui-layout.path-mod-chat-gui_ajax #chat-messages .chat-event.course-theme { text-align: center; diff --git a/style/essential_ie9.css b/style/essential_ie9.css index 551cab8e..eb6342b6 100644 --- a/style/essential_ie9.css +++ b/style/essential_ie9.css @@ -1,4 +1,4 @@ -@import url('essential_ie9-blessed1.css?z=1436643616160'); +@import url('essential_ie9-blessed1.css?z=1436645614308'); .yui-skin-sam .yui-layout.path-mod-chat-gui_ajax #chat-messages .chat-event.course-theme { text-align: center; margin: 10px 0; diff --git a/version.php b/version.php index 147bff65..2d5be257 100644 --- a/version.php +++ b/version.php @@ -26,9 +26,9 @@ defined('MOODLE_INTERNAL') || die; -$plugin->version = 2015062404; // YYYYMMDDVV. +$plugin->version = 2015062405; // YYYYMMDDVV. $plugin->maturity = MATURITY_BETA; // this version's maturity level. -$plugin->release = '2.9.0.5 (Build: 2015062404)'; +$plugin->release = '2.9.0.6 (Build: 2015062405)'; $plugin->requires = 2015051100.00; // 2.9 (Build: 20150511). $plugin->component = 'theme_essential'; $plugin->dependencies = array(); \ No newline at end of file