Merge branch 'develop' into ent-13473-widgets-block-histogram-y-module-histogram-no-se-visualizan-cuando-usamos-un-usuario-limitado

pandora_console/general/header.php

@@ -140,7 +140,6 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
                 }
             }
 
-            $search_bar .= '<div id="result_order" class="result_order"></div>';
             $search_bar .= '<input id="keywords" name="keywords"';
             if (!isset($config['search_keywords'])) {
                 $search_bar .= "value='".__('Enter keywords to search')."'";
@@ -408,6 +407,27 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
         $modal_box .= '<a href="https://discord.com/invite/xVt2ruSxmr" target="_blank">'.__('Join discord community').'</a>';
         $modal_box .= '</div>';
 
+        // Move help modal (header) fix z-index.
+        $modal_box .= '
+            <script>
+                $(document).ready(function() {
+                    let helpModalIcon = $("#modal-help-content > img");
+                    let helpModal = $("#modal_help");
+                
+                    if (helpModalIcon.length > 0) {
+                    let distanceRight =
+                        $(window).width() - (helpModalIcon.offset().left + helpModalIcon.width());
+                
+                    helpModal.css("z-index", "3");
+                    helpModal.css("position", "fixed");
+                    helpModal.css("top", "16px");
+                    helpModal.css("right", `${Math.floor(distanceRight) + 34}px`);
+                    helpModal.appendTo(document.body);
+                    }
+                });
+            </script>
+        ';
+
         if ($config['activate_feedback'] === '1') {
             $modal_help = html_print_div(
                 [
@@ -883,7 +903,8 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
                     enterprise: <?php echo (int) enterprise_installed(); ?>,
                 },
                 success: function (data) {
-                   $('#result_order').html(data);
+                    $('#result_order').html(data);
+                    resizeSearchHeader()
                 },
                 error: function (data) {
                     console.error("Fatal error in AJAX call to interpreter order", data)
@@ -1208,4 +1229,8 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
         });
     });
 /* ]]> */
+
+$(window).resize(function () { 
+    resizeSearchHeader()
+});
 </script>

pandora_console/include/class/AgentsAlerts.class.php

@@ -685,7 +685,7 @@ class AgentsAlerts extends HTML
             $alias = db_get_row('tagente', 'id_agente', $agent['id_agente']);
             echo '<tr>';
             // Name of the agent.
-            echo '<td style="text-align: left;font-weight: bold;color: #3f3f3f;">'.$alias['alias'].'</td>';
+            echo '<td style="text-align: left;font-weight: bold;color: var(--text-color-4);">'.$alias['alias'].'</td>';
             // Alerts of the agent.
             foreach ($templates as $tid => $tname) {
                 $anyfired = 0;

pandora_console/include/class/OrderInterpreter.class.php

@@ -404,7 +404,7 @@ class OrderInterpreter extends Wizard
                     if ($iterator <= 9 && $this->canShowItem($enterprise, $this->pages_menu[$key]['url'])) {
                         echo '<li class="list_found" name="'.$iterator.'" id="'.$iterator.'">';
                         echo '
-                        <span class="invert_filter"> Go to </span> &nbsp;
+                        <span class=""> Go to </span> &nbsp;
                         <img src="'.$this->pages_menu[$key]['icon'].'">';
                         echo '&nbsp;
                         <a href="'.$this->pages_menu[$key]['url'].'">

pandora_console/include/functions_inventory.php

@@ -752,7 +752,7 @@ function inventory_get_datatable(
     }
 
     if ($inventory_search_string != '') {
-        array_push($where, "REPLACE(tagente_datos_inventory.data, ' ', ' ') LIKE '%".$inventory_search_string."%'");
+        array_push($where, "REPLACE(tagent_module_inventory.data, ' ', ' ') LIKE '%".$inventory_search_string."%'");
     }
 
     if ($utimestamp > 0) {

pandora_console/include/functions_ui.php

@@ -4646,10 +4646,12 @@ function ui_toggle(
         $imageRotate = $rotateB;
         $style .= 'height:0;position:absolute;';
         $original = $img_b;
+        $data_close = 'true';
     } else {
         $imageRotate = $rotateA;
         $style .= 'height:auto;position:relative;';
         $original = $img_a;
+        $data_close = 'false';
     }
 
     $header_class = '';
@@ -4668,7 +4670,7 @@ function ui_toggle(
 
     // Link to toggle.
     $output = '<div class="'.$main_class.'" id="'.$id.'" '.$toggl_attr.'>';
-    $output .= '<div class="'.$header_class.'" '.(($disableToggle === false) ? 'style="cursor: pointer;" ' : '').' id="tgl_ctrl_'.$uniqid.'">';
+    $output .= '<div class="'.$header_class.'" '.(($disableToggle === false) ? 'style="cursor: pointer;" ' : '').' id="tgl_ctrl_'.$uniqid.'" data-close="'.$data_close.'">';
     if ($reverseImg === false) {
         if ($switch === true) {
             if (empty($switch_name) === true) {
@@ -4783,6 +4785,7 @@ function ui_toggle(
         $output .= "				    $('#tgl_div_".$uniqid."').css('position', '".$position_div."');\n";
         $output .= "				    $('#image_".$uniqid."').attr('style', 'rotate: ".$rotateA."');\n";
         $output .= "				    $('#checkbox-".$switch_name."').prop('checked', true);\n";
+        $output .= "				    $('#tgl_ctrl_".$uniqid."').attr('data-close', 'false');\n";
         $output .= $class_table;
         $output .= "			    }\n";
         $output .= "			    else {\n";
@@ -4791,6 +4794,7 @@ function ui_toggle(
         $output .= "				    $('#tgl_div_".$uniqid."').css('position', 'absolute');\n";
         $output .= "				    $('#image_".$uniqid."').attr('style', 'rotate: ".$rotateB."');\n";
         $output .= "				    $('#checkbox-".$switch_name."').prop('checked', false);\n";
+        $output .= "				    $('#tgl_ctrl_".$uniqid."').attr('data-close', 'true');\n";
         $output .= "			    }\n";
         $output .= "		    });\n";
         $output .= "	    }\n";

pandora_console/include/javascript/pandora.js

@@ -2736,3 +2736,8 @@ function menuTabsShowHide() {
     }
   }
 }
+
+function resizeSearchHeader() {
+  $(".show_result_interpreter").width($("#keywords").outerWidth() - 12);
+  $(".show_result_interpreter").css("left", $("#keywords").position().left + 2);
+}

pandora_console/include/javascript/pandora_visual_console.js

@@ -471,6 +471,8 @@ function createVisualConsole(
       // Start an interval to update the Visual Console.
       updateVisualConsole(props.id, updateInterval, updateInterval);
     }
+
+    normalizeStylesVC();
   } catch (error) {
     console.log("[ERROR]", "[VISUAL-CONSOLE-CLIENT]", error.message);
   }
@@ -2062,3 +2064,9 @@ function center_labels() {
     }
   });
 }
+
+function normalizeStylesVC() {
+  $(".visual-console-container-dashboard h1").addClass("unbootstrap");
+  $(".visual-console-container-dashboard h2").addClass("unbootstrap");
+  $(".visual-console-container-dashboard .graph").addClass("unbootstrap");
+}

pandora_console/include/lib/Dashboard/Widgets/graph_module_histogram.php

@@ -455,7 +455,7 @@ class GraphModuleHistogramWidget extends Widget
 
         $style = 'min-width:200px; min-height:100px;';
         $output .= '<div class="container-center" style="'.$style.'">';
-        $output .= '<div style="font-size:'.$size_label.'px;">';
+        $output .= '<div style="font-size:'.$size_label.'px; line-height:'.($size_label + 5).'px;">';
         $output .= $label;
         $output .= '</div>';
         $style = 'min-width:200px; width:'.($size['width'] + 15).'px;';

pandora_console/include/lib/Dashboard/Widgets/maps_made_by_user.php

@@ -493,7 +493,7 @@ class MapsMadeByUser extends Widget
 
         $output .= '<script type="text/javascript">';
         $output .= '$(document).ready(function () {';
-        $output .= 'dashboardLoadVC('.$settings.')';
+        $output .= 'dashboardLoadVC('.$settings.');';
         $output .= '});';
         $output .= '</script>';
 

pandora_console/include/styles/bootstrap.min.css

@@ -71,12 +71,12 @@ hr {
   height: 0;
   overflow: visible;
 }
-h1,
+h1:not(.unbootstrap),
-h2,
+h2:not(.unbootstrap),
-h3,
+h3:not(.unbootstrap),
-h4,
+h4:not(.unbootstrap),
-h5,
+h5:not(.unbootstrap),
-h6 {
+h6:not(.unbootstrap) {
   margin-top: 0;
   margin-bottom: 0.5rem;
 }
@@ -311,18 +311,18 @@ template {
 [hidden] {
   display: none !important;
 }
-.h1,
+.h1:not(.unbootstrap),
-.h2,
+.h2:not(.unbootstrap),
-.h3,
+.h3:not(.unbootstrap),
-.h4,
+.h4:not(.unbootstrap),
-.h5,
+.h5:not(.unbootstrap),
-.h6,
+.h6:not(.unbootstrap),
-h1,
+h1:not(.unbootstrap),
-h2,
+h2:not(.unbootstrap),
-h3,
+h3:not(.unbootstrap),
-h4,
+h4:not(.unbootstrap),
-h5,
+h5:not(.unbootstrap),
-h6 {
+h6:not(.unbootstrap) {
   margin-bottom: 0.5rem;
   font-weight: 500;
   line-height: 1.2;

pandora_console/include/styles/dashboards.css

@@ -46,16 +46,11 @@ a {
   text-decoration: none;
 }
 
-h1 {
+h1:not(.unbootstrap) {
   font-size: 2.5rem;
   margin-bottom: 0.5rem;
 }
 
-.visual-console-container-dashboard h1 {
-  font-size: inherit;
-  margin-bottom: inherit;
-}
-
 .container-fluid {
   margin-top: 5px;
 }
@@ -971,7 +966,7 @@ input.resize_button {
   right: 20px;
 }
 
-.parent_graph > .graph {
+.parent_graph > .graph:not(.unbootstrap) {
   margin-left: 10px;
 }
 
@@ -995,6 +990,17 @@ input.resize_button {
   justify-content: center;
 }
 
+.select2-container.select2-container--default.select2-container--open {
+  z-index: 999999;
+}
+.select2-search__field {
+  box-sizing: border-box !important;
+}
+
+.grid-stack-item-content .visual-console-container-dashboard {
+  text-align: initial;
+}
+
 ul.select2-selection__rendered > li.select2-selection__choice {
   box-sizing: border-box !important;
 }

pandora_console/include/styles/menu.css

@@ -478,7 +478,6 @@ ul li {
   top: 0;
   left: 0;
   background-color: #ffffff;
-  border-right: 1px solid #eee;
 }
 
 .button_collapse {
@@ -545,6 +544,13 @@ ul li {
   width: 35px;
 }
 
+#button_collapse {
+  width: 32px;
+  height: 32px;
+  background-color: #f6f7fb;
+  border-radius: 50%;
+}
+
 @media screen and (max-height: 750px) {
   .operation {
     padding-top: 10px;
@@ -586,7 +592,7 @@ ul li {
 
 #menu_tabs {
   height: 49px;
-  border-bottom: 1px solid #c1ccdc;
+  border-bottom: 1px solid #f6f7fb;
 }
 
 .div_border_line {

pandora_console/include/styles/order_interpreter.css

@@ -2,16 +2,18 @@ div.show_result_interpreter {
   background-color: #fff;
   color: #000;
   border: 1px solid #e2e2e2;
-  border-bottom-left-radius: 10px;
+  border-top: 0;
-  border-bottom-right-radius: 10px;
+  border-bottom-left-radius: 18px;
+  border-bottom-right-radius: 18px;
   padding-left: 10px;
   padding-top: 5px;
   padding-bottom: 5px;
   box-shadow: 0px 0px 15px -4px #dadada;
-  position: absolute;
+  position: fixed;
-  z-index: 1;
+  z-index: 3;
   width: 300px;
-  top: 45px;
+  top: 48px;
+  left: 50%;
 }
 
 .more_results {
@@ -21,27 +23,37 @@ div.show_result_interpreter {
 }
 
 .results-found {
-  background-image: url("../../images/input_zoom_gray.png");
+  background-image: url("../../images/details.svg");
-  background-position: center right 10px;
+  background-position: center left 20px;
   background-repeat: no-repeat;
   background-size: 17px;
-  background-color: #f2f6f7;
+  background-color: #f6f7fb;
   padding: 0px;
   margin: 0;
-  width: 300px;
+  width: 150px;
-  height: 30px;
+  height: 36px;
   margin-left: 2px;
-  padding-left: 15px;
+  padding-right: 15px;
-  padding-right: 40px;
+  padding-left: 45px;
   color: #777;
   font-size: 8.5pt;
-  border-top-left-radius: 10px;
+  border-top-left-radius: 18px;
-  border-top-right-radius: 10px;
+  border-top-right-radius: 18px;
+  border-bottom-left-radius: 0px;
+  border-bottom-right-radius: 0px;
   border-color: transparent;
 }
 
 .list_found {
-  padding-top: 5px;
+  padding: 5px;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
+}
+
+.list_found img {
+  padding: 0 5px;
 }
 
 .active {

pandora_console/include/styles/pandora.css

@@ -29,11 +29,13 @@
 
 :root {
   --primary-color: #14524f;
+  --primary-color-hover: #318280;
   --secondary-color: #ffffff;
 
   --text-color: #333;
   --text-color-2: #161628;
   --text-color-3: #454545;
+  --text-color-4: #3f3f3f;
 
   --background-main-color: #f6f7fb;
 
@@ -1609,7 +1611,6 @@ div#head {
   height: 60px;
   padding-top: 0px;
   margin: 0 auto;
-  border-bottom: 1px solid #eee;
   min-width: 882px;
   background-color: #fff;
   color: #000;
@@ -2007,21 +2008,43 @@ div.title_line {
 #menu_tab_frame_view,
 #menu_tab_frame_view_bc {
   position: sticky;
-  top: 61px;
+  top: 60px;
   z-index: 2;
   display: flex;
   align-items: flex-end;
   justify-content: space-between;
-  border-bottom: 1px solid #eee;
   width: -webkit-fill-available;
   width: -moz-available;
   padding-right: 0px;
   height: 50px;
   box-sizing: border-box;
-  background-color: #fff;
+  background-color: #f6f7fb;
   margin: -25px -25px 25px -25px;
 }
 
+#menu_full::before {
+  content: "";
+  width: 16px;
+  height: 16px;
+  background-color: var(--secondary-color);
+  position: absolute;
+  top: 60px;
+  right: -16px;
+  z-index: 0;
+}
+
+#menu_full::after {
+  content: "";
+  width: 16px;
+  height: 16px;
+  background-color: #f6f7fb;
+  position: absolute;
+  top: 60px;
+  right: -16px;
+  z-index: 0;
+  border-top-left-radius: 16px;
+}
+
 /* Breadcrum */
 #menu_tab_frame_view_bc {
   min-height: 55px;
@@ -2830,10 +2853,31 @@ div#pandora_logo_header {
   flex-direction: column;
 }
 
+#head,
+#header {
+  text-wrap: nowrap;
+}
+
 .header_center {
   display: flex;
   justify-content: center;
   align-items: center;
+  width: 100%;
+}
+
+#header_searchbar {
+  width: 100%;
+  padding: 0 100px;
+}
+
+@media screen and (max-width: 1300px) {
+  #header_searchbar {
+    padding: 0 30px;
+  }
+}
+
+#header_searchbar #keywords {
+  width: 100%;
 }
 
 .header_right {
@@ -3616,17 +3660,17 @@ div.tip > img {
  */
 input.search_input {
   background-image: url("../../images/details.svg");
-  background-position: center right 10px;
+  background-position: center left 20px;
   background-repeat: no-repeat;
   background-size: 17px;
-  background-color: #f2f6f7;
+  background-color: #f6f7fb;
   padding: 0px;
   margin: 0;
   width: 150px;
-  height: 30px;
+  height: 36px;
   margin-left: 2px;
-  padding-left: 15px;
+  padding-right: 15px;
-  padding-right: 40px;
+  padding-left: 45px;
   color: #777;
   font-size: 8.5pt;
   border-top-left-radius: 50px;
@@ -4098,15 +4142,22 @@ div.div_groups_status {
   min-height: 53px;
 }
 
-#menu_tab li:hover:not(.menu-dots-li) {
-  box-shadow: inset 0px 4px var(--primary-color);
-}
-
 #menu_tab li.nomn_high,
 #menu_tab li.nomn_high span {
   color: #fff;
-  box-shadow: inset 0px 4px var(--primary-color);
+}
-  background-color: #fff;
+
+#menu_tab li.nomn_high::before,
+#menu_tab li:hover:not(.menu-dots-li)::before {
+  content: "";
+  display: block;
+  position: absolute;
+  bottom: 0px;
+  width: 40px;
+  height: 5px;
+  margin-left: -5px;
+  background-color: var(--primary-color-hover);
+  border-radius: 5px;
 }
 
 #menu_tab li.nomn img,
@@ -10503,6 +10554,13 @@ select {
   box-sizing: border-box;
 }
 
+input.buttonButton {
+  border: 0px;
+  outline: 0px;
+  border-radius: 8px;
+  line-height: normal;
+}
+
 input[list],
 textarea[list],
 select[list] {
@@ -10534,6 +10592,11 @@ select:focus {
   border: 2px solid #8a96a6;
 }
 
+#keywords.results-found {
+  border: 1px solid var(--border-color);
+  border-bottom: 0px;
+}
+
 :focus {
   outline: #8a96a6;
 }
@@ -11108,7 +11171,6 @@ button.ui-button-text-only.ui-widget.sub {
   font-size: 16px !important;
   align-items: center;
   line-height: 24px;
-  box-shadow: 0px 3px 6px #c7c7c7;
   border-radius: 16px;
   cursor: pointer;
   padding: 0 16px;
@@ -11627,12 +11689,56 @@ pre.external_tools_output {
   z-index: 1;
   width: -webkit-fill-available;
   width: -moz-available;
-  margin: -25px -25px 25px -25px;
+  margin-bottom: 25px;
 }
 
 .white_table_graph.fixed_filter_bar {
+  border-radius: 0px;
+  background-color: #f6f7fb;
+  border: 0;
+  top: 133px;
+}
+
+.white_table_graph.fixed_filter_bar::before {
+  content: "";
+  width: calc(100% + 2px);
+  height: 25px;
+  background-color: #f6f7fb;
+  position: absolute;
+  top: -25px;
+  margin: 0 -1px;
+}
+
+.white_table_graph.fixed_filter_bar > div:nth-child(1) {
+  background-color: var(--secondary-color);
+  border: 1px solid #e5e9ed;
+  border-bottom: 0px;
   border-radius: 0;
-  top: 110px;
+  border-top-left-radius: 8px;
+  border-top-right-radius: 8px;
+}
+
+.white_table_graph.fixed_filter_bar > div:nth-child(1)[data-close="true"] {
+  border-radius: 8px;
+  border: 1px solid #e5e9ed;
+}
+
+.white_table_graph.fixed_filter_bar > div:nth-child(2) {
+  background-color: var(--secondary-color);
+  /* border: 1px solid #e5e9ed; */
+  border-top: 0px;
+  border-radius: 0;
+  border-bottom-left-radius: 8px;
+  border-bottom-right-radius: 8px;
+}
+
+.white_table_graph.fixed_filter_bar > div:nth-child(2) > div {
+  background-color: unset;
+  border: 1px solid #e5e9ed;
+  border-top: 0px;
+  border-radius: 0;
+  border-bottom-left-radius: 8px;
+  border-bottom-right-radius: 8px;
 }
 
 /*
@@ -13945,6 +14051,7 @@ button.disabled {
 
 .white_table_graph > div {
   background-color: transparent;
+  border-radius: 8px;
 }
 
 .link-bold {
@@ -14096,3 +14203,16 @@ table#snmp_console tbody .datos_orange * {
   background-color: var(--events-priority-bg-orange);
   color: var(--events-priority-text-orange) !important;
 }
+
+.open_search_status_color {
+  color: var(--text-color-2);
+}
+
+button.ui-button-text-only.ui-widget.sub:hover,
+#button_generate_code input.buttonButton:hover {
+  box-shadow: 0px 3px 6px #c7c7c7;
+}
+
+#button_generate_code input.buttonButton {
+  box-shadow: none;
+}

pandora_console/include/styles/register.css

@@ -1,10 +1,11 @@
 div.submit_buttons_container {
   position: relative;
-  margin: 10px auto 0px;
   bottom: 0px;
   width: 95%;
-  clear: both;
   height: 4em;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
 }
 
 .license_text {
@@ -13,3 +14,7 @@ div.submit_buttons_container {
   text-align: justify;
   margin: 1em auto;
 }
+
+div.submit_buttons_container > div {
+  display: initial;
+}

pandora_console/index.php

@@ -1565,6 +1565,9 @@ while (ob_get_length() > 0) {
     ob_end_flush();
 }
 
+// Results search header.
+echo '<div id="result_order" class="result_order"></div>';
+
 db_print_database_debug();
 echo '</html>';
 

pandora_console/update_manager_client/views/register.php

@@ -80,26 +80,24 @@ $product_name = get_product_name(); ?>
     </div>
 
     <div class="submit_buttons_container">
-        <div class="left">
+        <div class="ui-dialog-buttonset mrgn_lft_15px">
             <?php
             echo html_print_submit_button(
                 __('Cancel'),
                 'cancel_registration',
                 false,
-                'id="submit-cancel_registration" class="lato ui-widget
+                'id="submit-cancel_registration" class="submit-cancel secondaryButton ui-button ui-corner-all ui-widget"',
-            ui-state-default ui-corner-all ui-button-text-only sub upd submit-cancel"',
                 true
             );
             ?>
         </div>
-        <div class="right">
+        <div class="ui-dialog-buttonset right">
             <?php
             echo html_print_submit_button(
                 __('OK!'),
                 'register',
                 false,
-                'id="submit-register" class="lato ui-widget
+                'id="submit-register" class="submit-next ui-button ui-corner-all ui-widget"',
-            ui-state-default ui-corner-all ui-button-text-only sub ok submit-next w100px"',
                 true
             );
             ?>