From 6677b6a5ab4e8b9221a2e500157cc17b5779660f Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Wed, 13 Nov 2019 14:32:34 +0100 Subject: [PATCH 1/3] hide report in welcomewindow if not enterprise customer --- pandora_console/include/class/WelcomeWindow.class.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pandora_console/include/class/WelcomeWindow.class.php b/pandora_console/include/class/WelcomeWindow.class.php index a2a2b156f3..8140da8227 100644 --- a/pandora_console/include/class/WelcomeWindow.class.php +++ b/pandora_console/include/class/WelcomeWindow.class.php @@ -547,7 +547,10 @@ class WelcomeWindow extends Wizard ], ], ], - [ + ]; + + if (enterprise_installed()) { + $inputs[] = [ 'wrapper' => 'div', 'block_id' => 'div_not_working', 'class' => 'hole flex-row w100p', @@ -573,8 +576,8 @@ class WelcomeWindow extends Wizard ], ], - ], - ]; + ]; + } $output = $this->printForm( [ From 345eb48fd7ec28d736f58b6757730d93914ccce8 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Wed, 13 Nov 2019 17:38:48 +0100 Subject: [PATCH 2/3] save the green lines --- .../include/class/WelcomeWindow.class.php | 20 +++++++++---------- .../new_installation_welcome_window.css | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pandora_console/include/class/WelcomeWindow.class.php b/pandora_console/include/class/WelcomeWindow.class.php index 8140da8227..c69fbe40d9 100644 --- a/pandora_console/include/class/WelcomeWindow.class.php +++ b/pandora_console/include/class/WelcomeWindow.class.php @@ -342,11 +342,11 @@ class WelcomeWindow extends Wizard $btn_create_alert_class = ''; $btn_create_discovery_class = 'pending'; - $li_configure_mail_class = 'green'; - $li_create_agent_class = 'green'; - $li_create_module_class = 'grey'; - $li_create_alert_class = 'grey'; - $li_create_discovery_class = 'green'; + $li_configure_mail_class = 'row_green'; + $li_create_agent_class = 'row_green'; + $li_create_module_class = 'row_grey'; + $li_create_alert_class = 'row_grey'; + $li_create_discovery_class = 'row_green'; if (empty($config['welcome_mail_configured']) === false) { $btn_configure_mail_class = ' completed'; @@ -355,18 +355,18 @@ class WelcomeWindow extends Wizard if (empty($config['welcome_id_agent']) === false) { $btn_create_agent_class = ' completed'; $btn_create_module_class = ' pending'; - $li_create_module_class = 'green'; + $li_create_module_class = 'row_green'; } if (empty($config['welcome_module']) === false) { $btn_create_module_class = ' completed'; $btn_create_alert_class = ' pending'; - $li_create_module_class = 'green'; + $li_create_module_class = 'row_green'; } if (empty($config['welcome_alert']) === false) { $btn_create_alert_class = ' completed'; - $li_create_alert_class = 'green'; + $li_create_alert_class = 'row_green'; } if (empty($config['welcome_task']) === false) { @@ -380,8 +380,8 @@ class WelcomeWindow extends Wizard $btn_create_module_class = ' completed'; $btn_create_alert_class = ' completed'; $btn_create_discovery_class = ' completed'; - $li_create_module_class = 'green'; - $li_create_alert_class = 'green'; + $li_create_module_class = 'row_green'; + $li_create_alert_class = 'row_green'; } $form = [ diff --git a/pandora_console/include/styles/new_installation_welcome_window.css b/pandora_console/include/styles/new_installation_welcome_window.css index ab245f034d..98187357da 100644 --- a/pandora_console/include/styles/new_installation_welcome_window.css +++ b/pandora_console/include/styles/new_installation_welcome_window.css @@ -86,7 +86,7 @@ border-left: 4px solid #79a930; } -#welcome_form li:not(.centered_full):not(.white_box).grey { +#welcome_form li:not(.centered_full):not(.white_box).row_grey { border-left: 4px solid #d6d6d6; } From 0e2a3d0f47f94ba7bcf94be34abd240241aa2646 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Wed, 13 Nov 2019 17:42:14 +0100 Subject: [PATCH 3/3] minor style fix after feedback cleanup --- .../styles/new_installation_welcome_window.css | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pandora_console/include/styles/new_installation_welcome_window.css b/pandora_console/include/styles/new_installation_welcome_window.css index 98187357da..33903494ce 100644 --- a/pandora_console/include/styles/new_installation_welcome_window.css +++ b/pandora_console/include/styles/new_installation_welcome_window.css @@ -6,15 +6,8 @@ overflow: hidden; } -#welcome_modal_window { - /* - max-height: 100%; - height: 100%; - border-left: 1em solid #82b92f; - margin-bottom: -59px; - padding-bottom: 100px; - margin-left: -1px; - */ +#welcome_modal_window * { + font-size: 10pt; } #welcome_form ul.wizard > li {