From 37ee4854c4cb0b8f5aa23e3f518dee3bf2d30558 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 09 Apr 2014 20:57:09 -0400
Subject: [PATCH] Merged #43 "Switch to flotr2 graphs from GoogleCharts"
---
src/main/java/com/gitblit/wicket/pages/OverviewPage.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/OverviewPage.java b/src/main/java/com/gitblit/wicket/pages/OverviewPage.java
index efb7f4c..1979f97 100644
--- a/src/main/java/com/gitblit/wicket/pages/OverviewPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/OverviewPage.java
@@ -37,9 +37,9 @@
import com.gitblit.wicket.CacheControl.LastModified;
import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.WicketUtils;
-import com.gitblit.wicket.charting.GoogleChart;
-import com.gitblit.wicket.charting.GoogleCharts;
-import com.gitblit.wicket.charting.GoogleLineChart;
+import com.gitblit.wicket.charting.Chart;
+import com.gitblit.wicket.charting.Charts;
+import com.gitblit.wicket.charting.Flotr2Charts;
import com.gitblit.wicket.panels.BranchesPanel;
import com.gitblit.wicket.panels.LinkPanel;
import com.gitblit.wicket.panels.ReflogPanel;
@@ -135,8 +135,10 @@
if ((metrics != null) && (metrics.size() > 0)
&& app().settings().getBoolean(Keys.web.generateActivityGraph, true)) {
+ Charts charts = new Flotr2Charts();
+
// daily line chart
- GoogleChart chart = new GoogleLineChart("chartDaily", "", "unit",
+ Chart chart = charts.createLineChart("chartDaily", "", "unit",
getString("gb.commits"));
for (Metric metric : metrics) {
chart.addValue(metric.name, metric.count);
@@ -144,7 +146,6 @@
chart.setWidth(375);
chart.setHeight(150);
- GoogleCharts charts = new GoogleCharts();
charts.addChart(chart);
add(new HeaderContributor(charts));
}
--
Gitblit v1.9.1