tyler.durden/loganalyzer
1
0
Fork 0
mirror of https://github.com/rsyslog/loganalyzer.git synced 2025-09-26 03:09:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Enhanced reports admin interface for better usability

Browse Source
This commit is contained in:
Andre Lorbach 2010-03-18 17:05:24 +01:00
parent f112bbfe65
commit 90de75c294
7 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/admin/reports.php
View File

@ -1288,7 +1288,7 @@ function CreateCronCommand( $myReportID, $mySavedReportID = null )
{ {
// Running on Windows // Running on Windows
$phpCmd = PHP_BINDIR . "\\php.exe"; $phpCmd = PHP_BINDIR . "\\php.exe";
$phpScript = realpath($gl_root_path) . "\\cron\\cmdreportgen.php"; $phpScript = realpath($gl_root_path) . "cron\\cmdreportgen.php";
} }
else else
{ {

1
src/include/functions_common.php
View File

@ -700,6 +700,7 @@ function InitFrontEndVariables()
$content['MENU_DOCUMENTLIST'] = $content['BASEPATH'] . "images/icons/documents.png"; $content['MENU_DOCUMENTLIST'] = $content['BASEPATH'] . "images/icons/documents.png";
$content['MENU_WINDOWLIST'] = $content['BASEPATH'] . "images/icons/windows.png"; $content['MENU_WINDOWLIST'] = $content['BASEPATH'] . "images/icons/windows.png";
$content['MENU_CHECKED'] = $content['BASEPATH'] . "images/icons/check.png"; $content['MENU_CHECKED'] = $content['BASEPATH'] . "images/icons/check.png";
$content['MENU_PLAY_GREEN'] = $content['BASEPATH'] . "images/icons/bullet_triangle_green.png";
$content['MENU_PAGER_BEGIN'] = $content['BASEPATH'] . "images/icons/media_beginning.png"; $content['MENU_PAGER_BEGIN'] = $content['BASEPATH'] . "images/icons/media_beginning.png";
$content['MENU_PAGER_PREVIOUS'] = $content['BASEPATH'] . "images/icons/media_rewind.png"; $content['MENU_PAGER_PREVIOUS'] = $content['BASEPATH'] . "images/icons/media_rewind.png";

12
src/lang/de/admin.php
View File

@ -386,17 +386,17 @@ $content['LN_CMD_'] = "";
// Report Options // Report Options
$content['LN_REPORTS_EDIT'] = "Edit Report"; $content['LN_REPORTS_EDIT'] = "Edit Report";
$content['LN_REPORTS_DELETE'] = "Remove Report"; $content['LN_REPORTS_DELETE'] = "Remove Report";
$content['LN_REPORTS_ID'] = "Report ID";
$content['LN_REPORTS_CAT'] = "Report Category"; $content['LN_REPORTS_CAT'] = "Report Category";
$content['LN_REPORTS_ID'] = "Report ID";
$content['LN_REPORTS_NAME'] = "Report Name"; $content['LN_REPORTS_NAME'] = "Report Name";
$content['LN_REPORTS_DESCRIPTION'] = "Report Description"; $content['LN_REPORTS_DESCRIPTION'] = "Report Description";
$content['LN_REPORTS_REQUIREDFIELDS'] = "Required Fields"; $content['LN_REPORTS_REQUIREDFIELDS'] = "Required Fields";
$content['LN_REPORTS_ERROR_NOREPORTS'] = "There were no valid reports found in your installation."; $content['LN_REPORTS_ERROR_NOREPORTS'] = "There were no valid reports found in your installation.";
$content['LN_REPORTS_HELP'] = "Help"; $content['LN_REPORTS_HELP'] = "Help";
$content['LN_REPORTS_HELP_CLICK'] = "Klicken Sie hier, um weitere Hilfe und Beschreibung zum Report zu erhalten"; $content['LN_REPORTS_HELP_CLICK'] = "Click here for a detailed report description";
$content['LN_REPORTS_INFO'] = "Show more Information for this report module."; $content['LN_REPORTS_INFO'] = "Show more Information";
$content['LN_REPORTS_INIT'] = "Initialize settings for this report module."; $content['LN_REPORTS_INIT'] = "Initialize settings";
$content['LN_REPORTS_REMOVE'] = "Remove settings for this report module."; $content['LN_REPORTS_REMOVE'] = "Remove settings";
$content['LN_REPORTS_ERROR_IDNOTFOUND'] = "There was no report with ID '%1' found."; $content['LN_REPORTS_ERROR_IDNOTFOUND'] = "There was no report with ID '%1' found.";
$content['LN_REPORTS_ERROR_INVALIDID'] = "Invalid report id."; $content['LN_REPORTS_ERROR_INVALIDID'] = "Invalid report id.";
$content['LN_REPORTS_DETAILS'] = "Details for this report"; $content['LN_REPORTS_DETAILS'] = "Details for this report";
@ -405,7 +405,7 @@ $content['LN_REPORTS_ERROR_HASBEENREMOVED'] = "All settings for the report '%1'
$content['LN_REPORTS_ERROR_HASBEENADDED'] = "All required settings for the report '%1' have been added."; $content['LN_REPORTS_ERROR_HASBEENADDED'] = "All required settings for the report '%1' have been added.";
$content['LN_REPORTS_ERROR_NOFIELDS'] = "The report '%1' does not have any custom settings which can be added."; $content['LN_REPORTS_ERROR_NOFIELDS'] = "The report '%1' does not have any custom settings which can be added.";
$content['LN_REPORTS_ERROR_REPORTDOESNTNEEDTOBEREMOVED'] = "The report '%1' does not need to be removed or initialized."; $content['LN_REPORTS_ERROR_REPORTDOESNTNEEDTOBEREMOVED'] = "The report '%1' does not need to be removed or initialized.";
$content['LN_REPORTS_ADDSAVEDREPORT'] = "Add Savedreport from Type"; $content['LN_REPORTS_ADDSAVEDREPORT'] = "Add Savedreport";
$content['LN_REPORTS_EDITSAVEDREPORT'] = "Edit Savedreport"; $content['LN_REPORTS_EDITSAVEDREPORT'] = "Edit Savedreport";
$content['LN_REPORTS_REMOVESAVEDREPORT'] = "Remove Savedreport"; $content['LN_REPORTS_REMOVESAVEDREPORT'] = "Remove Savedreport";
$content['LN_REPORTS_CUSTOMTITLE'] = "Report Title"; $content['LN_REPORTS_CUSTOMTITLE'] = "Report Title";

8
src/lang/en/admin.php
View File

@ -407,9 +407,9 @@ $content['LN_REPORTS_REQUIREDFIELDS'] = "Required Fields";
$content['LN_REPORTS_ERROR_NOREPORTS'] = "There were no valid reports found in your installation."; $content['LN_REPORTS_ERROR_NOREPORTS'] = "There were no valid reports found in your installation.";
$content['LN_REPORTS_HELP'] = "Help"; $content['LN_REPORTS_HELP'] = "Help";
$content['LN_REPORTS_HELP_CLICK'] = "Click here for a detailed report description"; $content['LN_REPORTS_HELP_CLICK'] = "Click here for a detailed report description";
$content['LN_REPORTS_INFO'] = "Show more Information for this report module."; $content['LN_REPORTS_INFO'] = "Show more Information";
$content['LN_REPORTS_INIT'] = "Initialize settings for this report module."; $content['LN_REPORTS_INIT'] = "Initialize settings";
$content['LN_REPORTS_REMOVE'] = "Remove settings for this report module."; $content['LN_REPORTS_REMOVE'] = "Remove settings";
$content['LN_REPORTS_ERROR_IDNOTFOUND'] = "There was no report with ID '%1' found."; $content['LN_REPORTS_ERROR_IDNOTFOUND'] = "There was no report with ID '%1' found.";
$content['LN_REPORTS_ERROR_INVALIDID'] = "Invalid report id."; $content['LN_REPORTS_ERROR_INVALIDID'] = "Invalid report id.";
$content['LN_REPORTS_DETAILS'] = "Details for this report"; $content['LN_REPORTS_DETAILS'] = "Details for this report";
@ -418,7 +418,7 @@ $content['LN_REPORTS_ERROR_HASBEENREMOVED'] = "All settings for the report '%1'
$content['LN_REPORTS_ERROR_HASBEENADDED'] = "All required settings for the report '%1' have been added."; $content['LN_REPORTS_ERROR_HASBEENADDED'] = "All required settings for the report '%1' have been added.";
$content['LN_REPORTS_ERROR_NOFIELDS'] = "The report '%1' does not have any custom settings which can be added."; $content['LN_REPORTS_ERROR_NOFIELDS'] = "The report '%1' does not have any custom settings which can be added.";
$content['LN_REPORTS_ERROR_REPORTDOESNTNEEDTOBEREMOVED'] = "The report '%1' does not need to be removed or initialized."; $content['LN_REPORTS_ERROR_REPORTDOESNTNEEDTOBEREMOVED'] = "The report '%1' does not need to be removed or initialized.";
$content['LN_REPORTS_ADDSAVEDREPORT'] = "Add Savedreport from Type"; $content['LN_REPORTS_ADDSAVEDREPORT'] = "Add Savedreport";
$content['LN_REPORTS_EDITSAVEDREPORT'] = "Edit Savedreport"; $content['LN_REPORTS_EDITSAVEDREPORT'] = "Edit Savedreport";
$content['LN_REPORTS_REMOVESAVEDREPORT'] = "Remove Savedreport"; $content['LN_REPORTS_REMOVESAVEDREPORT'] = "Remove Savedreport";
$content['LN_REPORTS_CUSTOMTITLE'] = "Report Title"; $content['LN_REPORTS_CUSTOMTITLE'] = "Report Title";

10
src/lang/it_IT/admin.php
View File

@ -397,17 +397,17 @@ $content['LN_CMD_'] = "";
// Report Options // Report Options
$content['LN_REPORTS_EDIT'] = "Edit Report"; $content['LN_REPORTS_EDIT'] = "Edit Report";
$content['LN_REPORTS_DELETE'] = "Remove Report"; $content['LN_REPORTS_DELETE'] = "Remove Report";
$content['LN_REPORTS_ID'] = "Report ID";
$content['LN_REPORTS_CAT'] = "Report Category"; $content['LN_REPORTS_CAT'] = "Report Category";
$content['LN_REPORTS_ID'] = "Report ID";
$content['LN_REPORTS_NAME'] = "Report Name"; $content['LN_REPORTS_NAME'] = "Report Name";
$content['LN_REPORTS_DESCRIPTION'] = "Report Description"; $content['LN_REPORTS_DESCRIPTION'] = "Report Description";
$content['LN_REPORTS_REQUIREDFIELDS'] = "Required Fields"; $content['LN_REPORTS_REQUIREDFIELDS'] = "Required Fields";
$content['LN_REPORTS_ERROR_NOREPORTS'] = "There were no valid reports found in your installation."; $content['LN_REPORTS_ERROR_NOREPORTS'] = "There were no valid reports found in your installation.";
$content['LN_REPORTS_HELP'] = "Help"; $content['LN_REPORTS_HELP'] = "Help";
$content['LN_REPORTS_HELP_CLICK'] = "Click here for a detailed report description"; $content['LN_REPORTS_HELP_CLICK'] = "Click here for a detailed report description";
$content['LN_REPORTS_INFO'] = "Show more Information for this report module."; $content['LN_REPORTS_INFO'] = "Show more Information";
$content['LN_REPORTS_INIT'] = "Initialize settings for this report module."; $content['LN_REPORTS_INIT'] = "Initialize settings";
$content['LN_REPORTS_REMOVE'] = "Remove settings for this report module."; $content['LN_REPORTS_REMOVE'] = "Remove settings";
$content['LN_REPORTS_ERROR_IDNOTFOUND'] = "There was no report with ID '%1' found."; $content['LN_REPORTS_ERROR_IDNOTFOUND'] = "There was no report with ID '%1' found.";
$content['LN_REPORTS_ERROR_INVALIDID'] = "Invalid report id."; $content['LN_REPORTS_ERROR_INVALIDID'] = "Invalid report id.";
$content['LN_REPORTS_DETAILS'] = "Details for this report"; $content['LN_REPORTS_DETAILS'] = "Details for this report";
@ -416,7 +416,7 @@ $content['LN_REPORTS_ERROR_HASBEENREMOVED'] = "All settings for the report '%1'
$content['LN_REPORTS_ERROR_HASBEENADDED'] = "All required settings for the report '%1' have been added."; $content['LN_REPORTS_ERROR_HASBEENADDED'] = "All required settings for the report '%1' have been added.";
$content['LN_REPORTS_ERROR_NOFIELDS'] = "The report '%1' does not have any custom settings which can be added."; $content['LN_REPORTS_ERROR_NOFIELDS'] = "The report '%1' does not have any custom settings which can be added.";
$content['LN_REPORTS_ERROR_REPORTDOESNTNEEDTOBEREMOVED'] = "The report '%1' does not need to be removed or initialized."; $content['LN_REPORTS_ERROR_REPORTDOESNTNEEDTOBEREMOVED'] = "The report '%1' does not need to be removed or initialized.";
$content['LN_REPORTS_ADDSAVEDREPORT'] = "Add Savedreport from Type"; $content['LN_REPORTS_ADDSAVEDREPORT'] = "Add Savedreport";
$content['LN_REPORTS_EDITSAVEDREPORT'] = "Edit Savedreport"; $content['LN_REPORTS_EDITSAVEDREPORT'] = "Edit Savedreport";
$content['LN_REPORTS_REMOVESAVEDREPORT'] = "Remove Savedreport"; $content['LN_REPORTS_REMOVESAVEDREPORT'] = "Remove Savedreport";
$content['LN_REPORTS_CUSTOMTITLE'] = "Report Title"; $content['LN_REPORTS_CUSTOMTITLE'] = "Report Title";

8
src/lang/pt_BR/admin.php
View File

@ -394,9 +394,9 @@ $content['LN_REPORTS_REQUIREDFIELDS'] = "Required Fields";
$content['LN_REPORTS_ERROR_NOREPORTS'] = "There were no valid reports found in your installation."; $content['LN_REPORTS_ERROR_NOREPORTS'] = "There were no valid reports found in your installation.";
$content['LN_REPORTS_HELP'] = "Help"; $content['LN_REPORTS_HELP'] = "Help";
$content['LN_REPORTS_HELP_CLICK'] = "Click here for a detailed report description"; $content['LN_REPORTS_HELP_CLICK'] = "Click here for a detailed report description";
$content['LN_REPORTS_INFO'] = "Show more Information for this report module."; $content['LN_REPORTS_INFO'] = "Show more Information";
$content['LN_REPORTS_INIT'] = "Initialize settings for this report module."; $content['LN_REPORTS_INIT'] = "Initialize settings";
$content['LN_REPORTS_REMOVE'] = "Remove settings for this report module."; $content['LN_REPORTS_REMOVE'] = "Remove settings";
$content['LN_REPORTS_ERROR_IDNOTFOUND'] = "There was no report with ID '%1' found."; $content['LN_REPORTS_ERROR_IDNOTFOUND'] = "There was no report with ID '%1' found.";
$content['LN_REPORTS_ERROR_INVALIDID'] = "Invalid report id."; $content['LN_REPORTS_ERROR_INVALIDID'] = "Invalid report id.";
$content['LN_REPORTS_DETAILS'] = "Details for this report"; $content['LN_REPORTS_DETAILS'] = "Details for this report";
@ -405,7 +405,7 @@ $content['LN_REPORTS_ERROR_HASBEENREMOVED'] = "All settings for the report '%1'
$content['LN_REPORTS_ERROR_HASBEENADDED'] = "All required settings for the report '%1' have been added."; $content['LN_REPORTS_ERROR_HASBEENADDED'] = "All required settings for the report '%1' have been added.";
$content['LN_REPORTS_ERROR_NOFIELDS'] = "The report '%1' does not have any custom settings which can be added."; $content['LN_REPORTS_ERROR_NOFIELDS'] = "The report '%1' does not have any custom settings which can be added.";
$content['LN_REPORTS_ERROR_REPORTDOESNTNEEDTOBEREMOVED'] = "The report '%1' does not need to be removed or initialized."; $content['LN_REPORTS_ERROR_REPORTDOESNTNEEDTOBEREMOVED'] = "The report '%1' does not need to be removed or initialized.";
$content['LN_REPORTS_ADDSAVEDREPORT'] = "Add Savedreport from Type"; $content['LN_REPORTS_ADDSAVEDREPORT'] = "Add Savedreport";
$content['LN_REPORTS_EDITSAVEDREPORT'] = "Edit Savedreport"; $content['LN_REPORTS_EDITSAVEDREPORT'] = "Edit Savedreport";
$content['LN_REPORTS_REMOVESAVEDREPORT'] = "Remove Savedreport"; $content['LN_REPORTS_REMOVESAVEDREPORT'] = "Remove Savedreport";
$content['LN_REPORTS_CUSTOMTITLE'] = "Report Title"; $content['LN_REPORTS_CUSTOMTITLE'] = "Report Title";

29
src/templates/admin/admin_reports.html
View File

@ -46,40 +46,39 @@
<td align="left" class="{cssclass}" valign="top"><b>{ID}</b></td> <td align="left" class="{cssclass}" valign="top"><b>{ID}</b></td>
<td align="left" class="{cssclass}" valign="top"><a href="{BASEPATH}admin/reports.php?op=details&id={ID}">{DisplayName}</a></td> <td align="left" class="{cssclass}" valign="top"><a href="{BASEPATH}admin/reports.php?op=details&id={ID}">{DisplayName}</a></td>
<td align="left" class="{cssclass}" valign="top">{Description}</td> <td align="left" class="{cssclass}" valign="top">{Description}</td>
<td align="center" class="{cssclass}"> <td align="center" class="{cssclass}">&nbsp;</td>
<a href="{BASEPATH}admin/reports.php?op=addsavedreport&id={ID}"><img src="{MENU_ADD}" width="16" title="{LN_REPORTS_ADDSAVEDREPORT}"></a>&nbsp; </tr>
<!-- IF HASSAVEDREPORTS="true" -->
<tr>
<td align="center" colspan="1" rowspan="{SavedReportRowSpan}" class="cellmenu2_naked" valign="top">{LN_REPORTS_SAVEDREPORTS}</td>
<td align="center" colspan="3" class="line1">
<a href="{BASEPATH}admin/reports.php?op=addsavedreport&id={ID}"><img src="{MENU_ADD}" title="{LN_REPORTS_ADDSAVEDREPORT}">&nbsp;{LN_REPORTS_ADDSAVEDREPORT}</a>
<!-- IF ReportHelpEnabled="true" --> <!-- IF ReportHelpEnabled="true" -->
<a href="{ReportHelpArticle}" target="_blank"><img src="{MENU_HELP}" width="16" title="{LN_REPORTS_HELP}"></a>&nbsp;&nbsp; &nbsp;&nbsp;<a href="{ReportHelpArticle}" target="_blank"><img src="{MENU_HELP}" width="16" title="{LN_REPORTS_HELP}">&nbsp;{LN_REPORTS_HELP}</a>
<!-- ENDIF ReportHelpEnabled="true" --> <!-- ENDIF ReportHelpEnabled="true" -->
<a href="{BASEPATH}admin/reports.php?op=details&id={ID}"><img src="{MENU_INFORMATION}" width="16" title="{LN_REPORTS_INFO}"></a> &nbsp;&nbsp;<a href="{BASEPATH}admin/reports.php?op=details&id={ID}"><img src="{MENU_INFORMATION}" width="16" title="{LN_REPORTS_INFO}">&nbsp;{LN_REPORTS_INFO}</a>
<!-- IF EnableNeedsInit="true" --> <!-- IF EnableNeedsInit="true" -->
<!-- IF InitEnabled="true" --> <!-- IF InitEnabled="true" -->
&nbsp;<a href="{BASEPATH}admin/reports.php?op=initreport&id={ID}"><img src="{MENU_PARSER_INIT}" width="16" title="{LN_REPORTS_INIT}"></a> &nbsp;&nbsp;<a href="{BASEPATH}admin/reports.php?op=initreport&id={ID}"><img src="{MENU_PARSER_INIT}" width="16" title="{LN_REPORTS_INIT}">&nbsp;{LN_REPORTS_INIT}</a>
<!-- ENDIF InitEnabled="true" --> <!-- ENDIF InitEnabled="true" -->
<!-- IF DeleteEnabled="true" --> <!-- IF DeleteEnabled="true" -->
&nbsp;<a href="{BASEPATH}admin/reports.php?op=removereport&id={ID}"><img src="{MENU_PARSER_DELETE}" width="16" title="{LN_REPORTS_REMOVE}"></a> &nbsp;&nbsp;<a href="{BASEPATH}admin/reports.php?op=removereport&id={ID}"><img src="{MENU_PARSER_DELETE}" width="16" title="{LN_REPORTS_REMOVE}">&nbsp;{LN_REPORTS_REMOVE}</a>
<!-- ENDIF DeleteEnabled="true" --> <!-- ENDIF DeleteEnabled="true" -->
<!-- ENDIF EnableNeedsInit="true" --> <!-- ENDIF EnableNeedsInit="true" -->
</td> </td>
</tr> </tr>
<!-- IF HASSAVEDREPORTS="true" -->
<tr>
<td align="center" colspan="2" rowspan="{SavedReportRowSpan}" class="cellmenu2_naked" valign="top">{LN_REPORTS_SAVEDREPORTS}</td>
<td align="left" colspan="2" class="line1">
</td>
</tr>
<!-- BEGIN SAVEDREPORTS --> <!-- BEGIN SAVEDREPORTS -->
<tr> <tr>
<td align="left" class="{srcssclass}"> <td align="left" class="{srcssclass}" colspan="2">
<img src="{MENU_REPORTS}" width="16"> <img src="{MENU_REPORTS}" width="16">
<a href="{BASEPATH}admin/reports.php?op=editsavedreport&id={ID}&savedreportid={SavedReportID}">{customTitle}</a> <a href="{BASEPATH}admin/reports.php?op=editsavedreport&id={ID}&savedreportid={SavedReportID}">{customTitle}</a>
</td> </td>
<td align="center" class="{srcssclass}"> <td align="center" class="{srcssclass}">
&nbsp;<a href="{BASEPATH}reportgenerator.php?op=runreport&id={ID}&savedreportid={SavedReportID}" target="_blank"><img src="{MENU_CHART_PREVIEW}" width="16" title="{LN_REPORTS_RUNNOW}"></a> &nbsp;<a href="{BASEPATH}reportgenerator.php?op=runreport&id={ID}&savedreportid={SavedReportID}" target="_blank"><img src="{MENU_PLAY_GREEN}" width="16" title="{LN_REPORTS_RUNNOW}"></a>
&nbsp;<a href="{BASEPATH}admin/reports.php?op=editsavedreport&id={ID}&savedreportid={SavedReportID}"><img src="{MENU_EDIT}" width="16" title="{LN_REPORTS_EDITSAVEDREPORT}"></a> &nbsp;<a href="{BASEPATH}admin/reports.php?op=editsavedreport&id={ID}&savedreportid={SavedReportID}"><img src="{MENU_EDIT}" width="16" title="{LN_REPORTS_EDITSAVEDREPORT}"></a>
&nbsp;<a href="{BASEPATH}admin/reports.php?op=removesavedreport&savedreportid={SavedReportID}"><img src="{MENU_DELETE}" width="16" title="{LN_REPORTS_REMOVESAVEDREPORT}"></a> &nbsp;<a href="{BASEPATH}admin/reports.php?op=removesavedreport&savedreportid={SavedReportID}"><img src="{MENU_DELETE}" width="16" title="{LN_REPORTS_REMOVESAVEDREPORT}"></a>
</td> </td>
</tr> </tr>
<!-- END SAVEDREPORTS --> <!-- END SAVEDREPORTS -->