This image will not be shown in the summary itself when viewing the list of courses.
@@ -215,8 +207,7 @@ that you are operating the required version of Moodle as stated at the top - thi
functionality that is out of its control.
When reporting an issue you can post in the theme's forum on Moodle.org (currently 'moodle.org/mod/forum/view.php?id=46')
-or check the issue list https://github.com/gjb2048/moodle-theme_essential/issues and if the problem does not exist, create an
-issue.
+or check the issue list github.com/gjb2048/moodle-theme_essential/issues and if the problem does not exist, create an issue.
It is essential that you provide as much information as possible, the critical information being the contents of the theme's
'version.php' file. Other version information such as specific Moodle version, theme name and version also helps. A screen shot
@@ -228,9 +219,9 @@ Please look in CHANGES.txt.
See the theme in Action
=======================
-A video showing many of the core features is available for viewing at https://www.youtube.com/watch?v=grhmR5PmWtA
+A video showing many of the core features is available for viewing at www.youtube.com/watch?v=grhmR5PmWtA
Documentation
=============
-As always, documentation is a work in progress. Available documentation is available at http://docs.moodle.org/31/en/Essential_theme
-If you have questions you can post them in the issue tracker at https://github.com/gjb2048/moodle-theme_essential/issues
\ No newline at end of file
+As always, documentation is a work in progress. Available documentation is available at docs.moodle.org/31/en/Essential_theme
+If you have questions you can post them in the issue tracker at github.com/gjb2048/moodle-theme_essential/issues
\ No newline at end of file
diff --git a/classes/toolbox.php b/classes/toolbox.php
index 8abc2f15..93e341b7 100644
--- a/classes/toolbox.php
+++ b/classes/toolbox.php
@@ -832,6 +832,14 @@ static public function compile_properties($themename, $array = true) {
if ($array) {
$props['moodle_version'] = $CFG->version;
+ // Put the theme version next so that it will be at the top of the table.
+ foreach ($themeprops as $themeprop) {
+ if ($themeprop->name == 'version') {
+ $props['theme_version'] = $themeprop->value;
+ unset($themeprops[$themeprop->id]);
+ break;
+ }
+ }
foreach ($themeprops as $themeprop) {
$props[$themeprop->name] = $themeprop->value;
@@ -841,6 +849,18 @@ static public function compile_properties($themename, $array = true) {
$data->id = 0;
$data->value = $CFG->version;
$props['moodle_version'] = $data;
+ // Convert 'version' to 'theme_version'.
+ foreach ($themeprops as $themeprop) {
+ if ($themeprop->name == 'version') {
+ $data = new \stdClass();
+ $data->id = $themeprop->id;
+ $data->name = 'theme_version';
+ $data->value = $themeprop->value;
+ $props['theme_version'] = $data;
+ unset($themeprops[$themeprop->id]);
+ break;
+ }
+ }
foreach ($themeprops as $themeprop) {
$data = new \stdClass();
$data->id = $themeprop->id;
@@ -855,15 +875,24 @@ static public function compile_properties($themename, $array = true) {
static public function put_properties($themename, $props) {
global $DB;
- $report = get_string('putpropertiereport', 'theme_essential').PHP_EOL;
- $report .= 'Moodle '.get_string('putpropertieversion', 'theme_essential').' '.$props['moodle_version'].'.'.PHP_EOL;
- unset($props['moodle_version']);
- $report .= ucfirst($themename).' '.get_string('putpropertieversion', 'theme_essential').' '.$props['version'].'.'.PHP_EOL.PHP_EOL;
- unset($props['version']);
-
- // Get the current properties as a reference.
+ // Get the current properties as a reference and for theme version information.
$currentprops = self::compile_properties($themename, false);
+ // Build the report.
+ $report = get_string('putpropertyreport', 'theme_essential').PHP_EOL;
+ $report .= get_string('putpropertyproperties', 'theme_essential').' \'Moodle\' '.
+ get_string('putpropertyversion', 'theme_essential').' '.$props['moodle_version'].'.'.PHP_EOL;
+ unset($props['moodle_version']);
+ $report .= get_string('putpropertyour', 'theme_essential').' \'Moodle\' '.
+ get_string('putpropertyversion', 'theme_essential').' '.$currentprops['moodle_version']->value.'.'.PHP_EOL;
+ unset($currentprops['moodle_version']);
+ $report .= get_string('putpropertyproperties', 'theme_essential').' \''.ucfirst($themename).'\' '.
+ get_string('putpropertyversion', 'theme_essential').' '.$props['theme_version'].'.'.PHP_EOL;
+ unset($props['theme_version']);
+ $report .= get_string('putpropertyour', 'theme_essential').' \''.ucfirst($themename).'\' '.
+ get_string('putpropertyversion', 'theme_essential').' '.$currentprops['theme_version']->value.'.'.PHP_EOL.PHP_EOL;
+ unset($currentprops['theme_version']);
+
// Pre-process files - using 'theme_essential_pluginfile' in lib.php as a reference.
// TODO: refactor into one method for both this and that.
$filestoreport = '';
@@ -922,7 +951,6 @@ static public function put_properties($themename, $props) {
// Need to ignore and report on any unknown settings.
$report .= get_string('putpropertiessettingsreport', 'theme_essential').PHP_EOL;
- $changedprops = array();
$changed = '';
$unchanged = '';
$added = '';
@@ -932,7 +960,6 @@ static public function put_properties($themename, $props) {
$settinglog = '\''.$propkey.'\' '.get_string('putpropertiesvalue', 'theme_essential').' \''.$propvalue.'\'';
if (array_key_exists($propkey, $currentprops)) {
if ($propvalue != $currentprops[$propkey]->value) {
- $changedprops[] = $propkey;
$settinglog .= ' '.get_string('putpropertiesfrom', 'theme_essential').' \''.$currentprops[$propkey]->value.'\'';
$changed .= $settinglog.'.'.PHP_EOL;
$DB->update_record('config_plugins', array('id' => $currentprops[$propkey]->id, 'value' => $propvalue), true);
@@ -961,11 +988,6 @@ static public function put_properties($themename, $props) {
$report .= get_string('putpropertiesignored', 'theme_essential').PHP_EOL.$ignored.PHP_EOL;
}
- if (!empty($changedprops)) {
- // We need the 'id's for the records.
- global $DB;
- }
-
return $report;
}
diff --git a/essential_admin_setting_configinteger.php b/essential_admin_setting_configinteger.php
index 2e1965c1..48fbbc50 100644
--- a/essential_admin_setting_configinteger.php
+++ b/essential_admin_setting_configinteger.php
@@ -20,7 +20,7 @@
* @package theme
* @subpackage essential
* @copyright © 2014-onwards G J Barnard.
- * @author G J Barnard - gjbarnard at gmail dot com and {@link http://moodle.org/user/profile.php?id=442195}
+ * @author G J Barnard - {@link http://moodle.org/user/profile.php?id=442195}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
diff --git a/essential_admin_setting_configradio.php b/essential_admin_setting_configradio.php
index c2f87c08..823df79d 100644
--- a/essential_admin_setting_configradio.php
+++ b/essential_admin_setting_configradio.php
@@ -20,7 +20,7 @@
* @package theme
* @subpackage essential
* @copyright © 2016-onwards G J Barnard.
- * @author G J Barnard - gjbarnard at gmail dot com and {@link http://moodle.org/user/profile.php?id=442195}
+ * @author G J Barnard - {@link http://moodle.org/user/profile.php?id=442195}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
diff --git a/essential_admin_setting_configselect.php b/essential_admin_setting_configselect.php
index 5180c4bb..d028f5f9 100644
--- a/essential_admin_setting_configselect.php
+++ b/essential_admin_setting_configselect.php
@@ -20,7 +20,7 @@
* @package theme
* @subpackage essential
* @copyright © 2016-onwards G J Barnard.
- * @author G J Barnard - gjbarnard at gmail dot com and {@link http://moodle.org/user/profile.php?id=442195}
+ * @author G J Barnard - {@link http://moodle.org/user/profile.php?id=442195}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
diff --git a/essential_admin_setting_configtext.php b/essential_admin_setting_configtext.php
index ed7e0183..d4ef9ff4 100644
--- a/essential_admin_setting_configtext.php
+++ b/essential_admin_setting_configtext.php
@@ -20,7 +20,7 @@
* @package theme
* @subpackage essential
* @copyright © 2016-onwards G J Barnard.
- * @author G J Barnard - gjbarnard at gmail dot com and {@link http://moodle.org/user/profile.php?id=442195}
+ * @author G J Barnard - {@link http://moodle.org/user/profile.php?id=442195}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
diff --git a/essential_admin_setting_getprops.php b/essential_admin_setting_getprops.php
index ac55b68d..c9cd6553 100644
--- a/essential_admin_setting_getprops.php
+++ b/essential_admin_setting_getprops.php
@@ -20,7 +20,7 @@
* @package theme
* @subpackage essential
* @copyright © 2017-onwards G J Barnard.
- * @author G J Barnard - gjbarnard at gmail dot com and {@link http://moodle.org/user/profile.php?id=442195}
+ * @author G J Barnard - {@link http://moodle.org/user/profile.php?id=442195}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
diff --git a/essential_admin_setting_putprops.php b/essential_admin_setting_putprops.php
index 6ba26c20..20c7b780 100644
--- a/essential_admin_setting_putprops.php
+++ b/essential_admin_setting_putprops.php
@@ -20,7 +20,7 @@
* @package theme
* @subpackage essential
* @copyright © 2017-onwards G J Barnard.
- * @author G J Barnard - gjbarnard at gmail dot com and {@link http://moodle.org/user/profile.php?id=442195}
+ * @author G J Barnard - {@link http://moodle.org/user/profile.php?id=442195}
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
@@ -66,24 +66,32 @@ public function write_setting($data) {
}
/**
- * Validate data before storage
- * @param string data
- * @return mixed true if ok string if error found
+ * Validate data before storage.
+ * @param string data.
+ * @return mixed true if alright, string if error found.
*/
public function validate($data) {
$validated = parent::validate($data); // Pass parent validation first.
if ($validated == true) {
- $props = json_decode($data, true);
- if ($props === null) {
- if (function_exists('json_last_error_msg')) {
- $validated = json_last_error_msg();
+ if (!empty($data)) {
+ // Only attempt decode if we have the start of a JSON string, otherwise will certainly be the saved report.
+ if ($data[0] == '{') {
+ $props = json_decode($data, true);
+ if ($props === null) {
+ if (function_exists('json_last_error_msg')) {
+ $validated = json_last_error_msg();
+ } else {
+ // Fall back to numeric error for older PHP version.
+ $validated = json_last_error();
+ }
+ } else {
+ $this->report = call_user_func($this->callable, $this->themename, $props);
+ }
} else {
- // Fall back to numeric error for older PHP version.
- $validated = json_last_error();
+ // Keep what we have.
+ $this->report = $data;
}
- } else {
- $this->report = call_user_func($this->callable, $this->themename, $props);
}
}
diff --git a/essential_admin_setting_styleguide.php b/essential_admin_setting_styleguide.php
index 7dafa1b2..2a470cfc 100644
--- a/essential_admin_setting_styleguide.php
+++ b/essential_admin_setting_styleguide.php
@@ -20,7 +20,7 @@
* @package theme
* @subpackage essential
* @copyright © 2016-onwards G J Barnard.
- * @author G J Barnard - gjbarnard at gmail dot com and {@link http://moodle.org/user/profile.php?id=442195}
+ * @author G J Barnard - {@link http://moodle.org/user/profile.php?id=442195}
* @license PHP Code: http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later.
* @license Source HTML Code: http://www.apache.org/licenses/LICENSE-2.0 Apache License v2.0:
*
diff --git a/lang/en/theme_essential.php b/lang/en/theme_essential.php
index 61301db0..5797b3af 100644
--- a/lang/en/theme_essential.php
+++ b/lang/en/theme_essential.php
@@ -92,7 +92,7 @@
If you like this theme and would like me to customise it, transpose functionality to another theme, build a new theme from scratch or create a child theme then I offer competitive rates. Please contact me via \'www.gjbarnard.co.uk/contact/\' or \'gjbarnard at gmail dot com\' or \'about.me/gjbarnard\' to discuss your requirements.
+If you like this theme and would like me to customise it, transpose functionality to another theme, build a new theme from scratch or create a child theme then I offer competitive rates. Please contact me via \'http://moodle.org/user/profile.php?id=442195\' to discuss your requirements.
'; // General. @@ -866,8 +866,10 @@ $string['putpropertiesname'] = 'Put properties - Experimental!'; $string['putpropertiesdesc'] = 'Paste the JSON string and \'Save changes\'. Warning! Does not valiate setting values and performs a \'Purge all caches\'.'; -$string['putpropertiereport'] = 'Report:'; -$string['putpropertieversion'] = 'version:'; +$string['putpropertyreport'] = 'Report:'; +$string['putpropertyversion'] = 'version:'; +$string['putpropertyproperties'] = 'Properties'; +$string['putpropertyour'] = 'Our'; $string['putpropertiesignorecti'] = 'Ignoring all course title image settings.'; $string['putpropertiesreportfiles'] = 'Remember to upload the following files to their settings:'; $string['putpropertiessettingsreport'] = 'Settings report:'; diff --git a/layout/tiles/additionaljs.php b/layout/tiles/additionaljs.php index e0222efc..4263d86e 100644 --- a/layout/tiles/additionaljs.php +++ b/layout/tiles/additionaljs.php @@ -20,7 +20,7 @@ * @package theme_essential * @copyright 2016 Gareth J Barnard * @copyright 2015 Gareth J Barnard in respect to modifications of the Bootstrap theme. - * @author G J Barnard - gjbarnard at gmail dot com and {@link http://moodle.org/user/profile.php?id=442195} + * @author G J Barnard - {@link http://moodle.org/user/profile.php?id=442195} * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ diff --git a/pages/styleguide.php b/pages/styleguide.php index 66371414..23e0c380 100644 --- a/pages/styleguide.php +++ b/pages/styleguide.php @@ -20,7 +20,7 @@ * @package theme * @subpackage essential * @copyright © 2016-onwards G J Barnard in respect to modifications of the Bootstrap theme. - * @author G J Barnard - gjbarnard at gmail dot com and {@link http://moodle.org/user/profile.php?id=442195} + * @author G J Barnard - {@link http://moodle.org/user/profile.php?id=442195} * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ diff --git a/settings.php b/settings.php index c28848c4..32eb0beb 100644 --- a/settings.php +++ b/settings.php @@ -2543,7 +2543,7 @@ get_string('propertiessub', 'theme_essential'), format_text(get_string('propertiesdesc', 'theme_essential'), FORMAT_MARKDOWN))); - $essentialexportprops = optional_param('theme_essential_props_saveprops', 0, PARAM_INT); + $essentialexportprops = optional_param('theme_essential_getprops_saveprops', 0, PARAM_INT); $essentialprops = \theme_essential\toolbox::compile_properties('essential'); $essentialsettingsprops->add(new essential_admin_setting_getprops('theme_essential_getprops', get_string('propertiesproperty', 'theme_essential'), diff --git a/tests/corerenderer_test.php b/tests/corerenderer_test.php index 2528734c..9ab53353 100644 --- a/tests/corerenderer_test.php +++ b/tests/corerenderer_test.php @@ -20,7 +20,7 @@ * @package theme * @subpackage essential * @copyright © 2015-onwards G J Barnard in respect to modifications of the Bootstrap theme. - * @author G J Barnard - gjbarnard at gmail dot com and {@link http://moodle.org/user/profile.php?id=442195} + * @author G J Barnard - {@link http://moodle.org/user/profile.php?id=442195} * @author Based on code originally written by Bas Brands, David Scotson and many other contributors. * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ diff --git a/tests/toolbox_test.php b/tests/toolbox_test.php index 6eff39c9..fbf49fba 100644 --- a/tests/toolbox_test.php +++ b/tests/toolbox_test.php @@ -20,7 +20,7 @@ * @package theme * @subpackage essential * @copyright © 2015-onwards G J Barnard in respect to modifications of the Bootstrap theme. - * @author G J Barnard - gjbarnard at gmail dot com and {@link http://moodle.org/user/profile.php?id=442195} + * @author G J Barnard - {@link http://moodle.org/user/profile.php?id=442195} * @author Based on code originally written by Bas Brands, David Scotson and many other contributors. * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */