diff --git a/pandora_console/images/tree/corner@tree.svg b/pandora_console/images/tree/corner@tree.svg
new file mode 100644
index 0000000000..43d1c18d84
--- /dev/null
+++ b/pandora_console/images/tree/corner@tree.svg
@@ -0,0 +1,9 @@
+
+
\ No newline at end of file
diff --git a/pandora_console/images/tree/corner_minus@tree.svg b/pandora_console/images/tree/corner_minus@tree.svg
new file mode 100644
index 0000000000..f10a079519
--- /dev/null
+++ b/pandora_console/images/tree/corner_minus@tree.svg
@@ -0,0 +1,12 @@
+
+
\ No newline at end of file
diff --git a/pandora_console/images/tree/corner_plus@tree.svg b/pandora_console/images/tree/corner_plus@tree.svg
new file mode 100644
index 0000000000..9c0dfed126
--- /dev/null
+++ b/pandora_console/images/tree/corner_plus@tree.svg
@@ -0,0 +1,13 @@
+
+
\ No newline at end of file
diff --git a/pandora_console/images/tree/corner_straight@tree.svg b/pandora_console/images/tree/corner_straight@tree.svg
new file mode 100644
index 0000000000..d273b00002
--- /dev/null
+++ b/pandora_console/images/tree/corner_straight@tree.svg
@@ -0,0 +1,12 @@
+
+
\ No newline at end of file
diff --git a/pandora_console/images/tree/corner_straight_minus@tree.svg b/pandora_console/images/tree/corner_straight_minus@tree.svg
new file mode 100644
index 0000000000..b5e3e34080
--- /dev/null
+++ b/pandora_console/images/tree/corner_straight_minus@tree.svg
@@ -0,0 +1,18 @@
+
+
\ No newline at end of file
diff --git a/pandora_console/images/tree/corner_straight_plus@tree.svg b/pandora_console/images/tree/corner_straight_plus@tree.svg
new file mode 100644
index 0000000000..b7bccc1c41
--- /dev/null
+++ b/pandora_console/images/tree/corner_straight_plus@tree.svg
@@ -0,0 +1,19 @@
+
+
\ No newline at end of file
diff --git a/pandora_console/images/tree/straight@tree.svg b/pandora_console/images/tree/straight@tree.svg
new file mode 100644
index 0000000000..2cbc7399a2
--- /dev/null
+++ b/pandora_console/images/tree/straight@tree.svg
@@ -0,0 +1,9 @@
+
+
\ No newline at end of file
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index f409e44b90..6128238877 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -3354,7 +3354,7 @@ function html_print_input_color($name, $value, $id='', $class=false, $return=fal
/**
* Action buttons.
*
- * @param string $content HTML content. Usually must be buttons.
+ * @param mixed $content HTML content. Usually must be buttons.
* @param array $parameters Parameters for create the action buttons.
* $var['type'] => Type of action-buttons:
* 'form_action' => Fits into form size (fixed size).
@@ -3367,8 +3367,12 @@ function html_print_input_color($name, $value, $id='', $class=false, $return=fal
*
* @return mixed.
*/
-function html_print_action_buttons(string $content, array $parameters=[], bool $return=false)
+function html_print_action_buttons(mixed $content, array $parameters=[], bool $return=false)
{
+ if (is_array($content) === true) {
+ $content = implode('', $content);
+ }
+
$typeClass = 'fixed_action_buttons ';
switch (($parameters['type'] ?? '')) {
case 'form_action':
diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php
index b8bcf06b41..2bf28c2876 100755
--- a/pandora_console/include/functions_treeview.php
+++ b/pandora_console/include/functions_treeview.php
@@ -59,7 +59,7 @@ function treeview_printModuleTable($id_module, $server_data=false, $no_head=fals
$table->id = 'tree_view_module_data';
$table->style = [];
$table->style['title'] = 'height: 32px; width: 30%; padding-right: 5px; text-align: end;';
- $table->style['data'] = 'height: 32px; width: 70%; padding-left: 5px; font-family: \'Pandora-Regular\';';
+ $table->style['data'] = 'height: 32px; width: 70%; padding-left: 5px;font-weight: lighter;';
$table->data = [];
// Module name.
@@ -562,7 +562,7 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
$table->id = 'tree_view_agent_detail';
$table->style = [];
$table->style['title'] = 'height: 32px; width: 30%; padding-right: 5px; text-align: end;';
- $table->style['data'] = 'height: 32px; width: 70%; padding-left: 5px; font-family: \'Pandora-Regular\';';
+ $table->style['data'] = 'height: 32px; width: 70%; padding-left: 5px;font-weight: lighter;';
$table->head = [];
$table->data = [];
@@ -822,7 +822,7 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
$table_advanced->id = 'tree_view_agent_advanced';
$table_advanced->style = [];
$table_advanced->style['title'] = 'height: 32px; width: 30%; padding-right: 5px; text-align: end;';
- $table_advanced->style['data'] = 'height: 32px; width: 70%; padding-left: 5px; font-family: \'Pandora-Regular\';';
+ $table_advanced->style['data'] = 'height: 32px; width: 70%; padding-left: 5px;font-weight: lighter;';
$table_advanced->head = [];
$table_advanced->data = [];
diff --git a/pandora_console/include/javascript/fixed-bottom-box.js b/pandora_console/include/javascript/fixed-bottom-box.js
index 0d07eedb41..a05eb56e87 100644
--- a/pandora_console/include/javascript/fixed-bottom-box.js
+++ b/pandora_console/include/javascript/fixed-bottom-box.js
@@ -150,9 +150,9 @@
self._box
.addClass("fixed-bottom-box")
.css("position", "fixed")
- .css("top", "115px")
+ .css("top", "112px")
.css("right", "0")
- .css("width", "30%");
+ .css("width", "25%");
self._renderHead(head);
self._renderContent(content);
diff --git a/pandora_console/include/styles/tree.css b/pandora_console/include/styles/tree.css
index 54bc3753df..fe0e35e30a 100644
--- a/pandora_console/include/styles/tree.css
+++ b/pandora_console/include/styles/tree.css
@@ -18,7 +18,7 @@
}
.tree-node .module-action-buttons img {
- width: 20px;
+ width: 16px;
float: right;
}
@@ -43,20 +43,25 @@
display: flex;
align-items: center;
justify-content: center;
- height: 38px;
+ height: 32px;
}
.tree-node .node-icon .node-icon-container img {
padding: 0;
- width: 20px;
+ width: 16px;
}
.tree-node .node-status {
width: 40px;
- height: 38px;
+ height: 31px;
border-radius: 7px 0 0 7px;
- padding: 1px;
box-sizing: border-box;
position: absolute;
+ padding: 8px;
+ border-radius: 8px;
+ width: 19px;
+ height: 17px;
+ top: 6px;
+ left: 9px;
}
.tree-node .node-name {
position: relative;
@@ -64,17 +69,16 @@
}
.tree-group {
- margin-left: 24px;
+ margin-left: 40px;
/*padding-top: 1px;*/
}
.tree-node {
white-space: nowrap;
- /*
- background-image: url(../../images/tree/branch.png);
- background-position: 0px 0px;
+ background-image: url(../../images/tree/straight@tree.svg);
+ background-position: -1px -1px;
background-repeat: repeat-y;
-*/
+ background-size: 33px;
min-height: 26px;
margin-top: 1px;
}
@@ -96,7 +100,7 @@ div.tree-node span {
border-radius: 4px;
width: calc(100% - 50px);
box-sizing: border-box;
- height: 40px;
+ height: 32px;
font-size: 1.2em;
display: flex;
flex-direction: row;
@@ -118,7 +122,7 @@ div.tree-node span {
}
.leaf-icon {
- width: 18px;
+ width: 32px;
height: 32px;
}
@@ -133,9 +137,11 @@ div.tree-node span {
}
.tree-node.leaf-open > .leaf-icon {
- background-image: url(../../images/minus.svg);
+ /*background-image: url(../../images/minus.svg);*/
+ background-image: url(../../images/tree/corner@tree.svg);
+ background-repeat: no-repeat;
+ background-size: 30px 30px;
}
-
.tree-node.leaf-closed > .leaf-icon {
background-image: url(../../images/plus.svg);
}
@@ -150,11 +156,33 @@ div.tree-node span {
cursor: pointer;
}
+.tree-node.leaf-closed > .leaf-icon {
+ background-image: url(../../images/tree/corner_straight_plus@tree.svg);
+}
+
+.tree-node.leaf-closed:last-of-type > .leaf-icon {
+ background-image: url(../../images/tree/corner_plus@tree.svg);
+}
+
+.tree-node.leaf-open > .leaf-icon {
+ background-image: url(../../images/tree/corner_straight_minus@tree.svg);
+}
+
+.tree-node.leaf-open:last-of-type > .leaf-icon {
+ background-image: url(../../images/tree/corner_minus@tree.svg);
+}
.tree-node > .leaf-icon {
- background-position: 0px 11px;
+ background-position: 0px 0px;
background-repeat: no-repeat;
float: left;
- margin-right: 10px;
+ /* margin-right: 10px; */
+ background-image: url(../../images/tree/corner_straight@tree.svg);
+ background-repeat: no-repeat;
+ background-size: 30px 30px;
+}
+
+.tree-node:last-of-type > .leaf-icon {
+ background-image: url(../../images/tree/corner@tree.svg);
}
.tree-node > .node-content > img {
@@ -171,11 +199,12 @@ div.tree-node span {
.tree-node > .node-content > .agent-status.status_balls,
.tree-node > .node-content > .status_small_balls {
width: 1.5em;
- border-radius: 0;
+ /*border-radius: 0;
border-top-left-radius: 6px;
border-bottom-left-radius: 6px;
height: 38px;
position: relative;
+ */
}
.tree-node > .node-content > .agent-status.status_balls {
@@ -194,11 +223,12 @@ div.tree-node span {
flex: 1 1 80%;
position: relative;
font-weight: bold;
- font-size: 11pt;
+ font-size: 12px;
}
+.tree-node > .node-content.module-only-caption > .module-name,
.tree-node > .node-content > .module-name-parent.module-only-caption {
- top: 9px;
+ top: 5px;
}
.node-service > .node-service-name {
@@ -206,12 +236,9 @@ div.tree-node span {
font-size: 11pt;
font-weight: bold;
}
-.tree-node > .node-content.module-only-caption > .module-name {
- top: 7px;
-}
.node-content.module:not(.module-only-caption) .module-name {
- margin-left: 3.5em;
+ margin-left: 3em;
font-weight: normal;
}
/*.node-content.module.module-only-caption:not(:first-of-type) {
@@ -219,9 +246,9 @@ div.tree-node span {
}*/
.tree-node > .node-content > .module-name-alias {
- font-size: 12pt;
+ font-size: 14px;
font-weight: normal;
- top: 8px;
+ top: 4px;
margin-left: 3.3em;
}
@@ -229,7 +256,7 @@ div.tree-node span {
margin-left: 1em;
}
.tree-node > .node-content > .module-name-parent {
- font-size: 12pt;
+ font-size: 14px;
margin-left: 0.5em;
top: -4px;
}
@@ -265,10 +292,10 @@ div.tree-node span {
}
.tree-node > .node-content > .tree-node-counters {
- font-size: 1.2em;
+ font-size: 14px;
float: right;
position: relative;
- top: 8px;
+ top: 5px;
right: 10px;
}
@@ -287,7 +314,7 @@ div.tree-node span {
div#tree-controller-recipient {
text-align: left;
- width: calc((100% - 34%) - 20px);
+ width: calc((100% - 30%) - 20px);
margin-top: 10px;
margin-left: 20px;
}
@@ -332,7 +359,7 @@ div#tree-controller-recipient {
}
.node-content .module-button:hover {
- width: 20px;
+ /* width: 20px; */
background-color: #fff;
border-radius: 8px;
}
@@ -343,7 +370,7 @@ div#tree-controller-recipient {
.tree-node.leaf-open:last-child,
.tree-node.leaf-closed:last-child,
.tree-node.leaf-empty:last-child {
- margin-bottom: 8px;
+ margin-bottom: 1px;
}
.tree-root > .tree-node {
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index a66fd5063c..ebd9af3506 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -160,7 +160,7 @@ $table_status->cellspacing = 0;
$table_status->cellpadding = 0;
$table_status->class = 'floating_form';
$table_status->style[0] = 'height: 32px; width: 30%; padding-right: 5px; text-align: end;';
-$table_status->style[1] = 'height: 32px; width: 70%; padding-left: 5px; font-family: \'Pandora-Regular\';';
+$table_status->style[1] = 'height: 32px; width: 70%; padding-left: 5px;';
$agentStatusGraph = html_print_div(
[
@@ -382,7 +382,7 @@ $table_contact->cellspacing = 0;
$table_contact->cellpadding = 0;
$table_contact->class = 'floating_form';
$table_contact->style[0] = 'height: 32px; width: 30%; padding-right: 5px; text-align: end;';
-$table_contact->style[1] = 'height: 32px; width: 70%; padding-left: 5px; font-family: \'Pandora-Regular\';';
+$table_contact->style[1] = 'height: 32px; width: 70%; padding-left: 5px;';
$agentContactCaption = html_print_div(
[
@@ -539,8 +539,8 @@ $data_opcional->id = 'agent_data_main';
$data_opcional->class = 'floating_form';
$data_opcional->cellspacing = 0;
$data_opcional->cellpadding = 0;
-$data_opcional->style[0] = 'height: 46px; width: 25%; padding-right: 5px; font-family: \'Pandora-Bold\'; text-align: end;';
-$data_opcional->style[1] = 'height: 46px; width: 75%; padding-left: 5px; font-family: \'Pandora-Regular\';';
+$data_opcional->style[0] = 'height: 46px; width: 25%; padding-right: 5px;text-align: end;';
+$data_opcional->style[1] = 'height: 46px; width: 75%; padding-left: 5px;';
// Gis and url address.
$agentAdditionalContent = '';
// Position Information.