From 18d398e3ab5227fe10fe3f322798a51ce0cd10ca Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 23 Feb 2012 17:44:53 -0500
Subject: [PATCH] Documentation
---
src/com/gitblit/wicket/WicketUtils.java | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/src/com/gitblit/wicket/WicketUtils.java b/src/com/gitblit/wicket/WicketUtils.java
index dbeb47f..7be5328 100644
--- a/src/com/gitblit/wicket/WicketUtils.java
+++ b/src/com/gitblit/wicket/WicketUtils.java
@@ -95,11 +95,11 @@
public static void setTicketCssClass(Component container, String state) {
String css = null;
if (state.equals("open")) {
- css = "label important";
+ css = "label label-important";
} else if (state.equals("hold")) {
- css = "label warning";
+ css = "label label-warning";
} else if (state.equals("resolved")) {
- css = "label success";
+ css = "label label-success";
} else if (state.equals("invalid")) {
css = "label";
}
@@ -369,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) {
@@ -400,9 +408,10 @@
public static Label createDateLabel(String wicketId, Date date, TimeZone timeZone) {
String format = GitBlit.getString(Keys.web.datestampShortFormat, "MM/dd/yy");
DateFormat df = new SimpleDateFormat(format);
- if (timeZone != null) {
- df.setTimeZone(timeZone);
+ if (timeZone == null) {
+ timeZone = GitBlit.getTimezone();
}
+ df.setTimeZone(timeZone);
String dateString;
if (date.getTime() == 0) {
dateString = "--";
@@ -430,9 +439,10 @@
public static Label createTimeLabel(String wicketId, Date date, TimeZone timeZone) {
String format = GitBlit.getString(Keys.web.timeFormat, "HH:mm");
DateFormat df = new SimpleDateFormat(format);
- if (timeZone != null) {
- df.setTimeZone(timeZone);
+ if (timeZone == null) {
+ timeZone = GitBlit.getTimezone();
}
+ df.setTimeZone(timeZone);
String timeString;
if (date.getTime() == 0) {
timeString = "--";
@@ -441,7 +451,6 @@
}
String title = TimeUtils.timeAgo(date);
Label label = new Label(wicketId, timeString);
- WicketUtils.setCssClass(label, TimeUtils.timeAgoCss(date));
if (!StringUtils.isEmpty(title)) {
WicketUtils.setHtmlTooltip(label, title);
}
@@ -451,9 +460,10 @@
public static Label createDatestampLabel(String wicketId, Date date, TimeZone timeZone) {
String format = GitBlit.getString(Keys.web.datestampLongFormat, "EEEE, MMMM d, yyyy");
DateFormat df = new SimpleDateFormat(format);
- if (timeZone != null) {
- df.setTimeZone(timeZone);
+ if (timeZone == null) {
+ timeZone = GitBlit.getTimezone();
}
+ df.setTimeZone(timeZone);
String dateString;
if (date.getTime() == 0) {
dateString = "--";
@@ -475,7 +485,6 @@
title = tmp;
}
Label label = new Label(wicketId, dateString);
- WicketUtils.setCssClass(label, TimeUtils.timeAgoCss(date));
if (!StringUtils.isEmpty(title)) {
WicketUtils.setHtmlTooltip(label, title);
}
@@ -484,11 +493,12 @@
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);
+ if (timeZone == null) {
+ timeZone = GitBlit.getTimezone();
}
+ df.setTimeZone(timeZone);
String dateString;
if (date.getTime() == 0) {
dateString = "--";
--
Gitblit v1.9.1