From 6a5c2c58c779f410cb1b921c8c78d509f86d75f3 Mon Sep 17 00:00:00 2001
From: Jose Gonzalez <jose.gonzalez@pandorafms.com>
Date: Fri, 24 Feb 2023 10:19:56 +0100
Subject: [PATCH] Fix tree view

---
 .../include/functions_treeview.php            |  2 +-
 .../include/javascript/fixed-bottom-box.js    |  2 +-
 pandora_console/include/styles/pandora.css    | 12 +++++++++--
 pandora_console/include/styles/tree.css       | 21 +++++++++++--------
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php
index 2bf28c2876..b5996fc7d9 100755
--- a/pandora_console/include/functions_treeview.php
+++ b/pandora_console/include/functions_treeview.php
@@ -462,7 +462,7 @@ function treeview_printAlertsTable($id_module, $server_data=[], $no_head=false)
         // Actions table
         echo '<div class="w100p right_align">';
         echo '<a target=_blank href="'.$console_url.'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=alert&search=1&module_name='.$module_name.'&id_agente='.$agent_id.$url_hash.'" target="_blank">';
-            html_print_submit_button(__('Go to alerts edition'), 'upd_button', false, 'class="sub search" style="margin-right: 20px"');
+            html_print_submit_button(__('Go to alerts edition'), 'upd_button', false, ['icon' => 'alert']);
         echo '</a>';
         echo '</div>';
     }
diff --git a/pandora_console/include/javascript/fixed-bottom-box.js b/pandora_console/include/javascript/fixed-bottom-box.js
index a05eb56e87..e341a3f1d4 100644
--- a/pandora_console/include/javascript/fixed-bottom-box.js
+++ b/pandora_console/include/javascript/fixed-bottom-box.js
@@ -150,7 +150,7 @@
         self._box
           .addClass("fixed-bottom-box")
           .css("position", "fixed")
-          .css("top", "112px")
+          .css("top", "150px")
           .css("right", "0")
           .css("width", "25%");
 
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 37bc5d6055..002c371b2e 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -9931,6 +9931,11 @@ select {
   box-sizing: border-box;
 }
 
+input[list],
+textarea[list],
+select[list] {
+  line-height: initial;
+}
 textarea {
   padding: 10px;
   height: auto;
@@ -10312,7 +10317,10 @@ button div.camera {
   mask: url(../../images/picture.svg) no-repeat center / contain;
   -webkit-mask: url(../../images/picture.svg) no-repeat center / contain;
 }
-
+button div.alert {
+  mask: url(../../images/alert@svg.svg) no-repeat center / contain;
+  -webkit-mask: url(../../images/alert@svg.svg) no-repeat center / contain;
+}
 button div.ok {
   mask: url(../../images/ok.svg) no-repeat center / contain;
   -webkit-mask: url(../../images/ok.svg) no-repeat center / contain;
@@ -10458,7 +10466,7 @@ button.ui-button.ui-widget.submit-cancel:active {
 }
 
 .moduleIdBox {
-  height: 36px;
+  height: 35px;
   border-top-right-radius: 6px;
   border-bottom-right-radius: 6px;
   margin-left: -56px;
diff --git a/pandora_console/include/styles/tree.css b/pandora_console/include/styles/tree.css
index 41a6f1c0f0..d9a4f00c2c 100644
--- a/pandora_console/include/styles/tree.css
+++ b/pandora_console/include/styles/tree.css
@@ -51,17 +51,15 @@
   width: 16px;
 }
 .tree-node .node-status {
-  width: 40px;
-  height: 31px;
-  border-radius: 7px 0 0 7px;
   box-sizing: border-box;
   position: absolute;
-  padding: 8px;
   border-radius: 8px;
-  width: 19px;
-  height: 17px;
+  width: 18px;
+  height: 18px;
   top: 6px;
-  left: 9px;
+  margin: 0;
+  padding: 0;
+  left: 13px;
 }
 .tree-node .node-name {
   position: relative;
@@ -315,8 +313,6 @@ div.tree-node span {
 div#tree-controller-recipient {
   text-align: left;
   width: calc((100% - 30%) - 20px);
-  margin-top: 10px;
-  margin-left: 20px;
 }
 
 .tree-controller-recipient {
@@ -384,3 +380,10 @@ div#tree-controller-recipient {
   margin-top: 0;
   margin-bottom: 2px;
 }
+
+.tree-node > .node-content > .agent-alerts-fired {
+  float: left;
+  position: relative;
+  left: 26px;
+  top: -5px;
+}