diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index a1056516d9..d336ba361e 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,12 @@ +2014-06-02 Miguel de Dios + + * godmode/reporting/visual_console_builder.editor.js: fixed the + default height for the visualmap editor. + + Incident: #823 + + * godmode/servers/manage_recontask_form.php: fixed PHP warning. + 2014-06-02 Sergio Martin * include/styles/pandora.css: Change the zindex of autohidden diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js index 5e61f5a14c..5fd5295f03 100644 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.js +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js @@ -70,6 +70,9 @@ function visual_map_main() { } } }); + + //Resize the view to adapt the screen size. + $("#frame_view").height($("#main").height() - 75); } function cancel_button_palette_callback() { diff --git a/pandora_console/godmode/servers/manage_recontask_form.php b/pandora_console/godmode/servers/manage_recontask_form.php index 45964ba9a0..142d2d4ca4 100644 --- a/pandora_console/godmode/servers/manage_recontask_form.php +++ b/pandora_console/godmode/servers/manage_recontask_form.php @@ -214,10 +214,12 @@ $table->data[5][1] = html_print_select_from_sql ('SELECT id_np, name FROM tnetwo "id_network_profile", $id_network_profile, '', __('None'), 0, true); // Recon script +$data[1] = ''; $table->data[6][0] = "".__('Recon script'); $table->data[6][1] = html_print_select_from_sql ('SELECT id_recon_script, name FROM trecon_script', "id_recon_script", $id_recon_script, 'get_explanation_recon_script($(\'#id_recon_script\').val())', '', '', true); -$table->data[6][1] .= $data[1] .= html_print_input_hidden('macros',base64_encode($macros),true); +$table->data[6][1] .= $data[1] .= html_print_input_hidden('macros', + base64_encode($macros),true); // OS