From 859deba551b5e6850fb6331084493a402cecce45 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 05 May 2014 11:19:31 -0400
Subject: [PATCH] Integrate admin menu into user menu and add user menu extension
---
src/main/java/com/gitblit/wicket/panels/NavigationPanel.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/panels/NavigationPanel.java b/src/main/java/com/gitblit/wicket/panels/NavigationPanel.java
index 393dd13..7db29fa 100644
--- a/src/main/java/com/gitblit/wicket/panels/NavigationPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/NavigationPanel.java
@@ -45,25 +45,32 @@
@Override
public void populateItem(final Item<PageRegistration> item) {
PageRegistration entry = item.getModelObject();
+ String linkText = entry.translationKey;
+ try {
+ // try to lookup translation key
+ linkText = getString(entry.translationKey);
+ } catch (Exception e) {
+ }
+
if (entry.hiddenPhone) {
WicketUtils.setCssClass(item, "hidden-phone");
}
if (entry instanceof OtherPageLink) {
// other link
OtherPageLink link = (OtherPageLink) entry;
- Component c = new LinkPanel("link", null, getString(entry.translationKey), link.url);
+ Component c = new LinkPanel("link", null, linkText, 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);
+ Component c = new DropDownMenu("link", linkText, reg);
c.setRenderBodyOnly(true);
item.add(c);
WicketUtils.setCssClass(item, "dropdown");
} else {
// standard page link
- Component c = new LinkPanel("link", null, getString(entry.translationKey),
+ Component c = new LinkPanel("link", null, linkText,
entry.pageClass, entry.params);
c.setRenderBodyOnly(true);
if (entry.pageClass.equals(pageClass)) {
--
Gitblit v1.9.1