From a5ae672b9f2253ef5517b480895c3ccbccb655eb Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Sat, 29 Jul 2017 19:00:33 -0600 Subject: [PATCH] Add Bootswatch theme picker, Fix bug where the bootstrap theme can't be disabled --- admin/admin_settings.php | 26 ++++++++++++++++++++++++++ admin/admin_settings_save.php | 5 +++++ inc/header.inc.php | 17 ++++++++++++----- language/en/text.php | 1 + 4 files changed, 44 insertions(+), 5 deletions(-) diff --git a/admin/admin_settings.php b/admin/admin_settings.php index 6f686d97..f9a13a35 100644 --- a/admin/admin_settings.php +++ b/admin/admin_settings.php @@ -3582,6 +3582,32 @@ $modsForHesk_settings = mfh_getSettings(); buildColorSchemeColorpicker('dropdownItemTextHoverColor', 'dropdownItemTextHoverColor', $modsForHesk_settings['dropdownItemTextHoverColor'], 'Help'); ?> +
+
+ + +
+ +
+
+
diff --git a/admin/admin_settings_save.php b/admin/admin_settings_save.php index 7113cd6f..4eb15627 100644 --- a/admin/admin_settings_save.php +++ b/admin/admin_settings_save.php @@ -495,6 +495,9 @@ $set['dropdownItemTextColor'] = hesk_input(hesk_POST('dropdownItemTextColor')); $set['dropdownItemTextHoverColor'] = hesk_input(hesk_POST('dropdownItemTextHoverColor')); $set['questionMarkColor'] = hesk_input(hesk_POST('questionMarkColor')); $set['dropdownItemTextHoverBackgroundColor'] = hesk_input(hesk_POST('dropdownItemTextHoverBackgroundColor')); + +$set['bootswatch_theme'] = hesk_POST('bootswatch-theme'); + $set['admin_navbar_background'] = hesk_input(hesk_POST('admin-navbar-background-color')); $set['admin_navbar_background_hover'] = hesk_input(hesk_POST('admin-navbar-background-hover-color')); $set['admin_navbar_brand_background'] = hesk_input(hesk_POST('admin-navbar-brand-background-color')); @@ -666,6 +669,8 @@ if ($changedLoginImage) { mfh_updateSetting('login_box_header_image', $set['login_box_header_image'], true); } +mfh_updateSetting('bootswatch_theme', $set['bootswatch_theme'], true); + // Prepare settings file and save it $settings_file_content = '"> - + + css/bootstrap-theme.css?v=" type="text/css" - rel="stylesheet" > + rel="stylesheet"> +HERE; + } ?>