From 3daba4304dba818d54eb9b74d8d35df5aab8fee5 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 22 Nov 2013 10:36:05 -0500
Subject: [PATCH] Add pull request linking in changelog to generated documentation
---
src/main/java/com/gitblit/wicket/pages/RootPage.java | 95 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 76 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/RootPage.java b/src/main/java/com/gitblit/wicket/pages/RootPage.java
index f4ac907..a59e202 100644
--- a/src/main/java/com/gitblit/wicket/pages/RootPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RootPage.java
@@ -33,6 +33,9 @@
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.PageParameters;
+import org.apache.wicket.behavior.HeaderContributor;
+import org.apache.wicket.markup.html.IHeaderContributor;
+import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.PasswordTextField;
import org.apache.wicket.markup.html.form.TextField;
@@ -48,6 +51,7 @@
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.TeamModel;
import com.gitblit.models.UserModel;
+import com.gitblit.utils.ModelUtils;
import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.PageRegistration;
@@ -61,9 +65,9 @@
/**
* Root page is a topbar, navigable page like Repositories, Users, or
* Federation.
- *
+ *
* @author James Moger
- *
+ *
*/
public abstract class RootPage extends BasePage {
@@ -83,6 +87,51 @@
@Override
protected void setupPage(String repositoryName, String pageName) {
+
+ // CSS header overrides
+ add(new HeaderContributor(new IHeaderContributor() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ StringBuilder buffer = new StringBuilder();
+ buffer.append("<style type=\"text/css\">\n");
+ buffer.append(".navbar-inner {\n");
+ final String headerBackground = GitBlit.getString(Keys.web.headerBackgroundColor, null);
+ if (!StringUtils.isEmpty(headerBackground)) {
+ buffer.append(MessageFormat.format("background-color: {0};\n", headerBackground));
+ }
+ final String headerBorder = GitBlit.getString(Keys.web.headerBorderColor, null);
+ if (!StringUtils.isEmpty(headerBorder)) {
+ buffer.append(MessageFormat.format("border-bottom: 1px solid {0} !important;\n", headerBorder));
+ }
+ buffer.append("}\n");
+ final String headerBorderFocus = GitBlit.getString(Keys.web.headerBorderFocusColor, null);
+ if (!StringUtils.isEmpty(headerBorderFocus)) {
+ buffer.append(".navbar ul li:focus, .navbar .active {\n");
+ buffer.append(MessageFormat.format("border-bottom: 4px solid {0};\n", headerBorderFocus));
+ buffer.append("}\n");
+ }
+ final String headerForeground = GitBlit.getString(Keys.web.headerForegroundColor, null);
+ if (!StringUtils.isEmpty(headerForeground)) {
+ buffer.append(".navbar ul.nav li a {\n");
+ buffer.append(MessageFormat.format("color: {0};\n", headerForeground));
+ buffer.append("}\n");
+ buffer.append(".navbar ul.nav .active a {\n");
+ buffer.append(MessageFormat.format("color: {0};\n", headerForeground));
+ buffer.append("}\n");
+ }
+ final String headerHover = GitBlit.getString(Keys.web.headerHoverColor, null);
+ if (!StringUtils.isEmpty(headerHover)) {
+ buffer.append(".navbar ul.nav li a:hover {\n");
+ buffer.append(MessageFormat.format("color: {0} !important;\n", headerHover));
+ buffer.append("}\n");
+ }
+ buffer.append("</style>\n");
+ response.renderString(buffer.toString());
+ }
+ }));
+
boolean authenticateView = GitBlit.getBoolean(Keys.web.authenticateViewPages, false);
boolean authenticateAdmin = GitBlit.getBoolean(Keys.web.authenticateAdminPages, true);
boolean allowAdmin = GitBlit.getBoolean(Keys.web.allowAdministration, true);
@@ -101,7 +150,7 @@
setStatelessHint(true);
}
}
-
+
if (authenticateView || authenticateAdmin) {
if (GitBlitWebSession.get().isLoggedIn()) {
UserMenu userFragment = new UserMenu("userPanel", "userMenuFragment", RootPage.this);
@@ -113,7 +162,7 @@
} else {
add(new Label("userPanel").setVisible(false));
}
-
+
boolean showRegistrations = GitBlit.canFederate()
&& GitBlit.getBoolean(Keys.web.showFederationRegistrations, false);
@@ -139,7 +188,7 @@
addDropDownMenus(pages);
}
}
-
+
NavigationPanel navPanel = new NavigationPanel("navPanel", getRootNavPageClass(), pages);
add(navPanel);
@@ -159,7 +208,7 @@
super.setupPage(repositoryName, pageName);
}
-
+
protected Class<? extends BasePage> getRootNavPageClass() {
return getClass();
}
@@ -184,7 +233,7 @@
params.remove("db");
}
return params;
- }
+ }
}
return null;
}
@@ -221,7 +270,7 @@
}
}
}
-
+
protected List<RepositoryModel> getRepositoryModels() {
if (repositoryModels.isEmpty()) {
final UserModel user = GitBlitWebSession.get().getUser();
@@ -298,8 +347,12 @@
protected List<DropDownMenuItem> getTimeFilterItems(PageParameters params) {
// days back choices - additive parameters
int daysBack = GitBlit.getInteger(Keys.web.activityDuration, 7);
+ int maxDaysBack = GitBlit.getInteger(Keys.web.activityDurationMaximum, 30);
if (daysBack < 1) {
daysBack = 7;
+ }
+ if (daysBack > maxDaysBack) {
+ daysBack = maxDaysBack;
}
PageParameters clonedParams;
if (params == null) {
@@ -307,11 +360,11 @@
} else {
clonedParams = new PageParameters(params);
}
-
+
if (!clonedParams.containsKey("db")) {
clonedParams.put("db", daysBack);
}
-
+
List<DropDownMenuItem> items = new ArrayList<DropDownMenuItem>();
Set<Integer> choicesSet = new TreeSet<Integer>(GitBlit.getIntegers(Keys.web.activityDurationChoices));
if (choicesSet.isEmpty()) {
@@ -342,7 +395,7 @@
String userName = WicketUtils.getUsername(params);
if (StringUtils.isEmpty(projectName)) {
if (!StringUtils.isEmpty(userName)) {
- projectName = "~" + userName;
+ projectName = ModelUtils.getPersonalPath(userName);
}
}
String repositoryName = WicketUtils.getRepositoryName(params);
@@ -350,6 +403,7 @@
String regex = WicketUtils.getRegEx(params);
String team = WicketUtils.getTeam(params);
int daysBack = params.getInt("db", 0);
+ int maxDaysBack = GitBlit.getInteger(Keys.web.activityDurationMaximum, 30);
List<RepositoryModel> availableModels = getRepositoryModels();
Set<RepositoryModel> models = new HashSet<RepositoryModel>();
@@ -367,7 +421,7 @@
if (!StringUtils.isEmpty(projectName)) {
// try named project
- hasParameter = true;
+ hasParameter = true;
if (projectName.equalsIgnoreCase(GitBlit.getString(Keys.web.repositoryRootGroupName, "main"))) {
// root project/group
for (RepositoryModel model : availableModels) {
@@ -440,6 +494,9 @@
// time-filter the list
if (daysBack > 0) {
+ if (maxDaysBack > 0 && daysBack > maxDaysBack) {
+ daysBack = maxDaysBack;
+ }
Calendar cal = Calendar.getInstance();
cal.set(Calendar.HOUR_OF_DAY, 0);
cal.set(Calendar.MINUTE, 0);
@@ -455,14 +512,14 @@
}
models = timeFiltered;
}
-
+
List<RepositoryModel> list = new ArrayList<RepositoryModel>(models);
Collections.sort(list);
return list;
}
-
+
/**
- * Inline login form.
+ * Inline login form.
*/
private class LoginForm extends Fragment {
private static final long serialVersionUID = 1L;
@@ -502,7 +559,7 @@
add(loginForm);
}
}
-
+
/**
* Menu for the authenticated user.
*/
@@ -531,12 +588,12 @@
add(new BookmarkablePageLink<Void>("newRepository",
EditRepositoryPage.class).setVisible(user.canAdmin() || user.canCreate()));
- add(new BookmarkablePageLink<Void>("myProfile",
+ add(new BookmarkablePageLink<Void>("myProfile",
UserPage.class, WicketUtils.newUsernameParameter(user.username)));
- add(new BookmarkablePageLink<Void>("changePassword",
+ add(new BookmarkablePageLink<Void>("changePassword",
ChangePasswordPage.class).setVisible(editCredentials));
-
+
add(new BookmarkablePageLink<Void>("logout",
LogoutPage.class).setVisible(standardLogin));
}
--
Gitblit v1.9.1