fixed styles

pandora_console/godmode/alerts/configure_alert_template.php

@@ -37,10 +37,6 @@ enterprise_include_once('meta/include/functions_alerts_meta.php');
 
 check_login();
 
-if (is_metaconsole() === true) {
-    enterprise_hook('open_meta_frame');
-}
-
 if (! check_acl($config['id_user'], 0, 'LM')) {
     db_pandora_audit(
         AUDIT_LOG_ACL_VIOLATION,
@@ -1204,10 +1200,6 @@ if (!$disabled) {
 echo '</div>';
 echo '</form>';
 
-if (is_metaconsole() === true) {
-    enterprise_hook('close_meta_frame');
-}
-
 ui_require_javascript_file('pandora_alerts');
 ui_include_time_picker();
 ui_require_jquery_file('ui.datepicker-'.get_user_language(), 'include/javascript/i18n/');

pandora_console/godmode/category/edit_category.php

@@ -28,8 +28,6 @@
 
 check_login();
 
-enterprise_hook('open_meta_frame');
-
 // Include functions code.
 require_once $config['homedir'].'/include/functions_categories.php';
 
@@ -225,5 +223,3 @@ html_print_action_buttons(
 );
 
 echo '</form>';
-
-enterprise_hook('close_meta_frame');

pandora_console/godmode/groups/configure_group.php

@@ -31,8 +31,6 @@ global $config;
 
 check_login();
 
-enterprise_hook('open_meta_frame');
-
 if (! check_acl($config['id_user'], 0, 'AW')) {
     db_pandora_audit(
         AUDIT_LOG_ACL_VIOLATION,
@@ -248,8 +246,6 @@ if ($id_group) {
 echo '</div>';
 echo '</form>';
 
-enterprise_hook('close_meta_frame');
-
 ?>
 <script language="javascript" type="text/javascript">
 function icon_changed () {

pandora_console/godmode/groups/configure_modu_group.php

@@ -15,8 +15,6 @@ global $config;
 
 check_login();
 
-enterprise_hook('open_meta_frame');
-
 if (! check_acl($config['id_user'], 0, 'PM')) {
     db_pandora_audit(
         AUDIT_LOG_ACL_VIOLATION,
@@ -127,5 +125,3 @@ html_print_action_buttons(
     ['type' => 'form_action']
 );
 echo '</form>';
-
-enterprise_hook('close_meta_frame');

pandora_console/godmode/massive/massive_delete_agents.php

@@ -148,7 +148,11 @@ $delete = (bool) get_parameter_post('delete');
 if ($delete === true) {
     $result = process_manage_delete($id_agents);
 
-    $info = '{"Agent":"'.implode(',', $id_agents).'"}';
+    if (empty($id_agents) === true) {
+        $info = '{"Agent":"empty"}';
+    } else {
+        $info = '{"Agent":"'.implode(',', $id_agents).'"}';
+    }
 
     if ($result === true) {
         db_pandora_audit(

pandora_console/godmode/massive/massive_edit_users.php

@@ -61,7 +61,6 @@ if (is_management_allowed() === false) {
 
 if (is_metaconsole() === true) {
     include_once $config['homedir'].'/include/functions_visual_map.php';
-    open_meta_frame();
 }
 
 $edit_users = (int) get_parameter('edit_users');
@@ -589,8 +588,6 @@ if (is_metaconsole() === false) {
         });
     </script>
     <?php
-} else {
-    close_meta_frame();
 }
 
 ?>

pandora_console/godmode/modules/manage_inventory_modules_form.php

@@ -29,7 +29,6 @@ if (! check_acl($config['id_user'], 0, 'PM') && ! check_acl($config['id_user'],
 if (defined('METACONSOLE')) {
     $sec = 'advanced';
     enterprise_include_once('meta/include/functions_components_meta.php');
-    enterprise_hook('open_meta_frame');
     components_meta_print_header();
 } else {
     $sec = 'gmodules';
@@ -174,10 +173,6 @@ if ($id_module_inventory) {
 echo '</div>';
 echo '</form>';
 
-if (defined('METACONSOLE')) {
-    enterprise_hook('close_meta_frame');
-}
-
 ?>
 
 <script type="text/javascript">

pandora_console/godmode/netflow/nf_edit.php

@@ -19,8 +19,6 @@ require_once $config['homedir'].'/include/functions_netflow.php';
 
 check_login();
 
-enterprise_hook('open_meta_frame');
-
 if (! check_acl($config['id_user'], 0, 'AW')) {
     db_pandora_audit(
         AUDIT_LOG_ACL_VIOLATION,
@@ -218,8 +216,6 @@ html_print_submit_button(__('Create filter'), 'crt', false, 'class="sub wand"');
 echo '</div>';
 echo '</form>';
 
-enterprise_hook('close_meta_frame');
-
 ?>
 
 <script type="text/javascript">

pandora_console/godmode/netflow/nf_edit_form.php

@@ -20,8 +20,6 @@ require_once $config['homedir'].'/include/functions_groups.php';
 
 check_login();
 
-enterprise_hook('open_meta_frame');
-
 // Fix: Netflow have to check RW ACL
 if (! check_acl($config['id_user'], 0, 'RW')) {
     db_pandora_audit(
@@ -275,8 +273,6 @@ if ($id) {
 echo '</div>';
 echo '</form>';
 
-enterprise_hook('close_meta_frame');
-
 ?>
 
 <script type="text/javascript">

pandora_console/godmode/tag/edit_tag.php

@@ -13,8 +13,6 @@
 // GNU General Public License for more details.
 check_login();
 
-enterprise_hook('open_meta_frame');
-
 // Include functions code
 require_once $config['homedir'].'/include/functions_tags.php';
 
@@ -286,5 +284,3 @@ if (defined('METACONSOLE')) {
         echo '</table>';
 
         echo '</form>';
-
-        enterprise_hook('close_meta_frame');

pandora_console/godmode/tag/tag.php

@@ -49,14 +49,6 @@ $delete = (int) get_parameter('delete_tag', 0);
 $tag_name = (string) get_parameter('tag_name', '');
 $tab = (string) get_parameter('tab', 'list');
 
-if ($delete !== 0 && is_metaconsole() === true) {
-    open_meta_frame();
-}
-
-if ($tag_name != '' && is_metaconsole() === true) {
-    open_meta_frame();
-}
-
 // Metaconsole nodes.
 $servers = false;
 if (is_metaconsole() === true) {
@@ -432,10 +424,6 @@ if ($is_management_allowed === true) {
     echo '</table>';
 }
 
-if ($delete != 0 && is_metaconsole() === true) {
-    close_meta_frame();
-}
-
 ?>
 
 <script type="text/javascript">

pandora_console/include/class/SatelliteAgent.class.php

@@ -157,11 +157,6 @@ class SatelliteAgent extends HTML
 
             $this->tableId = 'satellite_agents';
 
-            if (is_metaconsole() === true) {
-                // Only in case of Metaconsole, format the frame.
-                open_meta_frame();
-            }
-
             // Load datatables user interface.
             ui_print_datatable(
                 [
@@ -211,11 +206,6 @@ class SatelliteAgent extends HTML
             echo $e->getMessage();
         }
 
-        if (is_metaconsole() === true) {
-            // Close the frame.
-            close_meta_frame();
-        }
-
         // Auxiliar div.
         $modal = '<div id="modal" class="invisible"></div>';
         $msg = '<div id="msg"     class="invisible"></div>';

pandora_console/include/class/SatelliteCollection.class.php

@@ -119,11 +119,6 @@ class SatelliteCollection extends HTML
 
         $this->createBlock();
 
-        if (is_metaconsole() === true) {
-            // Only in case of Metaconsole, format the frame.
-            open_meta_frame();
-        }
-
         // Datatables list.
         try {
             $columns = [
@@ -179,11 +174,6 @@ class SatelliteCollection extends HTML
             echo $e->getMessage();
         }
 
-        if (is_metaconsole() === true) {
-            // Close the frame.
-            close_meta_frame();
-        }
-
         echo '<div id="aux" class="invisible"></div>';
         echo '<div id="msg" class="invisible"></div>';
 

pandora_console/include/functions_html.php

@@ -3568,7 +3568,7 @@ function html_print_button($label='OK', $name='', $disabled=false, $script='', $
         $parameters[] = (empty($name) === false) ? ' name="'.$name.'"' : '';
         $parameters[] = 'id="'.$mainId.'"';
         $parameters[] = (empty($label) === false) ? ' value="'.$label.'"' : '';
-        $parameters[] = (empty($script) === false) ? ' onClick="'.$script.'"' : '';
+        $parameters[] = (empty($script) === false) ? " onClick='".$script."'" : '';
         $parameters[] = ($disabled === true) ? ' disabled' : '';
         $parameters[] = (empty($attributes) === false) ? $attributes : '';
 

pandora_console/include/functions_massive_operations.php

@@ -76,22 +76,19 @@ function attachActionButton(
         break;
     }
 
-    return html_print_div(
-        [
-            'class'   => 'action-buttons',
-            'style'   => sprintf('width: %s', $tableWidth),
-            'content' => html_print_input_hidden(
-                $action,
-                1
-            ).html_print_button(
-                __($caption),
-                'go',
-                false,
-                '',
-                sprintf('class="sub %s"', $class),
-                true
-            ),
-        ],
+    html_print_action_buttons(
+        html_print_input_hidden(
+            $action,
+            1
+        ).html_print_button(
+            __($caption),
+            'go',
+            false,
+            '',
+            ['icon' => $class],
+            true
+        ),
+        [],
         $return
     );
 }

pandora_console/include/lib/Dashboard/Manager.php

@@ -1025,10 +1025,6 @@ class Manager implements PublicLogin
 
         // Header.
         if ($this->slides === 0) {
-            if ((bool) \is_metaconsole() === true) {
-                open_meta_frame();
-            }
-
             View::render(
                 'dashboard/header',
                 [
@@ -1114,12 +1110,6 @@ class Manager implements PublicLogin
             ['dashboardId' => $this->dashboardId]
         );
 
-        if ((bool) \is_metaconsole() === true
-            && $this->slides === 0
-        ) {
-            close_meta_frame();
-        }
-
         return null;
     }
 

pandora_console/include/styles/dashboards.css

@@ -21,13 +21,6 @@
   margin-left: 20px;
 }
 
-ul.mn {
-  display: flex;
-  flex-direction: row-reverse;
-  align-items: center;
-  justify-content: center;
-}
-
 #menu_tab {
   margin: 0px;
 }

pandora_console/include/styles/form.css

@@ -113,60 +113,6 @@ div.arrow_box:before {
   color: #000;
 }
 
-/*
- * Breadcrum
- */
-
-#menu_tab_frame_view_bc {
-  display: flex;
-  justify-content: space-between;
-  border-bottom: 2px solid #82b92e;
-  max-height: 70px;
-  min-height: 55px;
-  width: 100%;
-  padding-right: 0px;
-  margin-left: 0px;
-  margin-bottom: 20px;
-  height: 55px;
-  box-sizing: border-box;
-  background-color: #fafafa;
-  border-top-right-radius: 7px;
-  border-top-left-radius: 7px;
-  box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.1);
-}
-
-#menu_tab_frame_view_bc .breadcrumbs_container {
-  align-self: flex-start;
-}
-/*
-.breadcrumbs_container {
-  padding-top: 4px;
-  text-indent: 0.25em;
-  padding-left: 2.5em;
-}
-*/
-.breadcrumb_link {
-  color: #848484;
-  font-size: 10pt;
-  text-decoration: none;
-}
-
-span.breadcrumb_link {
-  color: #d0d0d0;
-  font-size: 12pt;
-}
-
-.breadcrumb_link.selected {
-  color: #95b750;
-}
-
-.breadcrumb_link.selected:hover {
-  color: #95b750;
-}
-.breadcrumb_link:hover {
-  color: #95b750;
-}
-
 /*
  * Discovery forms structure
  */

pandora_console/include/styles/pandora.css

@@ -10646,6 +10646,10 @@ table tr td:first-child {
   margin-left: 5px;
 }
 
+button span {
+  pointer-events: none;
+}
+
 input[type="color"] {
   background: transparent;
   box-sizing: initial;

pandora_console/operation/dashboard/dashboard.php

@@ -70,14 +70,6 @@ if (is_ajax() === true) {
         }
     }
 } else {
-    if ((bool) is_metaconsole() === true) {
-        echo '<div class="meta_container_dashboard">';
-    }
-
     // Run.
     $cs->run();
-
-    if ((bool) is_metaconsole() === true) {
-        echo '</div>';
-    }
 }

pandora_console/operation/events/events.php

@@ -1418,11 +1418,6 @@ if ($pure) {
     // Floating menu - End.
     ui_require_jquery_file('countdown');
 } else {
-    if (is_metaconsole() === true) {
-        // Load metaconsole frame.
-        // enterprise_hook('open_meta_frame');
-    }
-
     // Header.
     $pss = get_user_info($config['id_user']);
     $hashup = md5($config['id_user'].$pss['password']);
@@ -2578,8 +2573,6 @@ if (check_acl(
     echo '</div>';
 }
 
-// Close viewer.
-// enterprise_hook('close_meta_frame');
 // Datepicker requirements.
 ui_require_css_file('datepicker');
 ui_include_time_picker();

pandora_console/operation/messages/message_edit.php

@@ -81,11 +81,6 @@ $buttons['create_message'] = [
     ).'</a>',
 ];
 
-// Header.
-if (is_metaconsole() === true) {
-    enterprise_hook('open_meta_frame');
-}
-
 ui_print_standard_header(
     __('Compose message'),
     'images/email_mc.png',
@@ -416,6 +411,3 @@ html_print_div(
 
 echo '</form>';
 echo $jsOutput;
-if (is_metaconsole() === true) {
-    enterprise_hook('close_meta_frame');
-}

pandora_console/operation/netflow/nf_live_view.php

@@ -202,8 +202,6 @@ if (isset($config['netflow_disable_custom_lvfilters'])) {
     $netflow_disable_custom_lvfilters = $config['netflow_disable_custom_lvfilters'];
 }
 
-enterprise_hook('open_meta_frame');
-
 $class = 'databox filters';
 
 echo '<form method="post" action="'.$config['homeurl'].'index.php?sec=netf&sec2=operation/netflow/nf_live_view&pure='.$pure.'">';
@@ -541,8 +539,6 @@ if (is_metaconsole()) {
         }
     }
 
-    enterprise_hook('close_meta_frame');
-
     ui_include_time_picker();
     ?>
 

pandora_console/operation/users/user_edit_header.php

@@ -31,8 +31,6 @@ global $config;
 
 check_login();
 
-enterprise_hook('open_meta_frame');
-
 require_once $config['homedir'].'/include/functions_profile.php';
 require_once $config['homedir'].'/include/functions_users.php';
 require_once $config['homedir'].'/include/functions_groups.php';

pandora_console/views/dashboard/list.php

@@ -36,12 +36,19 @@ if ((bool) \is_metaconsole() === true) {
     \ui_require_css_file('meta_dashboards');
 }
 
-\ui_print_page_header(
+ui_print_standard_header(
     __('Dashboards'),
     '',
     false,
     '',
-    false
+    true,
+    [],
+    [
+        [
+            'link'  => '',
+            'label' => __('Dashboards'),
+        ],
+    ]
 );
 
 if (isset($resultDelete) === true) {
@@ -115,7 +122,6 @@ if (empty($dashboards) === true) {
 
     $table->data = [];
 
-    \ui_pagination($count, false, $offset);
     foreach ($dashboards as $dashboard) {
         $data = [];
 
@@ -198,24 +204,24 @@ if (empty($dashboards) === true) {
     }
 
     \html_print_table($table);
-    \ui_pagination(
+    $tablePagination = \ui_pagination(
         $count,
         false,
         $offset,
         0,
-        false,
-        'offset',
         true,
+        'offset',
+        false,
         'pagination-bottom'
     );
 }
 
+$input_button = '';
 if ($writeDashboards === 1) {
     $text = __('Create a new dashboard');
 
     // Button for display modal options dashboard.
-    $output = '<div class="action-buttons" onclick=\'';
-    $output .= 'show_option_dialog('.json_encode(
+    $onclick = 'show_option_dialog('.json_encode(
         [
             'title'      => $text,
             'btn_text'   => __('Ok'),
@@ -224,21 +230,31 @@ if ($writeDashboards === 1) {
             'url_ajax'   => ui_get_full_url('ajax.php'),
         ]
     );
-    $output .= ')\'>';
-    $output .= html_print_button(
+    $onclick .= ')';
+
+    $input_button = html_print_button(
         __('New dashboard'),
         '',
         false,
-        '',
-        'class="sub next"',
+        $onclick,
+        ['icon' => 'add'],
         true
     );
+
     $output .= '</div>';
 
     echo $output;
 
     // Div for modal update dashboard.
     echo '<div id="modal-update-dashboard" class="invisible"></div>';
-
-    ui_require_javascript_file('pandora_dashboards');
 }
+
+html_print_action_buttons(
+    $input_button,
+    [
+        'type'          => 'form_action',
+        'right_content' => $tablePagination,
+    ]
+);
+
+ui_require_javascript_file('pandora_dashboards');