Restylized search form. Used GNOME's search icon.

James Moger

2011-04-23 4910c13d1049a03895972878ff268a10149ad033

 src/com/gitblit/wicket/panels/PageLinksPanel.java

@@ -2,28 +2,37 @@


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.StoredSettings;

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.TicGitPage;

import com.gitblit.wicket.pages.TicketsPage;

import com.gitblit.wicket.pages.TreePage;



public class PageLinksPanel extends Panel {

@@ -40,7 +49,7 @@
         put("branches", "gb.branches");

         put("tags", "gb.tags");

         put("tree", "gb.tree");

         put("ticgit", "gb.ticgit");

         put("tickets", "gb.tickets");

      }

   };



@@ -54,14 +63,14 @@
      add(new BookmarkablePageLink<Void>("tags", TagsPage.class, WicketUtils.newRepositoryParameter(repositoryName)));

      add(new BookmarkablePageLink<Void>("tree", TreePage.class, WicketUtils.newRepositoryParameter(repositoryName)));



      // Get the repository ticgit setting

      boolean checkTicgit = StoredSettings.getBoolean("ticgit.global", false);

      checkTicgit |= StoredSettings.getBoolean(MessageFormat.format("ticgit.{0}", repositoryName), false);

		
      // Get the repository tickets setting

      boolean checkTicgit = GitBlit.self().settings().getBoolean(Keys.tickets.global, false);

      checkTicgit |= GitBlit.self().settings().getBoolean(MessageFormat.format(Keys.tickets._ROOT + ".{0}", repositoryName), false);



      // Add dynamic repository extras

      List<String> extras = new ArrayList<String>();

      if (checkTicgit && JGitUtils.getTicGitBranch(r) != null) {

         extras.add("ticgit");

      if (checkTicgit && JGitUtils.getTicketsBranch(r) != null) {

         extras.add("tickets");

      }



      ListDataProvider<String> extrasDp = new ListDataProvider<String>(extras);

@@ -70,13 +79,15 @@


         public void populateItem(final Item<String> item) {

            String extra = item.getModelObject();

            if (extra.equals("ticgit")) {

            if (extra.equals("tickets")) {

               item.add(new Label("extraSeparator", " | "));

               item.add(new LinkPanel("extraLink", null, "ticgit", TicGitPage.class, WicketUtils.newRepositoryParameter(repositoryName)));

               item.add(new LinkPanel("extraLink", null, "tickets", TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName)));

            }

         }

      };

      add(extrasView);



      add(new SearchForm("searchForm", repositoryName));

   }



   public void disablePageLink(String pageName) {

@@ -84,7 +95,7 @@
         String key = knownPages.get(wicketId);

         String linkName = getString(key);

         if (linkName.equals(pageName)) {

            Component c = get(wicketId);				
            Component c = get(wicketId);

            if (c != null) {

               c.setEnabled(false);

            }

@@ -92,4 +103,34 @@
         }

      }

   }



   class SearchForm extends StatelessForm<Void> {

      private static final long serialVersionUID = 1L;



      private final String repositoryName;



      private final IModel<String> searchBoxModel = new Model<String>("");

		
      private final IModel<SearchType> searchTypeModel = new Model<SearchType>(SearchType.COMMIT);



      public SearchForm(String id, String repositoryName) {

         super(id);

         this.repositoryName = repositoryName;

         DropDownChoice<SearchType> searchType = new DropDownChoice<SearchType>("searchType", Arrays.asList(SearchType.values()));

         searchType.setModel(searchTypeModel);

         WicketUtils.setHtmlTitle(searchType, getString("gb.searchTypeTooltip"));

         add(searchType);

         TextField<String> searchBox = new TextField<String>("searchBox", searchBoxModel);

         add(searchBox);

         WicketUtils.setHtmlTitle(searchBox, getString("gb.searchTooltip"));

         WicketUtils.setInputPlaceholder(searchBox, getString("gb.search"));

      }



      @Override

      public void onSubmit() {

         SearchType searchType = searchTypeModel.getObject();

         String searchString = searchBoxModel.getObject();

         setResponsePage(SearchPage.class, WicketUtils.newSearchParameter(repositoryName, null, searchString, searchType));

      }

   }

}