From f5114918b50ea0148725410ff7236c32a9478ea3 Mon Sep 17 00:00:00 2001 From: Tatiana Llorente Date: Thu, 9 May 2019 08:45:55 +0200 Subject: [PATCH] Unify the styles of Discovery with Pandora - #4004 --- .../godmode/wizards/HostDevices.class.php | 144 +++++++++--------- .../include/class/CustomNetScan.class.php | 6 +- pandora_console/include/styles/discovery.css | 60 +++----- pandora_console/include/styles/wizard.css | 3 +- 4 files changed, 94 insertions(+), 119 deletions(-) diff --git a/pandora_console/godmode/wizards/HostDevices.class.php b/pandora_console/godmode/wizards/HostDevices.class.php index 9ac87d9baa..cd7f52f0df 100755 --- a/pandora_console/godmode/wizards/HostDevices.class.php +++ b/pandora_console/godmode/wizards/HostDevices.class.php @@ -594,11 +594,11 @@ class HostDevices extends Wizard if (isset($this->page) === false || $this->page == 0 ) { - // Comment input - $comment_input ='
'; + $comment_input = '
'; - $comment_input .= $this->printInput([ + $comment_input .= $this->printInput( + [ 'name' => 'comment', 'rows' => 1, 'columns' => 1, @@ -606,49 +606,55 @@ class HostDevices extends Wizard 'type' => 'textarea', 'size' => 25, 'class' => 'discovery_textarea_input', - 'return' => true - ]); + 'return' => true, + ] + ); // Task input $taskname_input_label = '
'; - $taskname_input = $this->printInput([ + $taskname_input = $this->printInput( + [ 'name' => 'taskname', 'value' => $this->task['name'], 'type' => 'text', 'size' => 25, - 'class' => 'discovery_full_width_input' - ]); + 'class' => 'discovery_full_width_input', + ] + ); // Network input $network_input_label .= '
'.ui_print_help_tip(__('You can specify several networks, separated by commas, for example: 192.168.50.0/24,192.168.60.0/24'), true).'
'; - $network_input = $this->printInput([ + $network_input = $this->printInput( + [ 'name' => 'network', 'value' => $this->task['subnet'], 'type' => 'text', 'size' => 25, 'class' => 'discovery_full_width_input', - ]); - + ] + ); // Discovery server input $discovery_server_select_label = '
'.ui_print_help_tip(__('You must select a Discovery Server to run the Task, otherwise the Recon Task will never run'), true).'
'; - $discovery_server_select = $this->printInput([ - 'type' => 'select_from_sql', - 'sql' => sprintf( - 'SELECT id_server, name + $discovery_server_select = $this->printInput( + [ + 'type' => 'select_from_sql', + 'sql' => sprintf( + 'SELECT id_server, name FROM tserver WHERE server_type = %d ORDER BY name', - SERVER_TYPE_DISCOVERY - ), - 'name' => 'id_recon_server', - 'selected' => $this->task['id_recon_server'], - 'return' => true, - 'style' => 'width: 100%', - ]); + SERVER_TYPE_DISCOVERY + ), + 'name' => 'id_recon_server', + 'selected' => $this->task['id_recon_server'], + 'return' => true, + 'style' => 'width: 100%', + ] + ); // Interval input $interv_manual = 0; @@ -658,38 +664,40 @@ class HostDevices extends Wizard $interval_input_label = '
'.ui_print_help_tip(__('Manual interval means that it will run only on demand.'), true).'
'; - $interval_input = $this->printInput([ - 'type' => 'select', - 'selected' => $interv_manual, - 'fields' => [ - 0 => __('Defined'), - 1 => __('Manual'), - ], - 'name' => 'interval_manual_defined', - 'return' => true, - 'style' => 'float: right;' - ]); + $interval_input = $this->printInput( + [ + 'type' => 'select', + 'selected' => $interv_manual, + 'fields' => [ + 0 => __('Defined'), + 1 => __('Manual'), + ], + 'name' => 'interval_manual_defined', + 'return' => true, + 'style' => 'float: right;', + ] + ); $interval_input_extra = ''.html_print_extended_select_for_time( - 'interval', - $this->task['interval_sweep'], - '', - '', - '0', - false, - true, - false, - false - ).ui_print_help_tip( - __('The minimum recomended interval for Recon Task is 5 minutes'), - true - ).''; - + 'interval', + $this->task['interval_sweep'], + '', + '', + '0', + false, + true, + false, + false + ).ui_print_help_tip( + __('The minimum recomended interval for Recon Task is 5 minutes'), + true + ).''; // Group select $group_select = '
'; - $group_select .= $this->printInput([ + $group_select .= $this->printInput( + [ 'name' => 'id_group', 'returnAllGroup' => false, 'privilege' => 'PM', @@ -699,15 +707,18 @@ class HostDevices extends Wizard 'class' => 'discovery_list_input', 'size' => 9, 'simple_multiple_options' => true, - ]); + ] + ); - if (isset($this->task['id_rt']) === true) { - //Propagate ID - $task_hidden = $this->printInput([ - 'name' => 'task', - 'value' => $this->task['id_rt'], - 'type' => 'hidden' - ]); + if (isset($this->task['id_rt']) === true) { + // Propagate ID + $task_hidden = $this->printInput( + [ + 'name' => 'task', + 'value' => $this->task['id_rt'], + 'type' => 'hidden', + ] + ); } $task_url = ''; @@ -725,32 +736,20 @@ class HostDevices extends Wizard // XXX: Could be improved validating inputs before continue (JS) // Print NetScan page 0. - //$this->printForm($form); - + // $this->printForm($form); echo '
'; echo $task_hidden; echo '
-
' - .'
'.html_print_image ("images/wizard/netscan_green.png", true, array ("title" => __('Close'), "style" => 'width: 60%;'), false).'
' - .'
'.$interval_input_label.'
'.$interval_input.'
'.$interval_input_extra.'
' - .'
+
'.'
'.html_print_image('images/wizard/netscan_green.png', true, ['title' => __('Close')], false).'
'.'
'.$interval_input_label.'
'.$interval_input.'
'.$interval_input_extra.'
'.'
-
'.$taskname_input_label.'
'.$taskname_input.'
' - .'
'.$discovery_server_select_label.$discovery_server_select.'
' - .'
'.$network_input_label.'
'.$network_input.'
' - .'
' - .'
'.$group_select.'
' - .'
' - - .'
+
'.$taskname_input_label.'
'.$taskname_input.'
'.'
'.$discovery_server_select_label.$discovery_server_select.'
'.'
'.$network_input_label.'
'.$network_input.'
'.'
'.'
'.$group_select.'
'.'
'.'
'.$comment_input.'
-
' - .''; + '.''; $str = __('Next'); @@ -778,7 +777,6 @@ class HostDevices extends Wizard }).change(); '; - } } diff --git a/pandora_console/include/class/CustomNetScan.class.php b/pandora_console/include/class/CustomNetScan.class.php index 078d23fa6b..dc28a696e7 100644 --- a/pandora_console/include/class/CustomNetScan.class.php +++ b/pandora_console/include/class/CustomNetScan.class.php @@ -443,7 +443,7 @@ class CustomNetScan extends Wizard 'name' => 'taskname', 'value' => $this->task['name'], 'type' => 'text', - 'size' => 25, + 'size' => 50, ], ]; @@ -465,7 +465,7 @@ class CustomNetScan extends Wizard 'name' => 'comment', 'value' => $this->task['description'], 'type' => 'text', - 'size' => 25, + 'size' => 50, ], ]; @@ -652,7 +652,7 @@ class CustomNetScan extends Wizard 'value' => $explanation, 'return' => true, 'attributes' => 'style="width: 388px;"', - 'class' => 'discovery_textarea_input' + 'class' => 'discovery_textarea_input', ], ]; diff --git a/pandora_console/include/styles/discovery.css b/pandora_console/include/styles/discovery.css index 51b4e98c10..28d4456a55 100644 --- a/pandora_console/include/styles/discovery.css +++ b/pandora_console/include/styles/discovery.css @@ -162,7 +162,7 @@ span.breadcrumb_link { .edit_discovery_info { display: flex; - align-items: center; + align-items: flex-start; padding-top: 25px; } @@ -181,63 +181,41 @@ span.breadcrumb_link { label { color: #343434 !important; - font-size: 1.5em; - font-family: "lato-bolder", "Open Sans", sans-serif !important; font-weight: bold; - margin: 0px 0px 5px 0px; } .discovery_full_width_input { width: 100%; } -select { - font-family: "lato-bolder", "Open Sans", sans-serif !important; - font-size: 1.6em !important; - color: #686868; +li > input[type="text"], +li > input[type="password"], +.discovery_text_input > input[type="password"], +.discovery_text_input > input[type="text"], +#interval_manual > input[type="text"] { + background-color: transparent !important; + border: none; + border-radius: 0 !important; + border-bottom: 1px solid #343434; + padding: 0px 0px 2px 0px; + box-sizing: border-box; + margin-bottom: 4px; } -select > option { - font-family: "lato-bolder", "Open Sans", sans-serif !important; - font-size: 1em !important; -} - -li > input[type=text], li > input[type=password], .discovery_text_input > input[type=password], .discovery_text_input > input[type=text], #interval_manual > input[type=text] { - background-color: transparent !important; - border: none; - border-radius: 0 !important; - border-bottom: 1px solid #343434; - padding: 0px 0px 2px 0px; - box-sizing: border-box; - margin-bottom: 4px; - font-family: "lato-bolder", "Open Sans", sans-serif !important; - font-size: 1.6em; -} - -li > input[type=text]:focus, li > input[type=password]:focus, .discovery_text_input > input[type=password]:focus, .discovery_text_input > input[type=text]:focus, #interval_manual > input[type=text]:focus { - font-weight: bold; -} - -#interval_manual > input[type=text] { +#interval_manual > input[type="text"] { width: 50px; margin-left: 10px; margin-right: 10px; } .discovery_list_input { - font-family: "lato-bolder", "Open Sans", sans-serif !important; - font-size: 1.6em !important; - color: #686868; width: 100%; - height: 240px; - border: 1px solid #CBCBCB; + border: 1px solid #cbcbcb; overflow-y: auto; } .discovery_list_input option { - font-family: "lato-bolder", "Open Sans", sans-serif !important; - font-size: 1.1em !important; - padding-left: 30%; + text-align: center; } .discovery_list_input option:checked { @@ -253,11 +231,9 @@ li > input[type=text]:focus, li > input[type=password]:focus, .discovery_text_in max-height: 100px; max-width: 100%; -webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */ - -moz-box-sizing: border-box; /* Firefox, other Gecko */ + -moz-box-sizing: border-box; /* Firefox, other Gecko */ box-sizing: border-box; resize: none; - font-family: "lato-bolder", "Open Sans", sans-serif !important; - font-size: 1.4em !important; } a.tip { @@ -270,4 +246,4 @@ a.tip { .discovery_interval_select_width { width: 90%; -} \ No newline at end of file +} diff --git a/pandora_console/include/styles/wizard.css b/pandora_console/include/styles/wizard.css index d7ec2e4ee5..029addf5cb 100644 --- a/pandora_console/include/styles/wizard.css +++ b/pandora_console/include/styles/wizard.css @@ -6,7 +6,8 @@ ul.wizard { } ul.wizard li { - padding: 10px; + padding-bottom: 10px; + padding-top: 10px; } ul.wizard li > label:not(.p-switch) {