Merge branch 'cambios_visuales_recorn_task' into 'develop'

fixed visual error in recorn task

See merge request !290
This commit is contained in:
daniel 2017-03-23 10:13:36 +01:00
commit a57cf46179
1 changed files with 20 additions and 20 deletions

View File

@ -206,7 +206,7 @@ $table->rowclass[5] = "network_sweep";
$table->rowclass[7] = "network_sweep";
$table->rowclass[8] = "network_sweep";
$table->rowclass[11] = "network_sweep";
$table->rowclass[17] = "network_sweep";
$table->rowclass[12] = "network_sweep";
$table->rowclass[18] = "network_sweep";
$table->rowclass[19] = "network_sweep";
$table->rowclass[20] = "network_sweep";
@ -215,11 +215,11 @@ $table->rowclass[22] = "network_sweep";
$table->rowclass[23] = "network_sweep";
$table->rowclass[6] = "recon_script";
$table->rowclass[12] = "recon_script";
$table->rowclass[13] = "recon_script";
$table->rowclass[14] = "recon_script";
$table->rowclass[15] = "recon_script";
$table->rowclass[16] = "recon_script";
$table->rowclass[17] = "recon_script";
// Name
$table->data[0][0] = "<b>" . __('Task name') . "</b>";
$table->data[0][1] = html_print_input_text ('name', $name, '', 25, 0, true);
@ -318,15 +318,19 @@ $table->data[10][0] = "<b>".__('Incident');
$table->data[10][1] = html_print_select ($values, "create_incident", $create_incident,
'','','',true) . ' ' . ui_print_help_tip (__('Choose if the discovery of a new system creates an incident or not.'), true);
//snmp_enabled
$table->data[11][0] = "<b>".__('SNMP enabled');
$table->data[11][1] = html_print_checkbox ('snmp_enabled', 1, $snmp_enabled, true);
// SNMP default community
$table->data[11][0] = "<b>".__('SNMP Default community');
$table->data[11][1] = html_print_input_text ('snmp_community', $snmp_community, '', 35, 0, true);
$table->data[12][0] = "<b>".__('SNMP Default community');
$table->data[12][1] = html_print_input_text ('snmp_community', $snmp_community, '', 35, 0, true);
// Explanation
$explanation = db_get_value('description', 'trecon_script', 'id_recon_script', $id_recon_script);
$table->data[12][0] = "<b>" . __('Explanation') . "</b>";
$table->data[12][1] = "<span id='spinner_layout' style='display: none;'>" . html_print_image ("images/spinner.gif", true) .
$table->data[13][0] = "<b>" . __('Explanation') . "</b>";
$table->data[13][1] = "<span id='spinner_layout' style='display: none;'>" . html_print_image ("images/spinner.gif", true) .
"</span>" . html_print_textarea('explanation', 4, 60, $explanation, 'style="width: 388px;"', true);
// A hidden "model row" to clone it from javascript to add fields dynamicaly
@ -362,28 +366,24 @@ if (!empty($macros)) {
}
// Comments
$table->data[17][0] = "<b>".__('Comments');
$table->data[17][1] = html_print_input_text ('description', $description, '', 45, 0, true);
$table->data[18][0] = "<b>".__('Comments');
$table->data[18][1] = html_print_input_text ('description', $description, '', 45, 0, true);
// OS detection
$table->data[18][0] = "<b>".__('OS detection');
$table->data[18][1] = html_print_checkbox ('os_detect', 1, $os_detect, true);
$table->data[19][0] = "<b>".__('OS detection');
$table->data[19][1] = html_print_checkbox ('os_detect', 1, $os_detect, true);
// Name resolution
$table->data[19][0] = "<b>".__('Name resolution');
$table->data[19][1] = html_print_checkbox ('resolve_names', 1, $resolve_names, true);
$table->data[20][0] = "<b>".__('Name resolution');
$table->data[20][1] = html_print_checkbox ('resolve_names', 1, $resolve_names, true);
// Parent detection
$table->data[20][0] = "<b>".__('Parent detection');
$table->data[20][1] = html_print_checkbox ('parent_detection', 1, $parent_detection, true);
$table->data[21][0] = "<b>".__('Parent detection');
$table->data[21][1] = html_print_checkbox ('parent_detection', 1, $parent_detection, true);
// Parent recursion
$table->data[21][0] = "<b>".__('Parent recursion');
$table->data[21][1] = html_print_input_text ('parent_recursion', $parent_recursion, '', 5, 0, true) . ui_print_help_tip (__('Maximum number of parent hosts that will be created if parent detection is enabled.'), true);
//snmp_enabled
$table->data[22][0] = "<b>".__('SNMP enabled');
$table->data[22][1] = html_print_checkbox ('snmp_enabled', 1, $snmp_enabled, true);
$table->data[22][0] = "<b>".__('Parent recursion');
$table->data[22][1] = html_print_input_text ('parent_recursion', $parent_recursion, '', 5, 0, true) . ui_print_help_tip (__('Maximum number of parent hosts that will be created if parent detection is enabled.'), true);
//vlan_enabled
$table->data[23][0] = "<b>".__('Vlan enabled');