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-7202-fallos-visuales-discovery' into 'develop' 

Ent 7202 fallos visuales discovery

See merge request artica/pandorafms!3953
This commit is contained in:
Daniel Rodriguez 2021-03-29 09:49:31 +00:00
parent d01c3e1c92 1f89a0d293
commit 4fa790dd7f
5 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandora_console/godmode/wizards/DiscoveryTaskList.class.php
View File

@ -515,19 +515,21 @@ class DiscoveryTaskList extends HTML
} }
// Task name. // Task name.
$table->headstyle[1] .= 'min-width: 150px; width: 300px;'; $table->headstyle[1] .= 'min-width: 170px; width: 300px;';
// Server Name.
$table->headstyle[2] .= 'min-width: 130px; width: 400px;';
// Name. // Name.
$table->headstyle[4] .= 'min-width: 100px; width: 400px;'; $table->headstyle[4] .= 'min-width: 100px; width: 350px;';
// Status. // Status.
$table->headstyle[5] .= 'min-width: 50px; width: 100px;'; $table->headstyle[5] .= 'min-width: 70px; width: 190px;';
// Task type. // Task type.
$table->headstyle[6] .= 'min-width: 200px; width: 200px;'; $table->headstyle[6] .= 'min-width: 190px; width: 200px;';
// Progress. // Progress.
$table->headstyle[7] .= 'min-width: 50px; width: 150px;'; $table->headstyle[7] .= 'min-width: 60px; width: 150px;';
// Updated at. // Updated at.
$table->headstyle[8] .= 'min-width: 50px; width: 150px;'; $table->headstyle[8] .= 'min-width: 50px; width: 150px;';
// Operations. // Operations.
$table->headstyle[9] .= 'min-width: 150px; width: 150px;'; $table->headstyle[9] .= 'min-width: 150px; width: 250px;';
if (check_acl($config['id_user'], 0, 'AW')) { if (check_acl($config['id_user'], 0, 'AW')) {
$table->head[0] = __('Force'); $table->head[0] = __('Force');

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

@ -809,7 +809,7 @@ class HostDevices extends Wizard
'name' => 'interval_manual_defined', 'name' => 'interval_manual_defined',
'return' => true, 'return' => true,
], ],
'extra' => '<div id="interval_manual_container"><div class="time_selection_container">'.ui_print_help_tip( 'extra' => '<div id="interval_manual_container"><div class="time_selection_container mrgn_top_20px">'.ui_print_help_tip(
__('The minimum recomended interval for Recon Task is 5 minutes'), __('The minimum recomended interval for Recon Task is 5 minutes'),
true true
).html_print_extended_select_for_time( ).html_print_extended_select_for_time(

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

@ -648,7 +648,7 @@ class CustomNetScan extends Wizard
); );
$form['inputs'][] = [ $form['inputs'][] = [
'label' => __('Explanation').'<span id="spinner_recon_script" class="invisible">'.html_print_image('images/spinner.gif', true).'</span>', 'label' => __('Explanation').'<span id="spinner_recon_script" style="display: none">'.html_print_image('images/spinner.gif', true).'</span>',
'arguments' => [ 'arguments' => [
'type' => 'textarea', 'type' => 'textarea',
'rows' => 4, 'rows' => 4,
@ -656,7 +656,8 @@ class CustomNetScan extends Wizard
'name' => 'explanation', 'name' => 'explanation',
'value' => $explanation, 'value' => $explanation,
'return' => true, 'return' => true,
'class' => 'discovery_textarea_input w388px', 'class' => 'w388px discovery_textarea_input',
'style' => 'width: 388px',
], ],
]; ];

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

@ -47,8 +47,8 @@ class ManageNetScanScripts extends Wizard
* @var array * @var array
*/ */
public $pageLabels = [ public $pageLabels = [
'List net scan scripts', 'List NetScan scripts',
'Operation net scan cripts', 'Operation NetScan scripts',
]; ];
@ -605,7 +605,7 @@ class ManageNetScanScripts extends Wizard
$datam = []; $datam = [];
$datam[0] = __('Description'); $datam[0] = __('Description');
$datam[0] .= "<span class='normal'> ( "; $datam[0] .= "<span class='normal_weight'> ( ";
$datam[0] .= $macro_name; $datam[0] .= $macro_name;
$datam[0] .= ' )</span>'; $datam[0] .= ' )</span>';
$datam[0] .= html_print_input_hidden( $datam[0] .= html_print_input_hidden(
@ -634,7 +634,7 @@ class ManageNetScanScripts extends Wizard
} }
$datam[2] = __('Default value'); $datam[2] = __('Default value');
$datam[2] .= "<span class='normal'> ( "; $datam[2] .= "<span class='normal_weight'> ( ";
$datam[2] .= $macro_name; $datam[2] .= $macro_name;
$datam[2] .= ' ) </span>'; $datam[2] .= ' ) </span>';
$datam[3] = html_print_input_text_extended( $datam[3] = html_print_input_text_extended(
@ -688,7 +688,7 @@ class ManageNetScanScripts extends Wizard
$datam = []; $datam = [];
$datam[0] = __('Help'); $datam[0] = __('Help');
$datam[0] .= "<span class='normal'> ( "; $datam[0] .= "<span class='normal_weight'> ( ";
$datam[0] .= $macro_name; $datam[0] .= $macro_name;
$datam[0] .= ' )</span><br><br><br>'; $datam[0] .= ' )</span><br><br><br>';

4
pandora_console/include/functions_ui.php
View File

@ -322,8 +322,8 @@ function ui_print_message($message, $class='', $attributes='', $return=false, $t
class="info_box '.$id.' '.$class.' textodialogo" style="'.$force_style.'"> class="info_box '.$id.' '.$class.' textodialogo" style="'.$force_style.'">
<tr> <tr>
<td class="icon icon_ui" rowspan="2" >'.html_print_image($icon_image, true, false, false, false, false).'</td> <td class="icon icon_ui" rowspan="2" >'.html_print_image($icon_image, true, false, false, false, false).'</td>
<td class="title" class="pandora_upper pdd_t_10px"><b>'.$text_title.'</b></td> <td class="title pandora_upper pdd_t_10px"><b>'.$text_title.'</b></td>
<td class="icon" class="right pdd_r_3px">'; <td class="icon right pdd_r_3px">';
if (!$no_close_bool) { if (!$no_close_bool) {
// Use the no_meta parameter because this image is only in // Use the no_meta parameter because this image is only in
// the base console. // the base console.