Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round

pandora_console/general/main_menu.php

@@ -98,6 +98,7 @@ echo '</div>';
 ?>
 <script type="text/javascript">
     $(document).ready(function() {
+        menuActionButtonResizing();
         const menuTypeClass = '<?php echo $menuTypeClass; ?>';
         if (menuTypeClass === 'classic' && menuTypeClass !== localStorage.getItem('menuType')) {
             localStorage.setItem('menuType', 'classic');

pandora_console/godmode/events/event_filter.php

@@ -243,11 +243,7 @@ $submitButtons .= html_print_submit_button(
 );
 
 html_print_action_buttons(
-    $submitButtons,
+    $submitButtons
-    [
-        'type' => 'form_action',
-        'id'   => 'list-events-filters',
-    ]
 );
 ?>
 

pandora_console/include/functions_html.php

@@ -5590,7 +5590,7 @@ function html_print_input($data, $wrapper='div', $input_only=false)
             );
 
         case 'submit':
-            $width = (isset($data['width']) === true) ? 'width: '.$data['width'] : 'width: 100%';
+            $width = (isset($data['width']) === true) ? 'width: '.$data['width'] : '';
             $output .= '<'.$wrapper.' class="action-buttons" style="'.$width.'">'.html_print_submit_button(
                 ((isset($data['label']) === true) ? $data['label'] : 'OK'),
                 ((isset($data['name']) === true) ? $data['name'] : ''),

pandora_console/include/functions_ui.php

@@ -3918,10 +3918,15 @@ function ui_print_datatable(array $parameters)
             ordering: '.$ordering.',
             initComplete: function(settings, json) {
                 // Move elements to table_action_buttons bar.
-                $(".action_buttons_right_content").append($("#'.$table_id.'_wrapper > .dataTables_paginate.paging_simple_numbers"));
+                $(".action_buttons_right_content").html("<div class=\"pagination-child-div\"></div>");
-                $(".action_buttons_right_content").append($("#'.$table_id.'_wrapper > .dataTables_length"));
+                $(".action_buttons_right_content").html("<div class=\"pagination-child-div\"></div>");
-                $(".action_buttons_right_content").append($("#'.$table_id.'_wrapper > .dt-buttons"));
+                $(".action_buttons_right_content").html("<div class=\"pagination-child-div\"></div>");
-                $(".action_buttons_right_content").append($("#'.$table_id.'_wrapper > .dataTables_filter"));
+                $(".action_buttons_right_content").html("<div class=\"pagination-child-div\"></div>");
+
+                $(".pagination-child-div").append($("#'.$table_id.'_wrapper > .dataTables_paginate.paging_simple_numbers"));
+                $(".pagination-child-div").append($("#'.$table_id.'_wrapper > .dataTables_length"));
+                $(".pagination-child-div").append($("#'.$table_id.'_wrapper > .dt-buttons"));
+                $(".pagination-child-div").append($("#'.$table_id.'_wrapper > .dataTables_filter"));
             },
             columns: [';
 

pandora_console/include/javascript/pandora.js

@@ -2402,8 +2402,8 @@ function topFunction() {
 }
 
 function menuActionButtonResizing() {
-  $(".action_buttons_right_content").attr(
+  $("#principal_action_buttons").attr(
     "style",
-    "left: " + $("#menu_full").width() + "px;"
+    "width: calc(100% - " + $("#menu_full").width() + "px);"
   );
 }

pandora_console/include/styles/pandora.css

@@ -1053,6 +1053,10 @@ select:-internal-list-box {
   border-radius: 8px;
 }
 
+.box-flat .action-buttons {
+  flex-direction: row-reverse;
+}
+
 .align-top td {
   vertical-align: top;
 }
@@ -2102,20 +2106,20 @@ table.rounded_cells td {
 
 .action-buttons {
   display: flex;
-  flex-direction: row-reverse;
   align-items: center;
 }
 
-.action-buttons > *:not(#backgroundMaskId) {
-  z-index: 5;
-}
-
 #principal_action_buttons {
   z-index: 6;
+  background: #ffffff;
+  display: flex;
+  flex-direction: row-reverse;
+  justify-content: space-between;
 }
 
-.action-buttons > button {
+#principal_action_buttons.action-buttons > button {
   margin-left: 16px;
+  flex: none;
 }
 
 .action-buttons-right-forced {
@@ -10957,24 +10961,28 @@ tr.bring_next_field {
   position: fixed;
   padding: 0;
   bottom: 0;
-  z-index: 1;
+  right: 0;
-  width: -webkit-fill-available;
   width: -moz-available;
-  padding-right: 10px;
+  height: auto;
-  left: 0;
-  height: 62px;
 }
 
 .action_buttons_right_content {
-  position: fixed;
+  flex: 1;
-  z-index: 10000;
+  height: auto;
-  left: 250px;
   display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
   align-items: center;
-  margin-left: 20px;
 }
 
-.action_buttons_right_content div {
+#principal_action_buttons > form:first-child,
+.action_buttons_right_content > div {
+  height: 62px;
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  margin-right: 1em;
   margin-left: 1em;
 }
 
@@ -10990,14 +10998,14 @@ tr.bring_next_field {
   position: absolute;
   left: 0;
   top: 0;
-  height: 62px;
+  height: auto;
   border-top: 1px solid #e5e9ed;
   background-color: #fff;
 }
-
+/*
 .fixed_action_buttons_size > .action_buttons_background_mask {
   left: -95px !important;
-}
+}*/
 
 .external_tools_title {
   padding: 0 10px;

pandora_console/include/styles/wizard.css

@@ -13,6 +13,10 @@ ul.wizard li {
   padding-top: 10px;
 }
 
+#principal_action_buttons ul.wizard li {
+  padding: 0px;
+}
+
 ul.wizard.inline li {
   display: flex;
   flex-direction: row;

pandora_console/index.php

@@ -1519,7 +1519,6 @@ require 'include/php_to_js_values.php';
 <script type="text/javascript" language="javascript">
     // Handle the scroll.
     $(document).ready(scrollFunction());
-    $(document).ready(menuActionButtonResizing());
     // When there are less than 5 rows, all rows must be white
     var theme = "<?php echo $config['style']; ?>";
     if (theme === 'pandora') {

pandora_console/operation/agentes/status_monitor.php

@@ -1448,7 +1448,7 @@ $url_timestamp_down .= '&sort_field=timestamp&sort=down';
 if (empty($result) === false) {
     if (is_metaconsole() === true) {
         html_print_action_buttons(
-            html_print_div(['style' => 'float:left; height: 55px;', 'class' => 'mrgn_top_15px'], true),
+            '',
             [
                 'type'          => 'form_action',
                 'right_content' => $tablePagination,
@@ -2229,7 +2229,7 @@ if (empty($result) === false) {
 
 if (is_metaconsole() !== true) {
     html_print_action_buttons(
-        html_print_div(['style' => 'float:left; height: 55px;'], true),
+        '',
         [
             'type'          => 'form_action',
             'right_content' => $tablePagination,

pandora_console/operation/network/network_report.php

@@ -111,7 +111,7 @@ $table->data[1][] = html_print_label_input_block(
                 $date_lower,
                 '',
                 10,
-                7,
+                10,
                 true
             ).html_print_input_text(
                 'time_lower',
@@ -141,16 +141,6 @@ $table->data[1][] = html_print_label_input_block(
             ),
         ],
         true
-    ).html_print_label_input_block(
-        '',
-        html_print_checkbox_switch(
-            'is_period',
-            1,
-            ($is_period === true) ? 1 : 0,
-            true,
-            false,
-            'network_report_click_period(event)'
-        ).'<label style="position:relative; top:13px">'.__('Defined period').'</label>',
     )
 );
 
@@ -165,7 +155,7 @@ $table->data[1][] = html_print_label_input_block(
                 $date_greater,
                 '',
                 10,
-                7,
+                10,
                 true
             ).html_print_input_text(
                 'time_greater',
@@ -180,6 +170,18 @@ $table->data[1][] = html_print_label_input_block(
     )
 );
 
+$table->data[2][] = html_print_label_input_block(
+    __('Defined period'),
+    html_print_checkbox_switch(
+        'is_period',
+        1,
+        ($is_period === true) ? 1 : 0,
+        true,
+        false,
+        'network_report_click_period(event)'
+    )
+);
+
 echo '<form method="post">';
 html_print_input_hidden('order_by', $order_by);
 if (empty($main_value) === false) {