tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-27 15:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-12989-opcion-de-csv-en-recon-task-aparece-descolocada' into 'develop'

Browse Source 
Ent 12989 opcion de csv en recon task aparece descolocada

See merge request artica/pandorafms!6995
This commit is contained in:
Rafael Ameijeiras 2024-03-07 15:41:12 +00:00
commit 17f045b2bc
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -943,11 +943,12 @@ class HostDevices extends Wizard
true true
), ),
'arguments' => [ 'arguments' => [
'name' => 'network_csv', 'name' => 'network_csv',
'type' => 'file', 'type' => 'file',
'columns' => 25, 'columns' => 25,
'rows' => 10, 'rows' => 10,
'class' => 'discovery_full_width_input', 'class' => 'discovery_full_width_input',
'class_label' => 'label_csv',
], ],
], ],
[ [

8
pandora_console/include/class/HTML.class.php
View File

@ -700,7 +700,11 @@ class HTML
$output .= '<div class="mrgn_right_10px">'; $output .= '<div class="mrgn_right_10px">';
} }
$output .= '<div class="">'; $class_label = (empty($input['arguments']['class_label']) === false)
? $input['arguments']['class_label']
: '';
$output .= '<div class="'.$class_label.'">';
$output .= $input['label']; $output .= $input['label'];
$output .= '</div>'; $output .= '</div>';
@ -1149,7 +1153,7 @@ class HTML
$output_submit .= self::printBlockAsGrid($input, true); $output_submit .= self::printBlockAsGrid($input, true);
} }
} else { } else {
$output_submit .= self::printBlockAsGrid($input, true); $output .= self::printBlockAsGrid($input, true);
} }
} else { } else {
$output .= $input; $output .= $input;

4
pandora_console/include/styles/wizard.css
View File

@ -17,6 +17,10 @@ ul.wizard li {
padding: 0px; padding: 0px;
} }
.label_csv {
margin-bottom: 5px;
}
ul.wizard.inline li { ul.wizard.inline li {
display: flex; display: flex;
flex-direction: row; flex-direction: row;