Merge branch 'develop' into ent-13420-arreglar-vista-de-exportacion-importacion-de-recursos-en-tema-oscuro

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/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/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/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,
-h2,
-h3,
-h4,
-h5,
-h6 {
+h1:not(.unbootstrap),
+h2:not(.unbootstrap),
+h3:not(.unbootstrap),
+h4:not(.unbootstrap),
+h5:not(.unbootstrap),
+h6:not(.unbootstrap) {
   margin-top: 0;
   margin-bottom: 0.5rem;
 }
@@ -311,18 +311,18 @@ template {
 [hidden] {
   display: none !important;
 }
-.h1,
-.h2,
-.h3,
-.h4,
-.h5,
-.h6,
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
+.h1:not(.unbootstrap),
+.h2:not(.unbootstrap),
+.h3:not(.unbootstrap),
+.h4:not(.unbootstrap),
+.h5:not(.unbootstrap),
+.h6:not(.unbootstrap),
+h1:not(.unbootstrap),
+h2:not(.unbootstrap),
+h3:not(.unbootstrap),
+h4:not(.unbootstrap),
+h5:not(.unbootstrap),
+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;
 }
 
@@ -1001,3 +996,7 @@ input.resize_button {
 .select2-search__field {
   box-sizing: border-box !important;
 }
+
+.grid-stack-item-content .visual-console-container-dashboard {
+  text-align: initial;
+}

pandora_console/include/styles/pandora.css

@@ -35,6 +35,7 @@
   --text-color: #333;
   --text-color-2: #161628;
   --text-color-3: #454545;
+  --text-color-4: #3f3f3f;
 
   --background-main-color: #f6f7fb;
 
@@ -14044,6 +14045,7 @@ button.disabled {
 
 .white_table_graph > div {
   background-color: transparent;
+  border-radius: 8px;
 }
 
 .link-bold {
@@ -14195,3 +14197,7 @@ 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);
+}

pandora_console/include/styles/pandora_black.css

@@ -28,6 +28,7 @@ Description: The default Pandora FMS theme layout
   --text-color: #fff;
   --text-color-2: #ededed;
   --text-color-3: #d5d5d5;
+  --text-color-4: #dddddd;
 
   --background-main-color: #f6f7fb;
   --background-2: #95a3bf;
@@ -77,7 +78,6 @@ table
 div#head,
 #menu_tab li.nomn_high,
 #menu_tab li.nomn_high span,
-.white_table_graph_header,
 .white-box-content,
 fieldset,
 .databox.filters,
@@ -267,6 +267,7 @@ h4,
 .info_table > thead > tr > th,
 .info_table > thead > tr > th a,
 .info_table > thead > tr > th > span,
+th,
 form.discovery label,
 .edit_user_labels,
 .input_label,
@@ -274,7 +275,8 @@ form.discovery label,
 tr.group_view_data,
 .group_view_data,
 ol.steps li span,
-ol.steps li a {
+ol.steps li a,
+.div-span {
   color: var(--text-color) !important;
 }
 
@@ -1132,17 +1134,15 @@ select,
 }
 
 .white_table_graph_header {
-  border: 1px solid #707070;
-  background-color: var(--secondary-color) !important;
   color: var(--text-color) !important;
   border-radius: 0;
 }
 
 .white_table_graph {
-  background-color: #111 !important;
+  background-color: var(--secondary-color) !important;
 }
 table.databox {
-  border-color: #707070;
+  border-color: var(--border-color);
   background-color: var(--secondary-color) !important;
   color: var(--text-color) !important;
 }
@@ -1175,6 +1175,7 @@ li.ui-tabs-tab.ui-corner-top.ui-state-default.ui-tab {
   width: 100%;
   position: relative;
   height: 30px;
+  background-color: var(--secondary-color);
 }
 
 .chartLegend table {
@@ -1182,7 +1183,8 @@ li.ui-tabs-tab.ui-corner-top.ui-state-default.ui-tab {
   right: 0px;
 }
 
-.graph_container {
+.graph_container,
+#graph_container {
   width: 800px;
   margin: 20px auto;
   border-radius: 3px;
@@ -1514,7 +1516,7 @@ span.select2-dropdown.select2-dropdown--below {
 }
 
 div.white_table_graph {
-  border-radius: 0;
+  border-radius: 8px;
 }
 
 div.white_box_opened[style*="height: 0px"],
@@ -1598,7 +1600,6 @@ a.autorefresh_txt,
 .white_box,
 .white-box-content {
   border: 0px;
-  background-color: var(--secondary-color) !important;
   color: var(--text-color) !important;
 }
 
@@ -1623,8 +1624,7 @@ a.pandora_pagination,
   border: 1px solid #2b2b2b !important;
 }
 
-.white_box,
-.white-box-content {
+.white_box {
   border: 1px solid #333;
 }
 
@@ -1638,11 +1638,7 @@ a.pandora_pagination,
 }
 
 .box-flat {
-  border: 1px solid #333;
-}
-
-.white_table_graph_header {
-  border: 1px solid #333;
+  border: 1px solid var(--border-color);
 }
 
 .info_table > tbody > tr > td {
@@ -2009,6 +2005,14 @@ div.show_result_interpreter {
   border-top: 0;
 }
 
+th {
+  border-bottom: 1px solid var(--border-color);
+}
+
+.white_table_graph.fixed_filter_bar {
+  border-radius: 8px;
+}
+
 .div-import,
 .div-export {
   background-color: var(--secondary-color);