From 50984c55466228ccff0630e49acb4c5e271d446b Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 11 Apr 2011 09:59:03 -0400 Subject: [PATCH] Moved paging count to setting. Fixed css layouts. Removed log pager. --- src/com/gitblit/wicket/pages/TicGitPage.java | 36 ++++++++++-------------------------- 1 files changed, 10 insertions(+), 26 deletions(-) diff --git a/src/com/gitblit/wicket/pages/TicGitPage.java b/src/com/gitblit/wicket/pages/TicGitPage.java index 16b07b9..2cfb772 100644 --- a/src/com/gitblit/wicket/pages/TicGitPage.java +++ b/src/com/gitblit/wicket/pages/TicGitPage.java @@ -7,10 +7,10 @@ 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; @@ -20,11 +20,10 @@ 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