tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reorganizate filter options and change visual

This commit is contained in:
m-lopez-f 2015-04-23 13:04:54 +02:00
parent 6544269429
commit 079b05b63e
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pandora_console/operation/agentes/networkmap.php
View File

@ -420,8 +420,6 @@ if ($delete_networkmap || $add_networkmap || $save_networkmap) {
// CONFIGURATION FORM
echo "<br>";
// Layout selection
$layout_array = array (
'circular' => 'circular',
@ -450,6 +448,12 @@ $form_elems[] = __('Store group') . '&nbsp;' .
$form_elems[] = __('Group') . '&nbsp;' .
html_print_select_groups(false, 'AR', false, 'group', $group, '', 'All', 0, true);
// Free text
if ($activeTab != 'radial_dynamic') {
$form_elems[] = __('Free text for search (*):') . '&nbsp;' .
html_print_input_text('text_filter', $text_filter, '', 25, 100, true);
}
// Module group
if ($activeTab == 'groups' || $activeTab == 'policies' || $activeTab == 'radial_dynamic') {
$form_elems[] = __('Module group') . '&nbsp;' .
@ -458,12 +462,6 @@ if ($activeTab == 'groups' || $activeTab == 'policies' || $activeTab == 'radial_
FROM tmodule_group', 'module_group', $module_group, '', 'All', 0, true);
}
// Interfaces
if ($activeTab == 'topology') {
$form_elems[] = __('Show interfaces') . '&nbsp;' .
html_print_checkbox ('show_snmp_modules', '1', $show_snmp_modules, true);
}
// Layout
if ($activeTab != 'dinamic' && $activeTab != 'radial_dynamic') {
$form_elems[] = __('Layout') . '&nbsp;' .
@ -480,6 +478,12 @@ if ($activeTab == 'groups') {
html_print_select ($depth_levels, 'depth', $depth, '', '', '', true, false, false);
}
// Interfaces
if ($activeTab == 'topology') {
$form_elems[] = __('Show interfaces') . '&nbsp;' .
html_print_checkbox ('show_snmp_modules', '1', $show_snmp_modules, true);
}
// No overlap
if ($activeTab != 'dinamic' && $activeTab != 'radial_dynamic') {
$form_elems[] = __('No Overlap') . '&nbsp;' .
@ -534,12 +538,6 @@ if ($activeTab != 'dinamic' && $activeTab != 'radial_dynamic') {
html_print_input_text ('font_size', $font_size, $alt = 'Font size (in pt)', 2, 4, true);
}
// Free text
if ($activeTab != 'radial_dynamic') {
$form_elems[] = __('Free text for search (*):') . '&nbsp;' .
html_print_input_text('text_filter', $text_filter, '', 30, 100, true);
}
// Don't show subgroups
if (($activeTab == 'groups') || ($activeTab == 'topology')) {
$form_elems[] = __('Don\'t show subgroups:') .
@ -561,11 +559,11 @@ if ($nooverlap == 1) {
}
unset($table);
$table->width = '98%';
$table->class = 'databox';
$table->width = '100%';
$table->class = 'databox filters';
$table->data = array();
$max_col = 5;
$max_col = 4;
$col = 0;
$row = 0;
@ -574,7 +572,7 @@ foreach ($form_elems as $key => $element) {
$col = 0;
$row++;
}
$table->size[] = "25%";
$table->data[$row][$col] = $element;
$col++;
}

13
pandora_console/operation/agentes/networkmap_list.php
View File

@ -110,7 +110,7 @@ $type_search = get_parameter('type_filter', '0');
?>
<form method="post" action="index.php?sec=network&amp;sec2=operation/agentes/networkmap_list">
<table style='width: 100%' class='databox'>
<table style='width: 100%' class='databox filters'>
<tr>
<td class='datos' >
<?php echo __('Group'); ?>
@ -144,7 +144,8 @@ $type_search = get_parameter('type_filter', '0');
// Display table
$table = new StdClass();
$table->width = "98%";
$table->width = "100%";
$table->class = "databox data";
$table->style = array();
$table->style[0] = '';
@ -192,8 +193,7 @@ $user_info = users_get_user_by_id($config['id_user']);
$network_maps = db_get_all_rows_filter('tnetwork_map', $where);
if ($network_maps === false) {
echo "<div class='warn'>" . __('Not networkmap defined.') .
"</div>";
ui_print_info_message ( array('no_close'=>true, 'message'=> __('Not networkmap defined.') ) );
}
else {
$table->data = array();
@ -237,9 +237,11 @@ else {
if ($networkmaps_write || $networkmaps_manage) {
$table_manage = new StdClass();
$table_manage->width = "100%";
$table_manage->class = "databox filters";
$table_manage->style = array();
$table_manage->style[0] = 'font-weight: bold';
$table_manage->style[3] = 'text-align: right';
$table_manage->style[2] = 'font-weight: bold';
$table_manage->style[4] = 'text-align: right';
$table_manage->size = array();
$table_manage->head = array();
$table_manage->data = array();
@ -256,6 +258,7 @@ if ($networkmaps_write || $networkmaps_manage) {
$row = array();
$row[] = __('Action');
$row[] = html_print_select($actions, 'action', 'create', '', '', 0, true, false, false);
$row[] = __('Type');
$row[] = html_print_select($networkmap_types, 'tab', 'topology', '', '', 0, true)
. html_print_select($delete_options, 'delete_options', 'selected', '', '', 0, true, false, false);
$row[] = html_print_submit_button (__('Execute'), 'crt', false, 'class="sub next"', true)