From 9bc17d16ea48a7978b198126d346828b1d24fe4e Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 18 Apr 2011 22:29:20 -0400 Subject: [PATCH] Color-coded change type indicator with tooltip for changed paths. --- src/com/gitblit/wicket/BasePage.java | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/com/gitblit/wicket/BasePage.java b/src/com/gitblit/wicket/BasePage.java index 2540ce1..33feacb 100644 --- a/src/com/gitblit/wicket/BasePage.java +++ b/src/com/gitblit/wicket/BasePage.java @@ -46,10 +46,15 @@ add(new Label("pageName", pageName)); // footer - User user = null; - if (GitBlit.self().settings().getBoolean(Keys.web.authenticate, true)) { - user = GitBlitWebSession.get().getUser(); - add(new LinkPanel("userPanel", null, getString("gb.logout") + " " + user.toString(), LogoutPage.class)); + if (GitBlit.self().settings().getBoolean(Keys.web.authenticateViewPages, true) + || GitBlit.self().settings().getBoolean(Keys.web.authenticateAdminPages, true)) { + if (GitBlitWebSession.get().isLoggedIn()) { + // logout + add(new LinkPanel("userPanel", null, getString("gb.logout") + " " + GitBlitWebSession.get().getUser().toString(), LogoutPage.class)); + } else { + // login + add(new LinkPanel("userPanel", null, getString("gb.login"), LoginPage.class)); + } } else { add(new Label("userPanel", "")); } -- Gitblit v1.9.1