From 66c29a66638066c3c56cdcbd423d5c7874b73a27 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 11 Apr 2011 09:59:56 -0400
Subject: [PATCH] Enforce default paging value.
---
src/com/gitblit/wicket/BasePage.java | 72 ++++++++++++++++--------------------
1 files changed, 32 insertions(+), 40 deletions(-)
diff --git a/src/com/gitblit/wicket/BasePage.java b/src/com/gitblit/wicket/BasePage.java
index 5d8176a..d795c61 100644
--- a/src/com/gitblit/wicket/BasePage.java
+++ b/src/com/gitblit/wicket/BasePage.java
@@ -1,16 +1,17 @@
package com.gitblit.wicket;
-import java.util.Date;
+import javax.servlet.http.HttpServletRequest;
-import org.apache.wicket.Component;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitblit.utils.Utils;
-
+import com.gitblit.Constants;
+import com.gitblit.StoredSettings;
+import com.gitblit.wicket.pages.SummaryPage;
public abstract class BasePage extends WebPage {
@@ -23,45 +24,36 @@
public BasePage(PageParameters params) {
super(params);
}
-
- protected Label createAuthorLabel(String wicketId, String author) {
- Label label = new Label(wicketId, author);
- WicketUtils.setHtmlTitle(label, author);
- return label;
- }
-
- protected Label createDateLabel(String wicketId, Date date) {
- Label label = new Label(wicketId, GitBlitWebSession.get().formatDate(date));
- WicketUtils.setCssClass(label, Utils.timeAgoCss(date));
- WicketUtils.setHtmlTitle(label, Utils.timeAgo(date));
- return label;
- }
-
- protected Label createShortlogDateLabel(String wicketId, Date date) {
- String dateString = GitBlitWebSession.get().formatDate(date);
- String title = Utils.timeAgo(date);
- if ((System.currentTimeMillis() - date.getTime()) < 10 * 24 * 60 * 60 * 1000l) {
- dateString = title;
- title = GitBlitWebSession.get().formatDate(date);
+
+ protected void setupPage(String repositoryName, String pageName) {
+ if (repositoryName != null && repositoryName.trim().length() > 0) {
+ add(new Label("title", getServerName() + " - " + repositoryName));
+ } else {
+ add(new Label("title", getServerName()));
}
- Label label = new Label(wicketId, dateString);
- WicketUtils.setCssClass(label, Utils.timeAgoCss(date));
- WicketUtils.setHtmlTitle(label, title);
- return label;
- }
-
- protected void setAlternatingBackground(Component c, int i) {
- String clazz = i % 2 == 0 ? "dark" : "light";
- WicketUtils.setCssClass(c, clazz);
- }
-
- protected String trimShortLog(String string) {
- if (string.length() > 60) {
- return string.substring(0, 60) + "...";
+ // header
+ String siteName = StoredSettings.getString("siteName", Constants.NAME);
+ if (siteName == null || siteName.trim().length() == 0) {
+ siteName = Constants.NAME;
}
- return string;
+ add(new Label("siteName", siteName));
+ add(new LinkPanel("repositoryName", null, repositoryName, SummaryPage.class, new PageParameters("p=" + repositoryName)));
+ add(new Label("pageName", pageName));
+
+ // footer
+ add(new Label("footerText", ""));
+ add(new Label("gbVersion", "v" + Constants.VERSION));
+ if (StoredSettings.getBoolean("aggressiveHeapManagement", false)) {
+ System.gc();
+ }
}
-
+
+ protected String getServerName() {
+ ServletWebRequest servletWebRequest = (ServletWebRequest) getRequest();
+ HttpServletRequest req = servletWebRequest.getHttpServletRequest();
+ return req.getServerName();
+ }
+
public void error(String message, Throwable t) {
super.error(message);
logger.error(message, t);
--
Gitblit v1.9.1