From 4f6a81dc5b2368be51581d496be0cdf027085177 Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Mon, 22 Apr 2019 17:46:04 +0200
Subject: [PATCH 1/4] visual changes to discovery

Former-commit-id: fd606abb997aa4f3144d072f610915524b5358db
---
 .../godmode/wizards/HostDevices.class.php     | 264 +++++++++---------
 .../godmode/wizards/Wizard.main.php           |  23 +-
 .../include/ajax/task_list.ajax.php           |  51 ++--
 .../include/class/CustomNetScan.class.php     |  20 +-
 pandora_console/include/functions_html.php    |  21 +-
 .../include/graphs/functions_d3.php           |   4 +-
 pandora_console/include/graphs/pandora.d3.js  |  23 +-
 pandora_console/include/styles/discovery.css  | 117 +++++++-
 8 files changed, 333 insertions(+), 190 deletions(-)

diff --git a/pandora_console/godmode/wizards/HostDevices.class.php b/pandora_console/godmode/wizards/HostDevices.class.php
index e4e0e97fdc..1c20eb04e3 100755
--- a/pandora_console/godmode/wizards/HostDevices.class.php
+++ b/pandora_console/godmode/wizards/HostDevices.class.php
@@ -581,113 +581,83 @@ class HostDevices extends Wizard
             if (isset($this->page) === false
                 || $this->page == 0
             ) {
-                $form = [];
 
-                // Input task name.
-                $form['inputs'][] = [
-                    'label'     => '<b>'.__('Task name').'</b>',
-                    'arguments' => [
+                // Comment input
+                $comment_input ='<div class="label_select"><label>'.__('Comment').':</label></div>';
+
+                $comment_input .= $this->printInput([
+                        'name'    => 'comment',
+                        'rows'    => 1,
+                        'columns' => 1,
+                        'value'   => $this->task['description'],
+                        'type'    => 'textarea',
+                        'size'    => 25,
+                        'class'   => 'discovery_textarea_input',
+                        'return'  => true
+                ]);
+
+                // Task input
+                $taskname_input_label = '<div class="label_select"><label>'.__('Task name').':</label></div>';
+
+                $taskname_input = $this->printInput([
                         'name'  => 'taskname',
                         'value' => $this->task['name'],
                         'type'  => 'text',
                         'size'  => 25,
-                    ],
-                ];
+                        'class' => 'discovery_full_width_input'
+                ]);
 
-                if (isset($this->task['id_rt']) === true) {
-                    // Propagate id.
-                    $form['inputs'][] = [
-                        'arguments' => [
-                            'name'  => 'task',
-                            'value' => $this->task['id_rt'],
-                            'type'  => 'hidden',
-                        ],
-                    ];
-                }
+                // Network input
+                $network_input_label .= '<div class="label_select discovery_label_hint"><label>'.__('Network').':</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).'</div>';
 
-                // Input task name.
-                $form['inputs'][] = [
-                    'label'     => '<b>'.__('Comment').'</b>',
-                    'arguments' => [
-                        'name'  => 'comment',
-                        'value' => $this->task['description'],
-                        'type'  => 'text',
-                        'size'  => 25,
-                    ],
-                ];
-
-                // Input Discovery Server.
-                $form['inputs'][] = [
-                    'label'     => '<b>'.__('Discovery server').'</b>'.ui_print_help_tip(
-                        __('You must select a Discovery Server to run the Task, otherwise the Recon Task will never run'),
-                        true
-                    ),
-                    'arguments' => [
-                        '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,
-                    ],
-                ];
-
-                // Input Network.
-                $form['inputs'][] = [
-
-                    'label'     => '<b>'.__('Network').'</b>'.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
-                    ),
-                    'arguments' => [
+                $network_input = $this->printInput([
                         'name'  => 'network',
                         'value' => $this->task['subnet'],
                         'type'  => 'text',
                         'size'  => 25,
-                    ],
-                ];
+                        'class' => 'discovery_full_width_input',
+                ]);
 
-                // Input Group.
-                $form['inputs'][] = [
-                    'label'     => '<b>'.__('Group').'</b>',
-                    'arguments' => [
-                        'name'           => 'id_group',
-                        'returnAllGroup' => false,
-                        'privilege'      => 'PM',
-                        'type'           => 'select_groups',
-                        'selected'       => $this->task['id_group'],
-                        'return'         => true,
-                    ],
-                ];
 
-                // Interval and schedules.
+                // Discovery server input
+                $discovery_server_select_label = '<div class="label_select discovery_label_hint"><label>'.__('Discovery server').':</label>'.ui_print_help_tip(__('You must select a Discovery Server to run the Task, otherwise the Recon Task will never run'), true).'</div>';
+
+                $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%',
+                ]);
+
+                // Interval input
                 $interv_manual = 0;
                 if ((int) $this->task['interval_sweep'] == 0) {
                     $interv_manual = 1;
                 }
 
-                // Schedule.
-                $form['inputs'][] = [
-                    'label'     => '<b>'.__('Interval').'</b>'.ui_print_help_tip(
-                        __('Manual interval means that it will be executed only On-demand'),
-                        true
-                    ),
-                    'arguments' => [
-                        'type'     => 'select',
-                        'selected' => $interv_manual,
-                        'fields'   => [
-                            0 => __('Defined'),
-                            1 => __('Manual'),
-                        ],
-                        'name'     => 'interval_manual_defined',
-                        'return'   => true,
+                $interval_input_label = '<div class="label_select discovery_label_hint" style="padding-top: 6px;"><label>'.__('Interval').':</label>'.ui_print_help_tip(__('Manual interval means that it will run only on demand.'), true).'</div>';
+
+                $interval_input = $this->printInput([
+                    'type'     => 'select',
+                    'selected' => $interv_manual,
+                    'fields'   => [
+                        0 => __('Defined'),
+                        1 => __('Manual'),
                     ],
-                    'extra'     => '<span id="interval_manual_container">'.html_print_extended_select_for_time(
+                    'name'     => 'interval_manual_defined',
+                    'return'   => true,
+                    'style'    => 'float: right;'
+                ]);
+
+                $interval_input_extra = '<span id="interval_manual_container">'.html_print_extended_select_for_time(
                         'interval',
                         $this->task['interval_sweep'],
                         '',
@@ -700,36 +670,37 @@ class HostDevices extends Wizard
                     ).ui_print_help_tip(
                         __('The minimum recomended interval for Recon Task is 5 minutes'),
                         true
-                    ).'</span>',
-                ];
+                    ).'</span>';
 
-                $str = __('Next');
 
-                if (isset($this->task['id_rt']) === true) {
-                    $str = __('Update and continue');
+                // Group select
+                $group_select = '<div class="label_select"><label>'.__('Group').':</label></div>';
+
+                $group_select .= $this->printInput([
+                        'name'           => 'id_group',
+                        'returnAllGroup' => false,
+                        'privilege'      => 'PM',
+                        'type'           => 'select_groups',
+                        'selected'       => $this->task['id_group'],
+                        'return'         => true,
+                        'class'          => 'discovery_list_input',
+                        'size'           => 9,
+                    ]);
+
+               if (isset($this->task['id_rt']) === true) {
+                    //Propagate ID
+                    $task_hidden = $this->printInput([
+                        'name'       => 'task',
+                        'value'      => $this->task['id_rt'],
+                        'type'       => 'hidden'
+                    ]);
                 }
 
-                // Submit button.
-                $form['inputs'][] = [
-                    'arguments' => [
-                        'name'       => 'submit',
-                        'label'      => $str,
-                        'type'       => 'submit',
-                        'attributes' => 'class="sub next"',
-                        'return'     => true,
-                    ],
-                ];
-
                 $task_url = '';
                 if (isset($this->task['id_rt'])) {
                     $task_url = '&task='.$this->task['id_rt'];
                 }
 
-                $form['form'] = [
-                    'method' => 'POST',
-                    'action' => $this->url.'&mode=netscan&page='.($this->page + 1).$task_url,
-                ];
-
                 // Default.
                 $interval = 600;
                 $unit = 60;
@@ -738,24 +709,62 @@ class HostDevices extends Wizard
                     $unit = $this->getTimeUnit($interval);
                 }
 
-                $form['js'] = '
-$("select#interval_manual_defined").change(function() {
-    if ($("#interval_manual_defined").val() == 1) {
-        $("#interval_manual_container").hide();
-        $("#text-interval_text").val(0);
-        $("#hidden-interval").val(0);
-    }
-    else {
-        $("#interval_manual_container").show();
-        $("#text-interval_text").val(10);
-        $("#hidden-interval").val('.$interval.');
-        $("#interval_units").val('.$unit.');
-    }
-}).change();';
-
                 // XXX: Could be improved validating inputs before continue (JS)
                 // Print NetScan page 0.
-                $this->printForm($form);
+                //$this->printForm($form);
+
+                echo '<form action="'.$this->url.'&mode=netscan&page='.($this->page + 1).$task_url.'" method="POST">';
+                echo $task_hidden;
+
+                echo '<div class="white_box">
+                    <div class="edit_discovery_info" style="margin-bottom: 15px;">
+                        <div style="width: 25%; padding: 9px;">'
+                            .'<div style="height: 50%; margin-bottom: 35px;">'.html_print_image ("images/wizard/netscan_green.png", true, array ("title" => __('Close'), "style" => 'width: 60%;'), false).'</div>'
+                            .'<div class="edit_discovery_input"><div style="display: flex;">'.$interval_input_label.'<div style="margin-left: 15 px; width: 50%;">'.$interval_input.'</div></div>'.$interval_input_extra.'</div>'
+                        .'</div>
+
+                        <div style="width: 40%; padding-left: 5%; padding-right: 12%;">
+                            <div class="edit_discovery_input">'.$taskname_input_label.'<div class="discovery_text_input">'.$taskname_input.'</div></div>'
+                            .'<div class="edit_discovery_input discovery_select_input">'.$discovery_server_select_label.$discovery_server_select.'<div class="discovery_hint"></div></div>'
+                            .'<div class="edit_discovery_input">'.$network_input_label.'<div class="discovery_text_input">'.$network_input.'</div></div>'
+                        .'</div>'
+                        .'<div style="width: 35%;">'.$group_select.'</div>'
+                    .'</div>'
+
+                    .'<div class="edit_discovery_info">
+                        <div style="width: 100%;">
+                            '.$comment_input.'
+                        </div>
+                    </div>'
+                .'</div>';
+
+                $str = __('Next');
+
+                if (isset($this->task['id_rt']) === true) {
+                    $str = __('Update and continue');
+                }
+
+                echo '<div class="action-buttons" style="width: 100%; margin-top: 10px;">'.html_print_submit_button($str, 'submit', false, 'class="sub next"', true).'</div>';
+                echo '</form>';
+
+                echo '<script>
+
+                    $("select#interval_manual_defined").change(function() {
+                        if ($("#interval_manual_defined").val() == 1) {
+                            $("#interval_manual_container").hide();
+                            $("#text-interval_text").val(0);
+                            $("#hidden-interval").val(0);
+                        }
+                        else {
+                            $("#interval_manual_container").show();
+                            $("#text-interval_text").val(10);
+                            $("#hidden-interval").val('.$interval.');
+                            $("#interval_units").val('.$unit.');
+                        }
+                    }).change();
+
+                </script>';
+
             }
         }
 
@@ -783,7 +792,7 @@ $("select#interval_manual_defined").change(function() {
             ];
 
             $form['inputs'][] = [
-                'extra' => '<p>Please, configure task <b>'.io_safe_output($this->task['name']).'</b></p>',
+                'extra' => '<p><h3>Please, configure task <b>'.io_safe_output($this->task['name']).'</b></h3></p>',
             ];
 
             // Input: Module template.
@@ -799,7 +808,6 @@ $("select#interval_manual_defined").change(function() {
                     'selected'      => $this->task['id_network_profile'],
                     'nothing_value' => 0,
                     'nothing'       => __('None'),
-
                 ],
             ];
 
@@ -850,7 +858,7 @@ $("select#interval_manual_defined").change(function() {
                 'action' => $this->url.'&mode=netscan&page='.($this->page + 1).'&task='.$this->task['id_rt'],
             ];
 
-            $this->printForm($form);
+            $this->printForm($form, false, true);
         }
 
         if ($this->page == 2) {
diff --git a/pandora_console/godmode/wizards/Wizard.main.php b/pandora_console/godmode/wizards/Wizard.main.php
index fde2b411c0..011e906cfa 100644
--- a/pandora_console/godmode/wizards/Wizard.main.php
+++ b/pandora_console/godmode/wizards/Wizard.main.php
@@ -479,7 +479,8 @@ class Wizard
                 ((isset($data['keys_field']) === true) ? $data['keys_field'] : 'id_grupo'),
                 ((isset($data['strict_user']) === true) ? $data['strict_user'] : false),
                 ((isset($data['delete_groups']) === true) ? $data['delete_groups'] : false),
-                ((isset($data['include_groups']) === true) ? $data['include_groups'] : false)
+                ((isset($data['include_groups']) === true) ? $data['include_groups'] : false),
+                ((isset($data['size']) === true) ? $data['size'] : false)
             );
 
             case 'submit':
@@ -636,7 +637,7 @@ class Wizard
      *
      * @return string HTML code.
      */
-    public function printForm(array $data, bool $return=false)
+    public function printForm(array $data, bool $return=false, bool $print_white_box=false)
     {
         $form = $data['form'];
         $inputs = $data['inputs'];
@@ -662,13 +663,27 @@ class Wizard
             error_log('Error executing wizard callback: ', $e->getMessage());
         }
 
-        $output = '<ul class="wizard">';
+        $output_submit = '';
+        $output = '';
+
+        if ($print_white_box === true)
+            $output .= '<div class="white_box">';
+
+        $output .= '<ul class="wizard">';
 
         foreach ($inputs as $input) {
-            $output .= $this->printBlock($input, true);
+            if ($input['arguments']['type']!='submit')
+                $output .= $this->printBlock($input, true);
+            else
+                $output_submit .= $this->printBlock($input, true);
         }
 
         $output .= '</ul>';
+
+        if ($print_white_box === true)
+            $output .= '</div>';
+
+        $output .= '<ul class="wizard">'.$output_submit.'</ul>';
         $output .= '</form>';
         $output .= '<script>'.$js.'</script>';
 
diff --git a/pandora_console/include/ajax/task_list.ajax.php b/pandora_console/include/ajax/task_list.ajax.php
index 33dc3e6b5f..c683a80a71 100644
--- a/pandora_console/include/ajax/task_list.ajax.php
+++ b/pandora_console/include/ajax/task_list.ajax.php
@@ -45,23 +45,27 @@ if ($progress_task_discovery) {
 
     $result = '<div id = progress_task_'.$id_task.'>';
     if ($task['utimestamp']) {
-        $result .= '<ul class="progress_task_discovery">';
-        $result .= '<li><h1>'._('Overall Progress').'</h1></li>';
-        $result .= '<li>';
-        $result .= d3_progress_bar(
+        $result .= '<div style="display: flex;">';
+        $result .= '<div style="width: 100%; text-align: center; margin-top: 40px;">';
+        $result .= '<span style="font-size: 1.9em; font-family: "lato-bolder", "Open Sans", sans-serif !important;">'._('Overall Progress').'</span>';
+
+$global_progress=83;
+
+        $result .= '<div style="margin-top: 25px;">';
+        $result .= progress_circular_bar(
             $id_task,
             ($global_progress < 0) ? 100 : $global_progress,
-            460,
-            30,
-            '#EA5434',
+            200,
+            200,
+            '#7eb641',
             '%',
             '',
-            '#FFFFFF',
-            0,
-            0,
+            '#3A3A3A',
             0
         );
 
+        $result .= '</div>';
+
         if ($global_progress > 0) {
             switch ($summary['step']) {
                 case STEP_SCANNING:
@@ -85,28 +89,28 @@ if ($progress_task_discovery) {
                 break;
             }
 
-            $result .= '</li>';
-            $result .= '<li><h1>'.$str.' ';
+            $result .= '</div>';
+            $result .= '<div style="width: 100%; text-align: center; margin-top: 40px;">';
+            $result .= '<span style="font-size: 1.9em; font-family: "lato-bolder", "Open Sans", sans-serif !important;">'.$str.' ';
             $result .= $summary['c_network_name'];
-            $result .= '</h1></li>';
-            $result .= '<li>';
-            $result .= d3_progress_bar(
+            $result .= '</span>';
+
+            $result .= '<div style="margin-top: 25px;">';
+            $result .= progress_circular_bar(
                 $id_task.'_detail',
                 $summary['c_network_percent'],
-                460,
-                30,
-                '#2751E1',
+                200,
+                200,
+                '#7eb641',
                 '%',
                 '',
-                '#FFFFFF',
-                0,
-                0,
+                '#3A3A3A',
                 0
             );
-            $result .= '</li>';
+            $result .= '</div></div>';
         }
 
-        $result .= '</ul>';
+        $result .= '</div></div>';
 
         $i = 0;
         $table = new StdClasS();
@@ -142,6 +146,7 @@ if ($progress_task_discovery) {
         $table->data[$i][1] .= $summary['summary']['WMI'];
         $table->data[$i++][1] .= '</span>';
 
+        $result .= '<div style="margin-top: 40px; text-align: center;"><span style="font-size: 1.9em; font-family: "lato-bolder", "Open Sans", sans-serif !important;">'.__('Summary').'</span></div>';
         $result .= html_print_table($table, true).'</div>';
     } else {
         $global_progress = -1;
diff --git a/pandora_console/include/class/CustomNetScan.class.php b/pandora_console/include/class/CustomNetScan.class.php
index 7477594637..bd0adba3f1 100644
--- a/pandora_console/include/class/CustomNetScan.class.php
+++ b/pandora_console/include/class/CustomNetScan.class.php
@@ -438,7 +438,7 @@ class CustomNetScan extends Wizard
 
                 // Input task name.
                 $form['inputs'][] = [
-                    'label'     => '<b>'.__('Task name').'</b>',
+                    'label'     => __('Task name'),
                     'arguments' => [
                         'name'  => 'taskname',
                         'value' => $this->task['name'],
@@ -460,7 +460,7 @@ class CustomNetScan extends Wizard
 
                 // Input task description.
                 $form['inputs'][] = [
-                    'label'     => '<b>'.__('Comment').'</b>',
+                    'label'     => __('Comment'),
                     'arguments' => [
                         'name'  => 'comment',
                         'value' => $this->task['description'],
@@ -471,7 +471,7 @@ class CustomNetScan extends Wizard
 
                 // Input Discovery Server.
                 $form['inputs'][] = [
-                    'label'     => '<b>'.__('Discovery server').'</b>'.ui_print_help_tip(
+                    'label'     => __('Discovery server').ui_print_help_tip(
                         __('You must select a Discovery Server to run the Task, otherwise the Recon Task will never run'),
                         true
                     ),
@@ -492,7 +492,7 @@ class CustomNetScan extends Wizard
 
                 // Input Group.
                 $form['inputs'][] = [
-                    'label'     => '<b>'.__('Group').'</b>',
+                    'label'     => __('Group'),
                     'arguments' => [
                         'name'           => 'id_group',
                         'returnAllGroup' => false,
@@ -511,7 +511,7 @@ class CustomNetScan extends Wizard
 
                 // Schedule.
                 $form['inputs'][] = [
-                    'label'     => '<b>'.__('Interval').'</b>'.ui_print_help_tip(
+                    'label'     => __('Interval').ui_print_help_tip(
                         __('Manual interval means that it will be executed only On-demand'),
                         true
                     ),
@@ -594,7 +594,7 @@ class CustomNetScan extends Wizard
 
                 // XXX: Could be improved validating inputs before continue (JS)
                 // Print NetScan page 0.
-                $this->printForm($form);
+                $this->printForm($form, false, true);
             }
         }
 
@@ -602,7 +602,7 @@ class CustomNetScan extends Wizard
             $name_ipam = 'IPAM Recon';
             // Recon script.
             $form['inputs'][] = [
-                'label'     => '<b>'.__('Recon script').'</b>',
+                'label'     => __('Recon script'),
                 'arguments' => [
                     'type'     => 'select_from_sql',
                     'sql'      => sprintf(
@@ -643,7 +643,7 @@ class CustomNetScan extends Wizard
             );
 
             $form['inputs'][] = [
-                'label'     => '<b>'.__('Explanation').'</b><span id="spinner_recon_script" style="display: none;">'.html_print_image('images/spinner.gif', true).'</span>',
+                'label'     => __('Explanation').'<span id="spinner_recon_script" style="display: none;">'.html_print_image('images/spinner.gif', true).'</span>',
                 'arguments' => [
                     'type'       => 'textarea',
                     'rows'       => 4,
@@ -652,6 +652,7 @@ class CustomNetScan extends Wizard
                     'value'      => $explanation,
                     'return'     => true,
                     'attributes' => 'style="width: 388px;"',
+                    'class'      => 'discovery_textarea_input'
                 ],
             ];
 
@@ -663,8 +664,9 @@ class CustomNetScan extends Wizard
                     'name'   => 'macro_name',
                     'value'  => 'macro_value',
                     'type'   => 'text',
-                    'size'   => 100,
+                    'size'   => 50,
                     'return' => true,
+
                 ],
             ];
 
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 4cb405d154..8feab63553 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -436,7 +436,8 @@ function html_print_select_groups(
     $keys_field='id_grupo',
     $strict_user=false,
     $delete_groups=false,
-    $include_groups=false
+    $include_groups=false,
+    $size=false
 ) {
     global $config;
 
@@ -481,7 +482,8 @@ function html_print_select_groups(
         $class,
         $disabled,
         $style,
-        $option_style
+        $option_style,
+        $size
     );
 
     if ($return) {
@@ -549,13 +551,11 @@ function html_print_select(
         $attributes .= ' onchange="'.$script.'"';
     }
 
-    if (!empty($multiple)) {
-        if ($size !== false) {
-            $attributes .= ' multiple="multiple" size="'.$size.'"';
-        } else {
-            $attributes .= ' multiple="multiple" size="10"';
-        }
-    }
+    if ($size !== false)
+        $attributes .= ' size="'.$size.'"';
+
+    if (!empty($multiple))
+        $attributes .= ' multiple="multiple"';
 
     if (!empty($class)) {
         $attributes .= ' class="'.$class.'"';
@@ -1774,7 +1774,8 @@ function html_print_button($label='OK', $name='', $disabled=false, $script='', $
  */
 function html_print_textarea($name, $rows, $columns, $value='', $attributes='', $return=false, $class='')
 {
-    $output = '<textarea id="textarea_'.$name.'" name="'.$name.'" cols="'.$columns.'" rows="'.$rows.'" '.$attributes.'" '.$class.'>';
+
+    $output = '<textarea id="textarea_'.$name.'" name="'.$name.'" cols="'.$columns.'" rows="'.$rows.'" '.$attributes.'" class="'.$class.'">';
     // $output .= io_safe_input ($value);
     $output .= ($value);
     $output .= '</textarea>';
diff --git a/pandora_console/include/graphs/functions_d3.php b/pandora_console/include/graphs/functions_d3.php
index 5ce06e982f..dfbcb46234 100644
--- a/pandora_console/include/graphs/functions_d3.php
+++ b/pandora_console/include/graphs/functions_d3.php
@@ -415,7 +415,7 @@ function d3_progress_bubble($id, $percentile, $width, $height, $color, $unit='%'
 }
 
 
-function progress_circular_bar($id, $percentile, $width, $height, $color, $unit='%', $text='', $fill_color='#FFFFFF')
+function progress_circular_bar($id, $percentile, $width, $height, $color, $unit='%', $text='', $fill_color='#FFFFFF', $transition=1)
 {
     global $config;
 
@@ -427,7 +427,7 @@ function progress_circular_bar($id, $percentile, $width, $height, $color, $unit=
     $output .= '<div id='.$recipient_name." style='overflow: hidden;'></div>";
     $output .= include_javascript_d3(true);
     $output .= "<script language=\"javascript\" type=\"text/javascript\">
-					print_circular_progress_bar('".$recipient_name_to_js."', ".(int) $percentile.', '.(int) $width.', '.(int) $height.", '".$color."', '".$unit."', '".$text."', '".$fill_color."');
+					print_circular_progress_bar('".$recipient_name_to_js."', ".(int) $percentile.', '.(int) $width.', '.(int) $height.", '".$color."', '".$unit."', '".$text."', '".$fill_color."', '".$transition."');
 				</script>";
 
     return $output;
diff --git a/pandora_console/include/graphs/pandora.d3.js b/pandora_console/include/graphs/pandora.d3.js
index 51dae061ec..d989c5f55f 100644
--- a/pandora_console/include/graphs/pandora.d3.js
+++ b/pandora_console/include/graphs/pandora.d3.js
@@ -1988,7 +1988,8 @@ function print_circular_progress_bar(
   color,
   unit,
   label,
-  label_color
+  label_color,
+  transition
 ) {
   var twoPi = Math.PI * 2;
   var radius = width / 2;
@@ -2120,15 +2121,19 @@ function print_circular_progress_bar(
 
   var progress = startPercent;
 
-  (function loops() {
-    updateProgress(progress);
+  if (transition == 0)
+    updateProgress(endPercent);
+  else {
+    (function loops() {
+      updateProgress(progress);
 
-    if (count > 0) {
-      count--;
-      progress += step;
-      setTimeout(loops, 30);
-    }
-  })();
+      if (count > 0) {
+        count--;
+        progress += step;
+        setTimeout(loops, 30);
+      }
+    })();
+  }
 }
 
 function print_interior_circular_progress_bar(
diff --git a/pandora_console/include/styles/discovery.css b/pandora_console/include/styles/discovery.css
index 34e9b98255..51b4e98c10 100644
--- a/pandora_console/include/styles/discovery.css
+++ b/pandora_console/include/styles/discovery.css
@@ -156,11 +156,118 @@ span.breadcrumb_link {
   color: #95b750;
 }
 
-.form_grid_items {
-  overflow: hidden;
+/*
+ * Discovery forms structure
+ */
+
+.edit_discovery_info {
+  display: flex;
+  align-items: center;
+  padding-top: 25px;
 }
-.form_grid_items .form_grid_item {
-  float: left;
+
+.edit_discovery_input {
+  align-items: center;
+  margin-bottom: 25px;
+}
+
+/*
+ * Discovery text inputs
+ */
+
+.discovery_label_hint {
+  display: flex;
+}
+
+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;
+}
+
+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] {
+  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;
+  overflow-y: auto;
+}
+
+.discovery_list_input option {
+  font-family: "lato-bolder", "Open Sans", sans-serif !important;
+  font-size: 1.1em !important;
+  padding-left: 30%;
+}
+
+.discovery_list_input option:checked {
+  background: #1aab8e -webkit-linear-gradient(bottom, #7db742 0%, #7db742 100%);
+  color: #fff;
+}
+
+.discovery_textarea_input {
+  background-color: #fbfbfb !important;
+  padding-left: 10px;
+  width: 100%;
+  height: 100px;
+  max-height: 100px;
+  max-width: 100%;
+  -webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
+  -moz-box-sizing: border-box;    /* Firefox, other Gecko */
   box-sizing: border-box;
-  padding: 10px;
+  resize: none;
+  font-family: "lato-bolder", "Open Sans", sans-serif !important;
+  font-size: 1.4em !important;
 }
+
+a.tip {
+  margin-left: 8px;
+}
+
+.inline_switch > label {
+  float: right;
+}
+
+.discovery_interval_select_width {
+  width: 90%;
+}
\ No newline at end of file

From 0e02d71712b3112c708c64b9300cf8e27ef0b31e Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Mon, 22 Apr 2019 17:47:30 +0200
Subject: [PATCH 2/4] add missing image

Former-commit-id: 0e5c0140a919223403c33a7dde15f64fdde62ed8
---
 pandora_console/images/wizard/netscan_green.png | Bin 0 -> 15485 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 pandora_console/images/wizard/netscan_green.png

diff --git a/pandora_console/images/wizard/netscan_green.png b/pandora_console/images/wizard/netscan_green.png
new file mode 100644
index 0000000000000000000000000000000000000000..faeae9b04208888f9b7fdb70a185494bf45cd862
GIT binary patch
literal 15485
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

literal 0
HcmV?d00001


From 01d1fb1c110c0ba91f6d1789b3436285ed6fb8c1 Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Mon, 22 Apr 2019 18:17:39 +0200
Subject: [PATCH 3/4] fixed visual bug

Former-commit-id: f2714283dd1f81c87505cdde349c33c6dd9bdc0b
---
 pandora_console/include/class/CustomNetScan.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/include/class/CustomNetScan.class.php b/pandora_console/include/class/CustomNetScan.class.php
index bd0adba3f1..078d23fa6b 100644
--- a/pandora_console/include/class/CustomNetScan.class.php
+++ b/pandora_console/include/class/CustomNetScan.class.php
@@ -742,7 +742,7 @@ class CustomNetScan extends Wizard
                     get_explanation_recon_script($(this).val(), "'.$id_task.'", "'.$url_ajax.'");
                 })'.$change;
 
-            $this->printForm($form);
+            $this->printForm($form, false, true);
         }
 
         if (isset($this->page) === true && $this->page === 2) {

From 92da84c47f6276efa29c3e1dd6d2ce96fef67abc Mon Sep 17 00:00:00 2001
From: alejandro-campos <alejandro.campos@artica.es>
Date: Tue, 23 Apr 2019 16:40:08 +0200
Subject: [PATCH 4/4] fix bug in discovery progress popups

Former-commit-id: 756f4b002db192794a09d0b15f5b6e3a2daf8731
---
 pandora_console/include/ajax/task_list.ajax.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pandora_console/include/ajax/task_list.ajax.php b/pandora_console/include/ajax/task_list.ajax.php
index c683a80a71..5839613f02 100644
--- a/pandora_console/include/ajax/task_list.ajax.php
+++ b/pandora_console/include/ajax/task_list.ajax.php
@@ -49,8 +49,6 @@ if ($progress_task_discovery) {
         $result .= '<div style="width: 100%; text-align: center; margin-top: 40px;">';
         $result .= '<span style="font-size: 1.9em; font-family: "lato-bolder", "Open Sans", sans-serif !important;">'._('Overall Progress').'</span>';
 
-$global_progress=83;
-
         $result .= '<div style="margin-top: 25px;">';
         $result .= progress_circular_bar(
             $id_task,