From c3f4f124f1b9e45d7696f3c16f958d1c81ff280a Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 21 Apr 2011 21:46:47 -0400 Subject: [PATCH] Use markdown for welcome message. Simplify login page appearance. --- src/com/gitblit/wicket/WicketUtils.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 57 insertions(+), 2 deletions(-) diff --git a/src/com/gitblit/wicket/WicketUtils.java b/src/com/gitblit/wicket/WicketUtils.java index 3288498..c8d605b 100644 --- a/src/com/gitblit/wicket/WicketUtils.java +++ b/src/com/gitblit/wicket/WicketUtils.java @@ -9,10 +9,13 @@ import org.apache.wicket.PageParameters; import org.apache.wicket.behavior.SimpleAttributeModifier; import org.apache.wicket.markup.html.basic.Label; +import org.eclipse.jgit.diff.DiffEntry.ChangeType; import org.eclipse.jgit.lib.Constants; import com.gitblit.GitBlit; import com.gitblit.Keys; +import com.gitblit.utils.JGitUtils.SearchType; +import com.gitblit.utils.StringUtils; import com.gitblit.utils.TimeUtils; public class WicketUtils { @@ -27,6 +30,24 @@ public static void setHtmlTitle(Component container, String value) { container.add(new SimpleAttributeModifier("title", value)); + } + + public static void setChangeTypeCssClass(Component container, ChangeType type) { + switch (type) { + case ADD: + setCssClass(container, "addition"); + break; + case COPY: + case RENAME: + setCssClass(container, "rename"); + break; + case DELETE: + setCssClass(container, "deletion"); + break; + case MODIFY: + setCssClass(container, "modification"); + break; + } } public static void setTicketCssClass(Component container, String state) { @@ -61,14 +82,14 @@ } public static PageParameters newObjectParameter(String repositoryName, String objectId) { - if (objectId == null || objectId.trim().length() == 0) { + if (StringUtils.isEmpty(objectId)) { return newRepositoryParameter(repositoryName); } return new PageParameters("r=" + repositoryName + ",h=" + objectId); } public static PageParameters newPathParameter(String repositoryName, String objectId, String path) { - if (path == null || path.trim().length() == 0) { + if (StringUtils.isEmpty(path)) { return newObjectParameter(repositoryName, objectId); } return new PageParameters("r=" + repositoryName + ",h=" + objectId + ",f=" + path); @@ -81,6 +102,28 @@ return new PageParameters("r=" + repositoryName + ",h=" + objectId + ",page=" + pageNumber); } + public static PageParameters newHistoryPageParameter(String repositoryName, String objectId, String path, int pageNumber) { + if (pageNumber <= 1) { + return newObjectParameter(repositoryName, objectId); + } + return new PageParameters("r=" + repositoryName + ",h=" + objectId + ",f=" + path + ",page=" + pageNumber); + } + + public static PageParameters newBlobDiffParameter(String repositoryName, String baseCommitId, String commitId, String path) { + return new PageParameters("r=" + repositoryName + ",h=" + commitId + ",f=" + path + ",hb=" + baseCommitId); + } + + public static PageParameters newSearchParameter(String repositoryName, String commitId, String search, SearchType type) { + if (StringUtils.isEmpty(commitId)) { + return new PageParameters("r=" + repositoryName + ",s=" + search + ",st=" + type.name()); + } + return new PageParameters("r=" + repositoryName + ",h=" + commitId + ",s=" + search + ",st=" + type.name()); + } + + public static PageParameters newSearchParameter(String repositoryName, String commitId, String search, SearchType type, int pageNumber) { + return new PageParameters("r=" + repositoryName + ",h=" + commitId + ",s=" + search + ",st=" + type.name() + ",page=" + pageNumber); + } + public static String getRepositoryName(PageParameters params) { return params.getString("r", ""); } @@ -93,6 +136,18 @@ return params.getString("f", null); } + public static String getBaseObjectId(PageParameters params) { + return params.getString("hb", null); + } + + public static String getSearchString(PageParameters params) { + return params.getString("s", null); + } + + public static String getSearchType(PageParameters params) { + return params.getString("st", null); + } + public static int getPage(PageParameters params) { return params.getInt("page", 1); // index from 1 } -- Gitblit v1.9.1