From dfc4ece4083bbbb98f55291d05e7d2b1513464b7 Mon Sep 17 00:00:00 2001 From: Thomas Pummer <dev@nullpointer.at> Date: Fri, 22 Feb 2013 11:10:11 -0500 Subject: [PATCH] the display-name in web.xml now shows the actual version of Gitblit --- src/com/gitblit/wicket/panels/NavigationPanel.java | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/com/gitblit/wicket/panels/NavigationPanel.java b/src/com/gitblit/wicket/panels/NavigationPanel.java index 018bbb2..558cc71 100644 --- a/src/com/gitblit/wicket/panels/NavigationPanel.java +++ b/src/com/gitblit/wicket/panels/NavigationPanel.java @@ -25,6 +25,7 @@ import com.gitblit.wicket.PageRegistration; import com.gitblit.wicket.PageRegistration.DropDownMenuRegistration; +import com.gitblit.wicket.PageRegistration.OtherPageLink; import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.pages.BasePage; @@ -43,16 +44,24 @@ public void populateItem(final Item<PageRegistration> item) { PageRegistration entry = item.getModelObject(); - if (entry instanceof DropDownMenuRegistration) { + if (entry instanceof OtherPageLink) { + // other link + OtherPageLink link = (OtherPageLink) entry; + Component c = new LinkPanel("link", null, getString(entry.translationKey), link.url); + c.setRenderBodyOnly(true); + item.add(c); + } else if (entry instanceof DropDownMenuRegistration) { // drop down menu DropDownMenuRegistration reg = (DropDownMenuRegistration) entry; Component c = new DropDownMenu("link", getString(entry.translationKey), reg); + c.setRenderBodyOnly(true); item.add(c); - WicketUtils.setCssClass(item, "menu"); + WicketUtils.setCssClass(item, "dropdown"); } else { // standard page link Component c = new LinkPanel("link", null, getString(entry.translationKey), entry.pageClass, entry.params); + c.setRenderBodyOnly(true); if (entry.pageClass.equals(pageClass)) { WicketUtils.setCssClass(item, "active"); } -- Gitblit v1.9.1