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

SNMP fix view

This commit is contained in:
Jonathan 2023-02-27 09:41:39 +01:00
parent 2b9bef1660
commit 9ed46e3b52
5 changed files with 54 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
pandora_console/godmode/snmpconsole/snmp_filters.php
View File

@ -200,6 +200,16 @@ if ($edit_filter > -2) {
$table->class = 'databox filters';
$table->data[0][0] = __('Description');
$table->data[0][1] = html_print_input_text('description', $description, '', 60, 100, true);
$table->data[0][1] .= html_print_image(
'images/add.png',
true,
[
'id' => 'add_filter',
'alt' => __('Click to add new filter'),
'title' => __('Click to add new filter'),
'style' => 'height:20px',
]
);
$table->data[1][0] = __('Filter');
if ($edit_filter > -1) {
$unified_filter = db_get_value_sql('SELECT unified_filters_id FROM tsnmp_filter WHERE id_snmp_filter != 0 AND id_snmp_filter = '.$edit_filter);
@ -245,25 +255,36 @@ if ($edit_filter > -2) {
}
html_print_table($table);
echo '<div class="action-buttons" style="width: '.$table->width.'">';
html_print_image(
'images/add.png',
false,
[
'id' => 'add_filter',
'alt' => __('Click to add new filter'),
'title' => __('Click to add new filter'),
'style' => 'float:left;',
'class' => 'invert_filter',
]
);
if ($edit_filter > -1) {
html_print_submit_button(__('Update'), 'submit_button', false, 'class="sub upd"');
$buttons[] = html_print_submit_button(
__('Update'),
'submit_button',
false,
[
'class' => 'sub ok',
'icon' => 'next',
],
true
);
} else {
html_print_submit_button(__('Create'), 'submit_button', false, 'class="sub upd"');
$buttons[] = html_print_submit_button(
__('Create'),
'submit_button',
false,
[
'class' => 'sub ok',
'icon' => 'next',
],
true
);
}
echo '</div>';
html_print_action_buttons(
implode('', $buttons),
['type' => 'form_action']
);
echo '</form>';
// Overview
} else {

12
pandora_console/godmode/snmpconsole/snmp_trap_generator.php
View File

@ -174,7 +174,17 @@ $table->data[2][2] = html_print_label_input_block(
);
$traps_generator .= html_print_table($table, true);
$traps_generator .= '<div class="action-buttons">'.html_print_submit_button(__('Generate trap'), 'btn_generate_trap', false, 'class="submitButton"', true).'</div>';
$buttons[] = html_print_submit_button(
__('Generate trap'),
'btn_generate_trap',
false,
[
'class' => 'sub ok submitButton',
'icon' => 'next',
],
true
);
$traps_generator .= '<div class="action-buttons">'.html_print_action_buttons(implode('', $buttons), ['type' => 'form_action'], true).'</div>';
$traps_generator .= html_print_input_hidden('generate_trap', 1, true);
unset($table);

5
pandora_console/include/class/SnmpConsole.class.php
View File

@ -564,10 +564,13 @@ class SnmpConsole extends HTML
echo '</div></td>';
echo '<td><div class="snmp_view_div">';
echo '<h3>'.__('Action').'</h3>';
echo '<div>';
echo '<div style=" display : flex;align-items : center;">';
echo html_print_image('images/validate.svg', true, ['class' => 'main_menu_icon']).' - '.__('Validate');
echo '</div>';
echo '<br />';
echo '<div style=" display : flex;align-items : center;">';
echo html_print_image('images/delete.svg', true, ['class' => 'main_menu_icon']).' - '.__('Delete');
echo '</div>';
echo '</div></div></td>';
// Load own javascript file.

6
pandora_console/include/functions_filemanager.php
View File

@ -857,7 +857,7 @@ function filemanager_file_explorer(
$createFolderElements = $tabs_dialog;
$createFolderElements .= sprintf('<form method="POST" action="%s">', $url);
$createFolderElements .= html_print_input_text('dirname', '', '', 30, 255, true);
$createFolderElements .= html_print_submit_button(__('Create'), 'crt', false, 'class="submitButton"', true);
$createFolderElements .= html_print_submit_button(__('Create'), 'crt', false, [ 'class' => 'submitButton', 'style' => 'float:right', 'icon' => 'next'], true);
$createFolderElements .= html_print_input_hidden('directory', $relative_directory, true);
$createFolderElements .= html_print_input_hidden('create_dir', 1, true);
$createFolderElements .= html_print_input_hidden('hash', md5($relative_directory.$config['server_unique_identifier']), true);
@ -897,7 +897,7 @@ function filemanager_file_explorer(
$uploadFileElements .= html_print_input_hidden('upload_file', 1, true);
}
$uploadFileElements .= html_print_submit_button(__('Go'), 'go', false, 'class="mrgn_lft_10px submitButton" style="display: inline;"', true);
$uploadFileElements .= html_print_submit_button(__('Go'), 'go', false, [ 'class' => 'submitButton', 'style' => 'float:right', 'icon' => 'next'], true);
$uploadFileElements .= html_print_input_hidden('real_directory', $real_directory, true);
$uploadFileElements .= html_print_input_hidden('directory', $relative_directory, true);
$uploadFileElements .= html_print_input_hidden('hash', md5($real_directory.$relative_directory.$config['server_unique_identifier']), true);
@ -918,7 +918,7 @@ function filemanager_file_explorer(
$createTextElements = $tabs_dialog;
$createTextElements .= '<form method="post" action="'.$url.'">';
$createTextElements .= html_print_input_text('name_file', '', '', 30, 50, true);
$createTextElements .= html_print_submit_button(__('Create'), 'create', false, 'class="submitButton"', true);
$createTextElements .= html_print_submit_button(__('Create'), 'create', false, [ 'class' => 'submitButton', 'style' => 'float:right', 'icon' => 'next'], true);
$createTextElements .= html_print_input_hidden('real_directory', $real_directory, true);
$createTextElements .= html_print_input_hidden('directory', $relative_directory, true);
$createTextElements .= html_print_input_hidden('hash', md5($real_directory.$relative_directory.$config['server_unique_identifier']), true);

5
pandora_console/include/styles/pandora.css
View File

@ -11327,11 +11327,6 @@ div[role="dialog"] {
z-index: 1115;
}
button[name="go"] {
margin-left: 10px;
display: inline !important;
}
.module_background_state {
mask: url(../../images/modules@svg.svg) no-repeat center / contain;
-webkit-mask: url(../../images/modules@svg.svg) no-repeat center / contain;