diff --git a/core/dashboard/app_config.php b/core/dashboard/app_config.php index 89549d09e7..712cda0e27 100644 --- a/core/dashboard/app_config.php +++ b/core/dashboard/app_config.php @@ -302,7 +302,7 @@ $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "dashboard_chart_border_color"; $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; - $apps[$x]['default_settings'][$y]['default_setting_value'] = "#fff"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "#ffffff"; $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; $apps[$x]['default_settings'][$y]['default_setting_description'] = ""; $y++; diff --git a/themes/default/app_config.php b/themes/default/app_config.php index 2c3eb61919..7a8d3c68b8 100644 --- a/themes/default/app_config.php +++ b/themes/default/app_config.php @@ -1080,6 +1080,38 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the border radius of the content cards."; $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b50066cb-c195-4cd5-bbe7-49aa9bd38e7d"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "dashboard_background_color"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "array"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "#ffffff"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the background color (and opacity) of the Dashboard blocks."; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "78b7afc5-66ed-4979-ba78-ec605dfda469"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "dashboard_background_color"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "array"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "#ffffff"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set a secondary background color, for a gradient effect."; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "1af7813b-50b0-4616-8b9a-9dfd757c633a"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "dashboard_background_gradient_style"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "mirror"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the background gradient style of the Dashboard blocks."; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "ddabcb64-8d26-4f76-9f20-11b0a0b39a1e"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "dashboard_background_gradient_angle"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "90"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the background gradient angle of the Dashboard blocks."; + $y++; $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "3b46602c-c736-43ec-a4b5-c733110dbe57"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "dashboard_border_color"; @@ -1304,21 +1336,21 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the shadow color of the Dashboard block detail box."; $y++; - $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "fe139795-6099-4cd6-8cc7-782ae678f226"; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "9cd7581d-a51f-449f-acfe-c23b9a1cb20f"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; - $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "dashboard_detail_background_color_center"; - $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "dashboard_detail_background_color"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "array"; $apps[$x]['default_settings'][$y]['default_setting_value'] = "#ffffff"; - $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; - $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the center gradient color of the Dashboard block detail area."; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the background color of the Dashboard block detail area."; $y++; - $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "45508cb4-b3ce-45f1-b7dd-fd37969276a8"; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "27ff8487-648b-49d3-a99a-0e5fde8bfdeb"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; - $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "dashboard_detail_background_color_edge"; - $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "dashboard_detail_background_color"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "array"; $apps[$x]['default_settings'][$y]['default_setting_value'] = "#ffffff"; $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; - $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the edge gradient color of the Dashboard block detail area."; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set a secondary background color, for a gradient effect."; $y++; $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b60d97bf-fed3-4484-b5ba-18c46b1a58a7"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; @@ -2869,7 +2901,7 @@ $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "keyboard_shortcut_copy_enabled"; $apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean"; $apps[$x]['default_settings'][$y]['default_setting_value'] = "true"; - $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "key: [ctrl]+[c], list,edit: to copy"; $y++; $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "2c0621d4-da12-40c1-8878-fc45a2f76d08"; diff --git a/themes/default/css.php b/themes/default/css.php index a5ffca9ea7..6637114bd4 100644 --- a/themes/default/css.php +++ b/themes/default/css.php @@ -246,6 +246,9 @@ $message_alert_background_color = $settings->get('theme', 'message_alert_backgro $operator_panel_border_color = $settings->get('theme', 'operator_panel_border_color', '#b9c5d8'); $operator_panel_sub_background_color = $settings->get('theme', 'operator_panel_sub_background_color', '#e5eaf5'); $operator_panel_main_background_color = $settings->get('theme', 'operator_panel_main_background_color', '#fff'); +$dashboard_background_color = $settings->get('theme', 'dashboard_background_color', ''); +$dashboard_background_gradient_style = $settings->get('theme', 'dashboard_background_gradient_style', ''); +$dashboard_background_gradient_angle = $settings->get('theme', 'dashboard_background_gradient_angle', ''); $dashboard_border_radius = $settings->get('theme', 'dashboard_border_radius', '5px'); $dashboard_border_color = $settings->get('theme', 'dashboard_border_color', '#ffffff'); $dashboard_border_color_hover = $settings->get('theme', 'dashboard_border_color_hover', '#ffffff'); @@ -270,8 +273,7 @@ $dashboard_number_title_text_font = $settings->get('theme', 'dashboard_number_ti $dashboard_number_title_text_shadow_color = $settings->get('theme', 'dashboard_number_title_text_shadow_color', '#737983'); $dashboard_detail_shadow_color = $settings->get('theme', 'dashboard_detail_shadow_color', '#ffffff'); $dashboard_detail_heading_text_size = $settings->get('theme', 'dashboard_detail_heading_text_size', '11px'); -$dashboard_detail_background_color_edge = $settings->get('theme', 'dashboard_detail_background_color_edge', '#ffffff'); -$dashboard_detail_background_color_center = $settings->get('theme', 'dashboard_detail_background_color_center', '#ffffff'); +$dashboard_detail_background_color = $settings->get('theme', 'dashboard_detail_background_color', ''); $dashboard_detail_row_text_size = $settings->get('theme', 'dashboard_detail_row_text_size', '11px'); $dashboard_shadow_color = $settings->get('theme', 'dashboard_shadow_color', '#d0d8e5'); $dashboard_footer_background_color = $settings->get('theme', 'dashboard_footer_background_color', '#e5e9f0'); @@ -2968,33 +2970,11 @@ else { //default: white margin-bottom: 15px; } - div.widget div.hud_box:first-of-type { - - } - /* hud boxes */ div.hud_box { height: auto; vertical-align: top; text-align: center; - - background: ; - background-image: -ms-linear-gradient(left, 0%, 30%, 70%, 100%); - background-image: -moz-linear-gradient(left, 0%, 30%, 70%, 100%); - background-image: -o-linear-gradient(left, 0%, 30%, 70%, 100%); - background-image: -webkit-gradient(linear, left, right, color-stop(0, ), color-stop(0.30, ), color-stop(0.70, ), color-stop(1, )); - background-image: -webkit-linear-gradient(left, 0%, 30%, 70%, 100%); - background-image: linear-gradient(to right, 0%, 30%, 70%, 100%); - -webkit-border-radius: ; -moz-border-radius: ; @@ -3009,6 +2989,24 @@ else { //default: white border: 1px solid ; } + div.widget div.hud_box:first-of-type { + + } + span.hud_title { display: block; width: 100%; @@ -3138,6 +3136,15 @@ else { //default: white div.hud_details { height: 350px; display: block; + } } @@ -3147,18 +3154,6 @@ else { //default: white font-family: ; color: ; padding-top: 3px; - - background: ; - background-image: -ms-linear-gradient(left, 0%, 30%, 70%, 100%); - background-image: -moz-linear-gradient(left, 0%, 30%, 70%, 100%); - background-image: -o-linear-gradient(left, 0%, 30%, 70%, 100%); - background-image: -webkit-gradient(linear, left, right, color-stop(0, ), color-stop(0.30, ), color-stop(0.70, ), color-stop(1, )); - background-image: -webkit-linear-gradient(left, 0%, 30%, 70%, 100%); - background-image: linear-gradient(to right, 0%, 30%, 70%, 100%); - } th.hud_heading:first-of-type { diff --git a/themes/default/template.php b/themes/default/template.php index 3cfd78a5fc..88b65f46d1 100644 --- a/themes/default/template.php +++ b/themes/default/template.php @@ -20,7 +20,7 @@ - + {*//link to custom css file *} {if !empty($settings.theme.custom_css)}