Adding icons next to reports to indicate reports with charts, configu…

…rable reports, etc. Fixed CSV reports not prompting for download.
hellifiknow · Jul 2, 2012 · cbf76bd · cbf76bd
1 parent 53f8a94
commit cbf76bd
Show file tree

Hide file tree

Showing 19 changed files with 18 additions and 3 deletions.
diff --git a/classes/report_formats/CsvReportFormat.php b/classes/report_formats/CsvReportFormat.php
@@ -10,8 +10,8 @@ public static function display(&$report, &$request) {
 
 		$file_name = preg_replace(array('/[\s]+/','/[^0-9a-zA-Z\-_\.]/'),array('_',''),$report->options['Name']);
 
-		//header("Content-type: application/csv");
-		//header("Content-Disposition: attachment; filename=".$file_name.".csv");
+		header("Content-type: application/csv");
+		header("Content-Disposition: attachment; filename=".$file_name.".csv");
 		header("Pragma: no-cache");
 		header("Expires: 0");
 

diff --git a/public/images/bug--plus.png b/public/images/bug--plus.png
diff --git a/public/images/calendar--pencil.png b/public/images/calendar--pencil.png
diff --git a/public/images/chart.png b/public/images/chart.png
diff --git a/public/images/chevron-expand.png b/public/images/chevron-expand.png
diff --git a/public/images/disk-black.png b/public/images/disk-black.png
diff --git a/public/images/disk.png b/public/images/disk.png
diff --git a/public/images/document-code.png b/public/images/document-code.png
diff --git a/public/images/document-excel-csv.png b/public/images/document-excel-csv.png
diff --git a/public/images/drill.png b/public/images/drill.png
diff --git a/public/images/mail.png b/public/images/mail.png
diff --git a/public/images/prohibition.png b/public/images/prohibition.png
diff --git a/public/images/question.png b/public/images/question.png
diff --git a/public/images/toggle-expand.png b/public/images/toggle-expand.png
diff --git a/public/images/toggle.png b/public/images/toggle.png
diff --git a/public/images/traffic-light-red.png b/public/images/traffic-light-red.png
diff --git a/public/images/ui-slider-vertical-050.png b/public/images/ui-slider-vertical-050.png
diff --git a/public/images/wrench--exclamation.png b/public/images/wrench--exclamation.png
diff --git a/templates/html/report_list_item.twig b/templates/html/report_list_item.twig
@@ -11,9 +11,24 @@
 		{% endfor %}
 	</div>
 	{% endif %}
-{% else %}
+{% elseif not item.ignore %}
 	<div class='report'>
 		<a href='{{item.url}}' id='report_{{item.Id}}'>{{item.Name}}</a>
+		{% if item.Variables %}
+			<img alt='Configurable' title='Configurable' src='{{base}}/public/images/ui-slider-vertical-050.png' />
+		{% endif %}
+		{% if item.Charts %}
+			<img alt='Contains graphs/charts' title='Contains graphs/charts' src='{{base}}/public/images/chart.png' />
+		{% endif %}
+		{% if item.stop %}
+			<img alt='Warning!' title='Warning!' src='{{base}}/public/images/prohibition.png' />
+		{% endif %}
+		{% if item.Caution %}
+			<img alt='Contains graphs/charts' title='Contains graphs/charts' src='{{base}}/public/images/chart.png' />
+		{% endif %}
+		{% if item.Detail %}
+			<img alt='Contains drill down links' title='Contains drill down links' src='{{base}}/public/images/drill.png' />
+		{% endif %}
 		{% if item.Created %}
 			<em>{{ item.Created }}</em>
 		{% endif %}