diff options
author | Jan Šmucr <jan.smucr@aimtec.cz> | 2014-11-27 14:00:48 +0100 |
---|---|---|
committer | Jan Šmucr <jan.smucr@aimtec.cz> | 2014-11-27 14:00:48 +0100 |
commit | 0e287b2e5c29e7674e54d80ed90e79f5b5432968 (patch) | |
tree | eea9dd473c51b77b0e8d7fb5df7e459b94291c97 | |
parent | 9f92fb94aa403928a2efe5e673e118b3b02ba291 (diff) | |
download | gitblit-0e287b2e5c29e7674e54d80ed90e79f5b5432968.tar.gz gitblit-0e287b2e5c29e7674e54d80ed90e79f5b5432968.zip |
Added a new property: web.displayUserPanel
This property allows the administrator to hide the user related part of
the top panel. This can come handy if there's no use for it (i.e. if
Gitblit runs as Gerrit plugin).
-rw-r--r-- | releases.moxie | 2 | ||||
-rw-r--r-- | src/main/distrib/data/defaults.properties | 6 | ||||
-rw-r--r-- | src/main/java/com/gitblit/wicket/pages/RootPage.java | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/releases.moxie b/releases.moxie index cc32d81e..b6ed96d0 100644 --- a/releases.moxie +++ b/releases.moxie @@ -36,6 +36,8 @@ r27: { - Freemarker 2.3.20 (ticket-124) - Lucene 4.10.0 (ticket-159) - SSHD 0.13.0 (ticket-218) + settings: + - { name: web.displayUserPanel, defaultValue: 'true' } contributors: - James Moger - David Ostrovsky diff --git a/src/main/distrib/data/defaults.properties b/src/main/distrib/data/defaults.properties index aa69331a..056b47ad 100644 --- a/src/main/distrib/data/defaults.properties +++ b/src/main/distrib/data/defaults.properties @@ -1344,6 +1344,12 @@ web.aggressiveHeapManagement = false # RESTART REQUIRED web.debugMode = false +# Allows to hide the user logon form or dropdown menu from the top pane +# if it's not needed. +# +# SINCE 1.7.0 +web.displayUserPanel = true + # Force a default locale for all users, ignoring the browser's settings. # An empty value allows Gitblit to use the translation preferred by the browser. # diff --git a/src/main/java/com/gitblit/wicket/pages/RootPage.java b/src/main/java/com/gitblit/wicket/pages/RootPage.java index c4d4dd11..37e98702 100644 --- a/src/main/java/com/gitblit/wicket/pages/RootPage.java +++ b/src/main/java/com/gitblit/wicket/pages/RootPage.java @@ -151,6 +151,7 @@ public abstract class RootPage extends BasePage { boolean authenticateAdmin = app().settings().getBoolean(Keys.web.authenticateAdminPages, true); boolean allowAdmin = app().settings().getBoolean(Keys.web.allowAdministration, true); boolean allowLucene = app().settings().getBoolean(Keys.web.allowLuceneIndexing, true); + boolean displayUserPanel = app().settings().getBoolean(Keys.web.displayUserPanel, true); boolean isLoggedIn = GitBlitWebSession.get().isLoggedIn(); if (authenticateAdmin) { @@ -168,7 +169,7 @@ public abstract class RootPage extends BasePage { } } - if (authenticateView || authenticateAdmin) { + if (displayUserPanel && (authenticateView || authenticateAdmin)) { if (isLoggedIn) { UserMenu userFragment = new UserMenu("userPanel", "userMenuFragment", RootPage.this); add(userFragment); |