From da34e56994d06e0df77902bb1fa7dfee11d3e9bf Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 14 Jul 2013 12:05:19 -0400
Subject: [PATCH] Reset build identifiers for next development cycle
---
src/main/java/com/gitblit/wicket/pages/MetricsPage.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/MetricsPage.java b/src/main/java/com/gitblit/wicket/pages/MetricsPage.java
index 5904a64..3195020 100644
--- a/src/main/java/com/gitblit/wicket/pages/MetricsPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/MetricsPage.java
@@ -28,7 +28,6 @@
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.basic.Label;
import org.eclipse.jgit.lib.Repository;
-import org.wicketstuff.googlecharts.Chart;
import org.wicketstuff.googlecharts.ChartAxis;
import org.wicketstuff.googlecharts.ChartAxisType;
import org.wicketstuff.googlecharts.ChartProvider;
@@ -42,6 +41,7 @@
import com.gitblit.utils.MetricUtils;
import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.WicketUtils;
+import com.gitblit.wicket.charting.SecureChart;
public class MetricsPage extends RepositoryPage {
@@ -85,9 +85,9 @@
provider.addAxis(commitAxis);
provider.setLineStyles(new LineStyle[] { new LineStyle(2, 4, 0), new LineStyle(0, 4, 1) });
- provider.addShapeMarker(new ShapeMarker(MarkerType.CIRCLE, Color.BLUE, 1, -1, 5));
+ provider.addShapeMarker(new ShapeMarker(MarkerType.CIRCLE, Color.decode("#002060"), 1, -1, 5));
- add(new Chart(wicketId, provider));
+ add(new SecureChart(wicketId, provider));
} else {
add(WicketUtils.newBlankImage(wicketId));
}
@@ -112,7 +112,7 @@
String.valueOf((int) WicketUtils.maxValue(metrics)) });
provider.addAxis(commitAxis);
- add(new Chart(wicketId, provider));
+ add(new SecureChart(wicketId, provider));
} else {
add(WicketUtils.newBlankImage(wicketId));
}
@@ -127,7 +127,7 @@
}
ChartProvider provider = new ChartProvider(new Dimension(800, 200), ChartType.PIE, data);
provider.setPieLabels(labels.toArray(new String[labels.size()]));
- add(new Chart(wicketId, provider));
+ add(new SecureChart(wicketId, provider));
} else {
add(WicketUtils.newBlankImage(wicketId));
}
@@ -181,4 +181,9 @@
protected String getPageName() {
return getString("gb.metrics");
}
+
+ @Override
+ protected Class<? extends BasePage> getRepoNavPageClass() {
+ return SummaryPage.class;
+ }
}
--
Gitblit v1.9.1