From b94965e87929c6b4e42f9a2078dc0d910cc2637d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 09 May 2012 07:59:00 -0400
Subject: [PATCH] Merge pull request #17 from peterloron/master

---
 src/com/gitblit/wicket/WicketUtils.java |   65 +++++++++++++++++++++++++-------
 1 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/src/com/gitblit/wicket/WicketUtils.java b/src/com/gitblit/wicket/WicketUtils.java
index 0a20718..864ebe6 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";
 		}
@@ -220,6 +220,19 @@
 		return img;
 	}
 
+	public static Label newIcon(String wicketId, String css) {
+		Label lbl = new Label(wicketId);
+		setCssClass(lbl, css);		
+		return lbl;
+	}
+	
+	public static Label newBlankIcon(String wicketId) {
+		Label lbl = new Label(wicketId);
+		setCssClass(lbl, "");
+		lbl.setRenderBodyOnly(true);
+		return lbl;
+	}
+	
 	public static ContextRelativeResource getResource(String file) {
 		return new ContextRelativeResource(file);
 	}
@@ -257,6 +270,10 @@
 
 	public static PageParameters newUsernameParameter(String username) {
 		return new PageParameters("user=" + username);
+	}
+
+	public static PageParameters newTeamnameParameter(String teamname) {
+		return new PageParameters("team=" + teamname);
 	}
 
 	public static PageParameters newRepositoryParameter(String repositoryName) {
@@ -365,8 +382,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 +400,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) {
@@ -392,9 +421,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 = "--";
@@ -422,9 +452,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 = "--";
@@ -433,7 +464,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);
 		}
@@ -443,9 +473,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 = "--";
@@ -453,7 +484,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);
 		}
@@ -463,7 +498,6 @@
 			title = tmp;
 		}
 		Label label = new Label(wicketId, dateString);
-		WicketUtils.setCssClass(label, TimeUtils.timeAgoCss(date));
 		if (!StringUtils.isEmpty(title)) {
 			WicketUtils.setHtmlTooltip(label, title);
 		}
@@ -472,11 +506,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