Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones

This commit is contained in:
Jose Gonzalez 2023-02-24 13:38:05 +01:00
commit 377d005800
4 changed files with 287 additions and 157 deletions

View File

@ -397,55 +397,135 @@ function mainAgentsModules()
1 => __('Show module data'),
];
$filter_type_label = '<b>'.__('Information to be shown').'</b>';
$filter_type = html_print_select($show_select, 'show_type', $show_type, '', '', 0, true, false, false, '', false, 'min-width: 180px;');
// Groups.
$filter_groups_label = '<b>'.__('Group').'</b>';
$filter_groups = html_print_select_groups(false, 'AR', true, 'group_id', $group_id, '', '', '', true, false, true, '', false, 'width: auto;');
$filter_recursion_label = '</td><td><b>'.__('Recursion').'</b>';
$filter_recursion = html_print_checkbox('recursion', 1, 0, true).'</td>';
// Groups module.
$filter_module_groups_label = '<b>'.__('Module group').'</b>';
$filter_module_groups = html_print_select_from_sql(
'SELECT * FROM tmodule_group ORDER BY name',
'modulegroup',
$modulegroup,
'',
__('All'),
0,
true,
false,
true,
false,
'width: auto;'
$filter_type = html_print_label_input_block(
__('Information to be shown'),
html_print_select(
$show_select,
'show_type',
$show_type,
'',
'',
0,
true,
false,
false,
'',
false,
'width: 100%;'
)
);
$filter_groups = html_print_label_input_block(
__('Group'),
html_print_select_groups(
false,
'AR',
true,
'group_id',
$group_id,
'',
'',
'',
true,
false,
true,
'',
false,
'width: 100%;'
)
);
$filter_groups .= html_print_label_input_block(
__('Recursion'),
html_print_checkbox_switch('recursion', 1, 0, true),
[
'div_class' => 'add-input-reverse',
'label_class' => 'label-thin',
]
);
$filter_module_groups = html_print_label_input_block(
__('Module group'),
html_print_select_from_sql(
'SELECT * FROM tmodule_group ORDER BY name',
'modulegroup',
$modulegroup,
'',
__('All'),
0,
true,
false,
true,
false,
'width: 100%;'
)
);
// Agent.
$agents = agents_get_group_agents($group_id);
if ((empty($agents)) || $agents == -1) {
$agents = [];
}
$filter_agents_label = '<b>'.__('Agents').'</b>';
$filter_agents = html_print_select($agents, 'id_agents2[]', $agents_id, '', '', 0, true, true, true, '', false, 'min-width: 180px; max-width: 200px;');
$filter_agents = html_print_label_input_block(
__('Agents'),
html_print_select(
$agents,
'id_agents2[]',
$agents_id,
'',
'',
0,
true,
true,
true,
'',
false,
'width: 100%;'
)
);
// Type show.
$selection = [
0 => __('Show common modules'),
1 => __('Show all modules'),
];
$filter_type_show_label = '<b>'.__('Show common modules').'</b>';
$filter_type_show = html_print_select($selection, 'selection_agent_module', $selection_a_m, '', '', 0, true, false, true, '', false, 'min-width: 180px;');
$filter_type_show = html_print_label_input_block(
__('Show common modules'),
html_print_select(
$selection,
'selection_agent_module',
$selection_a_m,
'',
'',
0,
true,
false,
true,
'',
false,
'width: 100%;'
)
);
// Modules.
$all_modules = select_modules_for_agent_group($group_id, $agents_id, $selection_a_m, false);
$filter_modules_label = '<b>'.__('Module').'</b>';
$filter_modules = html_print_select($all_modules, 'module[]', $modules_selected, '', '', 0, true, true, false, '', false, 'min-width: 180px; max-width: 200px;');
// Update.
$filter_update = html_print_submit_button(__('Update item'), 'edit_item', false, 'class="sub upd"', true);
$filter_modules = html_print_label_input_block(
__('Module'),
html_print_select(
$all_modules,
'module[]',
$modules_selected,
'',
'',
0,
true,
true,
false,
'',
false,
'width: 100%;'
)
);
$onheader = [
'updated_time' => $updated_time,
@ -566,36 +646,39 @@ function mainAgentsModules()
if ($config['pure'] != 1) {
$show_filters = '<form method="post" action="'.ui_get_url_refresh(['offset' => $offset, 'hor_offset' => $offset, 'group_id' => $group_id, 'modulegroup' => $modulegroup]).'" class="w100p">';
$show_filters .= '<table class="w100p no-border" cellpadding="15" cellspacing="0" border="0">';
$show_filters .= '<table class="filter-table-adv w100p no-border" cellpadding="4" cellspacing="4">';
$show_filters .= '<tr>';
$show_filters .= '<td>'.$filter_type_label.'</td>';
$show_filters .= '<td>'.$filter_type.'</td>';
$show_filters .= '<td width="33%">'.$filter_type.'</td>';
$show_filters .= '<td width="33%">'.$filter_groups.'</td>';
$show_filters .= '<td width="33%">'.$filter_module_groups.'</td>';
$show_filters .= '</tr>';
$show_filters .= '<tr>';
$show_filters .= '<td>'.$filter_groups_label.'</td>';
$show_filters .= '<td>'.$filter_groups.'&nbsp;&nbsp;&nbsp;'.$filter_recursion_label.$filter_recursion.'</td>';
$show_filters .= '<td></td>';
$show_filters .= '<td></td>';
$show_filters .= '<td>'.$filter_module_groups_label.'</td>';
$show_filters .= '<td>'.$filter_module_groups.'</td>';
$show_filters .= '</tr>';
$show_filters .= '<tr>';
$show_filters .= '<td>'.$filter_agents_label.'</td>';
$show_filters .= '<td>'.$filter_agents.'</td>';
$show_filters .= '<td>'.$filter_type_show_label.'</td>';
$show_filters .= '<td>'.$filter_type_show.'</td>';
$show_filters .= '<td>'.$filter_modules_label.'</td>';
$show_filters .= '<td>'.$filter_modules.'</td>';
$show_filters .= '</tr>';
$show_filters .= '<tr>';
$show_filters .= "<td colspan=6 ><span class='right pdd_r_35px mrgn_top_25px'>".$filter_update.'</span></td>';
$show_filters .= '</tr>';
$show_filters .= '</table>';
$show_filters .= html_print_div(
[
'class' => 'action-buttons',
'content' => html_print_submit_button(
__('Filter'),
'srcbutton',
false,
[
'icon' => 'search',
'mode' => 'mini',
],
true
),
],
true
);
$show_filters .= '</form>';
ui_toggle(
$show_filters,
__('Filters ').ui_print_help_tip(__('Secondary groups and agent subgroups will be taken into account.'), true),
'<span class="subsection_header_title">'.__('Filters ').'</span>'.ui_print_help_tip(__('Secondary groups and agent subgroups will be taken into account.'), true),
'filter_form',
'',
true,
@ -804,7 +887,20 @@ function mainAgentsModules()
// Prepare pagination.
$url = 'index.php?extension_in_menu=estado&sec=extensions&sec2=extensions/agents_modules&save_serialize=1&hor_offset='.$hor_offset.'&selection_a_m='.$selection_a_m;
ui_pagination($total_pagination, $url);
$tablePagination = ui_pagination(
$total_pagination,
$url,
0,
0,
true,
'offset',
false
);
html_print_action_buttons(
'',
[ 'right_content' => $tablePagination ]
);
foreach ($agents as $agent) {
// Get stats for this group.

View File

@ -266,32 +266,68 @@ function mainModuleGroups()
]
);
echo "<table cellpadding='4' cellspacing='4' class='databox filters bolder margin-bottom-10' width='100%'>
<tr>";
echo "<form method='post'
action='index.php?sec=view&sec2=extensions/module_groups'>";
$output = "<form method='post'
action='index.php?sec=view&sec2=extensions/module_groups'>";
echo '<td>';
echo __('Search by agent group').'&nbsp;';
html_print_input_text('agent_group_search', $agent_group_search);
echo '</td><td>';
echo __('Search by module group').'&nbsp;';
html_print_input_text('module_group_search', $module_group_search);
echo '</td><td>';
html_print_submit_button(
__('Search'),
'srcbutton',
false,
[
'icon' => 'search',
'mode' => 'secondary',
]
$output .= "<table cellpadding='4' cellspacing='4' class='filter-table-adv margin-bottom-10' width='100%'><tr>";
$output .= '<td>';
$output .= html_print_label_input_block(
__('Search by agent group'),
html_print_input_text(
'agent_group_search',
$agent_group_search,
'',
50,
255,
true
)
);
$output .= '</td><td>';
$output .= html_print_label_input_block(
__('Search by module group'),
html_print_input_text(
'module_group_search',
$module_group_search,
'',
50,
255,
true
)
);
$output .= '</td>';
$output .= '</tr></table>';
$output .= html_print_div(
[
'class' => 'action-buttons',
'content' => html_print_submit_button(
__('Filter'),
'srcbutton',
false,
[
'icon' => 'search',
'mode' => 'mini',
],
true
),
],
true
);
$output .= '</form>';
ui_toggle(
$output,
'<span class="subsection_header_title">'.__('Filters').'</span>',
'filter_form',
'',
true,
false,
'',
'white-box-content',
'box-flat white_table_graph fixed_filter_bar'
);
echo '</form>';
echo '<td>';
echo '</tr></table>';
$cell_style = '
min-width: 60px;
@ -386,25 +422,37 @@ function mainModuleGroups()
$table->headstyle = $headstyle;
$table->data = $data;
ui_pagination($counter);
echo "<div class='w100p' style='overflow-x:auto;'>";
html_print_table($table);
echo '</div>';
ui_pagination($counter);
$tablePagination = ui_pagination(
$counter,
false,
0,
0,
true,
'offset',
false
);
echo "<div class='legend_basic w99p'>";
echo '<table >';
echo "<tr><td colspan='2' class='pdd_b_10px'><b>".__('Legend').'</b></td></tr>';
echo "<tr><td class='legend_square_simple'><div style='background-color: ".COL_ALERTFIRED.";'></div></td><td>".__('Orange cell when the module group and agent have at least one alarm fired.').'</td></tr>';
echo "<tr><td class='legend_square_simple'><div style='background-color: ".COL_CRITICAL.";'></div></td><td>".__('Red cell when the module group and agent have at least one module in critical status and the others in any status').'</td></tr>';
echo "<tr><td class='legend_square_simple'><div style='background-color: ".COL_WARNING.";'></div></td><td>".__('Yellow cell when the module group and agent have at least one in warning status and the others in grey or green status').'</td></tr>';
echo "<tr><td class='legend_square_simple'><div style='background-color: ".COL_UNKNOWN.";'></div></td><td>".__('Grey cell when the module group and agent have at least one in unknown status and the others in green status').'</td></tr>';
echo "<tr><td class='legend_square_simple'><div style='background-color: ".COL_NORMAL.";'></div></td><td>".__('Green cell when the module group and agent have all modules in OK status').'</td></tr>';
echo "<tr><td class='legend_square_simple'><div style='background-color: ".COL_NOTINIT.";'></div></td><td>".__('Blue cell when the module group and agent have all modules in not init status.').'</td></tr>';
echo '</table>';
echo '</div>';
html_print_action_buttons(
'',
[ 'right_content' => $tablePagination ]
);
$show_legend = '<div>';
$show_legend .= '<table>';
$show_legend .= "<tr><td class='legend_square_simple'><div style='background-color: ".COL_ALERTFIRED.";'></div></td><td>".__('Orange cell when the module group and agent have at least one alarm fired.').'</td></tr>';
$show_legend .= "<tr><td class='legend_square_simple'><div style='background-color: ".COL_CRITICAL.";'></div></td><td>".__('Red cell when the module group and agent have at least one module in critical status and the others in any status').'</td></tr>';
$show_legend .= "<tr><td class='legend_square_simple'><div style='background-color: ".COL_WARNING.";'></div></td><td>".__('Yellow cell when the module group and agent have at least one in warning status and the others in grey or green status').'</td></tr>';
$show_legend .= "<tr><td class='legend_square_simple'><div style='background-color: ".COL_UNKNOWN.";'></div></td><td>".__('Grey cell when the module group and agent have at least one in unknown status and the others in green status').'</td></tr>';
$show_legend .= "<tr><td class='legend_square_simple'><div style='background-color: ".COL_NORMAL.";'></div></td><td>".__('Green cell when the module group and agent have all modules in OK status').'</td></tr>';
$show_legend .= "<tr><td class='legend_square_simple'><div style='background-color: ".COL_NOTINIT.";'></div></td><td>".__('Blue cell when the module group and agent have all modules in not init status.').'</td></tr>';
$show_legend .= '</table>';
$show_legend .= '</div>';
ui_toggle($show_legend, __('Legend'));
} else {
ui_print_info_message(['no_close' => true, 'message' => __('This table shows in columns the modules group and in rows agents group. The cell shows all modules') ]);
ui_print_info_message(['no_close' => true, 'message' => __('There are no defined groups or module groups') ]);

View File

@ -519,14 +519,21 @@ class SnmpConsole extends HTML
__('Validate'),
'updatebt',
false,
'class="sub ok"',
[
'class' => 'sub ok',
'icon' => 'next',
],
true
);
$buttons[] = html_print_submit_button(
__('Delete'),
'deletebt',
false,
'class="sub delete" onClick="javascript:return confirm(\''.__('Are you sure?').'\')"',
[
'icon' => 'delete',
'mode' => 'secondary',
'onClick' => "javascript:return confirm(\''.__('Are you sure?').'\')",
],
true
);
@ -535,60 +542,33 @@ class SnmpConsole extends HTML
['type' => 'form_action']
);
echo '<div class="snmp_view_div">';
echo '<h3>'.__('Status').'</h3>';
echo html_print_image(
'images/pixel_green.png',
true,
[
'width' => '20',
'height' => '20',
]
).' - '.__('Validated');
echo '<br />';
echo html_print_image(
'images/pixel_red.png',
true,
[
'width' => '20',
'height' => '20',
]
).' - '.__('Not validated');
echo '</div>';
echo '<div class="snmp_view_div">';
echo '<h3>'.__('Alert').'</h3>';
echo html_print_image(
'images/pixel_yellow.png',
true,
[
'width' => '20',
'height' => '20',
]
).' - '.__('Fired');
echo '<br />';
echo html_print_image(
'images/pixel_gray.png',
true,
[
'width' => '20',
'height' => '20',
]
).' - '.__('Not fired');
echo '</div>';
echo '<div class="snmp_view_div">';
echo '<h3>'.__('Action').'</h3>';
echo html_print_image('images/ok.png', true).' - '.__('Validate');
echo '<br />';
echo html_print_image('images/cross.png', true, ['class' => 'invert_filter']).' - '.__('Delete');
echo '</div>';
echo '<div class="snmp_view_div">';
echo '<table id="legend_snmp_browser"><td><div class="snmp_view_div">';
echo '<h3>'.__('Severity').'</h3>';
foreach (get_priorities() as $num => $name) {
echo '<span class="'.get_priority_class($num).'">'.$name.'</span>';
echo '<br />';
}
echo '</div>';
echo '</div></td>';
echo '<td><div class="snmp_view_div">';
echo '<h3>'.__('Status').'</h3>';
echo '<span class="datos_green">'.__('Validated').'</span>';
echo '<br />';
echo '<span class="datos_red">'.__('Not validated').'</span>';
echo '</div></td>';
echo '<td><div class="snmp_view_div">';
echo '<h3>'.__('Alert').'</h3>';
echo '<span class="datos_yellow">'.__('Alert').'</span>';
echo '<br />';
echo '<span class="datos_grey">'.__('Not fired').'</span>';
echo '</div></td>';
echo '<td><div class="snmp_view_div">';
echo '<h3>'.__('Action').'</h3>';
echo '<div>';
echo html_print_image('images/validate.svg', true, ['class' => 'main_menu_icon']).' - '.__('Validate');
echo '<br />';
echo html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon']).' - '.__('Delete');
echo '</div></div></td>';
// Load own javascript file.
echo $this->loadJS();
@ -916,12 +896,13 @@ class SnmpConsole extends HTML
$tmp->action = '';
if ($status != 1) {
$tmp->action .= '<a href="#">'.html_print_image(
'images/ok.png',
'images/validate.svg',
true,
[
'border' => '0',
'title' => __('Validate'),
'onclick' => 'validate_trap(\''.$tmp->id_trap.'\')',
'class' => 'main_menu_icon',
]
).'</a> ';
}
@ -929,39 +910,39 @@ class SnmpConsole extends HTML
if ($tmp->source === '') {
if (\users_is_admin()) {
$tmp->action .= '<a href="#">'.html_print_image(
'images/cross.png',
'images/delete.svg',
true,
[
'border' => '0',
'title' => __('Delete'),
'class' => 'invert_filter',
'class' => 'invert_filter main_menu_icon',
'onclick' => 'delete_trap(\''.$tmp->id_trap.'\')',
]
).'</a> ';
}
} else {
$tmp->action .= '<a href="#">'.html_print_image(
'images/cross.png',
'images/delete.svg',
true,
[
'border' => '0',
'title' => __('Delete'),
'class' => 'invert_filter',
'class' => 'invert_filter main_menu_icon',
'onclick' => 'delete_trap(\''.$tmp->id_trap.'\')',
]
).'</a> ';
}
$tmp->action .= '<a href="javascript: toggleVisibleExtendedInfo('.$tmp->id_trap.','.$count.');">'.html_print_image(
'images/eye.png',
'images/see-details@svg.svg',
true,
[
'alt' => __('Show more'),
'title' => __('Show more'),
'class' => 'invert_filter',
'class' => 'invert_filter main_menu_icon',
]
).'</a>';
$tmp->action .= '<a href="index.php?sec=snmpconsole&sec2=enterprise/godmode/snmpconsole/snmp_trap_editor_form&oid='.$tmp->oid.'&custom_oid='.urlencode($tmp->oid_custom).'&severity='.$tmp->severity.'&text='.io_safe_input($tmp->text).'&description='.io_safe_input($tmp->description, ENT_QUOTES).'" title="'.io_safe_input($tmp->description, ENT_QUOTES).'">'.html_print_image('images/edit.png', true, ['alt' => __('SNMP trap editor'), 'title' => __('SNMP trap editor')]).'</a>';
$tmp->action .= '<a href="index.php?sec=snmpconsole&sec2=enterprise/godmode/snmpconsole/snmp_trap_editor_form&oid='.$tmp->oid.'&custom_oid='.urlencode($tmp->oid_custom).'&severity='.$tmp->severity.'&text='.io_safe_input($tmp->text).'&description='.io_safe_input($tmp->description, ENT_QUOTES).'" title="'.io_safe_input($tmp->description, ENT_QUOTES).'">'.html_print_image('images/edit.svg', true, ['alt' => __('SNMP trap editor'), 'title' => __('SNMP trap editor'), 'class' => 'main_menu_icon']).'</a>';
$tmp->m = html_print_checkbox_extended('snmptrapid[]', $tmp->id_trap, false, false, '', 'class="chk"', true);

View File

@ -1981,18 +1981,9 @@ table.databox {
background-color: #fff;
border-spacing: 0px;
border-radius: 6px;
/*-moz-box-shadow: 0 3px 6px 0 rgb(0 0 0 / 13%);*/
/* -webkit-box-shadow: 0 3px 6px 0 rgb(0 0 0 / 13%); */
/* box-shadow: 0 3px 6px 0 rgb(0 0 0 / 13%); */
border: 2px solid #c0ccdc;
padding: 20px;
margin-bottom: 20px;
width: calc(100% - 40px);
width: -webkit-fill-available;
/*
width: -webkit-fill-available;
width: -moz-available;
*/
}
.databox > tbody > tr > td {
@ -7041,6 +7032,20 @@ div.graph div.legend table {
line-height: 17px;
vertical-align: top;
width: 120px;
position: relative;
}
.snmp_view_div > span {
padding: 2px 10px 2px 10px;
border-radius: 10px;
}
.snmp_view_div > h3 {
text-transform: unset;
}
#legend_snmp_browser > tbody > tr > td {
vertical-align: top;
}
.display_in {