Merge release 1.6.0

1 files changed, 8 insertions, 8 deletions

diff --git a/src/main/java/com/gitblit/wicket/pages/ActivityPage.java b/src/main/java/com/gitblit/wicket/pages/ActivityPage.java
index f0e390dc..c505a666 100644
--- a/src/main/java/com/gitblit/wicket/pages/ActivityPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/ActivityPage.java
@@ -31,15 +31,15 @@ import org.apache.wicket.markup.html.panel.Fragment;
 

 import com.gitblit.Keys;

 import com.gitblit.models.Activity;

+import com.gitblit.models.Menu.ParameterMenuItem;

+import com.gitblit.models.NavLink.DropDownPageMenuNavLink;

 import com.gitblit.models.Metric;

+import com.gitblit.models.NavLink;

 import com.gitblit.models.RepositoryModel;

 import com.gitblit.utils.ActivityUtils;

 import com.gitblit.utils.StringUtils;

 import com.gitblit.wicket.CacheControl;

 import com.gitblit.wicket.CacheControl.LastModified;

-import com.gitblit.wicket.PageRegistration;

-import com.gitblit.wicket.PageRegistration.DropDownMenuItem;

-import com.gitblit.wicket.PageRegistration.DropDownMenuRegistration;

 import com.gitblit.wicket.WicketUtils;

 import com.gitblit.wicket.charting.Chart;

 import com.gitblit.wicket.charting.Charts;

@@ -135,8 +135,8 @@ public class ActivityPage extends RootPage {
 	}

 

 	@Override

-	protected void addDropDownMenus(List<PageRegistration> pages) {

-		DropDownMenuRegistration filters = new DropDownMenuRegistration("gb.filters",

+	protected void addDropDownMenus(List<NavLink> navLinks) {

+		DropDownPageMenuNavLink filters = new DropDownPageMenuNavLink("gb.filters",

 				ActivityPage.class);

 

 		PageParameters currentParameters = getPageParameters();

@@ -153,9 +153,9 @@ public class ActivityPage extends RootPage {
 

 		if (filters.menuItems.size() > 0) {

 			// Reset Filter

-			filters.menuItems.add(new DropDownMenuItem(getString("gb.reset"), null, null));

+			filters.menuItems.add(new ParameterMenuItem(getString("gb.reset")));

 		}

-		pages.add(filters);

+		navLinks.add(filters);

 	}

 

 	/**

@@ -209,7 +209,7 @@ public class ActivityPage extends RootPage {
 		}

 		charts.addChart(chart);

 

-		// active repositories pie chart 

+		// active repositories pie chart

 		chart = charts.createPieChart("chartRepositories", getString("gb.activeRepositories"),

 				getString("gb.repository"), getString("gb.commits"));

 		for (Metric metric : repositoryMetrics.values()) {