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/panels/BasePanel.java | 26 +++++++-------------------
1 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/panels/BasePanel.java b/src/main/java/com/gitblit/wicket/panels/BasePanel.java
index e241a43..b60579b 100644
--- a/src/main/java/com/gitblit/wicket/panels/BasePanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/BasePanel.java
@@ -22,7 +22,6 @@
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.Model;
-import org.apache.wicket.protocol.http.request.WebClientInfo;
import com.gitblit.Constants;
import com.gitblit.GitBlit;
@@ -34,7 +33,7 @@
public abstract class BasePanel extends Panel {
private static final long serialVersionUID = 1L;
-
+
private transient TimeUtils timeUtils;
public BasePanel(String wicketId) {
@@ -45,31 +44,18 @@
return GitBlit.getBoolean(Keys.web.useClientTimezone, false) ? GitBlitWebSession.get()
.getTimezone() : GitBlit.getTimezone();
}
-
+
protected TimeUtils getTimeUtils() {
if (timeUtils == null) {
- ResourceBundle bundle;
+ ResourceBundle bundle;
try {
bundle = ResourceBundle.getBundle("com.gitblit.wicket.GitBlitWebApp", GitBlitWebSession.get().getLocale());
} catch (Throwable t) {
bundle = ResourceBundle.getBundle("com.gitblit.wicket.GitBlitWebApp");
}
- timeUtils = new TimeUtils(bundle);
+ timeUtils = new TimeUtils(bundle, getTimeZone());
}
return timeUtils;
- }
-
- protected boolean isWindows() {
- return isPlatform("windows");
- }
-
- protected boolean isMac() {
- return isPlatform("macintosh");
- }
-
- protected boolean isPlatform(String platform) {
- String ua = ((WebClientInfo) GitBlitWebSession.get().getClientInfo()).getUserAgent();
- return ua.toLowerCase().contains(platform);
}
protected void setPersonSearchTooltip(Component component, String value, Constants.SearchType searchType) {
@@ -88,6 +74,7 @@
super(event, true, new Model<String>(msg));
}
+ @Override
protected String newValue(final String currentValue, final String replacementValue) {
String prefix = "var conf = confirm('" + replacementValue + "'); "
+ "if (!conf) return false; ";
@@ -104,12 +91,13 @@
private static final long serialVersionUID = 1L;
private String initialValue = "";
-
+
public JavascriptTextPrompt(String event, String msg, String value) {
super(event, true, new Model<String>(msg));
initialValue = value;
}
+ @Override
protected String newValue(final String currentValue, final String message) {
String result = "var userText = prompt('" + message + "','"
+ (initialValue == null ? "" : initialValue) + "'); " + "return userText; ";
--
Gitblit v1.9.1