Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF

This commit is contained in:
fbsanchez 2019-11-13 17:42:38 +01:00
commit 9fffa5fec9
2 changed files with 19 additions and 23 deletions

View File

@ -342,11 +342,11 @@ class WelcomeWindow extends Wizard
$btn_create_alert_class = ''; $btn_create_alert_class = '';
$btn_create_discovery_class = 'pending'; $btn_create_discovery_class = 'pending';
$li_configure_mail_class = 'green'; $li_configure_mail_class = 'row_green';
$li_create_agent_class = 'green'; $li_create_agent_class = 'row_green';
$li_create_module_class = 'grey'; $li_create_module_class = 'row_grey';
$li_create_alert_class = 'grey'; $li_create_alert_class = 'row_grey';
$li_create_discovery_class = 'green'; $li_create_discovery_class = 'row_green';
if (empty($config['welcome_mail_configured']) === false) { if (empty($config['welcome_mail_configured']) === false) {
$btn_configure_mail_class = ' completed'; $btn_configure_mail_class = ' completed';
@ -355,18 +355,18 @@ class WelcomeWindow extends Wizard
if (empty($config['welcome_id_agent']) === false) { if (empty($config['welcome_id_agent']) === false) {
$btn_create_agent_class = ' completed'; $btn_create_agent_class = ' completed';
$btn_create_module_class = ' pending'; $btn_create_module_class = ' pending';
$li_create_module_class = 'green'; $li_create_module_class = 'row_green';
} }
if (empty($config['welcome_module']) === false) { if (empty($config['welcome_module']) === false) {
$btn_create_module_class = ' completed'; $btn_create_module_class = ' completed';
$btn_create_alert_class = ' pending'; $btn_create_alert_class = ' pending';
$li_create_module_class = 'green'; $li_create_module_class = 'row_green';
} }
if (empty($config['welcome_alert']) === false) { if (empty($config['welcome_alert']) === false) {
$btn_create_alert_class = ' completed'; $btn_create_alert_class = ' completed';
$li_create_alert_class = 'green'; $li_create_alert_class = 'row_green';
} }
if (empty($config['welcome_task']) === false) { if (empty($config['welcome_task']) === false) {
@ -380,8 +380,8 @@ class WelcomeWindow extends Wizard
$btn_create_module_class = ' completed'; $btn_create_module_class = ' completed';
$btn_create_alert_class = ' completed'; $btn_create_alert_class = ' completed';
$btn_create_discovery_class = ' completed'; $btn_create_discovery_class = ' completed';
$li_create_module_class = 'green'; $li_create_module_class = 'row_green';
$li_create_alert_class = 'green'; $li_create_alert_class = 'row_green';
} }
$form = [ $form = [
@ -547,7 +547,10 @@ class WelcomeWindow extends Wizard
], ],
], ],
], ],
[ ];
if (enterprise_installed()) {
$inputs[] = [
'wrapper' => 'div', 'wrapper' => 'div',
'block_id' => 'div_not_working', 'block_id' => 'div_not_working',
'class' => 'hole flex-row w100p', 'class' => 'hole flex-row w100p',
@ -573,8 +576,8 @@ class WelcomeWindow extends Wizard
], ],
], ],
], ];
]; }
$output = $this->printForm( $output = $this->printForm(
[ [

View File

@ -6,15 +6,8 @@
overflow: hidden; overflow: hidden;
} }
#welcome_modal_window { #welcome_modal_window * {
/* font-size: 10pt;
max-height: 100%;
height: 100%;
border-left: 1em solid #82b92f;
margin-bottom: -59px;
padding-bottom: 100px;
margin-left: -1px;
*/
} }
#welcome_form ul.wizard > li { #welcome_form ul.wizard > li {
@ -86,7 +79,7 @@
border-left: 4px solid #79a930; 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; border-left: 4px solid #d6d6d6;
} }