From 875f0a62622a76e6310037cfde796439302508c6 Mon Sep 17 00:00:00 2001 From: Matthew Vale Date: Thu, 3 Dec 2015 13:36:43 +0000 Subject: [PATCH 1/2] added save_switch_xml during install --- core/install/index.php | 4 ---- core/install/resources/classes/install_switch.php | 1 + themes/enhanced/app_defaults.php | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/core/install/index.php b/core/install/index.php index 1eb6efc8c9..36d012f0f7 100644 --- a/core/install/index.php +++ b/core/install/index.php @@ -78,10 +78,6 @@ if (!if_group("superadmin")) { echo "\n"; echo "\n"; - echo "

"; - - echo "

WiP

"; - //include the footer require_once "resources/footer.php"; ?> \ No newline at end of file diff --git a/core/install/resources/classes/install_switch.php b/core/install/resources/classes/install_switch.php index dd64ee1d60..3af53476c8 100644 --- a/core/install/resources/classes/install_switch.php +++ b/core/install/resources/classes/install_switch.php @@ -186,6 +186,7 @@ include "root.php"; $this->copy_conf(); $this->copy_scripts(); $this->create_config_lua(); + save_switch_xml(); $this->restart_switch(); $this->write_progress("Install completed for switch"); } diff --git a/themes/enhanced/app_defaults.php b/themes/enhanced/app_defaults.php index 333fb6efca..5080029782 100644 --- a/themes/enhanced/app_defaults.php +++ b/themes/enhanced/app_defaults.php @@ -287,7 +287,7 @@ if ($domains_processed == 1) { $array[$x]['default_setting_category'] = 'theme'; $array[$x]['default_setting_subcategory'] = 'background_color'; $array[$x]['default_setting_name'] = 'array'; - $array[$x]['default_setting_value'] = '#ffffff'; + $array[$x]['default_setting_value'] = '#6c89b5'; $array[$x]['default_setting_enabled'] = 'true'; $array[$x]['default_setting_order'] = '0'; $array[$x]['default_setting_description'] = 'Set a background (HTML compatible) color.'; @@ -295,7 +295,7 @@ if ($domains_processed == 1) { $array[$x]['default_setting_category'] = 'theme'; $array[$x]['default_setting_subcategory'] = 'background_color'; $array[$x]['default_setting_name'] = 'array'; - $array[$x]['default_setting_value'] = '#e7ebf1'; + $array[$x]['default_setting_value'] = '#144794'; $array[$x]['default_setting_order'] = '1'; $array[$x]['default_setting_enabled'] = 'true'; $array[$x]['default_setting_description'] = 'Set a secondary background (HTML compatible) color, for a gradient effect.'; From 7ce32f11d4da1cf6c661296969f2bbd16bcf8bd4 Mon Sep 17 00:00:00 2001 From: Matthew Vale Date: Thu, 3 Dec 2015 14:25:33 +0000 Subject: [PATCH 2/2] corrected function name --- core/install/resources/classes/install_switch.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/install/resources/classes/install_switch.php b/core/install/resources/classes/install_switch.php index 27efa25e3c..bdf9a2c48b 100644 --- a/core/install/resources/classes/install_switch.php +++ b/core/install/resources/classes/install_switch.php @@ -188,7 +188,7 @@ include "root.php"; $this->write_progress("Install phase 1 completed for switch"); } - function install_phase_1() { + function install_phase_2() { $this->write_progress("Install phase 2 started for switch"); $this->create_config_lua(); $this->restart_switch();