diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index b166e47106..83022638e6 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,20 @@ +2013-10-08 Sergio Martin + + * include/help/en/help_reporting_advanced_tab.php + include/help/es/help_reporting_advanced_tab.php: Add info + in the report macros help with new feature + + * images/custom_logo/none.png + images/custom_logo/artica_logo.jpg + images/custom_logo/artica_logo.png + images/custom_logo/sourceforge.png + images/custom_logo/pandora_logo_head.png + images/custom_logo/none.jpg: Clean and create new files for + pdf header + + * godmode/reporting/reporting_builder.php: Set FreeSans as + default font in reports + 2013-10-08 Sergio Martin * include/functions_alerts.php diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index 99558035b2..9ed08a4006 100644 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -523,6 +523,9 @@ switch ($action) { $id_group_edit_param = (int)get_parameter('id_group_edit', 0); $report_id_user = get_parameter('report_id_user'); + // Pretty font by default for pdf + $custom_font = 'FreeSans.ttf'; + switch ($type_access_selected) { case 'group_view': $id_group_edit = 0; @@ -590,7 +593,8 @@ switch ($action) { 'private' => $private, 'id_group_edit' => $id_group_edit, 'id_user' => $config['id_user'], - 'metaconsole' => $metaconsole_report)); + 'metaconsole' => $metaconsole_report, + 'custom_font' => $custom_font)); if ($idOrResult !== false) db_pandora_audit( "Report management", "Create report #$idOrResult"); else diff --git a/pandora_console/images/custom_logo/artica_logo.jpg b/pandora_console/images/custom_logo/artica_logo.jpg new file mode 100644 index 0000000000..7db529faa4 Binary files /dev/null and b/pandora_console/images/custom_logo/artica_logo.jpg differ diff --git a/pandora_console/images/custom_logo/artica_logo.png b/pandora_console/images/custom_logo/artica_logo.png deleted file mode 100644 index e7e397b2c4..0000000000 Binary files a/pandora_console/images/custom_logo/artica_logo.png and /dev/null differ diff --git a/pandora_console/images/custom_logo/none.jpg b/pandora_console/images/custom_logo/none.jpg new file mode 100644 index 0000000000..53f6f42f3e Binary files /dev/null and b/pandora_console/images/custom_logo/none.jpg differ diff --git a/pandora_console/images/custom_logo/none.png b/pandora_console/images/custom_logo/none.png deleted file mode 100644 index 157dbf59f0..0000000000 Binary files a/pandora_console/images/custom_logo/none.png and /dev/null differ diff --git a/pandora_console/images/custom_logo/pandora_logo_head.png b/pandora_console/images/custom_logo/pandora_logo_head.png deleted file mode 100755 index 2f5b60fb37..0000000000 Binary files a/pandora_console/images/custom_logo/pandora_logo_head.png and /dev/null differ diff --git a/pandora_console/images/custom_logo/sourceforge.png b/pandora_console/images/custom_logo/sourceforge.png deleted file mode 100644 index d5482f6264..0000000000 Binary files a/pandora_console/images/custom_logo/sourceforge.png and /dev/null differ diff --git a/pandora_console/include/help/en/help_reporting_advanced_tab.php b/pandora_console/include/help/en/help_reporting_advanced_tab.php index 2df2f46ca3..53449e0280 100755 --- a/pandora_console/include/help/en/help_reporting_advanced_tab.php +++ b/pandora_console/include/help/en/help_reporting_advanced_tab.php @@ -5,7 +5,7 @@ ?>

Advanced reporting

-You can use only a macro in the first page:

+You can use a macro in the first page, header and footer:

(_DATETIME_) will be replaced by the current date and time in the moment of generating the PDF.
(_REPORT_NAME_) will be replaced by the current name of report.

diff --git a/pandora_console/include/help/es/help_reporting_advanced_tab.php b/pandora_console/include/help/es/help_reporting_advanced_tab.php index 65ef234f06..42f30e24ce 100755 --- a/pandora_console/include/help/es/help_reporting_advanced_tab.php +++ b/pandora_console/include/help/es/help_reporting_advanced_tab.php @@ -5,7 +5,7 @@ ?>

Opciones avanzadas

-Puede usar una macro en la portada:

+Puede usar una macro en la portada, la cabecera y el pie de pagina:

(_DATETIME_) este token serĂ¡ reemplazado por la fecha y hora actual en el momento de generar el PDF. (_REPORT_NAME_) este token serĂ¡ reemplazado por el nombre del informe.