From 39b75cf9463e8e9ea2a80f98d4234d40fa32bb2d Mon Sep 17 00:00:00 2001 From: Pablo Aragon Date: Thu, 11 Apr 2024 15:22:40 +0200 Subject: [PATCH 1/3] 13414-Fix multiselect2 dark theme --- .../godmode/agentes/module_manager.php | 2 +- .../agentes/module_manager_editor_common.php | 6 +++--- pandora_console/include/styles/pandora.css | 8 ++++++++ .../include/styles/pandora_black.css | 17 +++++++++++++++++ 4 files changed, 29 insertions(+), 4 deletions(-) diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index 279872b744..3832461da0 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -1208,7 +1208,7 @@ $createModuleTable->data[1][] = html_print_label_input_block( html_print_anchor( [ 'href' => 'https://pandorafms.com/Library/Library/', - 'class' => 'color-black-grey invert_filter', + 'class' => 'color-black-grey', 'content' => __('Get more modules on Monitoring Library'), ], true diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php index 3b858f23a3..c535c1bb31 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_common.php +++ b/pandora_console/godmode/agentes/module_manager_editor_common.php @@ -442,7 +442,7 @@ $tableBasicThresholds->rowclass = []; $tableBasicThresholds->data = []; // 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->data['caption_warning_threshold'][0] .= __('Warning threshold').' '; @@ -617,7 +617,7 @@ $tableBasicThresholds->data['critical_threshold'][0] .= html_print_input_text( $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->data['thresholds_table'][0] = html_print_table($tableBasicThresholds, true); if (modules_is_string_type($id_module_type) === false || (bool) $edit === true) { @@ -896,7 +896,7 @@ $tagsAvailableData .= html_print_image( [ 'id' => 'right', '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', ] ); diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 22c1ba704c..a0235258d9 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -14197,3 +14197,11 @@ table#snmp_console tbody .datos_orange * { background-color: var(--events-priority-bg-orange); color: var(--events-priority-text-orange) !important; } + +.black-and-white { + filter: saturate(0); +} + +.invert_filter.black-and-white { + filter: invert(1) saturate(0) !important; +} diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css index e51b51f489..62ba6f5a04 100644 --- a/pandora_console/include/styles/pandora_black.css +++ b/pandora_console/include/styles/pandora_black.css @@ -2005,6 +2005,23 @@ div.show_result_interpreter { border-top: 0; } +.switch_radio_button input:checked + label { + color: var(--text-color) !important; +} + +.tags_selected_container > span.select2 { + background-color: #111 !important; +} + +.select2-container .select2-selection--single, +.select2-container .select2-selection--multiple { + border-color: #707070 !important; +} + +.select2-container.select2-container--focus .select2-selection--multiple { + border-color: #8a96a6 !important; +} + th { border-bottom: 1px solid var(--border-color); } From 1a0c3a2d86b7cf8229f08ecb5eea3e280b6095f7 Mon Sep 17 00:00:00 2001 From: Jorge Rincon Date: Thu, 11 Apr 2024 15:52:25 +0200 Subject: [PATCH 2/3] #13431 fixed calendar style is adjusted for the dark theme. --- .../include/styles/js/jquery-ui_custom.css | 13 +++++++------ pandora_console/include/styles/pandora.css | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pandora_console/include/styles/js/jquery-ui_custom.css b/pandora_console/include/styles/js/jquery-ui_custom.css index 5bf343ee60..180b3f0514 100644 --- a/pandora_console/include/styles/js/jquery-ui_custom.css +++ b/pandora_console/include/styles/js/jquery-ui_custom.css @@ -35,7 +35,8 @@ } .ui-datepicker .ui-datepicker-title select, .ui-datepicker .ui-datepicker-title option { - color: #111; + color: var(--text-color); + background-color: var(--secondary-color); } .ui-dialog .ui-dialog-title { color: #fff; @@ -228,16 +229,16 @@ a.ui-state-default > span:hover { margin-right: 25px !important; } .ui-widget-header { - background: white; + background: var(--secondary-color); color: #ffffff; } .ui-datepicker-calendar th { - background-color: #fff; + background-color: var(--secondary-color); padding-left: 15px; text-align: initial; } .ui-datepicker-calendar th span { - color: #000; + color: var(--text-color); } .ui-widget-header { height: fit-content !important; @@ -256,7 +257,7 @@ a.ui-state-default > span:hover { margin: 0px 15px 0px 15px; } .ui-timepicker-div .ui-datepicker-title { - color: black; + color: var(--text-color); } .ui-timepicker-div dl { margin-top: 0px !important; @@ -321,7 +322,7 @@ a.ui-button:active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; border-bottom: 0; - background: #ffffff; + background: var(--secondary-color); font-weight: normal; color: #212121; } diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 692162ca9f..61c4d1b01b 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -12336,7 +12336,7 @@ div.relative > div > div#ui-datepicker-div { } #ui-datepicker-div .ui-datepicker-header { - background-color: white; + background-color: var(--secondary-color); } .ui-widget-overlay { From 597f032247f7c9a0b1625d35176cb023e129842b Mon Sep 17 00:00:00 2001 From: artica Date: Fri, 12 Apr 2024 01:00:05 +0200 Subject: [PATCH 3/3] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.redhat_bin.el8.spec | 2 +- pandora_agents/unix/pandora_agent.redhat_bin.el9.spec | 2 +- pandora_agents/unix/pandora_agent.redhat_bin.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.rhel7.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/lib/PandoraFMS/PluginTools.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index c665a30841..87d52e2174 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0NG.776-240411 +Version: 7.0NG.776-240412 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index a6185dcff7..45277fb8a8 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.776-240411" +pandora_version="7.0NG.776-240412" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index c23c763e69..9c31cb218d 100755 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -1039,7 +1039,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0NG.776'; -use constant AGENT_BUILD => '240411'; +use constant AGENT_BUILD => '240412'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 93548856bd..9838d160df 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240411 +%define release 240412 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec index 7a1b0525e4..42479f4a7a 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el8.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240411 +%define release 240412 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec index b46fd8d021..81ac60c0f1 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.el9.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240411 +%define release 240412 %define debug_package %{nil} Summary: Pandora FMS Linux agent, binary version diff --git a/pandora_agents/unix/pandora_agent.redhat_bin.spec b/pandora_agents/unix/pandora_agent.redhat_bin.spec index 34dda65b65..46bba8cd43 100644 --- a/pandora_agents/unix/pandora_agent.redhat_bin.spec +++ b/pandora_agents/unix/pandora_agent.redhat_bin.spec @@ -5,7 +5,7 @@ %define name pandorafms_agent_linux_bin %define source_name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240411 +%define release 240412 Summary: Pandora FMS Linux agent, binary version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 583de39dea..8baade9231 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_agent_linux %define version 7.0NG.776 -%define release 240411 +%define release 240412 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 84b44b6990..fac9b76ec9 100755 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240411" +PI_BUILD="240412" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 2a92409a9d..1c14989430 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{240411} +{240412} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index d9250f4d5c..17e6504bc8 100644 --- a/pandora_agents/win32/pandora.cc +++ b/pandora_agents/win32/pandora.cc @@ -30,7 +30,7 @@ using namespace Pandora; using namespace Pandora_Strutils; #define PATH_SIZE _MAX_PATH+1 -#define PANDORA_VERSION ("7.0NG.776 Build 240411") +#define PANDORA_VERSION ("7.0NG.776 Build 240412") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index ad139ecdaa..96fe1e7348 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Pandora FMS" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0NG.776(Build 240411))" + VALUE "ProductVersion", "(7.0NG.776(Build 240412))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 2e55ffa032..5facf3f8f9 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0NG.776-240411 +Version: 7.0NG.776-240412 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index 1bc7b0890d..274a7a050b 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/pandora_console/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0NG.776-240411" +pandora_version="7.0NG.776-240412" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 4562f52114..98ae73830b 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ use DI\ContainerBuilder; /* * Pandora build version and version */ -$build_version = 'PC240411'; +$build_version = 'PC240412'; $pandora_version = 'v7.0NG.776'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 37a72c0535..804c2853f3 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -131,7 +131,7 @@
[ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index 9a11e1ac05..308fd97fd3 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -7,7 +7,7 @@ %define debug_package %{nil} %define name pandorafms_server %define version 7.0NG.776 -%define release 240411 +%define release 240412 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 87f07c18c0..5660ee84df 100644 --- a/pandora_server/pandora_server.spec +++ b/pandora_server/pandora_server.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.776 -%define release 240411 +%define release 240412 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index cce068a0d0..6c79e344e6 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.776" -PI_BUILD="240411" +PI_BUILD="240412" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index 35b68e1f1d..1427c1bb03 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -38,7 +38,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.776 Build 240411"; +my $version = "7.0NG.776 Build 240412"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index 5a75fb0226..c398d6588c 100755 --- a/pandora_server/util/pandora_manage.pl +++ b/pandora_server/util/pandora_manage.pl @@ -36,7 +36,7 @@ use Encode::Locale; Encode::Locale::decode_argv; # version: define current version -my $version = "7.0NG.776 Build 240411"; +my $version = "7.0NG.776 Build 240412"; # save program name for logging my $progname = basename($0);