From 7203a415392b5372c0866991f1c2810eb5e3527a Mon Sep 17 00:00:00 2001 From: James Moger Date: Mon, 18 Apr 2011 17:50:31 -0400 Subject: [PATCH] Add search form to the page nav links panel within a repository. --- src/com/gitblit/utils/JGitUtils.java | 4 +++ src/com/gitblit/wicket/GitBlitWebApp.java | 7 ---- src/com/gitblit/wicket/pages/SummaryPage.html | 2 +- .../gitblit/wicket/panels/PageLinksPanel.html | 17 +++++++-- .../gitblit/wicket/panels/PageLinksPanel.java | 36 +++++++++++++++++++ src/com/gitblit/wicket/resources/gitblit.css | 13 ++++++- 6 files changed, 67 insertions(+), 12 deletions(-) diff --git a/src/com/gitblit/utils/JGitUtils.java b/src/com/gitblit/utils/JGitUtils.java index 3b69c225..49fbf1ef 100644 --- a/src/com/gitblit/utils/JGitUtils.java +++ b/src/com/gitblit/utils/JGitUtils.java @@ -519,6 +519,10 @@ public class JGitUtils { } return null; } + + public String toString() { + return name().toLowerCase(); + } } public static List searchRevlogs(Repository r, String objectId, String value, final SearchType type, int offset, int maxCount) { diff --git a/src/com/gitblit/wicket/GitBlitWebApp.java b/src/com/gitblit/wicket/GitBlitWebApp.java index dc1e2c9c..106981e3 100644 --- a/src/com/gitblit/wicket/GitBlitWebApp.java +++ b/src/com/gitblit/wicket/GitBlitWebApp.java @@ -6,8 +6,6 @@ import org.apache.wicket.Request; import org.apache.wicket.Response; import org.apache.wicket.Session; import org.apache.wicket.protocol.http.WebApplication; -import org.apache.wicket.protocol.http.request.urlcompressing.UrlCompressingWebRequestProcessor; -import org.apache.wicket.request.IRequestCycleProcessor; import org.apache.wicket.request.target.coding.MixedParamUrlCodingStrategy; import com.gitblit.GitBlit; @@ -86,11 +84,6 @@ public class GitBlitWebApp extends WebApplication { return new GitBlitWebSession(request); } - @Override - protected final IRequestCycleProcessor newRequestCycleProcessor() { - return new UrlCompressingWebRequestProcessor(); - } - @Override public final String getConfigurationType() { if (GitBlit.self().isDebugMode()) diff --git a/src/com/gitblit/wicket/pages/SummaryPage.html b/src/com/gitblit/wicket/pages/SummaryPage.html index 7075bd2c..47c10b31 100644 --- a/src/com/gitblit/wicket/pages/SummaryPage.html +++ b/src/com/gitblit/wicket/pages/SummaryPage.html @@ -10,7 +10,7 @@
[page links]
-
+
diff --git a/src/com/gitblit/wicket/panels/PageLinksPanel.html b/src/com/gitblit/wicket/panels/PageLinksPanel.html index f2e4d316..40ec634f 100644 --- a/src/com/gitblit/wicket/panels/PageLinksPanel.html +++ b/src/com/gitblit/wicket/panels/PageLinksPanel.html @@ -5,9 +5,20 @@ lang="en"> - -
- | | | | + +
+
+ +
+
+ + +
+
+ | | | | +
\ No newline at end of file diff --git a/src/com/gitblit/wicket/panels/PageLinksPanel.java b/src/com/gitblit/wicket/panels/PageLinksPanel.java index f8824db5..65034051 100644 --- a/src/com/gitblit/wicket/panels/PageLinksPanel.java +++ b/src/com/gitblit/wicket/panels/PageLinksPanel.java @@ -2,26 +2,34 @@ package com.gitblit.wicket.panels; import java.text.MessageFormat; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import org.apache.wicket.Component; import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.markup.html.form.DropDownChoice; +import org.apache.wicket.markup.html.form.StatelessForm; +import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.markup.html.link.BookmarkablePageLink; import org.apache.wicket.markup.html.panel.Panel; 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.apache.wicket.model.IModel; +import org.apache.wicket.model.Model; import org.eclipse.jgit.lib.Repository; import com.gitblit.GitBlit; import com.gitblit.Keys; import com.gitblit.utils.JGitUtils; +import com.gitblit.utils.JGitUtils.SearchType; import com.gitblit.wicket.LinkPanel; import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.pages.BranchesPage; import com.gitblit.wicket.pages.LogPage; +import com.gitblit.wicket.pages.SearchPage; import com.gitblit.wicket.pages.SummaryPage; import com.gitblit.wicket.pages.TagsPage; import com.gitblit.wicket.pages.TicketsPage; @@ -78,6 +86,8 @@ public class PageLinksPanel extends Panel { } }; add(extrasView); + + add(new SearchForm("searchForm", repositoryName)); } public void disablePageLink(String pageName) { @@ -93,4 +103,30 @@ public class PageLinksPanel extends Panel { } } } + + class SearchForm extends StatelessForm { + private static final long serialVersionUID = 1L; + + private final String repositoryName; + + private final IModel searchBoxModel = new Model(""); + + private final IModel searchTypeModel = new Model(SearchType.COMMIT); + + public SearchForm(String id, String repositoryName) { + super(id); + this.repositoryName = repositoryName; + DropDownChoice searchType = new DropDownChoice("searchType", Arrays.asList(SearchType.values())); + searchType.setModel(searchTypeModel); + add(searchType); + add(new TextField("searchBox", searchBoxModel)); + } + + @Override + public void onSubmit() { + SearchType searchType = searchTypeModel.getObject(); + String searchString = searchBoxModel.getObject(); + setResponsePage(SearchPage.class, WicketUtils.newSearchParameter(repositoryName, null, searchString, searchType)); + } + } } \ No newline at end of file diff --git a/src/com/gitblit/wicket/resources/gitblit.css b/src/com/gitblit/wicket/resources/gitblit.css index 736dbb36..8264cbb5 100644 --- a/src/com/gitblit/wicket/resources/gitblit.css +++ b/src/com/gitblit/wicket/resources/gitblit.css @@ -5,6 +5,10 @@ html, body, table, dl, dt, dd, ol, ul, li, form, a, span, tr, th, td, div, em { font-family: verdana, sans-serif; font-size: 12px; line-height: 15px; + margin: 0; + padding: 0; + border: 0; + outline: 0; } body { @@ -141,7 +145,7 @@ div.page_footer { div.page_nav { color: #ddd; background-color: #000070; - padding: 5px; + padding: 7px; } div.page_nav a { @@ -161,6 +165,13 @@ div.page_nav2 { padding: 2px 5px 7px 5px; } +div.search { + color:yellow; + text-align:right; + float:right; + padding:3px; +} + .repositories_message { border: solid #bbb; border-width: 0px 0px 1px; -- 2.39.5