From 61b094152515532b42aa5e918f5405d82cde0440 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 13 Apr 2011 16:27:17 -0400
Subject: [PATCH] Fixed ticgit pages.
---
src/com/gitblit/wicket/pages/TicGitTicketPage.java | 10 ++++++----
src/com/gitblit/wicket/pages/TicGitPage.java | 4 ++--
src/com/gitblit/wicket/pages/TicGitTicketPage.html | 10 +++++-----
src/com/gitblit/wicket/GitBlitWebApp.java | 4 ++--
src/com/gitblit/wicket/pages/TicGitPage.html | 2 +-
src/com/gitblit/wicket/resources/gitblit.css | 7 ++++++-
6 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/src/com/gitblit/wicket/GitBlitWebApp.java b/src/com/gitblit/wicket/GitBlitWebApp.java
index b869a05..a1de7d6 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp.java
+++ b/src/com/gitblit/wicket/GitBlitWebApp.java
@@ -79,8 +79,8 @@
mount(new MixedParamUrlCodingStrategy("/patch", PatchPage.class, new String[] { "r", "h", "f" }));
// setup extended urls
- mount(new MixedParamUrlCodingStrategy("/ticgit", TicGitPage.class, new String[] { "p" }));
- mount(new MixedParamUrlCodingStrategy("/ticgittkt", TicGitTicketPage.class, new String[] { "p", "f" }));
+ mount(new MixedParamUrlCodingStrategy("/ticgit", TicGitPage.class, new String[] { "r" }));
+ mount(new MixedParamUrlCodingStrategy("/ticgittkt", TicGitTicketPage.class, new String[] { "r", "h", "f" }));
repositories = new File(StoredSettings.getString("repositoriesFolder", "repos"));
exportAll = StoredSettings.getBoolean("exportAll", true);
diff --git a/src/com/gitblit/wicket/pages/TicGitPage.html b/src/com/gitblit/wicket/pages/TicGitPage.html
index e339232..eb74b12 100644
--- a/src/com/gitblit/wicket/pages/TicGitPage.html
+++ b/src/com/gitblit/wicket/pages/TicGitPage.html
@@ -19,7 +19,7 @@
<tr wicket:id="ticket">
<td style="padding:0; margin:0;"><div wicket:id="ticketState">[ticket state]</div></td>
<td class="date"><span wicket:id="ticketDate">[ticket date]</span></td>
- <td><div wicket:id="ticketHandler">[ticket handler]</div></td>
+ <td class="author"><div wicket:id="ticketHandler">[ticket handler]</div></td>
<td><div wicket:id="ticketTitle">[ticket title]</div></td>
</tr>
</tbody>
diff --git a/src/com/gitblit/wicket/pages/TicGitPage.java b/src/com/gitblit/wicket/pages/TicGitPage.java
index 2a042a6..7a8b301 100644
--- a/src/com/gitblit/wicket/pages/TicGitPage.java
+++ b/src/com/gitblit/wicket/pages/TicGitPage.java
@@ -36,8 +36,8 @@
WicketUtils.setTicketCssClass(stateLabel, entry.state);
item.add(stateLabel);
item.add(WicketUtils.createDateLabel("ticketDate", entry.date, GitBlitWebSession.get().getTimezone()));
- item.add(new Label("ticketHandler", WicketUtils.trimString(entry.handler, 30)));
- item.add(new LinkPanel("ticketTitle", null, WicketUtils.trimString(entry.title, 80), TicGitTicketPage.class, newPathParameter(entry.name)));
+ item.add(new Label("ticketHandler", WicketUtils.trimString(entry.handler.toLowerCase(), 30)));
+ item.add(new LinkPanel("ticketTitle", "list subject", WicketUtils.trimString(entry.title, 80), TicGitTicketPage.class, newPathParameter(entry.name)));
WicketUtils.setAlternatingBackground(item, counter);
counter++;
diff --git a/src/com/gitblit/wicket/pages/TicGitTicketPage.html b/src/com/gitblit/wicket/pages/TicGitTicketPage.html
index 1746266..aafbf8c 100644
--- a/src/com/gitblit/wicket/pages/TicGitTicketPage.html
+++ b/src/com/gitblit/wicket/pages/TicGitTicketPage.html
@@ -26,12 +26,12 @@
<div class="header"><wicket:message key="gb.ticketComments">comments</wicket:message></div>
<!-- comments -->
- <table style="width:100%;" class="pretty">
+ <table style="width:100%;" class="comments">
<tbody>
- <tr wicket:id="comment">
- <td class="date"><span wicket:id="commentDate">[comment date]</span></td>
- <td class="author"><span wicket:id="commentAuthor">[comment author]</span></td>
- <td><div wicket:id="commentText">[comment text]</div></td>
+ <tr valign="top" wicket:id="comment">
+ <td><span class="date" wicket:id="commentDate">[comment date]</span><br/>
+ <span class="author" wicket:id="commentAuthor">[comment author]</span></td>
+ <td><span wicket:id="commentText">[comment text]</span></td>
</tr>
</tbody>
</table>
diff --git a/src/com/gitblit/wicket/pages/TicGitTicketPage.java b/src/com/gitblit/wicket/pages/TicGitTicketPage.java
index fdd6ea0..73b7085 100644
--- a/src/com/gitblit/wicket/pages/TicGitTicketPage.java
+++ b/src/com/gitblit/wicket/pages/TicGitTicketPage.java
@@ -8,6 +8,7 @@
import org.eclipse.jgit.lib.Repository;
import com.gitblit.utils.JGitUtils;
+import com.gitblit.utils.Utils;
import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.RepositoryPage;
import com.gitblit.wicket.WicketUtils;
@@ -26,8 +27,8 @@
add(new Label("ticketTitle", t.title));
add(new Label("ticketId", t.id));
- add(new Label("ticketHandler", t.handler));
- add(WicketUtils.createTimestampLabel("ticketOpendate", t.date, getTimeZone()));
+ add(new Label("ticketHandler", t.handler.toLowerCase()));
+ add(WicketUtils.createTimestampLabel("ticketOpenDate", t.date, getTimeZone()));
Label stateLabel = new Label("ticketState", t.state);
WicketUtils.setTicketCssClass(stateLabel, t.state);
add(stateLabel);
@@ -41,7 +42,7 @@
public void populateItem(final Item<Comment> item) {
final Comment entry = item.getModelObject();
item.add(WicketUtils.createDateLabel("commentDate", entry.date, GitBlitWebSession.get().getTimezone()));
- item.add(new Label("commentAuthor", entry.author));
+ item.add(new Label("commentAuthor", entry.author.toLowerCase()));
item.add(new Label("commentText", prepareComment(entry.text)).setEscapeModelStrings(false));
WicketUtils.setAlternatingBackground(item, counter);
counter++;
@@ -56,7 +57,8 @@
}
private String prepareComment(String comment) {
- String html = WicketUtils.breakLines(comment).trim();
+ String html = Utils.escapeForHtml(comment, false);
+ html = WicketUtils.breakLines(comment).trim();
return html.replaceAll("\\bcommit\\s*([A-Za-z0-9]*)\\b", "<a href=\"/commit/" + repositoryName + "/$1\">commit $1</a>");
}
}
diff --git a/src/com/gitblit/wicket/resources/gitblit.css b/src/com/gitblit/wicket/resources/gitblit.css
index bb99350..c5a416b 100644
--- a/src/com/gitblit/wicket/resources/gitblit.css
+++ b/src/com/gitblit/wicket/resources/gitblit.css
@@ -293,7 +293,7 @@
padding: 8px;
}
-table.pretty, table.repositories {
+table.pretty, table.repositories, table.comments {
margin-bottom:5px;
border-spacing: 0px;
border-left: 1px solid #bbb;
@@ -304,6 +304,11 @@
padding: 2px 4px;
}
+table.comments td {
+ padding: 4px;
+ line-height: 17px;
+}
+
table.repositories {
width:100%;
}
--
Gitblit v1.9.1