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 | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/src/com/gitblit/wicket/BasePage.java b/src/com/gitblit/wicket/BasePage.java
index 9aa7baa..33feacb 100644
--- a/src/com/gitblit/wicket/BasePage.java
+++ b/src/com/gitblit/wicket/BasePage.java
@@ -12,20 +12,22 @@
import org.slf4j.LoggerFactory;
import com.gitblit.Constants;
+import com.gitblit.GitBlit;
import com.gitblit.Keys;
-import com.gitblit.StoredSettings;
import com.gitblit.wicket.pages.SummaryPage;
public abstract class BasePage extends WebPage {
- Logger logger = LoggerFactory.getLogger(BasePage.class);
+ private final Logger logger;
public BasePage() {
super();
+ logger = LoggerFactory.getLogger(getClass());
}
public BasePage(PageParameters params) {
super(params);
+ logger = LoggerFactory.getLogger(getClass());
}
protected void setupPage(String repositoryName, String pageName) {
@@ -35,7 +37,7 @@
add(new Label("title", getServerName()));
}
// header
- String siteName = StoredSettings.getString(Keys.web_siteName, Constants.NAME);
+ String siteName = GitBlit.self().settings().getString(Keys.web.siteName, Constants.NAME);
if (siteName == null || siteName.trim().length() == 0) {
siteName = Constants.NAME;
}
@@ -44,21 +46,26 @@
add(new Label("pageName", pageName));
// footer
- User user = null;
- if (StoredSettings.getBoolean(Keys.web_authenticate, true)) {
- user = GitBlitWebSession.get().getUser();
- add(new Label("userText", "Logout " + user.toString()));
+ 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("userText", ""));
+ add(new Label("userPanel", ""));
}
add(new Label("gbVersion", "v" + Constants.VERSION));
- if (StoredSettings.getBoolean(Keys.server_aggressiveHeapManagement, false)) {
+ if (GitBlit.self().settings().getBoolean(Keys.web.aggressiveHeapManagement, false)) {
System.gc();
}
}
protected TimeZone getTimeZone() {
- return StoredSettings.getBoolean(Keys.web_useClientTimezone, false) ? GitBlitWebSession.get().getTimezone() : TimeZone.getDefault();
+ return GitBlit.self().settings().getBoolean(Keys.web.useClientTimezone, false) ? GitBlitWebSession.get().getTimezone() : TimeZone.getDefault();
}
protected String getServerName() {
--
Gitblit v1.9.1