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

2013-01-08 Dario Rodriguez <dario.rodriguez@artica.es> 

* godmode/reporting/reporting_builder.php: Added a default cover
	for PDF reports.
	include/help/ja/help_reporting_advanced_tab.php,
	include/help/en/help_reporting_advanced_tab.php,
	include/help/es/help_reporting_advanced_tab.php: Documented new macro
	called REPORT_NAME

	MERGED FROM 4.0.3



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7365 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
darode 2013-01-08 11:05:14 +00:00
parent ac64dba549
commit 366deb9a91
5 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/ChangeLog
View File

@ -1,3 +1,14 @@
2013-01-08 Dario Rodriguez <dario.rodriguez@artica.es>
* godmode/reporting/reporting_builder.php: Added a default cover
for PDF reports.
include/help/ja/help_reporting_advanced_tab.php,
include/help/en/help_reporting_advanced_tab.php,
include/help/es/help_reporting_advanced_tab.php: Documented new macro
called REPORT_NAME
MERGED FROM 4.0.3
2013-01-08 Dario Rodriguez <dario.rodriguez@artica.es>
* godmode/agentes/module_manager.php: Added a link to module library

4
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -560,10 +560,14 @@ switch ($action) {
else
$metaconsole_report = 0;
$start_url = ui_get_full_url(false);
$first_page = "&lt;p&#x20;style=&quot;text-align:&#x20;center;&quot;&gt;&amp;nbsp;&lt;/p&gt;&#x0d;&#x0a;&lt;p&#x20;style=&quot;text-align:&#x20;center;&quot;&gt;&amp;nbsp;&lt;/p&gt;&#x0d;&#x0a;&lt;p&#x20;style=&quot;text-align:&#x20;center;&quot;&gt;&amp;nbsp;&lt;/p&gt;&#x0d;&#x0a;&lt;p&#x20;style=&quot;text-align:&#x20;center;&quot;&gt;&amp;nbsp;&lt;/p&gt;&#x0d;&#x0a;&lt;p&#x20;style=&quot;text-align:&#x20;center;&quot;&gt;&amp;nbsp;&lt;/p&gt;&#x0d;&#x0a;&lt;p&#x20;style=&quot;text-align:&#x20;center;&quot;&gt;&amp;nbsp;&lt;/p&gt;&#x0d;&#x0a;&lt;p&#x20;style=&quot;text-align:&#x20;center;&quot;&gt;&amp;nbsp;&lt;/p&gt;&#x0d;&#x0a;&lt;p&#x20;style=&quot;text-align:&#x20;center;&quot;&gt;&lt;img&#x20;src=&quot;".$start_url."/images/pandora_report_logo.png&quot;&#x20;alt=&quot;&quot;&#x20;width=&quot;800&quot;&#x20;/&gt;&lt;/p&gt;&#x0d;&#x0a;&lt;p&#x20;style=&quot;text-align:&#x20;center;&quot;&gt;&amp;nbsp;&lt;/p&gt;&#x0d;&#x0a;&lt;p&#x20;style=&quot;text-align:&#x20;center;&quot;&gt;&lt;span&#x20;style=&quot;font-size:&#x20;xx-large;&quot;&gt;&#40;_REPORT_NAME_&#41;&lt;/span&gt;&lt;/p&gt;&#x0d;&#x0a;&lt;p&#x20;style=&quot;text-align:&#x20;center;&quot;&gt;&lt;span&#x20;style=&quot;font-size:&#x20;large;&quot;&gt;&#40;_DATETIME_&#41;&lt;/span&gt;&lt;/p&gt;";
$idOrResult = db_process_sql_insert('treport',
array('name' => $reportName,
'id_group' => $idGroupReport,
'description' => $description,
'first_page' => $first_page,
'private' => $private,
'id_group_edit' => $id_group_edit,
'id_user' => $config['id_user'],

4
pandora_console/include/help/en/help_reporting_advanced_tab.php
View File

@ -5,7 +5,9 @@
?>
<h1>Advanced reporting</h1>
<p>
You can use only a macro in the first page: (_DATETIME_) this token will be replaced by the current date and time in the moment of generating the PDF.
You can use only a macro in the first page: <br><br>
<b>(_DATETIME_)</b> will be replaced by the current date and time in the moment of generating the PDF.<br>
<b>(_REPORT_NAME_)</b> will be replaced by the current name of report.
<br><br>
If you have problems loading a image file, try using a PNG format instead JPG or other formats.
</p>

2
pandora_console/include/help/es/help_reporting_advanced_tab.php
View File

@ -6,8 +6,8 @@
<h1>Opciones avanzadas</h1>
<p>
Puede usar una macro en la portada:<br><br>
<b>(_DATETIME_)</b> este token será reemplazado por la fecha y hora actual en el momento de generar el PDF.
<b>(_REPORT_NAME_)</b> este token será reemplazado por el nombre del informe.
<br><br>
Si tiene problemas visualizando una imagen, prueba a usar el formato PNG en vez de usar otros formatos.
</p>

3
pandora_console/include/help/ja/help_reporting_advanced_tab.php
View File

@ -5,7 +5,8 @@
?>
<h1>拡張レポート</h1>
<p>
_DATETIME_ マクロは、最初のページで利用できます。これは、PDF を生成した時点の日時に置き換えられます。
<b>(_DATETIME_)</b> マクロは、最初のページで利用できます。これは、PDF を生成した時点の日時に置き換えられます。<br>
<b>(_REPORT_NAME)</b> will be replaced by the current name of report.
<br><br>
画像ファイルの読み込みで問題がある場合は、JPG 等のフォーマットではなく、PNG フォーマットを使ってみてください。
</p>