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

pandora_console/general/noaccess.php

@@ -15,7 +15,7 @@
     <style>
     #alert_messages_na {
         z-index: 2;
-        position: absolute;
+        position: fixed;
         left: 50%;
         top: 50%;
         transform: translate(-50%, -50%);
@@ -160,9 +160,9 @@
                 ?>
             </div>
 
-            <div class='modalokbutto cerrar'>
-                <span class='modalokbuttontex'>OK</span>
-            </div>
+            <button type="submit" class="cerrar submitButton" name="" id="" value="OK">
+                <span id="" style="" class="font_11">OK</span>
+            </button>
         </div>
     </div>
     <div id="opacidad"></div>
@@ -173,6 +173,4 @@
     $(".cerrar").click(function() {
         window.location = "<?php echo $config['homeurl']; ?>";
     });
-
-    $('div#page').css('background-color', '#d3d3d3');
 </script>

pandora_console/include/class/HTML.class.php

@@ -753,9 +753,18 @@ class HTML
             ) {
                 $output .= '<li id="'.$input['id'].'" class="'.$class.'">';
                 $output .= '<label>'.$input['label'].'</label>';
+                if (isset($input['extra-container']) === true && $input['extra-container'] === true) {
+                    $output .= '<div class="flex extra-container-input">';
+                }
+
                 $output .= self::printInput($input['arguments']);
                 // Allow dynamic content.
                 $output .= $input['extra'];
+
+                if (isset($input['extra-container']) === true && $input['extra-container'] === true) {
+                    $output .= '</div>';
+                }
+
                 $output .= '</li>';
             } else {
                 $output .= self::printInput($input['arguments']);

pandora_console/include/styles/pandora.css

@@ -934,6 +934,12 @@ select:-internal-list-box {
   display: flex;
 }
 
+.flex-row-important {
+  display: flex !important;
+  flex-direction: row !important;
+  justify-content: flex-start !important;
+}
+
 .padding-2 {
   padding: 2em;
 }
@@ -11619,10 +11625,8 @@ div[role="dialog"] {
 .row-title-font > td > div > div > b {
   font-size: 13px;
   line-height: 16px;
-  color: #161628;
   text-align: left;
   margin-bottom: 10px;
-  /* font-weight: bold; */
 }
 
 .font-title-font {
@@ -11819,3 +11823,8 @@ span.help_icon_15px > img {
     transform: rotate(360deg);
   }
 }
+
+li.input-interval .extra-container-input .select2 {
+  width: 50% !important;
+  margin-right: 10px;
+}

pandora_console/include/styles/pandora_black.css

@@ -1297,10 +1297,12 @@ a.pandora_pagination:hover {
   filter: brightness(0) contrast(50%) !important;
 }
 
+/*
 input:not(div.login_pass > input):not(div.login_nick > input[type="image"]) {
   background-color: transparent !important;
   color: inherit !important;
 }
+*/
 
 .databox_color {
   background-color: transparent !important;

pandora_console/include/styles/tables.css

@@ -837,3 +837,8 @@ table#simple.floating_form tr[id^="simple-macro_field"] {
 table#simple.floating_form tr[id^="simple-macro_field"] > td > input {
   width: 50%;
 }
+
+td.FF-thresholds-pdd {
+  padding: 0px !important;
+  padding-left: 13px !important;
+}

pandora_console/operation/agentes/ver_agente.php

@@ -1442,22 +1442,9 @@ $alerttab['active'] = ($tab === 'alert');
 
 // Inventory.
 $inventoryCount = db_get_num_rows('SELECT id_agent_module_inventory FROM tagent_module_inventory WHERE id_agente = '.$agent['id_agente']);
-$inventorytab['text'] = '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=inventory&id_agente='.$id_agente.'">'.html_print_image(
-    'images/hardware-software-component@svg.svg',
-    true,
-    [
-        'class' => 'main_menu_icon invert_filter',
-        'title' => __('Inventory'),
-    ]
-).'</a>';
-
-if ($tab == 'inventory') {
-    $inventorytab['active'] = true;
-} else {
-    $inventorytab['active'] = false;
-}
 
 $inventorytab = enterprise_hook('inventory_tab');
+
 if ($inventorytab === ENTERPRISE_NOT_HOOK || $inventoryCount === 0) {
     $inventorytab = '';
 }