From 5cc40c89abafdcccbc8a5b2cf3890780ccff908e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 09 Feb 2012 17:41:23 -0500
Subject: [PATCH] Rearranged button order to properly set default (issue 60)
---
src/com/gitblit/wicket/WicketUtils.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/com/gitblit/wicket/WicketUtils.java b/src/com/gitblit/wicket/WicketUtils.java
index 0a20718..fb05d3f 100644
--- a/src/com/gitblit/wicket/WicketUtils.java
+++ b/src/com/gitblit/wicket/WicketUtils.java
@@ -259,6 +259,10 @@
return new PageParameters("user=" + username);
}
+ public static PageParameters newTeamnameParameter(String teamname) {
+ return new PageParameters("team=" + teamname);
+ }
+
public static PageParameters newRepositoryParameter(String repositoryName) {
return new PageParameters("r=" + repositoryName);
}
@@ -365,8 +369,16 @@
return params.getInt("pg", 1);
}
+ public static String getRegEx(PageParameters params) {
+ return params.getString("x", "");
+ }
+
public static String getSet(PageParameters params) {
return params.getString("set", "");
+ }
+
+ public static String getTeam(PageParameters params) {
+ return params.getString("team", "");
}
public static int getDaysBack(PageParameters params) {
@@ -375,6 +387,10 @@
public static String getUsername(PageParameters params) {
return params.getString("user", "");
+ }
+
+ public static String getTeamname(PageParameters params) {
+ return params.getString("team", "");
}
public static String getToken(PageParameters params) {
@@ -453,7 +469,11 @@
dateString = df.format(date);
}
String title = null;
- if (date.getTime() <= System.currentTimeMillis()) {
+ if (TimeUtils.isToday(date)) {
+ title = "today";
+ } else if (TimeUtils.isYesterday(date)) {
+ title = "yesterday";
+ } else if (date.getTime() <= System.currentTimeMillis()) {
// past
title = TimeUtils.timeAgo(date);
}
@@ -472,7 +492,7 @@
public static Label createTimestampLabel(String wicketId, Date date, TimeZone timeZone) {
String format = GitBlit.getString(Keys.web.datetimestampLongFormat,
- "EEEE, MMMM d, yyyy h:mm a z");
+ "EEEE, MMMM d, yyyy HH:mm Z");
DateFormat df = new SimpleDateFormat(format);
if (timeZone != null) {
df.setTimeZone(timeZone);
--
Gitblit v1.9.1