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

Merge branch 'ent-10955-fallos-de-estilos-en-discovery-netscan' into 'develop' 

Ent 10955 fallos de estilos en discovery netscan

See merge request artica/pandorafms!5739
This commit is contained in:
Rafael Ameijeiras 2023-04-20 08:32:37 +00:00
parent 07cc7372b8 e1e72ca882
commit f2be417a5e
2 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pandora_console/godmode/wizards/HostDevices.class.php
View File

@ -792,7 +792,7 @@ class HostDevices extends Wizard
$form['rows'][0]['columns'][0] = [ $form['rows'][0]['columns'][0] = [
'width' => '30%', 'width' => '30%',
'style' => 'padding: 9px;min-width: 250px;', 'style' => 'padding: 9px;min-width: 188px;',
'inputs' => [ 'inputs' => [
'1' => '<div class="height_50p mrgn_btn_35px">'.html_print_image('images/wizard/netscan_green.png', true, ['title' => __('Close')], false).'</div>', '1' => '<div class="height_50p mrgn_btn_35px">'.html_print_image('images/wizard/netscan_green.png', true, ['title' => __('Close')], false).'</div>',
'2' => [ '2' => [
@ -825,12 +825,11 @@ class HostDevices extends Wizard
], ],
], ],
]; ];
$form['rows'][0]['columns'][1] = [ $form['rows'][0]['columns'][1] = [
'width' => '40%', 'width' => '40%',
'padding-right' => '12%', 'padding-right' => '8%',
'padding-left' => '5%', 'padding-left' => '0%',
'style' => 'min-width: 350px', 'style' => 'min-width: 230px',
'inputs' => [ 'inputs' => [
'0' => [ '0' => [
'label' => '<b>'.__('Task name').':</b>', 'label' => '<b>'.__('Task name').':</b>',
@ -926,11 +925,15 @@ class HostDevices extends Wizard
], ],
]; ];
// Group select (custom for this section). $form['rows'][0]['columns'][2] = [
$group_select = '<div class="label_select"><label>'.__('Group').':</label></div>'; 'width' => '40%',
'padding-right' => '5%',
$group_select .= $this->printInput( 'padding-left' => '0',
[ 'style' => 'min-width: 144px;',
'inputs' => [
'0' => [
'label' => '<b>'.__('Group').':</b>',
'arguments' => [
'name' => 'id_group', 'name' => 'id_group',
'returnAllGroup' => false, 'returnAllGroup' => false,
'privilege' => $this->access, 'privilege' => $this->access,
@ -940,13 +943,9 @@ class HostDevices extends Wizard
'class' => 'discovery_list_input', 'class' => 'discovery_list_input',
'simple_multiple_options' => true, 'simple_multiple_options' => true,
'required' => true, 'required' => true,
] ],
); ],
],
$form['rows'][0]['columns'][2] = [
'width' => '30%',
'style' => 'min-width: 250px',
'inputs' => ['0' => $group_select],
]; ];
$form['rows'][1]['style'] = 'style de row'; $form['rows'][1]['style'] = 'style de row';
@ -1586,6 +1585,10 @@ class HostDevices extends Wizard
$(function() { $(function() {
SNMPExtraShow($("#snmp_version").val()); SNMPExtraShow($("#snmp_version").val());
}); });
$("#id_network_profile").select2({
placeholder: "'.__('Please select...').'"
});
'; ';
if (enterprise_installed()) { if (enterprise_installed()) {

2
pandora_console/include/class/ManageNetScanScripts.class.php
View File

@ -560,7 +560,7 @@ class ManageNetScanScripts extends Wizard
$data = []; $data = [];
$data[0] = __('Description'); $data[0] = __('Description');
$data[1] = '<textarea name="form_description" cols="50" rows="4">'; $data[1] = '<textarea name="form_description" cols="69" rows="5">';
$data[1] .= $form_description; $data[1] .= $form_description;
$data[1] .= '</textarea>'; $data[1] .= '</textarea>';
$table->data['recon_description'] = $data; $table->data['recon_description'] = $data;