';
+ $output .= '
';
if (is_numeric($data) === true) {
$dataDatos = remove_right_zeros(
@@ -679,7 +679,7 @@ class AvgSumMaxMinModule extends Widget
if (empty($label) === false) {
// Div Label.
- $output .= '
'.$label.'
';
+ $output .= '
'.$label.'
';
}
$output .= '
';
diff --git a/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
index 21fa53d21c..2944663135 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
@@ -179,7 +179,7 @@ class ModulesByStatus extends Widget
// This forces at least a first configuration.
// This forces at least a first configuration.
$this->configurationRequired = false;
- if (empty($this->values['status']) === true) {
+ if (empty($this->values['status']) === true && $this->values['status'] !== '0') {
$this->configurationRequired = true;
}
@@ -311,6 +311,8 @@ class ModulesByStatus extends Widget
$nodes_fields[$server['id']] = $server['server_name'];
}
+ $nodes_fields[0] = __('Metaconsola');
+
$nodes_selected = explode(',', $values['nodes']);
(isset($values['nodes']) === false) ? $nodes_selected = $servers_ids : '';
@@ -369,6 +371,8 @@ class ModulesByStatus extends Widget
{
$this->size = parent::getSize();
+ global $config;
+
$output = '';
if (is_metaconsole() === true) {
@@ -413,7 +417,7 @@ class ModulesByStatus extends Widget
[
'id' => $tableId,
'class' => 'info_table align-left-important',
- 'style' => 'width: 100%',
+ 'style' => 'width: 99%',
'columns' => $columns,
'column_names' => $column_names,
'ajax_url' => 'include/ajax/module',
@@ -430,6 +434,26 @@ class ModulesByStatus extends Widget
'direction' => 'desc',
],
'csv' => 0,
+ 'pagination_options' => [
+ [
+ 5,
+ 10,
+ 25,
+ 100,
+ 200,
+ 500,
+ 1000,
+ ],
+ [
+ 5,
+ 10,
+ 25,
+ 100,
+ 200,
+ 500,
+ 1000,
+ ],
+ ],
]
);
} catch (\Exception $e) {
diff --git a/pandora_console/include/lib/Dashboard/Widgets/alerts_fired.php b/pandora_console/include/lib/Dashboard/Widgets/alerts_fired.php
index 68107388b4..48eeefac75 100755
--- a/pandora_console/include/lib/Dashboard/Widgets/alerts_fired.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/alerts_fired.php
@@ -284,11 +284,16 @@ class AlertsFiredWidget extends Widget
if (isset($groups) === true && is_array($groups) === true) {
$table = new \StdClass();
- $table->class = 'databox data';
+ $table->class = 'databox data centered';
$table->cellspacing = '0';
- $table->width = '90%';
+ $table->width = '100%';
$table->data = [];
$table->size = [];
+ $table->style = [];
+ $table->style[0] = 'text-align: left;';
+ $table->style[1] = 'text-align: left;';
+ $table->style[2] = 'text-align: left;';
+ $table->style[3] = 'text-align: left;';
$url = $config['homeurl'];
$url .= 'index.php?sec=estado&sec2=operation/agentes/alerts_status';
@@ -335,7 +340,7 @@ class AlertsFiredWidget extends Widget
if ($flag === true) {
$height = (count($table->data) * 30);
$style = 'min-width:300px; min-height:'.$height.'px;';
- $output .= '
';
+ $output .= '
';
$output .= html_print_table($table, true);
$output .= '
';
} else {
diff --git a/pandora_console/include/lib/Dashboard/Widgets/module_icon.php b/pandora_console/include/lib/Dashboard/Widgets/module_icon.php
index 316e8813b3..6790d70616 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/module_icon.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/module_icon.php
@@ -305,8 +305,8 @@ class ModuleIconWidget extends Widget
$values['imageSrc'] = $decoder['imageSrc'];
}
- if (isset($decoder['layout']) === true) {
- $values['layout'] = $decoder['layout'];
+ if (isset($decoder['horizontal']) === true) {
+ $values['horizontal'] = $decoder['horizontal'];
}
return $values;
@@ -486,14 +486,14 @@ class ModuleIconWidget extends Widget
],
];
- // Layout.
+ // Horizontal.
$inputs[] = [
- 'label' => __('Layout').ui_print_help_tip(__('Off: vertical. On: horizontal'), true),
+ 'label' => __('Horizontal').ui_print_help_tip(__('If not, layout is vertical'), true),
'arguments' => [
'wrapper' => 'div',
- 'name' => 'layout',
+ 'name' => 'horizontal',
'type' => 'switch',
- 'value' => $values['layout'],
+ 'value' => $values['horizontal'],
'return' => true,
],
];
@@ -520,7 +520,7 @@ class ModuleIconWidget extends Widget
$values['sizeValue'] = \get_parameter('sizeValue', 0);
$values['sizeLabel'] = \get_parameter_switch('sizeLabel');
$values['sizeIcon'] = \get_parameter_switch('sizeIcon');
- $values['layout'] = \get_parameter_switch('layout');
+ $values['horizontal'] = \get_parameter_switch('horizontal');
return $values;
}
@@ -563,7 +563,7 @@ class ModuleIconWidget extends Widget
$output .= '
';
$orientation = '';
- if ((int) $this->values['layout'] === 1) {
+ if ((int) $this->values['horizontal'] === 1) {
$orientation = 'flex aligni_center';
} else {
$orientation = 'grid';
@@ -596,7 +596,7 @@ class ModuleIconWidget extends Widget
// Div image.
$style_icon = 'flex: 0 1 '.$sizeIcon.'px;';
- $output .= '
';
+ $output .= '
';
$output .= html_print_image(
'images/console/icons/'.$icon.$color_icon.'.png',
true,
@@ -604,7 +604,7 @@ class ModuleIconWidget extends Widget
);
$output .= '
';
// Div value.
- $output .= '
';
+ $output .= '
';
$output .= remove_right_zeros(
number_format($data_module, $config['graph_precision'], $config['decimal_separator'], $config['thousand_separator'])
).$unit;
@@ -612,7 +612,7 @@ class ModuleIconWidget extends Widget
if (empty($label) === false) {
// Div Label.
- $output .= '
'.$label.'
';
+ $output .= '
'.$label.'
';
}
$output .= '
';
diff --git a/pandora_console/include/lib/Dashboard/Widgets/module_status.php b/pandora_console/include/lib/Dashboard/Widgets/module_status.php
index f8b7dda933..a9e72fd528 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/module_status.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/module_status.php
@@ -300,8 +300,8 @@ class ModuleStatusWidget extends Widget
$values['imageSrc'] = $decoder['imageSrc'];
}
- if (isset($decoder['layout']) === true) {
- $values['layout'] = $decoder['layout'];
+ if (isset($decoder['horizontal']) === true) {
+ $values['horizontal'] = $decoder['horizontal'];
}
return $values;
@@ -465,14 +465,14 @@ class ModuleStatusWidget extends Widget
],
];
- // Layout.
+ // Horizontal.
$inputs[] = [
- 'label' => __('Layout').ui_print_help_tip(__('Off: vertical. On: horizontal'), true),
+ 'label' => __('Horizontal').ui_print_help_tip(__('If not, layout is vertical'), true),
'arguments' => [
'wrapper' => 'div',
- 'name' => 'layout',
+ 'name' => 'horizontal',
'type' => 'switch',
- 'value' => $values['layout'],
+ 'value' => $values['horizontal'],
'return' => true,
],
];
@@ -499,7 +499,7 @@ class ModuleStatusWidget extends Widget
$values['sizeValue'] = \get_parameter('sizeValue', 0);
$values['sizeLabel'] = \get_parameter_switch('sizeLabel');
$values['sizeIcon'] = \get_parameter_switch('sizeIcon');
- $values['layout'] = \get_parameter_switch('layout');
+ $values['horizontal'] = \get_parameter_switch('horizontal');
return $values;
}
@@ -560,7 +560,7 @@ class ModuleStatusWidget extends Widget
$output .= '
';
$orientation = '';
- if ((int) $this->values['layout'] === 1) {
+ if ((int) $this->values['horizontal'] === 1) {
$orientation = 'flex aligni_center';
} else {
$orientation = 'grid';
@@ -570,7 +570,7 @@ class ModuleStatusWidget extends Widget
$output .= '
';
// Div image.
- $output .= '
';
+ $output .= '
';
$output .= html_print_image(
'images/console/icons/'.$icon,
true,
@@ -580,7 +580,7 @@ class ModuleStatusWidget extends Widget
if (empty($label) === false) {
// Div Label.
- $output .= '
'.$label.'
';
+ $output .= '
'.$label.'
';
}
$output .= '
';
diff --git a/pandora_console/include/lib/Dashboard/Widgets/module_value.php b/pandora_console/include/lib/Dashboard/Widgets/module_value.php
index 818db36b92..83521f6b25 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/module_value.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/module_value.php
@@ -284,8 +284,8 @@ class ModuleValueWidget extends Widget
$values['sizeLabel'] = $decoder['sizeLabel'];
}
- if (isset($decoder['layout']) === true) {
- $values['layout'] = $decoder['layout'];
+ if (isset($decoder['horizontal']) === true) {
+ $values['horizontal'] = $decoder['horizontal'];
}
return $values;
@@ -389,14 +389,14 @@ class ModuleValueWidget extends Widget
],
];
- // Layout.
+ // Horizontal.
$inputs[] = [
- 'label' => __('Layout').ui_print_help_tip(__('Off: vertical. On: horizontal'), true),
+ 'label' => __('Horizontal').ui_print_help_tip(__('If not, layout is vertical'), true),
'arguments' => [
'wrapper' => 'div',
- 'name' => 'layout',
+ 'name' => 'horizontal',
'type' => 'switch',
- 'value' => $values['layout'],
+ 'value' => $values['horizontal'],
'return' => true,
],
];
@@ -421,7 +421,7 @@ class ModuleValueWidget extends Widget
$values['moduleId'] = \get_parameter('moduleId', 0);
$values['sizeValue'] = \get_parameter('sizeValue', 0);
$values['sizeLabel'] = \get_parameter_switch('sizeLabel');
- $values['layout'] = \get_parameter_switch('layout');
+ $values['horizontal'] = \get_parameter_switch('horizontal');
return $values;
}
@@ -471,8 +471,8 @@ class ModuleValueWidget extends Widget
$output .= '
';
$orientation = '';
- if ((int) $this->values['layout'] === 1) {
- $orientation = 'flex';
+ if ((int) $this->values['horizontal'] === 1) {
+ $orientation = 'flex aligni_center';
} else {
$orientation = 'grid';
}
@@ -481,7 +481,7 @@ class ModuleValueWidget extends Widget
$output .= '
';
// Div value.
- $output .= '
';
+ $output .= '
';
if (is_numeric($data_module) === true) {
$dataDatos = remove_right_zeros(
@@ -502,7 +502,7 @@ class ModuleValueWidget extends Widget
if (empty($label) === false) {
// Div Label.
- $output .= '
'.$label.'
';
+ $output .= '
'.$label.'
';
}
$output .= '
';
diff --git a/pandora_console/include/lib/Dashboard/Widgets/os_quick_report.php b/pandora_console/include/lib/Dashboard/Widgets/os_quick_report.php
index f775ec7444..cd500e2972 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/os_quick_report.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/os_quick_report.php
@@ -300,18 +300,20 @@ class OsQuickReportWidget extends Widget
$table->style[1] = 'background-color: '.$values['background'].';';
$table->style[2] = 'background-color: '.$values['background'].'; font-size: 1.5em; font-weight: bolder;';
$table->style[3] = 'background-color: '.$values['background'].'; font-size: 1.5em; font-weight: bolder;';
- $table->style[4] = 'background-color: '.$values['background'].'; font-size: 1.5em; font-weight: bolder;';
- $table->style[5] = 'background-color: '.$values['background'].'; font-size: 1.5em; font-weight: bolder;';
+ $table->style[4] = 'background-color: '.$values['background'].';';
+ $table->style[5] = 'background-color: '.$values['background'].';';
foreach ($result as $id => $os) {
$data = [];
+ ($os['critical'] > 0) ? $color_critical = 'color: '.COL_CRITICAL.';' : $color_critical = '';
+ ($os['unknown'] > 0) ? $color_unknown = 'color: '.COL_UNKNOWN.';' : $color_unknown = '';
$data[0] = ui_print_os_icon($id, false, true);
$data[1] = $os['name'];
$data[2] = $os['total'];
$data[3] = $os['normal'];
- $data[4] = $os['critical'];
- $data[5] = $os['unknown'];
+ $data[4] = '
'.$os['critical'].'';
+ $data[5] = '
'.$os['unknown'].'';
$table->data[] = $data;
}
diff --git a/pandora_console/include/lib/Dashboard/Widgets/sla_percent.php b/pandora_console/include/lib/Dashboard/Widgets/sla_percent.php
index 874d07fee2..2e7483d58e 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/sla_percent.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/sla_percent.php
@@ -289,8 +289,8 @@ class SLAPercentWidget extends Widget
$values['period'] = $decoder['period'];
}
- if (isset($decoder['layout']) === true) {
- $values['layout'] = $decoder['layout'];
+ if (isset($decoder['horizontal']) === true) {
+ $values['horizontal'] = $decoder['horizontal'];
}
return $values;
@@ -408,14 +408,14 @@ class SLAPercentWidget extends Widget
],
];
- // Layout.
+ // Horizontal.
$inputs[] = [
- 'label' => __('Layout').ui_print_help_tip(__('Off: vertical. On: horizontal'), true),
+ 'label' => __('Horizontal').ui_print_help_tip(__('If not, layout is vertical'), true),
'arguments' => [
'wrapper' => 'div',
- 'name' => 'layout',
+ 'name' => 'horizontal',
'type' => 'switch',
- 'value' => $values['layout'],
+ 'value' => $values['horizontal'],
'return' => true,
],
];
@@ -441,7 +441,7 @@ class SLAPercentWidget extends Widget
$values['period'] = \get_parameter('period', 0);
$values['sizeValue'] = \get_parameter('sizeValue', '');
$values['sizeLabel'] = \get_parameter('sizeLabel', '');
- $values['layout'] = \get_parameter_switch('layout');
+ $values['horizontal'] = \get_parameter_switch('horizontal');
return $values;
}
@@ -516,8 +516,8 @@ class SLAPercentWidget extends Widget
$output .= '
';
$orientation = '';
- if ((int) $this->values['layout'] === 1) {
- $orientation = 'flex';
+ if ((int) $this->values['horizontal'] === 1) {
+ $orientation = 'flex aligni_center';
} else {
$orientation = 'grid';
}
@@ -525,13 +525,13 @@ class SLAPercentWidget extends Widget
// General div.
$output .= '
';
// Div value.
- $output .= '
';
+ $output .= '
';
$output .= $sla_array['sla_fixed'].'%';
$output .= '
';
if (empty($label) === false) {
// Div Label.
- $output .= '
'.$label.'
';
+ $output .= '
'.$label.'
';
}
$output .= '
';
diff --git a/pandora_console/include/styles/tables.css b/pandora_console/include/styles/tables.css
index 39b3368e69..25be958969 100644
--- a/pandora_console/include/styles/tables.css
+++ b/pandora_console/include/styles/tables.css
@@ -806,3 +806,7 @@ div[id^="auto-os-"] > img {
.dataTables_paginate.paging_simple_numbers {
margin-right: 0;
}
+
+.w22px {
+ width: 22px;
+}
diff --git a/pandora_console/include/styles/tactical_groups.css b/pandora_console/include/styles/tactical_groups.css
index 383e9ef37f..1c399d1b3b 100644
--- a/pandora_console/include/styles/tactical_groups.css
+++ b/pandora_console/include/styles/tactical_groups.css
@@ -29,3 +29,6 @@ rect {
.graph-distribution-so {
margin-top: 55px;
}
+#list_agents_tactical_wrapper .dataTables_length {
+ margin-bottom: 10px;
+}
diff --git a/pandora_console/include/styles/tips_window.css b/pandora_console/include/styles/tips_window.css
index 1fba4472d4..6e8927aa4d 100644
--- a/pandora_console/include/styles/tips_window.css
+++ b/pandora_console/include/styles/tips_window.css
@@ -12,7 +12,7 @@
padding: 0px;
}
.window {
- background-image: linear-gradient(180deg, #fffce8 0%, #ffffff 100%);
+ background-image: white;
width: 640px;
width: 100%;
border-radius: 5px;
@@ -145,9 +145,6 @@
color: #14524f;
font-weight: 600;
}
-#url_tip .arrow_tips {
- font-size: 20px;
-}
span.count-round-tip {
width: 6px !important;
height: 6px !important;
@@ -211,3 +208,7 @@ span.disable {
.buttons_actions input {
width: 32px;
}
+.hide-button {
+ opacity: 0;
+ pointer-events: none;
+}
diff --git a/pandora_console/operation/agentes/group_view.php b/pandora_console/operation/agentes/group_view.php
index fa4d171e24..d14a3d3262 100644
--- a/pandora_console/operation/agentes/group_view.php
+++ b/pandora_console/operation/agentes/group_view.php
@@ -321,7 +321,7 @@ if (empty($result_groups) === false) {
$link = "
";
} else {
$deep = groups_get_group_deep($data['_id_']);
- $link = "";
+ $link = "";
}
$group_name = ''.ui_print_truncate_text($data['_name_'], 50).'';
diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index da85b53430..b21cca1b32 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -1940,6 +1940,12 @@ if ((bool) $config['pure'] === false) {
'link' => '',
'label' => $tab_name,
],
+ ],
+ [
+ 'id_element' => $id_agente,
+ 'url' => 'operation/agentes/ver_agente&id_agente='.$id_agente,
+ 'label' => agents_get_alias($id_agente),
+ 'section' => 'Agents',
]
);
}
diff --git a/pandora_console/views/dashboard/tipsWindow.php b/pandora_console/views/dashboard/tipsWindow.php
index b95cf058c6..8279cfdd39 100644
--- a/pandora_console/views/dashboard/tipsWindow.php
+++ b/pandora_console/views/dashboard/tipsWindow.php
@@ -73,10 +73,13 @@ $output .= '';
$output .= $text;
$output .= '
';
+$link_class = 'invisible';
if (empty($url) === false && $url !== '') {
- $output .= ''.__('See more info').'→';
+ $link_class = '';
}
+$output .= '
'.__('See more info').'';
+
$output .= '
';
$output .= '
';
@@ -116,7 +119,7 @@ if ($preview === true) {
'',
[
'onclick' => 'next_tip()',
- 'class' => 'mini',
+ 'class' => ($totalTips === '1') ? 'mini hide-button' : 'mini',
],
true
);