| - '.__('Item Editor').' - | -||||
|---|---|---|---|---|
| diff --git a/pandora_console/godmode/reporting/reporting_builder.list_items.php b/pandora_console/godmode/reporting/reporting_builder.list_items.php index 6b5dda8159..238f020004 100755 --- a/pandora_console/godmode/reporting/reporting_builder.list_items.php +++ b/pandora_console/godmode/reporting/reporting_builder.list_items.php @@ -201,139 +201,86 @@ if (($agentFilter == 0) && ($moduleFilter == 0) && ($typeFilter == 0)) { $urlFilter = '&agent_filter='.$agentFilter.'&module_filter='.$moduleFilter.'&type_filter='.$typeFilter; -if (!defined('METACONSOLE')) { - $table = new stdClass(); - $table->width = '100%'; - $table->class = 'filter-table-adv'; - $table->size[0] = '33%'; - $table->size[1] = '33%'; - $table->size[1] = '33%'; - $table->data[0][0] = html_print_label_input_block( - __('Agents'), - html_print_select( - $agents, - 'agent_filter', - $agentFilter, - '', - __('All'), - 0, - true, - false, - true, - '', - false, - 'width:100%' - ) - ); - $table->data[0][1] = html_print_label_input_block( - __('Modules'), - html_print_select( - $modules, - 'module_filter', - $moduleFilter, - '', - __('All'), - 0, - true, - false, - true, - '', - false, - 'width:100%' - ) - ); - $table->data[0][2] = html_print_label_input_block( - __('Type'), - html_print_select( - $types, - 'type_filter', - $typeFilter, - '', - __('All'), - 0, - true, - false, - true, - '', - false, - 'width:100%' - ) - ); - $form = ''; - - ui_toggle($form, __('Filters'), '', '', false); -} else { - $table = new stdClass(); - $table->width = '96%'; - $table->class = 'databox_filters'; - $table->cellpadding = 0; - $table->cellspacing = 0; - $table->data[0][0] = __('Agents'); - $table->data[0][1] = html_print_select( +$table = new stdClass(); +$table->width = '100%'; +$table->class = 'filter-table-adv'; +$table->size[0] = '33%'; +$table->size[1] = '33%'; +$table->size[1] = '33%'; +$table->data[0][0] = html_print_label_input_block( + __('Agents'), + html_print_select( $agents, 'agent_filter', $agentFilter, '', __('All'), 0, - true - ); - $table->data[0][2] = __('Modules'); - $table->data[0][3] = html_print_select( + true, + false, + true, + '', + false, + 'width:100%' + ) +); +$table->data[0][1] = html_print_label_input_block( + __('Modules'), + html_print_select( $modules, 'module_filter', $moduleFilter, '', __('All'), 0, - true - ); - $table->data[0][4] = __('Type'); - $table->data[0][5] = html_print_select( + true, + false, + true, + '', + false, + 'width:100%' + ) +); +$table->data[0][2] = html_print_label_input_block( + __('Type'), + html_print_select( $types, 'type_filter', $typeFilter, '', __('All'), 0, - true - ); - $table->style[6] = 'text-align:right;'; - $table->data[0][6] = html_print_submit_button( - __('Filter'), - 'filter', + true, false, - 'class="sub upd"', - true - ).html_print_input_hidden('action', 'filter', true); + true, + '', + false, + 'width:100%' + ) +); +$form = ''; - $filters = ''; - ui_toggle($filters, __('Show Options')); -} +ui_toggle($form, __('Filters'), '', '', false); $where = '1=1'; if ($typeFilter != '0') { @@ -412,16 +359,9 @@ $table->style[0] = 'text-align: right;'; if ($items) { $table->width = '100%'; - if (defined('METACONSOLE')) { - $table->width = '100%'; - $table->class = 'databox data'; - $arrow_up = 'images/sort_up.png'; - $arrow_down = 'images/sort_down.png'; - } else { - $table->class = 'info_table'; - $arrow_up = 'images/sort_up_black.png'; - $arrow_down = 'images/sort_down_black.png'; - } + $table->class = 'info_table'; + $arrow_up = 'images/sort_up_black.png'; + $arrow_down = 'images/sort_down_black.png'; $table->size = []; $table->size[0] = '5px'; @@ -717,90 +657,65 @@ foreach ($items as $item) { } } -if (defined('METACONSOLE')) { - if ($items != false) { - ui_pagination($countItems, 'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=edit&id_report='.$idReport.$urlFilter); - html_print_table($table); - ui_pagination($countItems, 'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=edit&id_report='.$idReport.$urlFilter); - echo "'; - } -} else { - if ($items != false) { - ui_pagination( - $countItems, - 'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=edit&id_report='.$idReport.$urlFilter - ); - html_print_table($table); - ui_pagination( - $countItems, - 'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=edit&id_report='.$idReport.$urlFilter - ); - - echo "'; - } + echo ''; + echo ''; } $table = new stdClass(); $table->width = '100%'; +$table->class = 'filter-table-adv'; +$table->size[0] = '50%'; +$table->size[1] = '50%'; - -if (defined('METACONSOLE')) { - $table->colspan[0][0] = 3; - $table->size = []; - $table->size[0] = '25%'; - $table->size[1] = '25%'; - $table->size[2] = '25%'; - $table->size[3] = '25%'; - $table->class = 'databox data'; - $table->head[0] = __('Sort items'); - $table->head_colspan[0] = 4; - $table->headstyle[0] = 'text-align: center'; - - $table->data[1][0] = __('Sort selected items from position: '); - $table->data[1][1] = html_print_select_style( +$table->data[1][0] = html_print_label_input_block( + __('Sort selected items from position: '), + html_print_select_style( [ 'before' => __('Move before to'), 'after' => __('Move after to'), ], 'move_to', '', - '', + 'width:100%', '', '', 0, - true - ); - $table->data[1][2] = html_print_input_text_extended( + true, + ) +); +$table->data[1][2] = html_print_label_input_block( + __('Position'), + html_print_input_text_extended( 'position_to_sort', 1, 'text-position_to_sort', @@ -811,93 +726,42 @@ if (defined('METACONSOLE')) { "only_numbers('position_to_sort');", '', true - ); - $table->data[1][2] .= html_print_input_hidden('ids_items_to_sort', '', true); - $table->data[1][3] = html_print_submit_button(__('Sort'), 'sort_submit', false, 'class="sub upd"', true); + ).html_print_input_hidden('ids_items_to_sort', '', true) +); - echo "'; -} else { - $table->class = 'filter-table-adv'; - $table->size[0] = '50%'; - $table->size[1] = '50%'; - - $table->data[1][0] = html_print_label_input_block( - __('Sort selected items from position: '), - html_print_select_style( - [ - 'before' => __('Move before to'), - 'after' => __('Move after to'), - ], - 'move_to', - '', - 'width:100%', - '', - '', - 0, - true, - ) - ); - $table->data[1][2] = html_print_label_input_block( - __('Position'), - html_print_input_text_extended( - 'position_to_sort', - 1, - 'text-position_to_sort', - '', - 3, - 10, +$form = "'; - $form = "'; - - ui_toggle($form, __('Sort items'), '', '', false); -} +ui_toggle($form, __('Sort items'), '', '', false); $table = new stdClass(); $table->width = '100%'; +$table->class = 'filter-table-adv'; +$table->size[0] = '50%'; +$table->size[1] = '50%'; -if (defined('METACONSOLE')) { - $table->colspan[0][0] = 3; - $table->size = []; - $table->size[0] = '25%'; - $table->size[1] = '25%'; - $table->size[2] = '25%'; - $table->size[3] = '25%'; - $table->class = 'databox data'; - $table->head[0] = __('Delete items'); - $table->head_colspan[0] = 4; - $table->headstyle[0] = 'text-align: center'; - - $table->data[1][0] = __('Delete selected items from position: '); - $table->data[1][1] = html_print_select_style( +$table->data[0][0] = html_print_label_input_block( + __('Delete selected items from position: '), + html_print_select_style( [ 'above' => __('Delete above to'), 'below' => __('Delete below to'), @@ -909,8 +773,11 @@ if (defined('METACONSOLE')) { '', 0, true - ); - $table->data[1][2] = html_print_input_text_extended( + ) +); +$table->data[0][1] = html_print_label_input_block( + __('Poisition'), + html_print_input_text_extended( 'position_to_delete', 1, 'text-position_to_delete', @@ -921,75 +788,33 @@ if (defined('METACONSOLE')) { "only_numbers('position_to_delete');", '', true - ); - $table->data[1][2] .= html_print_input_hidden('ids_items_to_delete', '', true); - $table->data[1][3] = html_print_submit_button(__('Delete'), 'delete_submit', false, 'class="sub upd"', true); + ) +); - echo "'; -} else { - $table->class = 'filter-table-adv'; - $table->size[0] = '50%'; - $table->size[1] = '50%'; - - $table->data[0][0] = html_print_label_input_block( - __('Delete selected items from position: '), - html_print_select_style( - [ - 'above' => __('Delete above to'), - 'below' => __('Delete below to'), - ], - 'delete_m', - '', - '', - '', - '', - 0, - true - ) - ); - $table->data[0][1] = html_print_label_input_block( - __('Poisition'), - html_print_input_text_extended( - 'position_to_delete', - 1, - 'text-position_to_delete', - '', - 3, - 10, +$form = "'; +ui_toggle($form, __('Delete items'), '', '', false); - $form = "'; - ui_toggle($form, __('Delete items'), '', '', false); -} ?> diff --git a/pandora_console/operation/snmpconsole/snmp_browser.php b/pandora_console/operation/snmpconsole/snmp_browser.php index 28cb1ce4e4..12cba23676 100644 --- a/pandora_console/operation/snmpconsole/snmp_browser.php +++ b/pandora_console/operation/snmpconsole/snmp_browser.php @@ -203,7 +203,7 @@ function snmp_browser_show_add_module_massive(module_target = 'agent') { function modal_preaction() { // Select all in select box. - $("input[name='select_all_right']").click(); + $('#id_item2>option').prop('selected', true); // Load adding modules modal. waiting_modal(); diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec index cf27fcec8f..d6ea966f13 100644 --- a/pandora_console/pandora_console.redhat.spec +++ b/pandora_console/pandora_console.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_console %define version 7.0NG.769 -%define release 230321 +%define release 230322 # User and Group under which Apache is running %define httpd_name httpd diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec index bf54fb28ca..55e063bfd1 100644 --- a/pandora_console/pandora_console.rhel7.spec +++ b/pandora_console/pandora_console.rhel7.spec @@ -3,7 +3,7 @@ # %define name pandorafms_console %define version 7.0NG.769 -%define release 230321 +%define release 230322 # User and Group under which Apache is running %define httpd_name httpd diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec index 33d662cc72..a0537b7330 100644 --- a/pandora_console/pandora_console.spec +++ b/pandora_console/pandora_console.spec @@ -3,7 +3,7 @@ # %define name pandorafms_console %define version 7.0NG.769 -%define release 230321 +%define release 230322 %define httpd_name httpd # User and Group under which Apache is running %define httpd_name apache2 diff --git a/pandora_console/update_manager_client/views/register.php b/pandora_console/update_manager_client/views/register.php index b893479c23..4fffc0f88f 100644 --- a/pandora_console/update_manager_client/views/register.php +++ b/pandora_console/update_manager_client/views/register.php @@ -85,7 +85,7 @@ $product_name = get_product_name(); ?> __('Cancel'), 'cancel_registration', false, - 'class="lato ui-widget + 'id="submit-cancel_registration" class="lato ui-widget ui-state-default ui-corner-all ui-button-text-only sub upd submit-cancel"', true ); @@ -97,7 +97,7 @@ $product_name = get_product_name(); ?> __('OK!'), 'register', false, - 'class="lato ui-widget + 'id="submit-register" class="lato ui-widget ui-state-default ui-corner-all ui-button-text-only sub ok submit-next w100px"', true ); diff --git a/pandora_console/views/calendar/edit.php b/pandora_console/views/calendar/edit.php index 06d8b93d01..b7ec8a46ed 100644 --- a/pandora_console/views/calendar/edit.php +++ b/pandora_console/views/calendar/edit.php @@ -34,7 +34,7 @@ if (\is_metaconsole() === true) { \alerts_meta_print_header($tabs); } else { // Header. - \ui_print_standard_header( + ui_print_standard_header( __('Alerts'), 'images/gm_alerts.png', false, @@ -44,7 +44,11 @@ if (\is_metaconsole() === true) { [ [ 'link' => '', - 'label' => __('Calendars Edit'), + 'label' => __('Alerts'), + ], + [ + 'link' => '', + 'label' => __('Special days'), ], ] ); diff --git a/pandora_console/views/calendar/list.php b/pandora_console/views/calendar/list.php index 3e8e924a7d..d37a49955f 100644 --- a/pandora_console/views/calendar/list.php +++ b/pandora_console/views/calendar/list.php @@ -33,19 +33,23 @@ if (\is_metaconsole() === true) { \alerts_meta_print_header($tabs); } else { // Header. - \ui_print_page_header( - // Title. - __('Calendars'), - // Icon. + ui_print_standard_header( + __('Alerts'), 'images/gm_alerts.png', - // Return. false, - // Help. 'alert_special_days', - // Godmode. true, - // Options. - $tabs + $tabs, + [ + [ + 'link' => '', + 'label' => __('Alerts'), + ], + [ + 'link' => '', + 'label' => __('Special days'), + ], + ] ); } diff --git a/pandora_console/views/calendar/special_days.php b/pandora_console/views/calendar/special_days.php index fdf98d28b1..22ea5e3f4f 100644 --- a/pandora_console/views/calendar/special_days.php +++ b/pandora_console/views/calendar/special_days.php @@ -43,6 +43,10 @@ if (\is_metaconsole() === true) { true, $tabs, [ + [ + 'link' => '', + 'label' => __('Alerts'), + ], [ 'link' => '', 'label' => __('Special days'), diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control index 5af785d2cc..fe0681dca8 100644 --- a/pandora_server/DEBIAN/control +++ b/pandora_server/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-server -Version: 7.0NG.769-230321 +Version: 7.0NG.769-230322 Architecture: all Priority: optional Section: admin diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh index 1be45edb33..a92f613817 100644 --- a/pandora_server/DEBIAN/make_deb_package.sh +++ b/pandora_server/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.769-230321" +pandora_version="7.0NG.769-230322" package_cpan=0 package_pandora=1 diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm index a826b7e573..589c521931 100644 --- a/pandora_server/lib/PandoraFMS/Config.pm +++ b/pandora_server/lib/PandoraFMS/Config.pm @@ -46,7 +46,7 @@ our @EXPORT = qw( # version: Defines actual version of Pandora Server for this module only my $pandora_version = "7.0NG.769"; -my $pandora_build = "230321"; +my $pandora_build = "230322"; our $VERSION = $pandora_version." ".$pandora_build; # Setup hash diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm index f4bf669354..d880a0802a 100644 --- a/pandora_server/lib/PandoraFMS/PluginTools.pm +++ b/pandora_server/lib/PandoraFMS/PluginTools.pm @@ -34,7 +34,7 @@ our @ISA = qw(Exporter); # version: Defines actual version of Pandora Server for this module only my $pandora_version = "7.0NG.769"; -my $pandora_build = "230321"; +my $pandora_build = "230322"; our $VERSION = $pandora_version." ".$pandora_build; our %EXPORT_TAGS = ( 'all' => [ qw() ] ); diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec index e1b6b550cb..27492125a8 100644 --- a/pandora_server/pandora_server.redhat.spec +++ b/pandora_server/pandora_server.redhat.spec @@ -4,7 +4,7 @@ %global __os_install_post %{nil} %define name pandorafms_server %define version 7.0NG.769 -%define release 230321 +%define release 230322 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec index 4b2d286a32..308a016430 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.769 -%define release 230321 +%define release 230322 Summary: Pandora FMS Server Name: %{name} diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer index 324278d365..9213cdd253 100755 --- a/pandora_server/pandora_server_installer +++ b/pandora_server/pandora_server_installer @@ -9,7 +9,7 @@ # ********************************************************************** PI_VERSION="7.0NG.769" -PI_BUILD="230321" +PI_BUILD="230322" MODE=$1 if [ $# -gt 1 ]; then diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl index c31d92ef1c..b6e04d983b 100755 --- a/pandora_server/util/pandora_db.pl +++ b/pandora_server/util/pandora_db.pl @@ -35,7 +35,7 @@ use PandoraFMS::Config; use PandoraFMS::DB; # version: define current version -my $version = "7.0NG.769 Build 230321"; +my $version = "7.0NG.769 Build 230322"; # Pandora server configuration my %conf; diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl index ad406fbaa9..78c1965717 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.769 Build 230321"; +my $version = "7.0NG.769 Build 230322"; # save program name for logging my $progname = basename($0); | ||||