Refs #774

 * Adding table by segments in the Goal Overview and in each specific Goal report. Data table is ajax loaded when the segment is clicked. In the 'Goal overview', the datatable displays all goals (this can be a lot of columns). In a specific goal tab, the datatable will only show columns for the sum of all goals and for this specific goal.
 * The 'Goals' datatable is now showing, for each goal: conversions, conversion rate and revenue per visit
 * Adding widgets for the Goals plugins: Goals overview, and one widget for each goal report


git-svn-id: http://dev.piwik.org/svn/trunk@2303 59fd770c-687e-43c8-a1e3-f5a4ff64c105

1 files changed, 11 insertions, 23 deletions

diff --git a/plugins/Goals/templates/single_goal.tpl b/plugins/Goals/templates/single_goal.tpl
index 47ca1c4654..41968df30e 100644
--- a/plugins/Goals/templates/single_goal.tpl
+++ b/plugins/Goals/templates/single_goal.tpl
@@ -1,3 +1,4 @@
+<link rel="stylesheet" type="text/css" href="plugins/Goals/templates/goals.css" />
 {include file="Goals/templates/title_and_evolution_graph.tpl"}
 
 <div style="clear:both;"></div>
@@ -10,31 +11,18 @@
     <li>{'Goals_ReturningVisitorsConversionRateIs'|translate:"<b>$conversion_rate_returning%</b>"}, {'Goals_NewVisitorsConversionRateIs'|translate:"<b>$conversion_rate_new%</b>"}</li>
 	</ul>
 {/if}
-<hr />
-{$tableByConversion}
 
-<hr />
+
 {literal}
-<style>
-ul.ulGoalTopElements {
-	list-style-type:circle;
-	margin-left:30px;
-}
-.ulGoalTopElements a {
-	text-decoration:none;
-	color:#0033CC;
-	border-bottom:1px dotted #0033CC;
-	line-height:2em;
-}
-.goalTopElement { 
-	border-bottom:1px dotted; 
-} 
-</style>
-<script>
+<script type="text/javascript">
 $(document).ready( function() {
-	$('.goalTopElement')
-		.tooltip()
-		;
-	});
+	$('.goalTopElement').tooltip();
+});
 </script>
 {/literal}
+
+{if $displayFullReport}
+	{if $nb_conversions > 0}
+		{include file="Goals/templates/table_by_segment.tpl"}
+	{/if}
+{/if}
\ No newline at end of file