From 0a704fd39ac876fee9bda3a78469209ee9afa4e2 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 05 Sep 2013 14:09:53 -0400
Subject: [PATCH] Updated binary extensions and Lucene ignore extensions
---
src/main/java/com/gitblit/wicket/pages/ActivityPage.java | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/ActivityPage.java b/src/main/java/com/gitblit/wicket/pages/ActivityPage.java
index bceac8f..413403b 100644
--- a/src/main/java/com/gitblit/wicket/pages/ActivityPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/ActivityPage.java
@@ -35,7 +35,9 @@
import com.gitblit.models.RepositoryModel;
import com.gitblit.utils.ActivityUtils;
import com.gitblit.utils.StringUtils;
+import com.gitblit.wicket.CacheControl;
import com.gitblit.wicket.PageRegistration;
+import com.gitblit.wicket.CacheControl.LastModified;
import com.gitblit.wicket.PageRegistration.DropDownMenuItem;
import com.gitblit.wicket.PageRegistration.DropDownMenuRegistration;
import com.gitblit.wicket.WicketUtils;
@@ -52,6 +54,8 @@
* @author James Moger
*
*/
+
+@CacheControl(LastModified.ACTIVITY)
public class ActivityPage extends RootPage {
public ActivityPage(PageParameters params) {
@@ -61,7 +65,7 @@
// parameters
int daysBack = WicketUtils.getDaysBack(params);
if (daysBack < 1) {
- daysBack = 14;
+ daysBack = GitBlit.getInteger(Keys.web.activityDuration, 7);
}
String objectId = WicketUtils.getObject(params);
@@ -70,9 +74,26 @@
List<Activity> recentActivity = ActivityUtils.getRecentActivity(models,
daysBack, objectId, getTimeZone());
+ String headerPattern;
+ if (daysBack == 1) {
+ // today
+ if (recentActivity.size() == 0) {
+ headerPattern = getString("gb.todaysActivityNone");
+ } else {
+ headerPattern = getString("gb.todaysActivityStats");
+ }
+ } else {
+ // multiple days
+ if (recentActivity.size() == 0) {
+ headerPattern = getString("gb.recentActivityNone");
+ } else {
+ headerPattern = getString("gb.recentActivityStats");
+ }
+ }
+
if (recentActivity.size() == 0) {
// no activity, skip graphs and activity panel
- add(new Label("subheader", MessageFormat.format(getString("gb.recentActivityNone"),
+ add(new Label("subheader", MessageFormat.format(headerPattern,
daysBack)));
add(new Label("activityPanel"));
} else {
@@ -86,7 +107,7 @@
int totalAuthors = uniqueAuthors.size();
// add the subheader with stat numbers
- add(new Label("subheader", MessageFormat.format(getString("gb.recentActivityStats"),
+ add(new Label("subheader", MessageFormat.format(headerPattern,
daysBack, totalCommits, totalAuthors)));
// create the activity charts
@@ -109,7 +130,7 @@
ActivityPage.class);
PageParameters currentParameters = getPageParameters();
- int daysBack = GitBlit.getInteger(Keys.web.activityDuration, 14);
+ int daysBack = GitBlit.getInteger(Keys.web.activityDuration, 7);
if (currentParameters != null && !currentParameters.containsKey("db")) {
currentParameters.put("db", daysBack);
}
@@ -162,8 +183,6 @@
}
// build google charts
- int w = 310;
- int h = 150;
GoogleCharts charts = new GoogleCharts();
// sort in reverse-chronological order and then reverse that
@@ -178,8 +197,6 @@
for (Activity metric : recentActivity) {
chart.addValue(df.format(metric.startDate), metric.getCommitCount());
}
- chart.setWidth(w);
- chart.setHeight(h);
charts.addChart(chart);
// active repositories pie chart
@@ -188,8 +205,7 @@
for (Metric metric : repositoryMetrics.values()) {
chart.addValue(metric.name, metric.count);
}
- chart.setWidth(w);
- chart.setHeight(h);
+ chart.setShowLegend(false);
charts.addChart(chart);
// active authors pie chart
@@ -198,8 +214,7 @@
for (Metric metric : authorMetrics.values()) {
chart.addValue(metric.name, metric.count);
}
- chart.setWidth(w);
- chart.setHeight(h);
+ chart.setShowLegend(false);
charts.addChart(chart);
return charts;
--
Gitblit v1.9.1