Merge branch 'develop' into ent-13345-fechas-no-se-ven-en-seccion-token-management-tema-oscuro

This commit is contained in:
Pablo Aragon 2024-04-12 09:03:39 +02:00
commit a33923786f
51 changed files with 585 additions and 285 deletions

View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix package: pandorafms-agent-unix
Version: 7.0NG.776-240410 Version: 7.0NG.776-240412
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.776-240410" pandora_version="7.0NG.776-240412"
echo "Test if you has the tools for to make the packages." echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

View File

@ -1039,7 +1039,7 @@ my $Sem = undef;
my $ThreadSem = undef; my $ThreadSem = undef;
use constant AGENT_VERSION => '7.0NG.776'; use constant AGENT_VERSION => '7.0NG.776';
use constant AGENT_BUILD => '240410'; use constant AGENT_BUILD => '240412';
# Agent log default file size maximum and instances # Agent log default file size maximum and instances
use constant DEFAULT_MAX_LOG_SIZE => 600000; use constant DEFAULT_MAX_LOG_SIZE => 600000;

View File

@ -4,7 +4,7 @@
%global __os_install_post %{nil} %global __os_install_post %{nil}
%define name pandorafms_agent_linux %define name pandorafms_agent_linux
%define version 7.0NG.776 %define version 7.0NG.776
%define release 240410 %define release 240412
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version
Name: %{name} Name: %{name}

View File

@ -5,7 +5,7 @@
%define name pandorafms_agent_linux_bin %define name pandorafms_agent_linux_bin
%define source_name pandorafms_agent_linux %define source_name pandorafms_agent_linux
%define version 7.0NG.776 %define version 7.0NG.776
%define release 240410 %define release 240412
%define debug_package %{nil} %define debug_package %{nil}
Summary: Pandora FMS Linux agent, binary version Summary: Pandora FMS Linux agent, binary version

View File

@ -5,7 +5,7 @@
%define name pandorafms_agent_linux_bin %define name pandorafms_agent_linux_bin
%define source_name pandorafms_agent_linux %define source_name pandorafms_agent_linux
%define version 7.0NG.776 %define version 7.0NG.776
%define release 240410 %define release 240412
%define debug_package %{nil} %define debug_package %{nil}
Summary: Pandora FMS Linux agent, binary version Summary: Pandora FMS Linux agent, binary version

View File

@ -5,7 +5,7 @@
%define name pandorafms_agent_linux_bin %define name pandorafms_agent_linux_bin
%define source_name pandorafms_agent_linux %define source_name pandorafms_agent_linux
%define version 7.0NG.776 %define version 7.0NG.776
%define release 240410 %define release 240412
Summary: Pandora FMS Linux agent, binary version Summary: Pandora FMS Linux agent, binary version
Name: %{name} Name: %{name}

View File

@ -4,7 +4,7 @@
%global __os_install_post %{nil} %global __os_install_post %{nil}
%define name pandorafms_agent_linux %define name pandorafms_agent_linux
%define version 7.0NG.776 %define version 7.0NG.776
%define release 240410 %define release 240412
Summary: Pandora FMS Linux agent, PERL version Summary: Pandora FMS Linux agent, PERL version
Name: %{name} Name: %{name}

View File

@ -10,7 +10,7 @@
# ********************************************************************** # **********************************************************************
PI_VERSION="7.0NG.776" PI_VERSION="7.0NG.776"
PI_BUILD="240410" PI_BUILD="240412"
OS_NAME=`uname -s` OS_NAME=`uname -s`
FORCE=0 FORCE=0

View File

@ -186,7 +186,7 @@ UpgradeApplicationID
{} {}
Version Version
{240410} {240412}
ViewReadme ViewReadme
{Yes} {Yes}

View File

@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils; using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1 #define PATH_SIZE _MAX_PATH+1
#define PANDORA_VERSION ("7.0NG.776 Build 240410") #define PANDORA_VERSION ("7.0NG.776 Build 240412")
string pandora_path; string pandora_path;
string pandora_dir; string pandora_dir;

View File

@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Pandora FMS" VALUE "LegalCopyright", "Pandora FMS"
VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent" VALUE "ProductName", "Pandora FMS Windows Agent"
VALUE "ProductVersion", "(7.0NG.776(Build 240410))" VALUE "ProductVersion", "(7.0NG.776(Build 240412))"
VALUE "FileVersion", "1.0.0.0" VALUE "FileVersion", "1.0.0.0"
END END
END END

View File

@ -1,5 +1,5 @@
package: pandorafms-console package: pandorafms-console
Version: 7.0NG.776-240410 Version: 7.0NG.776-240412
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.776-240410" pandora_version="7.0NG.776-240412"
package_pear=0 package_pear=0
package_pandora=1 package_pandora=1

View File

@ -140,7 +140,6 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
} }
} }
$search_bar .= '<div id="result_order" class="result_order"></div>';
$search_bar .= '<input id="keywords" name="keywords"'; $search_bar .= '<input id="keywords" name="keywords"';
if (!isset($config['search_keywords'])) { if (!isset($config['search_keywords'])) {
$search_bar .= "value='".__('Enter keywords to search')."'"; $search_bar .= "value='".__('Enter keywords to search')."'";
@ -408,6 +407,27 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
$modal_box .= '<a href="https://discord.com/invite/xVt2ruSxmr" target="_blank">'.__('Join discord community').'</a>'; $modal_box .= '<a href="https://discord.com/invite/xVt2ruSxmr" target="_blank">'.__('Join discord community').'</a>';
$modal_box .= '</div>'; $modal_box .= '</div>';
// Move help modal (header) fix z-index.
$modal_box .= '
<script>
$(document).ready(function() {
let helpModalIcon = $("#modal-help-content > img");
let helpModal = $("#modal_help");
if (helpModalIcon.length > 0) {
let distanceRight =
$(window).width() - (helpModalIcon.offset().left + helpModalIcon.width());
helpModal.css("z-index", "3");
helpModal.css("position", "fixed");
helpModal.css("top", "16px");
helpModal.css("right", `${Math.floor(distanceRight) + 34}px`);
helpModal.appendTo(document.body);
}
});
</script>
';
if ($config['activate_feedback'] === '1') { if ($config['activate_feedback'] === '1') {
$modal_help = html_print_div( $modal_help = html_print_div(
[ [
@ -883,7 +903,8 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
enterprise: <?php echo (int) enterprise_installed(); ?>, enterprise: <?php echo (int) enterprise_installed(); ?>,
}, },
success: function (data) { success: function (data) {
$('#result_order').html(data); $('#result_order').html(data);
resizeSearchHeader()
}, },
error: function (data) { error: function (data) {
console.error("Fatal error in AJAX call to interpreter order", data) console.error("Fatal error in AJAX call to interpreter order", data)
@ -1208,4 +1229,8 @@ echo sprintf('<div id="header_table" class="header_table_%s">', $menuTypeClass);
}); });
}); });
/* ]]> */ /* ]]> */
$(window).resize(function () {
resizeSearchHeader()
});
</script> </script>

View File

@ -1208,7 +1208,7 @@ $createModuleTable->data[1][] = html_print_label_input_block(
html_print_anchor( html_print_anchor(
[ [
'href' => 'https://pandorafms.com/Library/Library/', 'href' => 'https://pandorafms.com/Library/Library/',
'class' => 'color-black-grey invert_filter', 'class' => 'color-black-grey',
'content' => __('Get more modules on Monitoring Library'), 'content' => __('Get more modules on Monitoring Library'),
], ],
true true

View File

@ -442,7 +442,7 @@ $tableBasicThresholds->rowclass = [];
$tableBasicThresholds->data = []; $tableBasicThresholds->data = [];
// WARNING THRESHOLD. // WARNING THRESHOLD.
$tableBasicThresholds->rowclass['caption_warning_threshold'] = 'field_half_width pdd_t_10px'; $tableBasicThresholds->rowclass['caption_warning_threshold'] = 'field_half_width';
$tableBasicThresholds->rowclass['warning_threshold'] = 'field_half_width'; $tableBasicThresholds->rowclass['warning_threshold'] = 'field_half_width';
$tableBasicThresholds->data['caption_warning_threshold'][0] .= __('Warning threshold').'&nbsp;'; $tableBasicThresholds->data['caption_warning_threshold'][0] .= __('Warning threshold').'&nbsp;';
@ -617,7 +617,7 @@ $tableBasicThresholds->data['critical_threshold'][0] .= html_print_input_text(
$classdisabledBecauseInPolicy $classdisabledBecauseInPolicy
); );
$table_simple->rowstyle['thresholds_table'] = 'margin-top: 15px;height: 400px;width: 100%'; $table_simple->rowstyle['thresholds_table'] = 'margin-top: 15px;height: 450px;width: 100%';
$table_simple->cellclass['thresholds_table'][0] = 'table_section half_section_left'; $table_simple->cellclass['thresholds_table'][0] = 'table_section half_section_left';
$table_simple->data['thresholds_table'][0] = html_print_table($tableBasicThresholds, true); $table_simple->data['thresholds_table'][0] = html_print_table($tableBasicThresholds, true);
if (modules_is_string_type($id_module_type) === false || (bool) $edit === true) { if (modules_is_string_type($id_module_type) === false || (bool) $edit === true) {
@ -896,7 +896,7 @@ $tagsAvailableData .= html_print_image(
[ [
'id' => 'right', 'id' => 'right',
'title' => __('Add tags to module'), 'title' => __('Add tags to module'),
'class' => 'main_menu_icon invert_filter clickable mrgn_lft_5px', 'class' => 'main_menu_icon invert_filter clickable mrgn_lft_5px black-and-white',
] ]
); );

View File

@ -685,7 +685,7 @@ class AgentsAlerts extends HTML
$alias = db_get_row('tagente', 'id_agente', $agent['id_agente']); $alias = db_get_row('tagente', 'id_agente', $agent['id_agente']);
echo '<tr>'; echo '<tr>';
// Name of the agent. // 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. // Alerts of the agent.
foreach ($templates as $tid => $tname) { foreach ($templates as $tid => $tname) {
$anyfired = 0; $anyfired = 0;

View File

@ -404,7 +404,7 @@ class OrderInterpreter extends Wizard
if ($iterator <= 9 && $this->canShowItem($enterprise, $this->pages_menu[$key]['url'])) { if ($iterator <= 9 && $this->canShowItem($enterprise, $this->pages_menu[$key]['url'])) {
echo '<li class="list_found" name="'.$iterator.'" id="'.$iterator.'">'; echo '<li class="list_found" name="'.$iterator.'" id="'.$iterator.'">';
echo ' echo '
<span class="invert_filter"> Go to </span> &nbsp; <span class=""> Go to </span> &nbsp;
<img src="'.$this->pages_menu[$key]['icon'].'">'; <img src="'.$this->pages_menu[$key]['icon'].'">';
echo '&nbsp; echo '&nbsp;
<a href="'.$this->pages_menu[$key]['url'].'"> <a href="'.$this->pages_menu[$key]['url'].'">

View File

@ -22,7 +22,7 @@ use DI\ContainerBuilder;
/* /*
* Pandora build version and version * Pandora build version and version
*/ */
$build_version = 'PC240410'; $build_version = 'PC240412';
$pandora_version = 'v7.0NG.776'; $pandora_version = 'v7.0NG.776';
// Do not overwrite default timezone set if defined. // Do not overwrite default timezone set if defined.

View File

@ -752,7 +752,7 @@ function inventory_get_datatable(
} }
if ($inventory_search_string != '') { if ($inventory_search_string != '') {
array_push($where, "REPLACE(tagente_datos_inventory.data, '&#x20;', ' ') LIKE '%".$inventory_search_string."%'"); array_push($where, "REPLACE(tagent_module_inventory.data, '&#x20;', ' ') LIKE '%".$inventory_search_string."%'");
} }
if ($utimestamp > 0) { if ($utimestamp > 0) {

View File

@ -4646,10 +4646,12 @@ function ui_toggle(
$imageRotate = $rotateB; $imageRotate = $rotateB;
$style .= 'height:0;position:absolute;'; $style .= 'height:0;position:absolute;';
$original = $img_b; $original = $img_b;
$data_close = 'true';
} else { } else {
$imageRotate = $rotateA; $imageRotate = $rotateA;
$style .= 'height:auto;position:relative;'; $style .= 'height:auto;position:relative;';
$original = $img_a; $original = $img_a;
$data_close = 'false';
} }
$header_class = ''; $header_class = '';
@ -4668,7 +4670,7 @@ function ui_toggle(
// Link to toggle. // Link to toggle.
$output = '<div class="'.$main_class.'" id="'.$id.'" '.$toggl_attr.'>'; $output = '<div class="'.$main_class.'" id="'.$id.'" '.$toggl_attr.'>';
$output .= '<div class="'.$header_class.'" '.(($disableToggle === false) ? 'style="cursor: pointer;" ' : '').' id="tgl_ctrl_'.$uniqid.'">'; $output .= '<div class="'.$header_class.'" '.(($disableToggle === false) ? 'style="cursor: pointer;" ' : '').' id="tgl_ctrl_'.$uniqid.'" data-close="'.$data_close.'">';
if ($reverseImg === false) { if ($reverseImg === false) {
if ($switch === true) { if ($switch === true) {
if (empty($switch_name) === true) { if (empty($switch_name) === true) {
@ -4783,6 +4785,7 @@ function ui_toggle(
$output .= " $('#tgl_div_".$uniqid."').css('position', '".$position_div."');\n"; $output .= " $('#tgl_div_".$uniqid."').css('position', '".$position_div."');\n";
$output .= " $('#image_".$uniqid."').attr('style', 'rotate: ".$rotateA."');\n"; $output .= " $('#image_".$uniqid."').attr('style', 'rotate: ".$rotateA."');\n";
$output .= " $('#checkbox-".$switch_name."').prop('checked', true);\n"; $output .= " $('#checkbox-".$switch_name."').prop('checked', true);\n";
$output .= " $('#tgl_ctrl_".$uniqid."').attr('data-close', 'false');\n";
$output .= $class_table; $output .= $class_table;
$output .= " }\n"; $output .= " }\n";
$output .= " else {\n"; $output .= " else {\n";
@ -4791,6 +4794,7 @@ function ui_toggle(
$output .= " $('#tgl_div_".$uniqid."').css('position', 'absolute');\n"; $output .= " $('#tgl_div_".$uniqid."').css('position', 'absolute');\n";
$output .= " $('#image_".$uniqid."').attr('style', 'rotate: ".$rotateB."');\n"; $output .= " $('#image_".$uniqid."').attr('style', 'rotate: ".$rotateB."');\n";
$output .= " $('#checkbox-".$switch_name."').prop('checked', false);\n"; $output .= " $('#checkbox-".$switch_name."').prop('checked', false);\n";
$output .= " $('#tgl_ctrl_".$uniqid."').attr('data-close', 'true');\n";
$output .= " }\n"; $output .= " }\n";
$output .= " });\n"; $output .= " });\n";
$output .= " }\n"; $output .= " }\n";

View File

@ -2736,3 +2736,8 @@ function menuTabsShowHide() {
} }
} }
} }
function resizeSearchHeader() {
$(".show_result_interpreter").width($("#keywords").outerWidth() - 12);
$(".show_result_interpreter").css("left", $("#keywords").position().left + 2);
}

View File

@ -471,6 +471,8 @@ function createVisualConsole(
// Start an interval to update the Visual Console. // Start an interval to update the Visual Console.
updateVisualConsole(props.id, updateInterval, updateInterval); updateVisualConsole(props.id, updateInterval, updateInterval);
} }
normalizeStylesVC();
} catch (error) { } catch (error) {
console.log("[ERROR]", "[VISUAL-CONSOLE-CLIENT]", error.message); 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");
}

View File

@ -455,7 +455,7 @@ class GraphModuleHistogramWidget extends Widget
$style = 'min-width:200px; min-height:100px;'; $style = 'min-width:200px; min-height:100px;';
$output .= '<div class="container-center" style="'.$style.'">'; $output .= '<div class="container-center" style="'.$style.'">';
$output .= '<div style="font-size:'.$size_label.'px;">'; $output .= '<div style="font-size:'.$size_label.'px; line-height:'.($size_label + 5).'px;">';
$output .= $label; $output .= $label;
$output .= '</div>'; $output .= '</div>';
$style = 'min-width:200px; width:'.($size['width'] + 15).'px;'; $style = 'min-width:200px; width:'.($size['width'] + 15).'px;';

View File

@ -493,7 +493,7 @@ class MapsMadeByUser extends Widget
$output .= '<script type="text/javascript">'; $output .= '<script type="text/javascript">';
$output .= '$(document).ready(function () {'; $output .= '$(document).ready(function () {';
$output .= 'dashboardLoadVC('.$settings.')'; $output .= 'dashboardLoadVC('.$settings.');';
$output .= '});'; $output .= '});';
$output .= '</script>'; $output .= '</script>';

View File

@ -71,12 +71,12 @@ hr {
height: 0; height: 0;
overflow: visible; overflow: visible;
} }
h1, h1:not(.unbootstrap),
h2, h2:not(.unbootstrap),
h3, h3:not(.unbootstrap),
h4, h4:not(.unbootstrap),
h5, h5:not(.unbootstrap),
h6 { h6:not(.unbootstrap) {
margin-top: 0; margin-top: 0;
margin-bottom: 0.5rem; margin-bottom: 0.5rem;
} }
@ -311,18 +311,18 @@ template {
[hidden] { [hidden] {
display: none !important; display: none !important;
} }
.h1, .h1:not(.unbootstrap),
.h2, .h2:not(.unbootstrap),
.h3, .h3:not(.unbootstrap),
.h4, .h4:not(.unbootstrap),
.h5, .h5:not(.unbootstrap),
.h6, .h6:not(.unbootstrap),
h1, h1:not(.unbootstrap),
h2, h2:not(.unbootstrap),
h3, h3:not(.unbootstrap),
h4, h4:not(.unbootstrap),
h5, h5:not(.unbootstrap),
h6 { h6:not(.unbootstrap) {
margin-bottom: 0.5rem; margin-bottom: 0.5rem;
font-weight: 500; font-weight: 500;
line-height: 1.2; line-height: 1.2;

File diff suppressed because one or more lines are too long

View File

@ -46,16 +46,11 @@ a {
text-decoration: none; text-decoration: none;
} }
h1 { h1:not(.unbootstrap) {
font-size: 2.5rem; font-size: 2.5rem;
margin-bottom: 0.5rem; margin-bottom: 0.5rem;
} }
.visual-console-container-dashboard h1 {
font-size: inherit;
margin-bottom: inherit;
}
.container-fluid { .container-fluid {
margin-top: 5px; margin-top: 5px;
} }
@ -971,7 +966,7 @@ input.resize_button {
right: 20px; right: 20px;
} }
.parent_graph > .graph { .parent_graph > .graph:not(.unbootstrap) {
margin-left: 10px; margin-left: 10px;
} }
@ -994,3 +989,14 @@ input.resize_button {
width: 100%; width: 100%;
justify-content: center; justify-content: center;
} }
.select2-container.select2-container--default.select2-container--open {
z-index: 999999;
}
.select2-search__field {
box-sizing: border-box !important;
}
.grid-stack-item-content .visual-console-container-dashboard {
text-align: initial;
}

View File

@ -35,7 +35,8 @@
} }
.ui-datepicker .ui-datepicker-title select, .ui-datepicker .ui-datepicker-title select,
.ui-datepicker .ui-datepicker-title option { .ui-datepicker .ui-datepicker-title option {
color: #111; color: var(--text-color);
background-color: var(--secondary-color);
} }
.ui-dialog .ui-dialog-title { .ui-dialog .ui-dialog-title {
color: #fff; color: #fff;
@ -228,16 +229,16 @@ a.ui-state-default > span:hover {
margin-right: 25px !important; margin-right: 25px !important;
} }
.ui-widget-header { .ui-widget-header {
background: white; background: var(--secondary-color);
color: #ffffff; color: #ffffff;
} }
.ui-datepicker-calendar th { .ui-datepicker-calendar th {
background-color: #fff; background-color: var(--secondary-color);
padding-left: 15px; padding-left: 15px;
text-align: initial; text-align: initial;
} }
.ui-datepicker-calendar th span { .ui-datepicker-calendar th span {
color: #000; color: var(--text-color);
} }
.ui-widget-header { .ui-widget-header {
height: fit-content !important; height: fit-content !important;
@ -256,7 +257,7 @@ a.ui-state-default > span:hover {
margin: 0px 15px 0px 15px; margin: 0px 15px 0px 15px;
} }
.ui-timepicker-div .ui-datepicker-title { .ui-timepicker-div .ui-datepicker-title {
color: black; color: var(--text-color);
} }
.ui-timepicker-div dl { .ui-timepicker-div dl {
margin-top: 0px !important; margin-top: 0px !important;
@ -321,7 +322,7 @@ a.ui-button:active,
.ui-widget-header .ui-state-active { .ui-widget-header .ui-state-active {
border: 1px solid #aaaaaa; border: 1px solid #aaaaaa;
border-bottom: 0; border-bottom: 0;
background: #ffffff; background: var(--secondary-color);
font-weight: normal; font-weight: normal;
color: #212121; color: #212121;
} }

View File

@ -478,7 +478,6 @@ ul li {
top: 0; top: 0;
left: 0; left: 0;
background-color: #ffffff; background-color: #ffffff;
border-right: 1px solid #eee;
} }
.button_collapse { .button_collapse {
@ -545,6 +544,13 @@ ul li {
width: 35px; width: 35px;
} }
#button_collapse {
width: 32px;
height: 32px;
background-color: #f6f7fb;
border-radius: 50%;
}
@media screen and (max-height: 750px) { @media screen and (max-height: 750px) {
.operation { .operation {
padding-top: 10px; padding-top: 10px;
@ -586,7 +592,7 @@ ul li {
#menu_tabs { #menu_tabs {
height: 49px; height: 49px;
border-bottom: 1px solid #c1ccdc; border-bottom: 1px solid #f6f7fb;
} }
.div_border_line { .div_border_line {

View File

@ -2,16 +2,18 @@ div.show_result_interpreter {
background-color: #fff; background-color: #fff;
color: #000; color: #000;
border: 1px solid #e2e2e2; border: 1px solid #e2e2e2;
border-bottom-left-radius: 10px; border-top: 0;
border-bottom-right-radius: 10px; border-bottom-left-radius: 18px;
border-bottom-right-radius: 18px;
padding-left: 10px; padding-left: 10px;
padding-top: 5px; padding-top: 5px;
padding-bottom: 5px; padding-bottom: 5px;
box-shadow: 0px 0px 15px -4px #dadada; box-shadow: 0px 0px 15px -4px #dadada;
position: absolute; position: fixed;
z-index: 1; z-index: 3;
width: 300px; width: 300px;
top: 45px; top: 48px;
left: 50%;
} }
.more_results { .more_results {
@ -21,27 +23,37 @@ div.show_result_interpreter {
} }
.results-found { .results-found {
background-image: url("../../images/input_zoom_gray.png"); background-image: url("../../images/details.svg");
background-position: center right 10px; background-position: center left 20px;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 17px; background-size: 17px;
background-color: #f2f6f7; background-color: #f6f7fb;
padding: 0px; padding: 0px;
margin: 0; margin: 0;
width: 300px; width: 150px;
height: 30px; height: 36px;
margin-left: 2px; margin-left: 2px;
padding-left: 15px; padding-right: 15px;
padding-right: 40px; padding-left: 45px;
color: #777; color: #777;
font-size: 8.5pt; font-size: 8.5pt;
border-top-left-radius: 10px; border-top-left-radius: 18px;
border-top-right-radius: 10px; border-top-right-radius: 18px;
border-bottom-left-radius: 0px;
border-bottom-right-radius: 0px;
border-color: transparent; border-color: transparent;
} }
.list_found { .list_found {
padding-top: 5px; padding: 5px;
display: flex;
flex-direction: row;
flex-wrap: nowrap;
align-items: center;
}
.list_found img {
padding: 0 5px;
} }
.active { .active {

View File

@ -29,11 +29,13 @@
:root { :root {
--primary-color: #14524f; --primary-color: #14524f;
--primary-color-hover: #318280;
--secondary-color: #ffffff; --secondary-color: #ffffff;
--text-color: #333; --text-color: #333;
--text-color-2: #161628; --text-color-2: #161628;
--text-color-3: #454545; --text-color-3: #454545;
--text-color-4: #3f3f3f;
--background-main-color: #f6f7fb; --background-main-color: #f6f7fb;
@ -1609,7 +1611,6 @@ div#head {
height: 60px; height: 60px;
padding-top: 0px; padding-top: 0px;
margin: 0 auto; margin: 0 auto;
border-bottom: 1px solid #eee;
min-width: 882px; min-width: 882px;
background-color: #fff; background-color: #fff;
color: #000; color: #000;
@ -2007,21 +2008,43 @@ div.title_line {
#menu_tab_frame_view, #menu_tab_frame_view,
#menu_tab_frame_view_bc { #menu_tab_frame_view_bc {
position: sticky; position: sticky;
top: 61px; top: 60px;
z-index: 2; z-index: 2;
display: flex; display: flex;
align-items: flex-end; align-items: flex-end;
justify-content: space-between; justify-content: space-between;
border-bottom: 1px solid #eee;
width: -webkit-fill-available; width: -webkit-fill-available;
width: -moz-available; width: -moz-available;
padding-right: 0px; padding-right: 0px;
height: 50px; height: 50px;
box-sizing: border-box; box-sizing: border-box;
background-color: #fff; background-color: #f6f7fb;
margin: -25px -25px 25px -25px; margin: -25px -25px 25px -25px;
} }
#menu_full::before {
content: "";
width: 16px;
height: 16px;
background-color: var(--secondary-color);
position: absolute;
top: 60px;
right: -16px;
z-index: 0;
}
#menu_full::after {
content: "";
width: 16px;
height: 16px;
background-color: #f6f7fb;
position: absolute;
top: 60px;
right: -16px;
z-index: 0;
border-top-left-radius: 16px;
}
/* Breadcrum */ /* Breadcrum */
#menu_tab_frame_view_bc { #menu_tab_frame_view_bc {
min-height: 55px; min-height: 55px;
@ -2830,10 +2853,31 @@ div#pandora_logo_header {
flex-direction: column; flex-direction: column;
} }
#head,
#header {
text-wrap: nowrap;
}
.header_center { .header_center {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
width: 100%;
}
#header_searchbar {
width: 100%;
padding: 0 100px;
}
@media screen and (max-width: 1300px) {
#header_searchbar {
padding: 0 30px;
}
}
#header_searchbar #keywords {
width: 100%;
} }
.header_right { .header_right {
@ -3616,17 +3660,17 @@ div.tip > img {
*/ */
input.search_input { input.search_input {
background-image: url("../../images/details.svg"); background-image: url("../../images/details.svg");
background-position: center right 10px; background-position: center left 20px;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 17px; background-size: 17px;
background-color: #f2f6f7; background-color: #f6f7fb;
padding: 0px; padding: 0px;
margin: 0; margin: 0;
width: 150px; width: 150px;
height: 30px; height: 36px;
margin-left: 2px; margin-left: 2px;
padding-left: 15px; padding-right: 15px;
padding-right: 40px; padding-left: 45px;
color: #777; color: #777;
font-size: 8.5pt; font-size: 8.5pt;
border-top-left-radius: 50px; border-top-left-radius: 50px;
@ -4098,15 +4142,22 @@ div.div_groups_status {
min-height: 53px; min-height: 53px;
} }
#menu_tab li:hover:not(.menu-dots-li) {
box-shadow: inset 0px 4px var(--primary-color);
}
#menu_tab li.nomn_high, #menu_tab li.nomn_high,
#menu_tab li.nomn_high span { #menu_tab li.nomn_high span {
color: #fff; color: #fff;
box-shadow: inset 0px 4px var(--primary-color); }
background-color: #fff;
#menu_tab li.nomn_high::before,
#menu_tab li:hover:not(.menu-dots-li)::before {
content: "";
display: block;
position: absolute;
bottom: 0px;
width: 40px;
height: 5px;
margin-left: -5px;
background-color: var(--primary-color-hover);
border-radius: 5px;
} }
#menu_tab li.nomn img, #menu_tab li.nomn img,
@ -10503,6 +10554,13 @@ select {
box-sizing: border-box; box-sizing: border-box;
} }
input.buttonButton {
border: 0px;
outline: 0px;
border-radius: 8px;
line-height: normal;
}
input[list], input[list],
textarea[list], textarea[list],
select[list] { select[list] {
@ -10534,6 +10592,11 @@ select:focus {
border: 2px solid #8a96a6; border: 2px solid #8a96a6;
} }
#keywords.results-found {
border: 1px solid var(--border-color);
border-bottom: 0px;
}
:focus { :focus {
outline: #8a96a6; outline: #8a96a6;
} }
@ -11108,7 +11171,6 @@ button.ui-button-text-only.ui-widget.sub {
font-size: 16px !important; font-size: 16px !important;
align-items: center; align-items: center;
line-height: 24px; line-height: 24px;
box-shadow: 0px 3px 6px #c7c7c7;
border-radius: 16px; border-radius: 16px;
cursor: pointer; cursor: pointer;
padding: 0 16px; padding: 0 16px;
@ -11627,12 +11689,56 @@ pre.external_tools_output {
z-index: 1; z-index: 1;
width: -webkit-fill-available; width: -webkit-fill-available;
width: -moz-available; width: -moz-available;
margin: -25px -25px 25px -25px; margin-bottom: 25px;
} }
.white_table_graph.fixed_filter_bar { .white_table_graph.fixed_filter_bar {
border-radius: 0px;
background-color: #f6f7fb;
border: 0;
top: 133px;
}
.white_table_graph.fixed_filter_bar::before {
content: "";
width: calc(100% + 2px);
height: 25px;
background-color: #f6f7fb;
position: absolute;
top: -25px;
margin: 0 -1px;
}
.white_table_graph.fixed_filter_bar > div:nth-child(1) {
background-color: var(--secondary-color);
border: 1px solid #e5e9ed;
border-bottom: 0px;
border-radius: 0; border-radius: 0;
top: 110px; border-top-left-radius: 8px;
border-top-right-radius: 8px;
}
.white_table_graph.fixed_filter_bar > div:nth-child(1)[data-close="true"] {
border-radius: 8px;
border: 1px solid #e5e9ed;
}
.white_table_graph.fixed_filter_bar > div:nth-child(2) {
background-color: var(--secondary-color);
/* border: 1px solid #e5e9ed; */
border-top: 0px;
border-radius: 0;
border-bottom-left-radius: 8px;
border-bottom-right-radius: 8px;
}
.white_table_graph.fixed_filter_bar > div:nth-child(2) > div {
background-color: unset;
border: 1px solid #e5e9ed;
border-top: 0px;
border-radius: 0;
border-bottom-left-radius: 8px;
border-bottom-right-radius: 8px;
} }
/* /*
@ -12236,7 +12342,7 @@ div.relative > div > div#ui-datepicker-div {
} }
#ui-datepicker-div .ui-datepicker-header { #ui-datepicker-div .ui-datepicker-header {
background-color: white; background-color: var(--secondary-color);
} }
.ui-widget-overlay { .ui-widget-overlay {
@ -13945,6 +14051,7 @@ button.disabled {
.white_table_graph > div { .white_table_graph > div {
background-color: transparent; background-color: transparent;
border-radius: 8px;
} }
.link-bold { .link-bold {
@ -14096,3 +14203,24 @@ table#snmp_console tbody .datos_orange * {
background-color: var(--events-priority-bg-orange); background-color: var(--events-priority-bg-orange);
color: var(--events-priority-text-orange) !important; color: var(--events-priority-text-orange) !important;
} }
.open_search_status_color {
color: var(--text-color-2);
}
button.ui-button-text-only.ui-widget.sub:hover,
#button_generate_code input.buttonButton:hover {
box-shadow: 0px 3px 6px #c7c7c7;
}
#button_generate_code input.buttonButton {
box-shadow: none;
}
.black-and-white {
filter: saturate(0);
}
.invert_filter.black-and-white {
filter: invert(1) saturate(0) !important;
}

File diff suppressed because it is too large Load Diff

View File

@ -1,10 +1,11 @@
div.submit_buttons_container { div.submit_buttons_container {
position: relative; position: relative;
margin: 10px auto 0px;
bottom: 0px; bottom: 0px;
width: 95%; width: 95%;
clear: both;
height: 4em; height: 4em;
display: flex;
align-items: center;
justify-content: space-between;
} }
.license_text { .license_text {
@ -13,3 +14,7 @@ div.submit_buttons_container {
text-align: justify; text-align: justify;
margin: 1em auto; margin: 1em auto;
} }
div.submit_buttons_container > div {
display: initial;
}

View File

@ -1565,6 +1565,9 @@ while (ob_get_length() > 0) {
ob_end_flush(); ob_end_flush();
} }
// Results search header.
echo '<div id="result_order" class="result_order"></div>';
db_print_database_debug(); db_print_database_debug();
echo '</html>'; echo '</html>';

View File

@ -131,7 +131,7 @@
<div style='padding-bottom: 50px'> <div style='padding-bottom: 50px'>
<?php <?php
$version = '7.0NG.776'; $version = '7.0NG.776';
$build = '240410'; $build = '240412';
$banner = "v$version Build $build"; $banner = "v$version Build $build";
error_reporting(0); error_reporting(0);

View File

@ -6,7 +6,7 @@
%define debug_package %{nil} %define debug_package %{nil}
%define name pandorafms_console %define name pandorafms_console
%define version 7.0NG.776 %define version 7.0NG.776
%define release 240410 %define release 240412
# User and Group under which Apache is running # User and Group under which Apache is running
%define httpd_name httpd %define httpd_name httpd

View File

@ -6,7 +6,7 @@
%define debug_package %{nil} %define debug_package %{nil}
%define name pandorafms_console %define name pandorafms_console
%define version 7.0NG.776 %define version 7.0NG.776
%define release 240410 %define release 240412
# User and Group under which Apache is running # User and Group under which Apache is running
%define httpd_name httpd %define httpd_name httpd

View File

@ -3,7 +3,7 @@
# #
%define name pandorafms_console %define name pandorafms_console
%define version 7.0NG.776 %define version 7.0NG.776
%define release 240410 %define release 240412
%define httpd_name httpd %define httpd_name httpd
# User and Group under which Apache is running # User and Group under which Apache is running
%define httpd_name apache2 %define httpd_name apache2

View File

@ -80,26 +80,24 @@ $product_name = get_product_name(); ?>
</div> </div>
<div class="submit_buttons_container"> <div class="submit_buttons_container">
<div class="left"> <div class="ui-dialog-buttonset mrgn_lft_15px">
<?php <?php
echo html_print_submit_button( echo html_print_submit_button(
__('Cancel'), __('Cancel'),
'cancel_registration', 'cancel_registration',
false, false,
'id="submit-cancel_registration" class="lato ui-widget 'id="submit-cancel_registration" class="submit-cancel secondaryButton ui-button ui-corner-all ui-widget"',
ui-state-default ui-corner-all ui-button-text-only sub upd submit-cancel"',
true true
); );
?> ?>
</div> </div>
<div class="right"> <div class="ui-dialog-buttonset right">
<?php <?php
echo html_print_submit_button( echo html_print_submit_button(
__('OK!'), __('OK!'),
'register', 'register',
false, false,
'id="submit-register" class="lato ui-widget 'id="submit-register" class="submit-next ui-button ui-corner-all ui-widget"',
ui-state-default ui-corner-all ui-button-text-only sub ok submit-next w100px"',
true true
); );
?> ?>

View File

@ -1,5 +1,5 @@
package: pandorafms-server package: pandorafms-server
Version: 7.0NG.776-240410 Version: 7.0NG.776-240412
Architecture: all Architecture: all
Priority: optional Priority: optional
Section: admin Section: admin

View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
pandora_version="7.0NG.776-240410" pandora_version="7.0NG.776-240412"
package_cpan=0 package_cpan=0
package_pandora=1 package_pandora=1

View File

@ -46,7 +46,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only # version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.776"; my $pandora_version = "7.0NG.776";
my $pandora_build = "240410"; my $pandora_build = "240412";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash # Setup hash

View File

@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
# version: Defines actual version of Pandora Server for this module only # version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.776"; my $pandora_version = "7.0NG.776";
my $pandora_build = "240410"; my $pandora_build = "240412";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] ); our %EXPORT_TAGS = ( 'all' => [ qw() ] );

View File

@ -7,7 +7,7 @@
%define debug_package %{nil} %define debug_package %{nil}
%define name pandorafms_server %define name pandorafms_server
%define version 7.0NG.776 %define version 7.0NG.776
%define release 240410 %define release 240412
Summary: Pandora FMS Server Summary: Pandora FMS Server
Name: %{name} Name: %{name}

View File

@ -4,7 +4,7 @@
%global __os_install_post %{nil} %global __os_install_post %{nil}
%define name pandorafms_server %define name pandorafms_server
%define version 7.0NG.776 %define version 7.0NG.776
%define release 240410 %define release 240412
Summary: Pandora FMS Server Summary: Pandora FMS Server
Name: %{name} Name: %{name}

View File

@ -9,7 +9,7 @@
# ********************************************************************** # **********************************************************************
PI_VERSION="7.0NG.776" PI_VERSION="7.0NG.776"
PI_BUILD="240410" PI_BUILD="240412"
MODE=$1 MODE=$1
if [ $# -gt 1 ]; then if [ $# -gt 1 ]; then

View File

@ -38,7 +38,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB; use PandoraFMS::DB;
# version: define current version # version: define current version
my $version = "7.0NG.776 Build 240410"; my $version = "7.0NG.776 Build 240412";
# Pandora server configuration # Pandora server configuration
my %conf; my %conf;

View File

@ -36,7 +36,7 @@ use Encode::Locale;
Encode::Locale::decode_argv; Encode::Locale::decode_argv;
# version: define current version # version: define current version
my $version = "7.0NG.776 Build 240410"; my $version = "7.0NG.776 Build 240412";
# save program name for logging # save program name for logging
my $progname = basename($0); my $progname = basename($0);