From c7410205383daedebce55d8e0736437123473665 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 4 Jun 2019 13:57:55 +0200
Subject: [PATCH] styles review

---
 pandora_console/general/logon_ok.php          | 347 +++++++++---------
 pandora_console/godmode/admin_access_logs.php |   2 +-
 .../godmode/agentes/agent_manager.php         |   4 +-
 .../godmode/agentes/module_manager_editor.php |   3 +-
 .../godmode/reporting/create_container.php    |   6 +-
 .../godmode/servers/servers.build_table.php   |   3 +-
 pandora_console/godmode/users/user_list.php   |   9 +-
 .../wizards/DiscoveryTaskList.class.php       |  12 +-
 .../include/class/NetworkMap.class.php        |  10 +-
 .../include/functions_snmp_browser.php        |   4 +-
 .../include/functions_treeview.php            |   2 +-
 pandora_console/include/functions_ui.php      |  21 +-
 pandora_console/include/styles/agent_view.css |   4 +
 pandora_console/include/styles/footer.css     |   2 +-
 pandora_console/include/styles/logon.css      |  24 ++
 pandora_console/include/styles/news.css       |  14 +
 pandora_console/include/styles/pandora.css    |  70 +---
 pandora_console/include/styles/tables.css     |  90 ++++-
 pandora_console/operation/agentes/graphs.php  |   2 +-
 .../operation/agentes/status_events.php       |   1 +
 .../operation/agentes/status_monitor.php      |  11 +-
 .../operation/agentes/tactical.php            |   9 +-
 .../operation/events/events_list.php          |   1 +
 23 files changed, 383 insertions(+), 268 deletions(-)
 create mode 100644 pandora_console/include/styles/logon.css
 create mode 100644 pandora_console/include/styles/news.css

diff --git a/pandora_console/general/logon_ok.php b/pandora_console/general/logon_ok.php
index a84bd263af..a02f6c11ac 100644
--- a/pandora_console/general/logon_ok.php
+++ b/pandora_console/general/logon_ok.php
@@ -103,202 +103,203 @@ if (!empty($all_data)) {
     $data['server_sanity'] = format_numeric((100 - $data['module_sanity']), 1);
 }
 
+ui_require_css_file('logon');
 
-?>
-<table border="0" width="100%" cellspacing="0" cellpadding="0">
-    <tr>
-        
-        <td width="25%" style="padding-right: 20px;" valign="top">
-            
-            
-            <?php
-            //
-            // Overview Table.
-            //
-            $table = new stdClass();
-            $table->class = 'databox';
-            $table->cellpadding = 4;
-            $table->cellspacing = 4;
-            $table->head = [];
-            $table->data = [];
-            $table->headstyle[0] = 'text-align:center;';
-            $table->width = '100%';
-            $table->head[0] = '<span>'.__('%s Overview', get_product_name()).'</span>';
-            $table->head_colspan[0] = 4;
+echo '<div id="welcome_panel">';
 
-            // Indicators.
-            $tdata = [];
-            $stats = reporting_get_stats_indicators($data, 120, 10, false);
-            $status = '<table class="status_tactical">';
-            foreach ($stats as $stat) {
-                $status .= '<tr><td><b>'.$stat['title'].'</b></td><td>'.$stat['graph'].'</td></tr>';
-            }
+//
+// Overview Table.
+//
+$table = new stdClass();
+$table->class = 'no-class';
+$table->cellpadding = 4;
+$table->cellspacing = 4;
+$table->head = [];
+$table->data = [];
+$table->headstyle[0] = 'text-align:center;';
+$table->width = '100%';
+$table->head_colspan[0] = 4;
 
-            $status .= '</table>';
-            $table->data[0][0] = $status;
-            $table->rowclass[] = '';
+// Indicators.
+$tdata = [];
+$stats = reporting_get_stats_indicators($data, 120, 10, false);
+$status = '<table class="status_tactical">';
+foreach ($stats as $stat) {
+    $status .= '<tr><td><b>'.$stat['title'].'</b></td><td>'.$stat['graph'].'</td></tr>';
+}
 
-            $table->data[] = $tdata;
+$status .= '</table>';
+$table->data[0][0] = $status;
+$table->rowclass[] = '';
 
-            // Alerts.
-            $tdata = [];
-            $tdata[0] = reporting_get_stats_alerts($data);
-            $table->rowclass[] = '';
-            $table->data[] = $tdata;
+$table->data[] = $tdata;
 
-            // Modules by status.
-            $tdata = [];
-            $tdata[0] = reporting_get_stats_modules_status($data, 180, 100);
-            $table->rowclass[] = '';
-            $table->data[] = $tdata;
+// Alerts.
+$tdata = [];
+$tdata[0] = reporting_get_stats_alerts($data);
+$table->rowclass[] = '';
+$table->data[] = $tdata;
 
-            // Total agents and modules.
-            $tdata = [];
-            $tdata[0] = reporting_get_stats_agents_monitors($data);
-            $table->rowclass[] = '';
-            $table->data[] = $tdata;
+// Modules by status.
+$tdata = [];
+$tdata[0] = reporting_get_stats_modules_status($data, 180, 100);
+$table->rowclass[] = '';
+$table->data[] = $tdata;
 
-            // Users.
-            if (users_is_admin()) {
-                $tdata = [];
-                $tdata[0] = reporting_get_stats_users($data);
-                $table->rowclass[] = '';
-                $table->data[] = $tdata;
-            }
+// Total agents and modules.
+$tdata = [];
+$tdata[0] = reporting_get_stats_agents_monitors($data);
+$table->rowclass[] = '';
+$table->data[] = $tdata;
 
-            html_print_table($table);
-            unset($table);
-            ?>
-            
-            
-        </td>
-        
-        <td width="75%" valign="top">
-            
-            
-            <?php
-            $options = [];
-            $options['id_user'] = $config['id_user'];
-            $options['modal'] = false;
-            $options['limit'] = 3;
-            $news = get_news($options);
+// Users.
+if (users_is_admin()) {
+    $tdata = [];
+    $tdata[0] = reporting_get_stats_users($data);
+    $table->rowclass[] = '';
+    $table->data[] = $tdata;
+}
+
+ui_toggle(
+    html_print_table($table, true),
+    __('%s Overview', get_product_name()),
+    '',
+    'overview',
+    false
+);
+unset($table);
+
+echo '<div id="right">';
+
+// News.
+$options = [];
+$options['id_user'] = $config['id_user'];
+$options['modal'] = false;
+$options['limit'] = 3;
+$news = get_news($options);
 
 
-            if (!empty($news)) {
-                // NEWS BOARD.
-                echo '<div id="news_board">';
+if (!empty($news)) {
+    ui_require_css_file('news');
+    // NEWS BOARD.
+    if ($config['prominent_time'] == 'timestamp') {
+        $comparation_suffix = '';
+    } else {
+        $comparation_suffix = __('ago');
+    }
 
-                echo '<table cellpadding="0" width=100% cellspacing="0" class="databox filters">';
-                echo '<tr><th style="text-align:center;"><span >'.__('News board').'</span></th></tr>';
-                if ($config['prominent_time'] == 'timestamp') {
-                    $comparation_suffix = '';
-                } else {
-                    $comparation_suffix = __('ago');
-                }
+    $output_news = '<div id="news_board" class="new">';
+    foreach ($news as $article) {
+        $image = false;
+        if ($article['text'] == '&amp;lt;p&#x20;style=&quot;text-align:&#x20;center;&#x20;font-size:&#x20;13px;&quot;&amp;gt;Hello,&#x20;congratulations,&#x20;if&#x20;you&apos;ve&#x20;arrived&#x20;here&#x20;you&#x20;already&#x20;have&#x20;an&#x20;operational&#x20;monitoring&#x20;console.&#x20;Remember&#x20;that&#x20;our&#x20;forums&#x20;and&#x20;online&#x20;documentation&#x20;are&#x20;available&#x20;24x7&#x20;to&#x20;get&#x20;you&#x20;out&#x20;of&#x20;any&#x20;trouble.&#x20;You&#x20;can&#x20;replace&#x20;this&#x20;message&#x20;with&#x20;a&#x20;personalized&#x20;one&#x20;at&#x20;Admin&#x20;tools&#x20;-&amp;amp;gt;&#x20;Site&#x20;news.&amp;lt;/p&amp;gt;&#x20;') {
+            $image = true;
+        }
 
-                foreach ($news as $article) {
-                    $image = false;
-                    if ($article['text'] == '&amp;lt;p&#x20;style=&quot;text-align:&#x20;center;&#x20;font-size:&#x20;13px;&quot;&amp;gt;Hello,&#x20;congratulations,&#x20;if&#x20;you&apos;ve&#x20;arrived&#x20;here&#x20;you&#x20;already&#x20;have&#x20;an&#x20;operational&#x20;monitoring&#x20;console.&#x20;Remember&#x20;that&#x20;our&#x20;forums&#x20;and&#x20;online&#x20;documentation&#x20;are&#x20;available&#x20;24x7&#x20;to&#x20;get&#x20;you&#x20;out&#x20;of&#x20;any&#x20;trouble.&#x20;You&#x20;can&#x20;replace&#x20;this&#x20;message&#x20;with&#x20;a&#x20;personalized&#x20;one&#x20;at&#x20;Admin&#x20;tools&#x20;-&amp;amp;gt;&#x20;Site&#x20;news.&amp;lt;/p&amp;gt;&#x20;') {
-                        $image = true;
-                    }
+        $text_bbdd = io_safe_output($article['text']);
+        $text = html_entity_decode($text_bbdd);
+        $output_news .= '<span class="green_title">'.$article['subject'].'</span>';
+        $output_news .= '<div class="new content">';
+        $output_news .= '<p>'.__('by').' <b>'.$article['author'].'</b> <i>'.ui_print_timestamp($article['timestamp'], true).'</i> '.$comparation_suffix.'</p>';
+        if ($image) {
+            $output_news .= '<center><img src="./images/welcome_image.png" alt="img colabora con nosotros - Support" width="191" height="207"></center>';
+        }
 
-                    $text_bbdd = io_safe_output($article['text']);
-                    $text = html_entity_decode($text_bbdd);
-                    echo '<tr><th class="green_title">'.$article['subject'].'</th></tr>';
-                    echo '<tr><td>'.__('by').' <b>'.$article['author'].'</b> <i>'.ui_print_timestamp($article['timestamp'], true).'</i> '.$comparation_suffix.'</td></tr>';
-                    echo '<tr><td class="datos">';
-                    if ($image) {
-                        echo '<center><img src="./images/welcome_image.png" alt="img colabora con nosotros - Support" width="191" height="207"></center>';
-                    }
+        $output_news .= nl2br($text);
+        $output_news .= '</div>';
+    }
 
-                    echo nl2br($text);
-                    echo '</td></tr>';
-                }
+    $output_news .= '</div>';
 
-                echo '</table>';
-                echo '</div>';
-                // News board.
-                echo '<br><br>';
+    // News board.
+    ui_toggle(
+        $output_news,
+        __('News board'),
+        '',
+        'news',
+        false
+    );
+    // END OF NEWS BOARD.
+}
 
-                // END OF NEWS BOARD.
-            }
-
-            // LAST ACTIVITY.
-            // Show last activity from this user.
-            echo '<div id="activity">';
-
-            $table = new stdClass();
-            $table->class = 'info_table';
-            $table->cellpadding = 0;
-            $table->cellspacing = 0;
-            $table->width = '100%';
-            // Don't specify px.
-            $table->data = [];
-            $table->size = [];
-            $table->headstyle = [];
-            $table->size[0] = '5%';
-            $table->size[1] = '15%';
-            $table->headstyle[1] = 'min-width: 12em;';
-            $table->size[2] = '5%';
-            $table->headstyle[2] = 'min-width: 65px;';
-            $table->size[3] = '10%';
-            $table->size[4] = '25%';
-            $table->head = [];
-            $table->head[0] = __('User');
-            $table->head[1] = __('Action');
-            $table->head[2] = __('Date');
-            $table->head[3] = __('Source IP');
-            $table->head[4] = __('Comments');
-            $table->title = '<span>'.__('This is your last activity performed on the %s console', get_product_name()).'</span>';
-            $sql = sprintf(
-                'SELECT id_usuario,accion, ip_origen,descripcion,utimestamp
-						FROM tsesion
-						WHERE (`utimestamp` > UNIX_TIMESTAMP(NOW()) - '.SECONDS_1WEEK.") 
-							AND `id_usuario` = '%s' ORDER BY `utimestamp` DESC LIMIT 10",
-                $config['id_user']
-            );
+// LAST ACTIVITY.
+// Show last activity from this user.
+$table = new stdClass();
+$table->class = 'no-td-padding info_table';
+$table->cellpadding = 0;
+$table->cellspacing = 0;
+$table->width = '100%';
+// Don't specify px.
+$table->data = [];
+$table->size = [];
+$table->headstyle = [];
+$table->size[0] = '5%';
+$table->size[1] = '15%';
+$table->headstyle[1] = 'min-width: 12em;';
+$table->size[2] = '5%';
+$table->headstyle[2] = 'min-width: 65px;';
+$table->size[3] = '10%';
+$table->size[4] = '25%';
+$table->head = [];
+$table->head[0] = __('User');
+$table->head[1] = __('Action');
+$table->head[2] = __('Date');
+$table->head[3] = __('Source IP');
+$table->head[4] = __('Comments');
+$table->align[4] = 'left';
+$sql = sprintf(
+    'SELECT id_usuario,accion, ip_origen,descripcion,utimestamp
+            FROM tsesion
+            WHERE (`utimestamp` > UNIX_TIMESTAMP(NOW()) - '.SECONDS_1WEEK.") 
+                AND `id_usuario` = '%s' ORDER BY `utimestamp` DESC LIMIT 10",
+    $config['id_user']
+);
 
 
-            $sessions = db_get_all_rows_sql($sql);
+$sessions = db_get_all_rows_sql($sql);
 
-            if ($sessions === false) {
-                $sessions = [];
-            }
+if ($sessions === false) {
+    $sessions = [];
+}
 
-            foreach ($sessions as $session) {
-                $data = [];
-                $session_id_usuario = $session['id_usuario'];
-                $session_ip_origen = $session['ip_origen'];
+foreach ($sessions as $session) {
+    $data = [];
+    $session_id_usuario = $session['id_usuario'];
+    $session_ip_origen = $session['ip_origen'];
 
 
+    $data[0] = '<strong>'.$session_id_usuario.'</strong>';
+    $data[1] = ui_print_session_action_icon($session['accion'], true).' '.$session['accion'];
+    $data[2] = ui_print_help_tip(
+        date($config['date_format'], $session['utimestamp']),
+        true
+    ).human_time_comparation($session['utimestamp'], 'tiny');
+    $data[3] = $session_ip_origen;
+    $description = str_replace([',', ', '], ', ', $session['descripcion']);
+    if (strlen($description) > 100) {
+        $data[4] = '<div >'.io_safe_output(substr($description, 0, 150).'...').'</div>';
+    } else {
+        $data[4] = '<div >'.io_safe_output($description).'</div>';
+    }
 
-                $data[0] = '<strong>'.$session_id_usuario.'</strong>';
-                $data[1] = ui_print_session_action_icon($session['accion'], true).' '.$session['accion'];
-                $data[2] = ui_print_help_tip(
-                    date($config['date_format'], $session['utimestamp']),
-                    true
-                ).human_time_comparation($session['utimestamp'], 'tiny');
-                $data[3] = $session_ip_origen;
-                $description = str_replace([',', ', '], ', ', $session['descripcion']);
-                if (strlen($description) > 100) {
-                    $data[4] = '<div >'.io_safe_output(substr($description, 0, 150).'...').'</div>';
-                } else {
-                    $data[4] = '<div >'.io_safe_output($description).'</div>';
-                }
+    array_push($table->data, $data);
+}
 
-                array_push($table->data, $data);
-            }
+$activity .= html_print_table($table, true);
+unset($table);
 
-            echo "<div style='width:100%; overflow-x:auto;'>";
-            html_print_table($table);
-            unset($table);
-            echo '</div>';
-            echo '</div>';
-            // END OF LAST ACTIVIYY.
-            ?>
-            
-            
-        </td>
-        
-    </tr>
-</table>
+ui_toggle(
+    $activity,
+    __('Latest activity'),
+    '',
+    'activity',
+    false,
+    false,
+    '',
+    'white-box-content padded'
+);
+// END OF LAST ACTIVIYY.
+// Close right panel.
+echo '</div>';
+
+// Close welcome panel.
+echo '</div>';
diff --git a/pandora_console/godmode/admin_access_logs.php b/pandora_console/godmode/admin_access_logs.php
index 67a933d8cb..112a45754f 100644
--- a/pandora_console/godmode/admin_access_logs.php
+++ b/pandora_console/godmode/admin_access_logs.php
@@ -94,7 +94,7 @@ $table->data[1] = $data;
 $form = '<form name="query_sel" method="post" action="index.php?sec=glog&sec2=godmode/admin_access_logs">';
 $form .= html_print_table($table, true);
 $form .= '</form>';
-ui_toggle($form, __('Filter'), '', false);
+ui_toggle($form, __('Filter'), '', '', false);
 
 $filter = '1=1';
 
diff --git a/pandora_console/godmode/agentes/agent_manager.php b/pandora_console/godmode/agentes/agent_manager.php
index 236ccb1055..d0c9040742 100644
--- a/pandora_console/godmode/agentes/agent_manager.php
+++ b/pandora_console/godmode/agentes/agent_manager.php
@@ -781,7 +781,7 @@ ui_toggle(
     $table_adv_options,
     __('Advanced options'),
     '',
-    true,
+    '',
     false,
     '',
     'padding-4'
@@ -907,7 +907,7 @@ if (!empty($fields)) {
         html_print_table($table, true),
         __('Custom fields'),
         '',
-        true,
+        '',
         false,
         'white_box white_box_opened',
         'no-border'
diff --git a/pandora_console/godmode/agentes/module_manager_editor.php b/pandora_console/godmode/agentes/module_manager_editor.php
index 4c87577b24..b340761265 100644
--- a/pandora_console/godmode/agentes/module_manager_editor.php
+++ b/pandora_console/godmode/agentes/module_manager_editor.php
@@ -586,7 +586,8 @@ echo '<form method="post" id="module_form">';
 ui_toggle(
     html_print_table($table_simple, true),
     __('Base options'),
-    true,
+    '',
+    '',
     false
 );
 
diff --git a/pandora_console/godmode/reporting/create_container.php b/pandora_console/godmode/reporting/create_container.php
index b0566d7867..3c2e144178 100644
--- a/pandora_console/godmode/reporting/create_container.php
+++ b/pandora_console/godmode/reporting/create_container.php
@@ -414,7 +414,7 @@ if ($edit_container) {
     echo "<table width='100%' cellpadding=4 cellspacing=4 class='databox filters'>";
         echo '<tr>';
             echo '<td>';
-                echo ui_toggle($single_table, 'Simple module graph', '', true, true);
+                echo ui_toggle($single_table, 'Simple module graph', '', '', true);
             echo '</td>';
         echo '</tr>';
     echo '</table>';
@@ -466,7 +466,7 @@ if ($edit_container) {
     echo "<table width='100%' cellpadding=4 cellspacing=4 class='databox filters'>";
         echo '<tr>';
             echo '<td>';
-                echo ui_toggle(html_print_table($table, true), 'Custom graph', '', true, true);
+                echo ui_toggle(html_print_table($table, true), 'Custom graph', '', '', true);
             echo '</td>';
         echo '</tr>';
     echo '</table>';
@@ -561,7 +561,7 @@ if ($edit_container) {
     echo "<table width='100%' cellpadding=4 cellspacing=4 class='databox filters'>";
         echo '<tr>';
             echo '<td>';
-                echo ui_toggle(html_print_table($table, true), 'Dynamic rules for simple module graph', '', true, true);
+                echo ui_toggle(html_print_table($table, true), 'Dynamic rules for simple module graph', '', '', true);
             echo '</td>';
         echo '</tr>';
     echo '</table>';
diff --git a/pandora_console/godmode/servers/servers.build_table.php b/pandora_console/godmode/servers/servers.build_table.php
index 77f6da7315..aa2f0a0735 100644
--- a/pandora_console/godmode/servers/servers.build_table.php
+++ b/pandora_console/godmode/servers/servers.build_table.php
@@ -234,7 +234,8 @@ if ($tiny) {
     ui_toggle(
         html_print_table($table, true),
         __('Tactical server information'),
-        false,
+        '',
+        '',
         $hidden_toggle
     );
 } else {
diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php
index 63caad6d3f..4e8cfbb2c1 100644
--- a/pandora_console/godmode/users/user_list.php
+++ b/pandora_console/godmode/users/user_list.php
@@ -297,7 +297,14 @@ if (defined('METACONSOLE')) {
     $form_filter = "<form method='post'>";
     $form_filter .= html_print_table($table, true);
     $form_filter .= '</form>';
-    ui_toggle($form_filter, __('Users control filter'), __('Toggle filter(s)'), !$search);
+    ui_toggle(
+        $form_filter,
+        __('Users control filter'),
+        __('Toggle filter(s)'),
+        '',
+        '',
+        !$search
+    );
 }
 
 // Urls to sort the table.
diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
index 9392d03ad4..9ba322d42f 100644
--- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
+++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php
@@ -651,20 +651,24 @@ class DiscoveryTaskList extends Wizard
                 array_push($table->data, $data);
             }
 
-                echo '<h2>'.__('Server tasks').'</h2>';
             if (empty($table->data)) {
-                echo '<div class="nf">'.__('Server').' '.$server_name.' '.__('has no discovery tasks assigned').'</div>';
-                return false;
+                $content = '<div class="nf">'.__('Server').' '.$server_name.' '.__('has no discovery tasks assigned').'</div>';
+                $return = false;
             } else {
-                html_print_table($table);
+                $content = html_print_table($table, true);
+                $return = true;
             }
 
+            ui_toggle($content, __('Server Tasks'), '', '', false);
+
             // Div neccesary for modal map task.
             echo '<div id="map_task" style="display:none"></div>';
 
             unset($table);
 
             ui_require_javascript_file('pandora_taskList');
+
+            return $return;
         }
 
         return true;
diff --git a/pandora_console/include/class/NetworkMap.class.php b/pandora_console/include/class/NetworkMap.class.php
index 7bf232e068..29acf27c30 100644
--- a/pandora_console/include/class/NetworkMap.class.php
+++ b/pandora_console/include/class/NetworkMap.class.php
@@ -2845,8 +2845,9 @@ class NetworkMap
             html_print_table($table, true),
             __('Node Details'),
             __('Node Details'),
+            '',
             false,
-            true
+            false
         );
 
         $output .= '</div>';
@@ -2897,6 +2898,7 @@ class NetworkMap
             html_print_table($table, true),
             __('Node Details'),
             __('Node Details'),
+            '',
             false,
             true
         );
@@ -2922,6 +2924,7 @@ class NetworkMap
             html_print_table($table, true),
             __('Interface Information (SNMP)'),
             __('Interface Information (SNMP)'),
+            '',
             true,
             true
         );
@@ -2996,6 +2999,7 @@ class NetworkMap
             html_print_table($table, true),
             __('Node options'),
             __('Node options'),
+            '',
             true,
             true
         );
@@ -3056,6 +3060,7 @@ class NetworkMap
             html_print_table($table, true),
             __('Relations'),
             __('Relations'),
+            '',
             true,
             true
         );
@@ -3165,6 +3170,7 @@ class NetworkMap
             $add_agent_node_html,
             __('Add agent node'),
             __('Add agent node'),
+            '',
             false,
             true
         );
@@ -3216,6 +3222,7 @@ class NetworkMap
             $add_agent_node_html,
             __('Add agent node (filter by group)'),
             __('Add agent node'),
+            '',
             true,
             true
         );
@@ -3256,6 +3263,7 @@ class NetworkMap
             $add_agent_node_html,
             __('Add fictional point'),
             __('Add agent node'),
+            '',
             true,
             true
         );
diff --git a/pandora_console/include/functions_snmp_browser.php b/pandora_console/include/functions_snmp_browser.php
index d20daecb46..884698aa38 100644
--- a/pandora_console/include/functions_snmp_browser.php
+++ b/pandora_console/include/functions_snmp_browser.php
@@ -900,10 +900,10 @@ function snmp_browser_print_container($return=false, $width='100%', $height='500
         $output .= '<div id="snmp3_browser_options" style="display: none;">';
     }
 
-    $output .= ui_toggle(html_print_table($table3, true), __('SNMP v3 options'), '', true, true);
+    $output .= ui_toggle(html_print_table($table3, true), __('SNMP v3 options'), '', '', true, true);
     $output .= '</div>';
     $output .= '<div style="width: 100%; padding-top: 10px;">';
-    $output .= ui_toggle(html_print_table($table2, true), __('Search options'), '', true, true);
+    $output .= ui_toggle(html_print_table($table2, true), __('Search options'), '', '', true, true);
     $output .= '</div>';
 
     // SNMP tree container
diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php
index eb4d1e16d7..adcb6c31bd 100755
--- a/pandora_console/include/functions_treeview.php
+++ b/pandora_console/include/functions_treeview.php
@@ -670,7 +670,7 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
     $agent_table .= '<br>';
 
     // print agent data toggle
-    ui_toggle($agent_table, __('Agent data'), '', false);
+    ui_toggle($agent_table, __('Agent data'), '', '', false);
 
     // Advanced data
     $table = new StdClass();
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 066c9f947b..be26ceea64 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -2921,12 +2921,15 @@ function ui_print_event_priority(
 /**
  * Print a code into a DIV and enable a toggle to show and hide it.
  *
- * @param string  $code           Html code.
- * @param string  $name           Name of the link.
- * @param string  $title          Title of the link.
- * @param boolean $hidden_default If the div will be hidden by default (default: true).
- * @param boolean $return         Whether to return an output string or echo now (default: true).
- * @param string  $toggle_class   Toggle class.
+ * @param string  $code            Html code.
+ * @param string  $name            Name of the link.
+ * @param string  $title           Title of the link.
+ * @param string  $id              Block id.
+ * @param boolean $hidden_default  If the div will be hidden by default (default: true).
+ * @param boolean $return          Whether to return an output string or echo now (default: true).
+ * @param string  $toggle_class    Toggle class.
+ * @param string  $container_class Container class.
+ * @param string  $main_class      Main object class.
  *
  * @return string HTML.
  */
@@ -2934,10 +2937,12 @@ function ui_toggle(
     $code,
     $name,
     $title='',
+    $id='',
     $hidden_default=true,
     $return=false,
     $toggle_class='',
-    $container_class='white-box-content'
+    $container_class='white-box-content',
+    $main_class='box-shadow white_table_graph'
 ) {
     // Generate unique Id.
     $uniqid = uniqid('');
@@ -2954,7 +2959,7 @@ function ui_toggle(
     }
 
     // Link to toggle.
-    $output = '<div class="box-shadow white_table_graph">';
+    $output = '<div class="'.$main_class.'" id="'.$id.'">';
     $output .= '<div class="white_table_graph_header" style="cursor: pointer;" id="tgl_ctrl_'.$uniqid.'">'.html_print_image(
         $original,
         true,
diff --git a/pandora_console/include/styles/agent_view.css b/pandora_console/include/styles/agent_view.css
index f960928e83..cd0d97b860 100644
--- a/pandora_console/include/styles/agent_view.css
+++ b/pandora_console/include/styles/agent_view.css
@@ -19,6 +19,10 @@ div.agent_details_agent_alias * {
   font-family: "lato-bolder", "Open Sans", sans-serif;
 }
 
+#module_list {
+  width: 100%;
+}
+
 #module_filter_agent_view tr td {
   padding-bottom: 3em;
 }
diff --git a/pandora_console/include/styles/footer.css b/pandora_console/include/styles/footer.css
index b215497f35..aaa96bca14 100644
--- a/pandora_console/include/styles/footer.css
+++ b/pandora_console/include/styles/footer.css
@@ -16,7 +16,7 @@ div#foot {
   background: #343434;
   clear: both;
   width: auto;
-  height: 4em;
+  height: 41px;
   margin-top: auto;
   box-sizing: border-box;
 }
diff --git a/pandora_console/include/styles/logon.css b/pandora_console/include/styles/logon.css
new file mode 100644
index 0000000000..d5da931f84
--- /dev/null
+++ b/pandora_console/include/styles/logon.css
@@ -0,0 +1,24 @@
+#welcome_panel {
+  display: flex;
+  flex-direction: row;
+}
+
+#overview {
+  width: 30em;
+  min-width: 30em;
+  margin-top: 15px;
+  align-self: start;
+}
+#right {
+  flex: 1;
+}
+
+#news {
+  flex: 1 1 auto;
+  margin: 15px;
+}
+
+#activity {
+  flex: 1 1 auto;
+  margin: 15px;
+}
diff --git a/pandora_console/include/styles/news.css b/pandora_console/include/styles/news.css
new file mode 100644
index 0000000000..0ed635bafd
--- /dev/null
+++ b/pandora_console/include/styles/news.css
@@ -0,0 +1,14 @@
+.green_title {
+  background-color: #82b92e;
+  font-weight: 600;
+  width: 100%;
+  text-align: center;
+  display: block;
+  padding: 1em;
+  font-size: 1.3em;
+  color: #fff;
+}
+
+.new.content {
+  padding: 0 4em 2em;
+}
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 6c0e974411..bd8a9e79e9 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -2145,7 +2145,8 @@ td.cellBig {
 }
 
 .info_box {
-  background: #f9faf9;
+  background: #fff;
+  box-shadow: 0px 0px 15px -10px #888;
   margin-top: 10px;
   margin-bottom: 10px;
   padding: 0px 5px 5px 10px;
@@ -3151,6 +3152,10 @@ div.div_groups_status {
   border-radius: 100px;
 }
 
+.databox.pies {
+  border: none;
+}
+
 .databox.pies fieldset.tactical_set {
   width: 100%;
   min-height: 285px;
@@ -3227,61 +3232,6 @@ div.div_groups_status {
   border: 1px solid #e2e2e2;
 }
 
-.databox.filters,
-.databox.data {
-  margin-bottom: 20px;
-}
-
-.databox.filters > tbody > tr > td {
-  padding: 10px;
-  padding-left: 20px;
-}
-
-.databox.filters > tbody > tr > td > img,
-.databox.filters > tbody > tr > td > div > a > img,
-.databox.filters > tbody > tr > td > span > img,
-.databox.filters > tbody > tr > td > span > a > img,
-.databox.filters > tbody > tr > td > a > img {
-  vertical-align: middle;
-  margin-left: 5px;
-}
-.databox.data > tbody > tr > td > img,
-.databox.data > thead > tr > th > img,
-.databox.data > tbody > tr > td > div > a > img,
-.databox.data > tbody > tr > td > span > img,
-.databox.data > tbody > tr > td > span > a > img,
-.databox.data > tbody > tr > td > a > img,
-.databox.data > tbody > tr > td > form > a > img {
-  vertical-align: middle;
-}
-
-.databox.filters > tbody > tr > td > a > img {
-  vertical-align: middle;
-}
-
-.databox.data > tbody > tr > td > input[type="checkbox"] {
-  margin: 0px;
-}
-
-.databox_color > tbody > tr > td {
-  padding-left: 10px;
-}
-
-.databox.agente > tbody > tr > td > div > canvas {
-  width: 100%;
-  text-align: left;
-}
-.databox.agente > tbody > tr > td > div.graph {
-  width: 100%;
-  text-align: left;
-}
-
-.green_title {
-  background-color: #82b92e;
-  font-weight: normal;
-  text-align: center;
-}
-
 .dashboard {
   top: 23px;
 }
@@ -3935,9 +3885,6 @@ span.log_zone_line_error {
 .rowOdd:hover {
   background-color: #eee;
 }
-.databox.data > tbody > tr:hover {
-  background-color: #eee;
-}
 .checkselected {
   background-color: #eee;
 }
@@ -5688,6 +5635,11 @@ div#status_pie {
   padding-left: 10px;
 }
 
+.white-box-content.padded {
+  padding-top: 2em;
+  padding-bottom: 2em;
+}
+
 .white-box-content {
   width: 100%;
   height: 100%;
diff --git a/pandora_console/include/styles/tables.css b/pandora_console/include/styles/tables.css
index 5aa66ef7f6..3e2c4ae6d9 100644
--- a/pandora_console/include/styles/tables.css
+++ b/pandora_console/include/styles/tables.css
@@ -26,6 +26,68 @@
   width: 33%;
 }
 
+.white-box-content > form > .databox.filters {
+  border: none;
+}
+
+.databox.filters {
+  background: #fff;
+  padding: 1em 0;
+}
+
+.databox.filters,
+.databox.data {
+  margin-bottom: 20px;
+}
+
+.databox.filters > tbody > tr > td {
+  padding: 10px;
+  padding-left: 20px;
+}
+
+.databox.filters > tbody > tr > td > img,
+.databox.filters > tbody > tr > td > div > a > img,
+.databox.filters > tbody > tr > td > span > img,
+.databox.filters > tbody > tr > td > span > a > img,
+.databox.filters > tbody > tr > td > a > img {
+  vertical-align: middle;
+  margin-left: 5px;
+}
+.databox.filters > tbody > tr > td > a > img {
+  vertical-align: middle;
+}
+
+.databox.data > tbody > tr > td > img,
+.databox.data > thead > tr > th > img,
+.databox.data > tbody > tr > td > div > a > img,
+.databox.data > tbody > tr > td > span > img,
+.databox.data > tbody > tr > td > span > a > img,
+.databox.data > tbody > tr > td > a > img,
+.databox.data > tbody > tr > td > form > a > img {
+  vertical-align: middle;
+}
+
+.databox.data > tbody > tr:hover {
+  background-color: #eee;
+}
+
+.databox.data > tbody > tr > td > input[type="checkbox"] {
+  margin: 0px;
+}
+
+.databox_color > tbody > tr > td {
+  padding-left: 10px;
+}
+
+.databox.agente > tbody > tr > td > div > canvas {
+  width: 100%;
+  text-align: left;
+}
+.databox.agente > tbody > tr > td > div.graph {
+  width: 100%;
+  text-align: left;
+}
+
 .info_table {
   background-color: #fff;
   margin-bottom: 10px;
@@ -57,6 +119,11 @@
   border-bottom: 1px solid #e2e2e2;
 }
 
+.info_table > thead > tr {
+  height: 3em;
+  vertical-align: top;
+}
+
 /* Radius top */
 .info_table > thead > tr:first-child > th:first-child {
   border-top-left-radius: 4px;
@@ -93,12 +160,17 @@
   -webkit-border-radius: 0px;
   border-radius: 0px;
   border: none;
-  padding-left: 9px;
-  padding-right: 9px;
+  padding-left: 0px;
+  padding-right: 0px;
   padding-top: 7px;
   padding-bottom: 7px;
 }
 
+.info_table.no-td-padding td {
+  padding-left: 0;
+  padding-right: 0;
+}
+
 .info_table > tbody > tr > td > img,
 .info_table > thead > tr > th > img,
 .info_table > tbody > tr > td > div > a > img,
@@ -131,6 +203,18 @@
   font-weight: normal;
 }
 
+.databox.datos2 {
+  background: #f5f5f5;
+}
+
+.databox.datos {
+  background: #fff;
+}
+
+.filters input {
+  background: #fbfbfb;
+}
+
 .datos4 {
   /*Add because in php the function html_print_table write style in cell and this is style head.*/
   text-align: center;
@@ -141,7 +225,7 @@
 .info_table .datos3 *,
 .info_table .datos4 * {
   font-size: 8.6pt;
-  font-weight: normal;
+  font-weight: 600;
   padding: 1.3em 0;
 }
 
diff --git a/pandora_console/operation/agentes/graphs.php b/pandora_console/operation/agentes/graphs.php
index 628c25d3ba..79ff02b021 100644
--- a/pandora_console/operation/agentes/graphs.php
+++ b/pandora_console/operation/agentes/graphs.php
@@ -255,7 +255,7 @@ $htmlForm .= html_print_button(
 $htmlForm .= '</div>';
 $htmlForm .= '</form>';
 
-ui_toggle($htmlForm, __('Filter graphs'), __('Toggle filter(s)'), false);
+ui_toggle($htmlForm, __('Filter graphs'), __('Toggle filter(s)'), '', false);
 
 $utime = get_system_time();
 $current = date('Y-m-d', $utime);
diff --git a/pandora_console/operation/agentes/status_events.php b/pandora_console/operation/agentes/status_events.php
index 5e6e060f82..df30d75dda 100755
--- a/pandora_console/operation/agentes/status_events.php
+++ b/pandora_console/operation/agentes/status_events.php
@@ -25,6 +25,7 @@ ui_toggle(
     "<div style='width: 100%;' id='event_list'>".html_print_image('images/spinner.gif', true).'</div>',
     __('Latest events for this agent'),
     __('Latest events for this agent'),
+    '',
     false,
     false,
     '',
diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index 447baa3556..37717021b3 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -421,7 +421,7 @@ if (!is_metaconsole()) {
 
 $table->data[0][5] = html_print_select($rows_select, 'modulegroup', $modulegroup, '', __('All'), -1, true, false, true, '', false, 'width: 120px;');
 
-$table->rowspan[0][6] = 2;
+$table->rowspan[0][6] = 3;
 $table->data[0][6] = html_print_submit_button(
     __('Show'),
     'uptbutton',
@@ -705,13 +705,14 @@ if (is_metaconsole()) {
         html_print_table($table_custom_fields, true),
         __('Advanced Options'),
         '',
+        '',
         true,
         true
     );
 
     $filters .= html_print_table($table, true);
     $filters .= '</form>';
-    ui_toggle($filters, __('Show Options'), '', false);
+    ui_toggle($filters, __('Show Options'), '', '', false);
 } else {
     $table->colspan[3][0] = 7;
     $table->cellstyle[3][0] = 'padding-left: 10px;';
@@ -722,8 +723,12 @@ if (is_metaconsole()) {
         ),
         __('Agent custom fields'),
         '',
+        '',
         true,
-        true
+        true,
+        '',
+        'white-box-content',
+        'white_table_graph'
     );
 
     $filters .= html_print_table($table, true);
diff --git a/pandora_console/operation/agentes/tactical.php b/pandora_console/operation/agentes/tactical.php
index 40fc911352..c482ef255c 100755
--- a/pandora_console/operation/agentes/tactical.php
+++ b/pandora_console/operation/agentes/tactical.php
@@ -168,7 +168,8 @@ if ($is_admin) {
 ui_toggle(
     html_print_table($table, true),
     __('Report of State'),
-    true,
+    '',
+    '',
     false
 );
 
@@ -194,7 +195,8 @@ if (check_acl($config['id_user'], 0, 'ER')) {
     ui_toggle(
         $events,
         __('Latest events'),
-        false,
+        '',
+        '',
         false
     );
 }
@@ -219,7 +221,8 @@ $out = '<table cellpadding=0 cellspacing=0 class="databox pies"  style="margin-t
 ui_toggle(
     $out,
     __('Event graphs'),
-    true,
+    '',
+    '',
     false
 );
 
diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php
index 8333ca5b0d..298310a845 100644
--- a/pandora_console/operation/events/events_list.php
+++ b/pandora_console/operation/events/events_list.php
@@ -992,6 +992,7 @@ $data[0] = ui_toggle(
     html_print_table($table_advanced, true),
     __('Advanced options'),
     '',
+    '',
     true,
     true
 );