diff --git a/pandora_console/extensions/agents_alerts.php b/pandora_console/extensions/agents_alerts.php index 373ff97819..72b90eeafa 100755 --- a/pandora_console/extensions/agents_alerts.php +++ b/pandora_console/extensions/agents_alerts.php @@ -422,7 +422,7 @@ function mainAgentsAlerts() continue; } - echo ''.io_safe_output($tname).html_print_image('images/information_alerts.png', true, ['title' => io_safe_output($tname), 'style' => 'margin-left:5px' ]).''; + echo ''.io_safe_output($tname).''; } echo ''; @@ -506,7 +506,7 @@ function mainAgentsAlerts() function print_alerts_summary_modal_window($id, $alerts) { $table->width = '98%'; - $table->class = 'databox'; + $table->class = 'info_table'; $table->data = []; $table->head[0] = __('Module'); diff --git a/pandora_console/godmode/agentes/agent_template.php b/pandora_console/godmode/agentes/agent_template.php index 64e78320f5..ef771ebe77 100644 --- a/pandora_console/godmode/agentes/agent_template.php +++ b/pandora_console/godmode/agentes/agent_template.php @@ -224,7 +224,7 @@ if ($result === false) { $table->width = '100%'; $table->cellpadding = 0; $table->cellspacing = 0; -$table->class = 'databox data'; +$table->class = 'info_table'; $table->head = []; $table->data = []; $table->align = []; @@ -252,9 +252,9 @@ foreach ($result as $row) { $data[2] = mb_substr($row['descripcion'], 0, 60); - $data[3] = ''.html_print_image('images/cross.png', true, ['border' => '0', 'alt' => __('Delete'), 'onclick' => "if (!confirm('".__('Are you sure?')."')) return false;"]).'  '; - - $data[3] .= '  '.html_print_image('images/config.png', true, ['border' => '0', 'alt' => __('Update')]).''; + $table->cellclass[][3] = 'action_buttons'; + $data[3] = ''.html_print_image('images/cross.png', true, ['border' => '0', 'alt' => __('Delete'), 'onclick' => "if (!confirm('".__('Are you sure?')."')) return false;"]).''; + $data[3] .= ''.html_print_image('images/config.png', true, ['border' => '0', 'alt' => __('Update')]).''; array_push($table->data, $data); } diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php index b8d551091e..902d074f21 100644 --- a/pandora_console/godmode/agentes/modificar_agente.php +++ b/pandora_console/godmode/agentes/modificar_agente.php @@ -224,13 +224,13 @@ switch ($config['dbtype']) { break; } -$selected = 'border: 1px solid black;'; -$selectNameUp = ''; -$selectNameDown = ''; -$selectOsUp = ''; -$selectOsDown = ''; -$selectGroupUp = ''; -$selectGroupDown = ''; +$selected = true; +$selectNameUp = false; +$selectNameDown = false; +$selectOsUp = false; +$selectOsDown = false; +$selectGroupUp = false; +$selectGroupDown = false; switch ($sortField) { case 'remote': switch ($sort) { @@ -441,17 +441,24 @@ if (($config['dbtype'] == 'oracle') && ($agents !== false)) { ui_pagination($total_agents, "index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id=$ag_group&recursion=$recursion&search=$search&sort_field=$sortField&sort=$sort&disabled=$disabled&os=$os", $offset); if ($agents !== false) { + // Urls to sort the table. + $url_up_agente = 'index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=name&sort=up&disabled=$disabled'; + $url_down_agente = 'index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=name&sort=down&disabled=$disabled'; + $url_up_remote = 'index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=remote&sort=up&disabled=$disabled'; + $url_down_remote = 'index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=remote&sort=down&disabled=$disabled'; + $url_up_os = 'index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=os&sort=up&disabled=$disabled'; + $url_down_os = 'index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=os&sort=down&disabled=$disabled'; + $url_up_group = 'index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=group&sort=up&disabled=$disabled'; + $url_down_group = 'index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search.'&os='.$os.'&offset='.$offset.'&sort_field=group&sort=down&disabled=$disabled'; + + echo ""; echo ''; - echo ''; - echo "'; - echo ''; + echo ''; + echo "'; + echo ''; echo ''; - echo ''; + echo ''; echo ''; echo "'; echo ''; diff --git a/pandora_console/godmode/agentes/module_manager.php b/pandora_console/godmode/agentes/module_manager.php index 9df6860591..6ad5267c0e 100644 --- a/pandora_console/godmode/agentes/module_manager.php +++ b/pandora_console/godmode/agentes/module_manager.php @@ -358,17 +358,17 @@ if ($multiple_delete) { // TABLE LIST MODULES // ================== $url = 'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=module&id_agente='.$id_agente; -$selectNameUp = ''; -$selectNameDown = ''; -$selectServerUp = ''; -$selectServerDown = ''; -$selectTypeUp = ''; -$selectTypeDown = ''; -$selectIntervalUp = ''; -$selectIntervalDown = ''; +$selectNameUp = false; +$selectNameDown = false; +$selectServerUp = false; +$selectServerDown = false; +$selectTypeUp = false; +$selectTypeDown = false; +$selectIntervalUp = false; +$selectIntervalDown = false; $sortField = get_parameter('sort_field'); $sort = get_parameter('sort', 'none'); -$selected = ''; +$selected = true; $order[] = [ 'field' => 'tmodule_group.name', @@ -482,13 +482,13 @@ switch ($sortField) { default: $selectNameUp = $selected; - $selectNameDown = ''; - $selectServerUp = ''; - $selectServerDown = ''; - $selectTypeUp = ''; - $selectTypeDown = ''; - $selectIntervalUp = ''; - $selectIntervalDown = ''; + $selectNameDown = false; + $selectServerUp = false; + $selectServerDown = false; + $selectTypeUp = false; + $selectTypeDown = false; + $selectIntervalUp = false; + $selectIntervalDown = false; switch ($config['dbtype']) { case 'mysql': case 'postgresql': @@ -626,32 +626,39 @@ if ($paginate_module) { ui_pagination($total_modules, $url); } +$url_name = $url.'&sort_field=name&sort='; +$url_server = $url.'&sort_field=server&sort='; +$url_type = $url.'&sort_field=type&sort='; +$url_interval = $url.'&sort_field=interval&sort='; + $table = new stdClass(); $table->width = '100%'; -$table->class = 'databox data'; +$table->class = 'info_table'; $table->head = []; -$table->head[0] = __('Name').' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectNameUp]).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectNameDown]).''; +$table->head['checkbox'] = html_print_checkbox('all_delete', 0, false, true, false); +$table->head[0] = __('Name').ui_get_sorting_arrows($url_name.'up', $url_name.'down', $selectNameUp, $selectNameDown); // The access to the policy is granted only with AW permission if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK && check_acl($config['id_user'], $agent['id_grupo'], 'AW')) { $table->head[1] = "".__('P.').''; } -$table->head[2] = "".__('S.').''.' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectServerUp]).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectServerDown]).''; -$table->head[3] = __('Type').' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectTypeUp]).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectTypeDown]).''; -$table->head[4] = __('Interval').' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectIntervalUp]).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectIntervalDown]).''; +$table->head[2] = "".__('S.').''.ui_get_sorting_arrows($url_server.'up', $url_server.'down', $selectServerUp, $selectServerDown); +$table->head[3] = __('Type').ui_get_sorting_arrows($url_type.'up', $url_type.'down', $selectTypeUp, $selectTypeDown); +$table->head[4] = __('Interval').ui_get_sorting_arrows($url_interval.'up', $url_interval.'down', $selectIntervalUp, $selectIntervalDown); $table->head[5] = __('Description'); $table->head[6] = __('Status'); $table->head[7] = __('Warn'); $table->head[8] = __('Action'); -$table->head[9] = ''.__('Del.').''.html_print_checkbox('all_delete', 0, false, true, false); +$table->head[9] = ''.__('Del.').''; $table->rowstyle = []; $table->style = []; $table->style[0] = 'font-weight: bold'; $table->size = []; +$table->size['checkbox'] = '20px'; $table->size[2] = '70px'; $table->align = []; $table->align[2] = 'left'; @@ -706,15 +713,19 @@ foreach ($modules as $module) { $table->rowstyle[($i - 1)] = 'text-align: center'; $table->rowclass[($i - 1)] = 'datos3'; if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) { - $table->colspan[($i - 1)][0] = 10; + $table->colspan[($i - 1)][0] = 11; } else { - $table->colspan[($i - 1)][0] = 9; + $table->colspan[($i - 1)][0] = 10; } $data = []; } } + if (check_acl_one_of_groups($config['id_user'], $all_groups, 'AW')) { + $data['checkbox'] = html_print_checkbox('id_delete[]', $module['id_agente_modulo'], false, true); + } + $data[0] = ''; if (isset($module['deep']) && ($module['deep'] != 0)) { @@ -858,7 +869,7 @@ foreach ($modules as $module) { } if (check_acl_one_of_groups($config['id_user'], $all_groups, 'AW') && $module['id_tipo_modulo'] != 25) { - $data[8] .= ' '; $data[8] .= html_print_image( 'images/copy.png', @@ -870,7 +881,7 @@ foreach ($modules as $module) { // Make a data normalization if (isset($numericModules[$type])) { if ($numericModules[$type] === true) { - $data[8] .= ' '; + $data[8] .= ''; $data[8] .= html_print_image( 'images/chart_curve.png', true, @@ -879,18 +890,19 @@ foreach ($modules as $module) { $data[8] .= ''; } } else { - $data[8] .= ' '.html_print_image( + $data[8] .= html_print_image( 'images/chart_curve.disabled.png', true, ['title' => __('Normalize (Disabled)')] ); + $data[8] .= '  '; } // create network component action if ((is_user_admin($config['id_user'])) && ($module['id_modulo'] == MODULE_NETWORK) ) { - $data[8] .= ' '; $data[8] .= html_print_image( 'images/network.png', @@ -899,11 +911,12 @@ foreach ($modules as $module) { ); $data[8] .= ' '; } else { - $data[8] .= ' '.html_print_image( + $data[8] .= html_print_image( 'images/network.disabled.png', true, ['title' => __('Create network component (Disabled)')] ); + $data[8] .= '  '; } } @@ -917,10 +930,17 @@ foreach ($modules as $module) { ['title' => __('Delete')] ); $data[9] .= ' '; - $data[9] .= html_print_checkbox('id_delete[]', $module['id_agente_modulo'], false, true); } + $table->cellclass[] = [ + 8 => 'action_buttons', + 9 => 'action_buttons', + ]; array_push($table->data, $data); + $table->cellclass[] = [ + 8 => 'action_buttons', + 9 => 'action_buttons', + ]; } if (check_acl_one_of_groups($config['id_user'], $all_groups, 'AW')) { diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php index dd4d0e0763..e7a013d971 100644 --- a/pandora_console/godmode/alerts/alert_list.list.php +++ b/pandora_console/godmode/alerts/alert_list.list.php @@ -226,17 +226,18 @@ $order = null; $sortField = get_parameter('sort_field'); $sort = get_parameter('sort', 'none'); -$selected = 'border: 1px solid black;'; +$selected = true; +// 'border: 1px solid black;'; $selectDisabledUp = ''; $selectDisabledDown = ''; $selectStandbyUp = ''; $selectStandbyDown = ''; -$selectAgentUp = ''; -$selectAgentDown = ''; -$selectModuleUp = ''; -$selectModuleDown = ''; -$selectTemplateUp = ''; -$selectTemplateDown = ''; +$selectAgentUp = false; +$selectAgentDown = false; +$selectModuleUp = false; +$selectModuleDown = false; +$selectTemplateUp = false; +$selectTemplateDown = false; switch ($sortField) { case 'disabled': @@ -346,11 +347,11 @@ switch ($sortField) { $selectStandbyUp = ''; $selectStandbyDown = ''; $selectAgentUp = $selected; - $selectAgentDown = ''; - $selectModuleUp = ''; - $selectModuleDown = ''; - $selectTemplateUp = ''; - $selectTemplateDown = ''; + $selectAgentDown = false; + $selectModuleUp = false; + $selectModuleDown = false; + $selectTemplateUp = false; + $selectTemplateDown = false; $order = [ 'field' => 'agent_name', 'order' => 'ASC', @@ -360,12 +361,12 @@ switch ($sortField) { $selectDisabledDown = ''; $selectStandbyUp = ''; $selectStandbyDown = ''; - $selectAgentUp = ''; - $selectAgentDown = ''; + $selectAgentUp = false; + $selectAgentDown = false; $selectModuleUp = $selected; - $selectModuleDown = ''; - $selectTemplateUp = ''; - $selectTemplateDown = ''; + $selectModuleDown = false; + $selectTemplateUp = false; + $selectTemplateDown = false; $order = [ 'field' => 'agent_module_name', 'order' => 'ASC', @@ -402,6 +403,15 @@ if (!$id_agente) { $url = 'index.php?sec='.$sec.'&sec2=godmode/agentes/configurar_agente&pure='.$pure.'&tab=alert&id_agente='.$id_agente.'&offset='.$offset.$form_params; } +// Urls to sort the table. +$url_up_agente = $url.'&sort_field=agent&sort=up&pure='.$pure; +$url_down_agente = $url.'&sort_field=agent&sort=down&pure='.$pure; +$url_up_module = $url.'&sort_field=module&sort=up&pure='.$pure; +$url_down_module = $url.'&sort_field=module&sort=down&pure='.$pure; +$url_up_template = $url.'&sort_field=template&sort=up&pure='.$pure; +$url_down_template = $url.'&sort_field=template&sort=down&pure='.$pure; + + $table = new stdClass(); if (is_metaconsole()) { @@ -427,7 +437,7 @@ $table->head = []; if (! $id_agente) { $table->style = []; $table->style[0] = 'font-weight: bold;'; - $table->head[0] = __('Agent').' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectAgentUp]).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectAgentDown]).''; + $table->head[0] = __('Agent').ui_get_sorting_arrows($url_up_agente, $url_down_agente, $selectAgentUp, $selectAgentDown); $table->size[0] = '4%'; $table->size[1] = '8%'; $table->size[2] = '8%'; @@ -439,7 +449,7 @@ if (! $id_agente) { $table->size[4] = '8%'; }*/ } else { - $table->head[0] = __('Module').' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectModuleUp]).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectModuleDown]).''; + $table->head[0] = __('Module').ui_get_sorting_arrows($url_up_module, $url_down_module, $selectModuleUp, $selectModuleDown); // Different sizes or the layout screws up $table->size[0] = '0%'; $table->size[1] = '10%'; @@ -452,7 +462,7 @@ if (! $id_agente) { $table->size[4] = '1%'; } -$table->head[1] = __('Template').' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectTemplateUp]).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectTemplateDown]).''; +$table->head[1] = __('Template').ui_get_sorting_arrows($url_up_template, $url_down_template, $selectTemplateUp, $selectTemplateDown); $table->head[2] = __('Actions'); $table->head[3] = __('Status'); $table->head[4] = "".__('Op.').''; @@ -728,7 +738,10 @@ foreach ($simple_alerts as $alert) { $data[3] = ui_print_status_image($status, $title, true); - $table->cellclass[][4] = 'action_buttons'; + $table->cellclass[] = [ + 3 => 'action_buttons', + 4 => 'action_buttons', + ]; $data[4] = ''; if ($alert['disabled']) { $data[4] .= html_print_input_image('enable', 'images/lightbulb_off.png', 1, 'padding:0px', true); diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php index c879cbdf09..63caad6d3f 100644 --- a/pandora_console/godmode/users/user_list.php +++ b/pandora_console/godmode/users/user_list.php @@ -38,13 +38,13 @@ $sort = get_parameter('sort', 'none'); $tab = get_parameter('tab', 'user'); $pure = get_parameter('pure', 0); -$selected = 'border: 1px solid black;'; -$selectUserIDUp = ''; -$selectUserIDDown = ''; -$selectFullnameUp = ''; -$selectFullnameDown = ''; -$selectLastConnectUp = ''; -$selectLastConnectDown = ''; +$selected = true; +$selectUserIDUp = false; +$selectUserIDDown = false; +$selectFullnameUp = false; +$selectFullnameDown = false; +$selectLastConnectUp = false; +$selectLastConnectDown = false; $order = null; switch ($sortField) { @@ -110,11 +110,11 @@ switch ($sortField) { default: $selectUserIDUp = $selected; - $selectUserIDDown = ''; - $selectFullnameUp = ''; - $selectFullnameDown = ''; - $selectLastConnectUp = ''; - $selectLastConnectDown = ''; + $selectUserIDDown = false; + $selectFullnameUp = false; + $selectFullnameDown = false; + $selectLastConnectUp = false; + $selectLastConnectDown = false; $order = [ 'field' => 'id_user', 'order' => 'ASC', @@ -300,6 +300,15 @@ if (defined('METACONSOLE')) { ui_toggle($form_filter, __('Users control filter'), __('Toggle filter(s)'), !$search); } +// Urls to sort the table. +$url_up_id = '?sec='.$sec.'&sec2=godmode/users/user_list&sort_field=id_user&sort=up&pure='.$pure; +$url_down_id = '?sec='.$sec.'&sec2=godmode/users/user_list&sort_field=id_user&sort=down&pure='.$pure; +$url_up_name = '?sec='.$sec.'&sec2=godmode/users/user_list&sort_field=fullname&sort=up&pure='.$pure; +$url_down_name = '?sec='.$sec.'&sec2=godmode/users/user_list&sort_field=fullname&sort=down&pure='.$pure; +$url_up_last = '?sec='.$sec.'&sec2=godmode/users/user_list&sort_field=last_connect&sort=up&pure='.$pure; +$url_down_last = '?sec='.$sec.'&sec2=godmode/users/user_list&sort_field=last_connect&sort=down&pure='.$pure; + + $table = new stdClass(); $table->cellpadding = 0; $table->cellspacing = 0; @@ -312,9 +321,10 @@ $table->align = []; $table->size = []; $table->valign = []; -$table->head[0] = __('User ID').' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectUserIDUp]).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectUserIDDown]).''; -$table->head[1] = __('Name').' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectFullnameUp ]).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectFullnameDown]).''; -$table->head[2] = __('Last contact').' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectLastConnectUp ]).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectLastConnectDown]).''; +$table->head[0] = __('User ID').ui_get_sorting_arrows($url_up_id, $url_down_id, $selectUserIDUp, $selectUserIDDown); +$table->head[1] = __('Name').ui_get_sorting_arrows($url_up_name, $url_down_name, $selectFullnameUp, $selectFullnameDown); +$table->head[2] = __('Last contact').ui_get_sorting_arrows($url_up_last, $url_down_last, $selectLastConnectUp, $selectLastConnectDown); + $table->head[3] = __('Admin'); $table->head[4] = __('Profile / Group'); $table->head[5] = __('Description'); diff --git a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php index 610353ebb7..c90a799ec6 100644 --- a/pandora_console/godmode/wizards/DiscoveryTaskList.class.php +++ b/pandora_console/godmode/wizards/DiscoveryTaskList.class.php @@ -352,10 +352,10 @@ class DiscoveryTaskList extends Wizard $url_ajax = $config['homeurl'].'ajax.php'; $table = new StdClass(); - $table->cellpadding = 4; - $table->cellspacing = 4; + $table->cellpadding = 0; + $table->cellspacing = 0; $table->width = '100%'; - $table->class = 'databox data'; + $table->class = 'info_table'; $table->head = []; $table->data = []; $table->align = []; @@ -566,6 +566,8 @@ class DiscoveryTaskList extends Wizard $data[9] = ''; } + $table->cellclass[][9] = 'action_buttons'; + // Div neccesary for modal progress task. echo ''; diff --git a/pandora_console/images/sort_down_black.png b/pandora_console/images/sort_down_black.png new file mode 100644 index 0000000000..13ade460fc Binary files /dev/null and b/pandora_console/images/sort_down_black.png differ diff --git a/pandora_console/images/sort_down_green.png b/pandora_console/images/sort_down_green.png new file mode 100644 index 0000000000..dc6086912d Binary files /dev/null and b/pandora_console/images/sort_down_green.png differ diff --git a/pandora_console/images/sort_up_black.png b/pandora_console/images/sort_up_black.png new file mode 100644 index 0000000000..238d89520f Binary files /dev/null and b/pandora_console/images/sort_up_black.png differ diff --git a/pandora_console/images/sort_up_green.png b/pandora_console/images/sort_up_green.png new file mode 100644 index 0000000000..5c57937f40 Binary files /dev/null and b/pandora_console/images/sort_up_green.png differ diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php index fb62ff8339..7ce37005ea 100755 --- a/pandora_console/include/ajax/module.php +++ b/pandora_console/include/ajax/module.php @@ -527,19 +527,19 @@ if (check_login()) { $show_notinit = (int) get_parameter('show_notinit', 0); $cluster_list = (int) get_parameter('cluster_list', 0); $url = 'index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$id_agent; - $selectTypeUp = ''; - $selectTypeDown = ''; - $selectNameUp = ''; - $selectNameDown = ''; - $selectStatusUp = ''; - $selectStatusDown = ''; - $selectDataUp = ''; - $selectDataDown = ''; - $selectLastContactUp = ''; - $selectLastContactDown = ''; + $selectTypeUp = false; + $selectTypeDown = false; + $selectNameUp = false; + $selectNameDown = false; + $selectStatusUp = false; + $selectStatusDown = false; + $selectDataUp = false; + $selectDataDown = false; + $selectLastContactUp = false; + $selectLastContactDown = false; $sortField = get_parameter('sort_field'); $sort = get_parameter('sort', 'none'); - $selected = 'border: 1px solid black;'; + $selected = true; $order[] = [ 'field' => 'tmodule_group.name', @@ -627,16 +627,16 @@ if (check_login()) { break; default: - $selectTypeUp = ''; - $selectTypeDown = ''; + $selectTypeUp = false; + $selectTypeDown = false; $selectNameUp = $selected; - $selectNameDown = ''; - $selectStatusUp = ''; - $selectStatusDown = ''; - $selectDataUp = ''; - $selectDataDown = ''; - $selectLastContactUp = ''; - $selectLastContactDown = ''; + $selectNameDown = false; + $selectStatusUp = false; + $selectStatusDown = false; + $selectDataUp = false; + $selectDataDown = false; + $selectLastContactUp = false; + $selectLastContactDown = false; $order[] = [ 'field' => 'tagente_modulo.nombre', @@ -756,6 +756,17 @@ if (check_login()) { $modules = []; } + // Urls to sort the table. + $url_up_type = $url.'&sort_field=type&sort=up&refr=&filter_monitors=1&status_filter_monitor='.$status_filter_monitor.' &status_text_monitor='.$status_text_monitor.'&status_module_group= '.$status_module_group; + $url_down_type = $url.'&sort_field=type&sort=down&refr=&filter_monitors=1&status_filter_monitor='.$status_filter_monitor.' &status_text_monitor='.$status_text_monitor.'&status_module_group= '.$status_module_group; + $url_up_name = $url.'&sort_field=name&sort=up&refr=&filter_monitors=1&status_filter_monitor='.$status_filter_monitor.' &status_text_monitor='.$status_text_monitor.'&status_module_group= '.$status_module_group; + $url_down_name = $url.'&sort_field=name&sort=down&refr=&filter_monitors=1&status_filter_monitor='.$status_filter_monitor.' &status_text_monitor='.$status_text_monitor.'&status_module_group= '.$status_module_group; + $url_up_status = $url.'&sort_field=status&sort=up&refr=&filter_monitors=1&status_filter_monitor='.$status_filter_monitor.' &status_text_monitor='.$status_text_monitor.'&status_module_group= '.$status_module_group; + $url_down_status = $url.'&sort_field=status&sort=down&refr=&filter_monitors=1&status_filter_monitor='.$status_filter_monitor.' &status_text_monitor='.$status_text_monitor.'&status_module_group= '.$status_module_group; + $url_up_last = $url.'&sort_field=last_contact&sort=up&refr=&filter_monitors=1&status_filter_monitor='.$status_filter_monitor.' &status_text_monitor='.$status_text_monitor.'&status_module_group= '.$status_module_group; + $url_down_last = $url.'&sort_field=last_contact&sort=down&refr=&filter_monitors=1&status_filter_monitor='.$status_filter_monitor.' &status_text_monitor='.$status_text_monitor.'&status_module_group= '.$status_module_group; + + $table = new stdClass(); $table->width = '100%'; $table->cellpadding = 0; @@ -773,17 +784,15 @@ if (check_login()) { $table->head[1] = "".__('P.').''; } - $table->head[2] = __('Type').' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectTypeUp, 'alt' => 'up']).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectTypeDown, 'alt' => 'down']).''; - $table->head[3] = __('Module name').' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectNameUp, 'alt' => 'up']).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectNameDown, 'alt' => 'down']).''; + $table->head[2] = __('Type').ui_get_sorting_arrows($url_up_type, $url_down_type, $selectTypeUp, $selectTypeDown); + $table->head[3] = __('Module name').ui_get_sorting_arrows($url_up_name, $url_down_name, $selectNameUp, $selectNameDown); $table->head[4] = __('Description'); - $table->head[5] = __('Status').' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectStatusUp, 'alt' => 'up']).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectStatusDown, 'alt' => 'down']).''; + $table->head[5] = __('Status').ui_get_sorting_arrows($url_up_status, $url_down_status, $selectStatusUp, $selectStatusDown); $table->head[6] = __('Thresholds'); $table->head[7] = __('Data'); $table->head[8] = __('Graph'); $table->headstyle[8] = 'min-width: 60px'; - $table->head[9] = __('Last contact').' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectLastContactUp, 'alt' => 'up']).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectLastContactDown, 'alt' => 'down']).''; - - + $table->head[9] = __('Last contact').ui_get_sorting_arrows($url_up_last, $url_down_last, $selectLastContactUp, $selectLastContactDown); $table->align = [ 'left', 'left', @@ -896,7 +905,7 @@ if (check_login()) { $data[2] = servers_show_type($module['id_modulo']).' '; if (check_acl($config['id_user'], $id_grupo, 'AW')) { - $data[2] .= ''.html_print_image('images/config.png', true, ['alt' => '0', 'border' => '', 'title' => __('Edit')]).''; + $data[2] .= ''.html_print_image('images/config.png', true, ['alt' => '0', 'border' => '', 'title' => __('Edit'), 'class' => 'action_button_img']).''; } diff --git a/pandora_console/include/class/ManageNetScanScripts.class.php b/pandora_console/include/class/ManageNetScanScripts.class.php index f3ca4c92b5..efc94cc8b6 100644 --- a/pandora_console/include/class/ManageNetScanScripts.class.php +++ b/pandora_console/include/class/ManageNetScanScripts.class.php @@ -389,10 +389,12 @@ class ManageNetScanScripts extends Wizard $rows = db_get_all_rows_in_table('trecon_script'); if ($rows !== false) { - echo '
'.__('Agent name').' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectNameUp]).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectNameDown]).''; - echo '".__('R').' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectRemoteUp]).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectRemoteDown]).''; - echo ''.__('OS').' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectOsUp]).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectOsDown]).''; - echo ''.__('Agent name').ui_get_sorting_arrows($url_up_agente, $url_down_agente, $selectNameUp, $selectNameDown).'".__('R').ui_get_sorting_arrows($url_up_remote, $url_down_remote, $selectRemoteUp, $selectRemoteDown).''.__('OS').ui_get_sorting_arrows($url_up_os, $url_down_os, $selectOsUp, $selectOsDown).''.__('Type').''.__('Group').' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectGroupUp]).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectGroupDown]).''; - echo ''.__('Group').ui_get_sorting_arrows($url_up_group, $url_down_group, $selectGroupUp, $selectGroupDown).''.__('Description').'".__('Actions').'
'; + echo '
'; + echo ''; echo ''; echo ''; echo ''; + echo ''; $color = 0; foreach ($rows as $row) { if ($color == 1) { diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index b621161ecc..413bebef35 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -4429,3 +4429,34 @@ function ui_get_favicon() return 'images/custom_favicon/'.$config['custom_favicon']; } + + +/** + * Show sorting arrows for tables + * + * @return string HTML anchor link with the arrow icon. + */ +function ui_get_sorting_arrows($url_up, $url_down, $selectUp, $selectDown) +{ + $arrow_up = 'images/sort_up_black.png'; + $arrow_down = 'images/sort_down_black.png'; + + // en el hover usar flechas verdes en el nodo + if ($selectUp === true) { + $arrow_up = 'images/sort_up_green.png'; + } + + if ($selectDown === true) { + $arrow_down = 'images/sort_down_green.png'; + } + + if (is_metaconsole()) { + $arrow_up = 'images/sort_up.png'; + $arrow_down = 'images/sort_down.png'; + } + + return ' + '.html_print_image($arrow_up, true, ['alt' => 'up']).' + '.html_print_image($arrow_down, true, ['alt' => 'down']).' + '; +} diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index bb64542112..940b22f237 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -1014,17 +1014,30 @@ div#cont { } td.datos3, -td.datos3 * { - background-color: #666; - color: white !important; +/*td.datos3 **/ +td.datos4 { + background-color: #fff; + color: #000 !important; + border-bottom: 2px solid #82b92e !important; + border-left: none !important; + border-right: none !important; + height: 30px; + font-size: 8.6pt; + font-weight: normal; } -td.datos4, -td.datos4 * { +td.datos4 /*, +td.datos4 */ { /*Add !important because in php the function html_print_table write style in cell and this is style head.*/ text-align: center !important; - background-color: #666; - color: white !important; + /* background-color: #666; + color: white !important;*/ +} + +td.datos3 *, +td.datos4 * { + font-size: 8.6pt; + font-weight: normal; } /*td.datos_id { @@ -5031,6 +5044,9 @@ table.info_table tr:first-child > th { border-top: 1px solid #e2e2e2; color: #000; text-align: left; + vertical-align: middle; + + /*background-color: pink;*/ } table.info_table tr:first-child > th span { @@ -5076,10 +5092,11 @@ table.info_table > thead > tr > th a { /*padding: 9px 7px;*/ padding-left: 9px; padding-right: 9px; - padding-top: 7px; - padding-bottom: 7px; - font-weight: bold; + padding-top: 9px; + padding-bottom: 9px; + font-weight: normal; color: #000; + font-size: 8.6pt; } table.info_table > tbody > tr > td { @@ -5137,8 +5154,14 @@ table.info_table td:last-child img { /* no confundir con action-buttons */ /* esta se pa los botones de las tablas de delete etc*/ +/*para cuando solo hay un boton y puede haber iconos que no son botones al lado*/ +.action_button_img { + cursor: pointer; +} + .action_buttons a[href] img, -.action_buttons input[type="image"] { +.action_buttons input[type="image"], +.action_button_img { border-radius: 4px; border: 1px solid #dcdcdc !important; padding: 1px; @@ -5187,6 +5210,11 @@ table.info_table td:last-child img { display: block; } +.pagination .page_number:hover, +.pagination .pagination-arrows:hover { + background-color: #e2e2e2; +} + .pagination .total_number > *:first-child { border-top-left-radius: 2px; border-bottom-left-radius: 2px; @@ -5231,3 +5259,12 @@ table.info_table td:last-child img { margin-top: 0px; align-items: flex-start; } + +/* FELCHAS ORDENACION */ +.sort_arrow { + display: inline-grid; + vertical-align: middle; +} +.sort_arrow a { + padding: 0 0 0 5px !important; +} diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php index d63d9b8e7d..8aaa9b11eb 100755 --- a/pandora_console/operation/agentes/alerts_status.php +++ b/pandora_console/operation/agentes/alerts_status.php @@ -220,13 +220,13 @@ if ($free_search != '') { $sortField = get_parameter('sort_field'); $sort = get_parameter('sort', 'none'); -$selected = 'border: 1px solid black;'; -$selectAgentUp = ''; -$selectAgentDown = ''; -$selectModuleUp = ''; -$selectModuleDown = ''; -$selectTemplateUp = ''; -$selectTemplateDown = ''; +$selected = true; +$selectAgentUp = false; +$selectAgentDown = false; +$selectModuleUp = false; +$selectModuleDown = false; +$selectTemplateUp = false; +$selectTemplateDown = false; switch ($sortField) { case 'agent': switch ($sort) { @@ -292,12 +292,12 @@ switch ($sortField) { if ($print_agent) { $selectDisabledUp = ''; $selectDisabledDown = ''; - $selectAgentUp = ''; - $selectAgentDown = ''; + $selectAgentUp = false; + $selectAgentDown = false; $selectModuleUp = $selected; - $selectModuleDown = ''; - $selectTemplateUp = ''; - $selectTemplateDown = ''; + $selectModuleDown = false; + $selectTemplateUp = false; + $selectTemplateDown = false; $order = [ 'field' => 'agent_module_name', 'order' => 'ASC', @@ -305,12 +305,12 @@ switch ($sortField) { } else { $selectDisabledUp = ''; $selectDisabledDown = ''; - $selectAgentUp = ''; - $selectAgentDown = ''; + $selectAgentUp = false; + $selectAgentDown = false; $selectModuleUp = $selected; - $selectModuleDown = ''; - $selectTemplateUp = ''; - $selectTemplateDown = ''; + $selectModuleDown = false; + $selectTemplateUp = false; + $selectTemplateDown = false; $order = [ 'field' => 'agent_module_name', 'order' => 'ASC', @@ -440,6 +440,14 @@ if ($print_agent) { } } +// Urls to sort the table. +$url_up_agente = $url.'&sort_field=agent&sort=up'; +$url_down_agente = $url.'&sort_field=agent&sort=down'; +$url_up_module = $url.'&sort_field=module&sort=up'; +$url_down_module = $url.'&sort_field=module&sort=down'; +$url_up_template = $url.'&sort_field=template&sort=up'; +$url_down_template = $url.'&sort_field=template&sort=down'; + $table = new stdClass(); $table->width = '100%'; $table->class = 'info_table'; @@ -481,9 +489,9 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) { // Sort buttons are only for normal console if (!is_metaconsole()) { - $table->head[3] .= ' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectAgentUp]).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectAgentDown]).''; - $table->head[4] .= ' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectModuleUp]).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectModuleDown]).''; - $table->head[5] .= ' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectTemplateUp]).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectTemplateDown]).''; + $table->head[3] .= ui_get_sorting_arrows($url_up_agente, $url_down_agente, $selectAgentUp, $selectAgentDown); + $table->head[4] .= ui_get_sorting_arrows($url_up_module, $url_down_module, $selectModuleUp, $selectModuleDown); + $table->head[5] .= ui_get_sorting_arrows($url_up_template, $url_down_template, $selectTemplateUp, $selectTemplateDown); } } else { if (!is_metaconsole()) { @@ -515,8 +523,8 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) { // Sort buttons are only for normal console if (!is_metaconsole()) { - $table->head[3] .= ' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectModuleUp]).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectModuleDown]).''; - $table->head[4] .= ' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectTemplateUp]).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectTemplateDown]).''; + $table->head[3] .= ui_get_sorting_arrows($url_up_module, $url_down_module, $selectModuleUp, $selectModuleDown); + $table->head[4] .= ui_get_sorting_arrows($url_up_template, $url_down_template, $selectTemplateUp, $selectTemplateDown); } } } else { @@ -547,9 +555,9 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) { // Sort buttons are only for normal console if (!is_metaconsole()) { - $table->head[2] .= ' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectAgentUp]).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectAgentDown]).''; - $table->head[3] .= ' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectModuleUp]).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectModuleDown]).''; - $table->head[4] .= ' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectTemplateUp]).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectTemplateDown]).''; + $table->head[3] .= ui_get_sorting_arrows($url_up_agente, $url_down_agente, $selectAgentUp, $selectAgentDown); + $table->head[4] .= ui_get_sorting_arrows($url_up_module, $url_down_module, $selectModuleUp, $selectModuleDown); + $table->head[5] .= ui_get_sorting_arrows($url_up_template, $url_down_template, $selectTemplateUp, $selectTemplateDown); } } else { if (!is_metaconsole()) { @@ -577,8 +585,8 @@ if ($isFunctionPolicies !== ENTERPRISE_NOT_HOOK) { // Sort buttons are only for normal console if (!is_metaconsole()) { - $table->head[2] .= ' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectModuleUp]).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectModuleDown]).''; - $table->head[3] .= ' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectTemplateUp]).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectTemplateDown]).''; + $table->head[2] .= ui_get_sorting_arrows($url_up_module, $url_down_module, $selectModuleUp, $selectModuleDown); + $table->head[3] .= ui_get_sorting_arrows($url_up_template, $url_down_template, $selectTemplateUp, $selectTemplateDown); } } } diff --git a/pandora_console/operation/agentes/custom_fields.php b/pandora_console/operation/agentes/custom_fields.php index a0c123ea5e..a98f92d4ee 100644 --- a/pandora_console/operation/agentes/custom_fields.php +++ b/pandora_console/operation/agentes/custom_fields.php @@ -60,7 +60,7 @@ if ($fields === false) { } else { $table = new stdClass(); $table->width = '100%'; - $table->class = 'databox data'; + $table->class = 'info_table'; $table->head = []; $table->head[0] = __('Field'); $table->size[0] = '20%'; diff --git a/pandora_console/operation/agentes/estado_agente.php b/pandora_console/operation/agentes/estado_agente.php index 16c080edd3..bb9dc7cef7 100644 --- a/pandora_console/operation/agentes/estado_agente.php +++ b/pandora_console/operation/agentes/estado_agente.php @@ -264,17 +264,19 @@ if ($search != '') { $sortField = get_parameter('sort_field'); $sort = get_parameter('sort', 'none'); -$selected = 'border: 1px solid black;'; -$selectNameUp = ''; -$selectNameDown = ''; -$selectOsUp = ''; -$selectOsDown = ''; -$selectIntervalUp = ''; -$selectIntervalDown = ''; -$selectGroupUp = ''; -$selectGroupDown = ''; -$selectLastContactUp = ''; -$selectLastContactDown = ''; +$selected = true; +$selectNameUp = false; +$selectNameDown = false; +$selectOsUp = false; +$selectOsDown = false; +$selectIntervalUp = false; +$selectIntervalDown = false; +$selectGroupUp = false; +$selectGroupDown = false; +$selectDescriptionUp = false; +$selectDescriptionDown = false; +$selectLastContactUp = false; +$selectLastContactDown = false; $order = null; @@ -428,7 +430,7 @@ switch ($sortField) { case 'description': switch ($sort) { case 'up': - $selectLastContactUp = $selected; + $selectDescriptionUp = $selected; $order = [ 'field' => 'comentarios', 'field2' => 'alias'.$order_collation, @@ -437,7 +439,7 @@ switch ($sortField) { break; case 'down': - $selectLastContactDown = $selected; + $selectDescriptionDown = $selected; $order = [ 'field' => 'comentarios', 'field2' => 'alias'.$order_collation, @@ -449,15 +451,17 @@ switch ($sortField) { default: $selectNameUp = $selected; - $selectNameDown = ''; - $selectOsUp = ''; - $selectOsDown = ''; - $selectIntervalUp = ''; - $selectIntervalDown = ''; - $selectGroupUp = ''; - $selectGroupDown = ''; - $selectLastContactUp = ''; - $selectLastContactDown = ''; + $selectNameDown = false; + $selectOsUp = false; + $selectOsDown = false; + $selectIntervalUp = false; + $selectIntervalDown = false; + $selectGroupUp = false; + $selectGroupDown = false; + $selectDescriptionUp = false; + $selectDescriptionDown = false; + $selectLastContactUp = false; + $selectLastContactDown = false; $order = [ 'field' => 'alias'.$order_collation, 'field2' => 'alias'.$order_collation, @@ -620,6 +624,23 @@ if (empty($agents)) { $agents = []; } +// Urls to sort the table. +$url_up_agente = 'index.php?sec=view&sec2=operation/agentes/estado_agente&refr='.$refr.'&offset='.$offset.'&group_id='.$group_id.'&recursion='.$recursion.'&search='.$search.'&status='.$status.'&sort_field=name&sort=up'; +$url_down_agente = 'index.php?sec=view&sec2=operation/agentes/estado_agente&refr='.$refr.'&offset='.$offset.'&group_id='.$group_id.'&recursion='.$recursion.'&search='.$search.'&status='.$status.'&sort_field=name&sort=down'; +$url_up_description = 'index.php?sec=view&sec2=operation/agentes/estado_agente&refr='.$refr.'&offset='.$offset.'&group_id='.$group_id.'&recursion='.$recursion.'&search='.$search.'&status='.$status.'&sort_field=description&sort=up'; +$url_down_description = 'index.php?sec=view&sec2=operation/agentes/estado_agente&refr='.$refr.'&offset='.$offset.'&group_id='.$group_id.'&recursion='.$recursion.'&search='.$search.'&status='.$status.'&sort_field=description&sort=down'; +$url_up_remote = 'index.php?sec=view&sec2=operation/agentes/estado_agente&refr='.$refr.'&offset='.$offset.'&group_id='.$group_id.'&recursion='.$recursion.'&search='.$search.'&status='.$status.'&sort_field=remote&sort=up'; +$url_down_remote = 'index.php?sec=view&sec2=operation/agentes/estado_agente&refr='.$refr.'&offset='.$offset.'&group_id='.$group_id.'&recursion='.$recursion.'&search='.$search.'&status='.$status.'&sort_field=remote&sort=down'; +$url_up_os = 'index.php?sec=view&sec2=operation/agentes/estado_agente&refr='.$refr.'&offset='.$offset.'&group_id='.$group_id.'&recursion='.$recursion.'&search='.$search.'&status='.$status.'&sort_field=os&sort=up'; +$url_down_os = 'index.php?sec=view&sec2=operation/agentes/estado_agente&refr='.$refr.'&offset='.$offset.'&group_id='.$group_id.'&recursion='.$recursion.'&search='.$search.'&status='.$status.'&sort_field=os&sort=down'; +$url_up_interval = 'index.php?sec=view&sec2=operation/agentes/estado_agente&refr='.$refr.'&offset='.$offset.'&group_id='.$group_id.'&recursion='.$recursion.'&search='.$search.'&status='.$status.'&sort_field=interval&sort=up'; +$url_down_interval = 'index.php?sec=view&sec2=operation/agentes/estado_agente&refr='.$refr.'&offset='.$offset.'&group_id='.$group_id.'&recursion='.$recursion.'&search='.$search.'&status='.$status.'&sort_field=interval&sort=down'; +$url_up_group = 'index.php?sec=view&sec2=operation/agentes/estado_agente&refr='.$refr.'&offset='.$offset.'&group_id='.$group_id.'&recursion='.$recursion.'&search='.$search.'&status='.$status.'&sort_field=group&sort=up'; +$url_down_group = 'index.php?sec=view&sec2=operation/agentes/estado_agente&refr='.$refr.'&offset='.$offset.'&group_id='.$group_id.'&recursion='.$recursion.'&search='.$search.'&status='.$status.'&sort_field=group&sort=down'; +$url_up_last = 'index.php?sec=view&sec2=operation/agentes/estado_agente&refr='.$refr.'&offset='.$offset.'&group_id='.$group_id.'&recursion='.$recursion.'&search='.$search.'&status='.$status.'&sort_field=last_contact&sort=up'; +$url_down_last = 'index.php?sec=view&sec2=operation/agentes/estado_agente&refr='.$refr.'&offset='.$offset.'&group_id='.$group_id.'&recursion='.$recursion.'&search='.$search.'&status='.$status.'&sort_field=last_contact&sort=down'; + + // Prepare pagination ui_pagination( $total_agents, @@ -634,24 +655,22 @@ $table->width = '100%'; $table->class = 'info_table'; $table->head = []; -$table->head[0] = __('Agent').' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectNameUp, 'alt' => 'up']).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectNameDown, 'alt' => 'down']).''; +$table->head[0] = __('Agent').ui_get_sorting_arrows($url_up_agente, $url_down_agente, $selectNameUp, $selectNameDown); $table->size[0] = '10%'; -$table->head[1] = __('Description').' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectNameUp, 'alt' => 'up']).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectNameDown, 'alt' => 'down']).''; - +$table->head[1] = __('Description').ui_get_sorting_arrows($url_up_description, $url_down_description, $selectDescriptionUp, $selectDescriptionDown); $table->size[1] = '16%'; -$table->head[10] = __('Remote').' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectRemoteUp, 'alt' => 'up']).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectRemoteDown, 'alt' => 'down']).''; - +$table->head[10] = __('Remote').ui_get_sorting_arrows($url_up_remote, $url_down_remote, $selectRemoteUp, $selectRemoteDown); $table->size[10] = '9%'; -$table->head[2] = __('OS').' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectOsUp, 'alt' => 'up']).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectOsDown, 'alt' => 'down']).''; +$table->head[2] = __('OS').ui_get_sorting_arrows($url_up_os, $url_down_os, $selectOsUp, $selectOsDown); $table->size[2] = '8%'; -$table->head[3] = __('Interval').' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectIntervalUp, 'alt' => 'up']).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectIntervalDown, 'alt' => 'down']).''; +$table->head[3] = __('Interval').ui_get_sorting_arrows($url_up_interval, $url_down_interval, $selectIntervalUp, $selectIntervalDown); $table->size[3] = '10%'; -$table->head[4] = __('Group').' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectGroupUp, 'alt' => 'up']).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectGroupDown, 'alt' => 'down']).''; +$table->head[4] = __('Group').ui_get_sorting_arrows($url_up_group, $url_down_group, $selectGroupUp, $selectGroupDown); $table->size[4] = '8%'; $table->head[5] = __('Type'); @@ -666,7 +685,7 @@ $table->size[7] = '4%'; $table->head[8] = __('Alerts'); $table->size[8] = '4%'; -$table->head[9] = __('Last contact').' '.''.html_print_image('images/sort_up.png', true, ['style' => $selectLastContactUp, 'alt' => 'up']).''.''.html_print_image('images/sort_down.png', true, ['style' => $selectLastContactDown, 'alt' => 'down']).''; +$table->head[9] = __('Last contact').ui_get_sorting_arrows($url_up_last, $url_down_last, $selectLastContactUp, $selectLastContactDown); $table->size[9] = '15%'; $table->align = []; diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php index 18cb29027a..8774f94402 100755 --- a/pandora_console/operation/agentes/estado_generalagente.php +++ b/pandora_console/operation/agentes/estado_generalagente.php @@ -211,7 +211,7 @@ $table_contact->id = 'agent_contact_main'; $table_contact->width = '100%'; $table_contact->cellspacing = 0; $table_contact->cellpadding = 0; -$table_contact->class = 'databox data'; +$table_contact->class = 'info_table'; $table_contact->style[0] = 'width: 30%;height:30px;'; $table_contact->style[1] = 'width: 70%;'; @@ -254,7 +254,7 @@ $table_data->width = '100%'; $table_data->styleTable = 'height:180px'; $table_data->cellspacing = 0; $table_data->cellpadding = 0; -$table_data->class = 'databox data'; +$table_data->class = 'info_table'; $table_data->style[0] = 'width: 30%;'; $table_data->style[1] = 'width: 40%;'; @@ -416,7 +416,7 @@ if ($last_incident != false) { $table_incident->width = '100%'; $table_incident->cellspacing = 0; $table_incident->cellpadding = 0; - $table_incident->class = 'databox'; + $table_incident->class = 'info_table'; $table_incident->style[0] = 'width: 30%;'; $table_incident->style[1] = 'width: 70%;'; @@ -456,7 +456,7 @@ if (!empty($network_interfaces_by_agents) && !empty($network_interfaces_by_agent if (!empty($network_interfaces)) { $table_interface = new stdClass(); $table_interface->id = 'agent_interface_info'; - $table_interface->class = 'databox data'; + $table_interface->class = 'info_table'; $table_interface->width = '98%'; $table_interface->style = []; $table_interface->style['interface_status'] = 'width: 30px;padding-top:0px;padding-bottom:0px;'; @@ -478,7 +478,7 @@ if (!empty($network_interfaces)) { 'class' => 'closed', 'style' => 'vertical-align:righ; cursor:pointer;', ]; - $table_interface->head[0] = html_print_image('images/graphmenu_arrow.png', true, $options).'  '; + $table_interface->head[0] = html_print_image('images/go.png', true, $options).'  '; $table_interface->head[0] .= ''.__('Interface information').' (SNMP)'; $table_interface->head_colspan = []; $table_interface->head_colspan[0] = 8; @@ -610,11 +610,11 @@ if (!empty($network_interfaces)) { var arrow = $("#agent_interface_info").find("thead").find("img"); if (arrow.hasClass("closed")) { arrow.removeClass("closed"); - arrow.prop("src", "images/arrow-down-white.png"); + arrow.prop("src", "images/down.png"); $("#agent_interface_info").find("tbody").show(); } else { arrow.addClass("closed"); - arrow.prop("src", "images/graphmenu_arrow.png"); + arrow.prop("src", "images/go.png"); $("#agent_interface_info").find("tbody").hide(); } }) diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php index 9a51210216..38f6b059d3 100644 --- a/pandora_console/operation/agentes/status_monitor.php +++ b/pandora_console/operation/agentes/status_monitor.php @@ -1284,6 +1284,7 @@ if (!empty($result)) { } if ($show_edit_icon) { + $table->cellclass[][2] = 'action_buttons'; $data[2] .= ''.html_print_image( 'images/config.png', true,
'.__('Name').''.__('Description').''.__('Delete').'