diff --git a/src/lang/de/main.php b/src/lang/de/main.php index 7d8731c..26498aa 100644 --- a/src/lang/de/main.php +++ b/src/lang/de/main.php @@ -288,5 +288,6 @@ $content['LN_DETAIL_BACKTOLIST'] = "Back to Listview"; $content['LN_GEN_ERROR_INVALIDFIELD'] = "Invalid fieldname"; $content['LN_GEN_ERROR_MISSINGCHARTFIELD'] = "Missing fieldname"; $content['LN_GEN_ERROR_INVALIDTYPE'] = "Invalid or unknown chart type"; + $content['LN_ERROR_CHARTS_NOTCONFIGURED'] = "There are no charts configured at all."; ?> \ No newline at end of file diff --git a/src/lang/en/main.php b/src/lang/en/main.php index 8ba156a..cf10af8 100644 --- a/src/lang/en/main.php +++ b/src/lang/en/main.php @@ -289,9 +289,15 @@ $content['LN_CONVERT_ERROR_SOURCEIMPORT'] = "Critical Error while importing the $content['LN_STATS_GRAPH'] = "Graph"; $content['LN_GEN_ERROR_INVALIDFIELD'] = "Invalid fieldname"; $content['LN_GEN_ERROR_MISSINGCHARTFIELD'] = "Missing fieldname"; - $content['LN_GEN_ERROR_INVALIDTYPE'] = "Invalid or unknown chart type"; - - - + $content['LN_GEN_ERROR_INVALIDTYPE'] = "Invalid or unknown chart type."; + $content['LN_ERROR_CHARTS_NOTCONFIGURED'] = "There are no charts configured at all."; + $content['LN_CHART_TYPE'] = "Chart type"; + $content['LN_CHART_WIDTH'] = "Chart width"; + $content['LN_CHART_FIELD'] = "Chart field"; + $content['LN_CHART_MAXRECORDS'] = "Top records count"; + $content['LN_CHART_SHOWPERCENT'] = "Show percentage data"; + $content['LN_CHART_TYPE_CAKE'] = "Cake (Pie)"; + $content['LN_CHART_TYPE_BARS_VERTICAL'] = "Bars vertical"; + $content['LN_CHART_TYPE_BARS_HORIZONTAL'] = "Bars horizontal"; ?> \ No newline at end of file diff --git a/src/lang/pt_BR/main.php b/src/lang/pt_BR/main.php index ca30cd9..c36f9cb 100644 --- a/src/lang/pt_BR/main.php +++ b/src/lang/pt_BR/main.php @@ -293,5 +293,6 @@ $content['LN_DETAIL_BACKTOLIST'] = "Voltar para a lista"; $content['LN_GEN_ERROR_INVALIDFIELD'] = "Invalid fieldname"; $content['LN_GEN_ERROR_MISSINGCHARTFIELD'] = "Missing fieldname"; $content['LN_GEN_ERROR_INVALIDTYPE'] = "Invalid or unknown chart type"; + $content['LN_ERROR_CHARTS_NOTCONFIGURED'] = "There are no charts configured at all."; ?> \ No newline at end of file diff --git a/src/statistics.php b/src/statistics.php index 522bbfc..4fd6d39 100644 --- a/src/statistics.php +++ b/src/statistics.php @@ -63,6 +63,37 @@ if ( isset($content['Charts']) ) $i = 0; // Help counter! foreach ($content['Charts'] as &$myChart ) { + // --- Set display name for chart type + switch($myChart['chart_type']) + { + case CHART_CAKE: + $myChart['CHART_TYPE_DISPLAYNAME'] = $content['LN_CHART_TYPE_CAKE']; + break; + case CHART_BARS_VERTICAL: + $myChart['CHART_TYPE_DISPLAYNAME'] = $content['LN_CHART_TYPE_BARS_VERTICAL']; + break; + case CHART_BARS_HORIZONTAL: + $myChart['CHART_TYPE_DISPLAYNAME'] = $content['LN_CHART_TYPE_BARS_HORIZONTAL']; + break; + default: + $myChart['CHART_TYPE_DISPLAYNAME'] = $content['LN_GEN_ERROR_INVALIDTYPE']; + break; + } + // --- + + // --- Set display name for chart field + if ( isset($myChart['chart_field']) && isset($content[ $fields[$myChart['chart_field']]['FieldCaptionID'] ]) ) + $myChart['CHART_FIELD_DISPLAYNAME'] = $content[ $fields[$myChart['chart_field']]['FieldCaptionID'] ]; + else + $myChart['CHART_FIELD_DISPLAYNAME'] = $myChart['chart_field']; + // --- + + // --- Set showpercent display + if ( $myChart['showpercent'] == 1 ) + $myChart['showpercent_display'] = "Yes"; + else + $myChart['showpercent_display'] = "No"; + // --- // --- Set CSS Class if ( $i % 2 == 0 ) diff --git a/src/templates/statistics.html b/src/templates/statistics.html index 67c6be0..c9e9d41 100644 --- a/src/templates/statistics.html +++ b/src/templates/statistics.html @@ -21,9 +21,29 @@ {rowbegin}

- - -
{DisplayName}
+ + + + + + + + + + + + + + + + + + + + + + +
{DisplayName}
{LN_CHART_TYPE} {CHART_TYPE_DISPLAYNAME}
{LN_CHART_FIELD} {CHART_FIELD_DISPLAYNAME}
{LN_CHART_WIDTH} {chart_width}
{LN_CHART_MAXRECORDS} {maxrecords}
{LN_CHART_SHOWPERCENT} {showpercent_display}
diff --git a/src/themes/dark/main.css b/src/themes/dark/main.css index b9ec9f2..c429c88 100644 --- a/src/themes/dark/main.css +++ b/src/themes/dark/main.css @@ -103,6 +103,12 @@ font border-color: #050A0F #050A0F #050A0F #050A0F; } +.table_with_border_light +{ + background-color:#1C2021; + border:1px #050A0F solid; +} + .with_border { text-indent:3px; diff --git a/src/themes/default/main.css b/src/themes/default/main.css index 082bd71..587be8b 100644 --- a/src/themes/default/main.css +++ b/src/themes/default/main.css @@ -104,6 +104,12 @@ font border-color: #CCCCCC #000000 #000000 #CCCCCC; } +.table_with_border_light +{ + background-color:#CCCCCC; + border:1px #AAAAAA solid; +} + .with_border { text-indent:3px;