From 9ab5cc754c62ac9f7aa58b1f64fda7532cdad05b Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 13 Apr 2011 15:53:19 -0400
Subject: [PATCH] Html and Css simplifications.
---
src/com/gitblit/wicket/pages/TicGitPage.java | 38 +++++++++++---------------------------
1 files changed, 11 insertions(+), 27 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/TicGitPage.java b/src/com/gitblit/wicket/pages/TicGitPage.java
index 16b07b9..2a042a6 100644
--- a/src/com/gitblit/wicket/pages/TicGitPage.java
+++ b/src/com/gitblit/wicket/pages/TicGitPage.java
@@ -7,24 +7,23 @@
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
import org.apache.wicket.markup.repeater.data.ListDataProvider;
-import org.eclipse.jgit.lib.Repository;
import com.gitblit.utils.JGitUtils;
-import com.gitblit.utils.TicGitTicket;
+import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.LinkPanel;
import com.gitblit.wicket.RepositoryPage;
import com.gitblit.wicket.WicketUtils;
+import com.gitblit.wicket.models.TicGitTicket;
public class TicGitPage extends RepositoryPage {
public TicGitPage(PageParameters params) {
super(params);
- Repository r = getRepository();
- List<TicGitTicket> tickets = JGitUtils.getTicGitTickets(r);
+ List<TicGitTicket> tickets = JGitUtils.getTicGitTickets(getRepository());
- // shortlog
- add(new LinkPanel("summary", "title", repositoryName, SummaryPage.class, newRepositoryParameter()));
+ // header
+ add(new LinkPanel("header", "title", repositoryName, SummaryPage.class, newRepositoryParameter()));
ListDataProvider<TicGitTicket> ticketsDp = new ListDataProvider<TicGitTicket>(tickets);
DataView<TicGitTicket> ticketsView = new DataView<TicGitTicket>("ticket", ticketsDp) {
@@ -34,36 +33,21 @@
public void populateItem(final Item<TicGitTicket> item) {
final TicGitTicket entry = item.getModelObject();
Label stateLabel = new Label("ticketState", entry.state);
- String css = null;
- if (entry.state.equals("open")) {
- css = "bug_open";
- } else if (entry.state.equals("hold")) {
- css = "bug_hold";
- } else if (entry.state.equals("resolved")) {
- css = "bug_resolved";
- } else if (entry.state.equals("invalid")) {
- css = "bug_invalid";
- }
- if (css != null) {
- WicketUtils.setCssClass(stateLabel, css);
- }
+ WicketUtils.setTicketCssClass(stateLabel, entry.state);
item.add(stateLabel);
- item.add(createDateLabel("ticketDate", entry.date));
- item.add(new Label("ticketHandler", trimString(entry.handler, 30)));
- item.add(new LinkPanel("ticketTitle", null, trimString(entry.title, 80), TicGitTicketPage.class, newPathParameter(entry.name)));
+ 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)));
- setAlternatingBackground(item, counter);
+ WicketUtils.setAlternatingBackground(item, counter);
counter++;
}
};
add(ticketsView);
-
- // footer
- addFooter();
}
@Override
protected String getPageName() {
- return "ticgit";
+ return getString("gb.ticgit");
}
}
--
Gitblit v1.9.1