Merge release 1.6.0

1 files changed, 7 insertions, 7 deletions

diff --git a/src/main/java/com/gitblit/wicket/pages/DashboardPage.java b/src/main/java/com/gitblit/wicket/pages/DashboardPage.java
index 9853449e..9c10e01b 100644
--- a/src/main/java/com/gitblit/wicket/pages/DashboardPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/DashboardPage.java
@@ -36,7 +36,10 @@ import org.eclipse.jgit.lib.Repository;
 

 import com.gitblit.Keys;

 import com.gitblit.models.DailyLogEntry;

+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.RefLogEntry;

 import com.gitblit.models.RepositoryCommit;

 import com.gitblit.models.RepositoryModel;

@@ -45,9 +48,6 @@ import com.gitblit.utils.ArrayUtils;
 import com.gitblit.utils.RefLogUtils;

 import com.gitblit.utils.StringUtils;

 import com.gitblit.wicket.GitBlitWebApp;

-import com.gitblit.wicket.PageRegistration;

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

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

 import com.gitblit.wicket.charting.Chart;

 import com.gitblit.wicket.charting.Charts;

 import com.gitblit.wicket.charting.Flotr2Charts;

@@ -141,10 +141,10 @@ public abstract class DashboardPage extends RootPage {
 	}

 

 	@Override

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

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

 		PageParameters params = getPageParameters();

 

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

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

 				GitBlitWebApp.get().getHomePage());

 

 		// preserve repository filter option on time choices

@@ -152,10 +152,10 @@ public abstract class DashboardPage extends RootPage {
 

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

 			// Reset Filter

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

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

 		}

 

-		pages.add(menu);

+		navLinks.add(menu);

 	}