diff --git a/admin/api_settings.php b/admin/api_settings.php index 85c654e0..4a1e8f4d 100644 --- a/admin/api_settings.php +++ b/admin/api_settings.php @@ -3,7 +3,7 @@ define('IN_SCRIPT', 1); define('HESK_PATH', '../'); define('PAGE_TITLE', 'ADMIN_SETTINGS'); -define('MFH_PAGE_LAYOUT', 'TOP_AND_SIDE'); +define('MFH_PAGE_LAYOUT', 'TOP_ONLY'); // Make sure the install folder is deleted if (is_dir(HESK_PATH . 'install')) { @@ -92,7 +92,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
diff --git a/install/mods-for-hesk/database-validation.php b/install/mods-for-hesk/database-validation.php index 1794874b..05f96b69 100644 --- a/install/mods-for-hesk/database-validation.php +++ b/install/mods-for-hesk/database-validation.php @@ -184,6 +184,21 @@ hesk_dbConnect(); $all_good = $all_good & run_column_check('custom_nav_element_to_text', 'language'); $all_good = $all_good & run_column_check('custom_nav_element_to_text', 'text'); $all_good = $all_good & run_column_check('custom_nav_element_to_text', 'subtext'); + $all_good = $all_good & run_setting_check('admin_navbar_background'); + $all_good = $all_good & run_setting_check('admin_navbar_background_hover'); + $all_good = $all_good & run_setting_check('admin_navbar_text'); + $all_good = $all_good & run_setting_check('admin_navbar_text_hover'); + $all_good = $all_good & run_setting_check('admin_navbar_brand_background'); + $all_good = $all_good & run_setting_check('admin_navbar_brand_background_hover'); + $all_good = $all_good & run_setting_check('admin_navbar_brand_text'); + $all_good = $all_good & run_setting_check('admin_navbar_brand_text_hover'); + $all_good = $all_good & run_setting_check('admin_sidebar_background'); + $all_good = $all_good & run_setting_check('admin_sidebar_background_hover'); + $all_good = $all_good & run_setting_check('admin_sidebar_text'); + $all_good = $all_good & run_setting_check('admin_sidebar_text_hover'); + $all_good = $all_good & run_setting_check('admin_sidebar_font_weight'); + $all_good = $all_good & run_setting_check('admin_sidebar_header_background'); + $all_good = $all_good & run_setting_check('admin_sidebar_header_text'); if ($all_good) { echo ""; @@ -198,6 +213,16 @@ hesk_dbConnect(); Setting Exists: ' . $setting_name, $all_good); + + return $all_good !== false; +} + function run_table_check($table_name) { return run_column_check($table_name, '1'); } diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php index 53080c41..e0e8bb90 100644 --- a/install/mods-for-hesk/sql/installSql.php +++ b/install/mods-for-hesk/sql/installSql.php @@ -1040,7 +1040,7 @@ function execute310Scripts() { $sidebar = array( 'background' => $light_theme ? '#f9fafc' : '#222d32', 'text' => $light_theme ? '#444' : '#b8c7ce', - 'text_hover' => $light_theme ? '#444' : '#b8c7ce', + 'text_hover' => $light_theme ? '#444' : '#fff', 'background_hover' => $light_theme ? '#f4f4f5' : '#1e282c', 'font_weight' => $light_theme ? 'bold' : 'normal' );