Sprinkled some icons throughout ui. Centralized icon retrieval.

8 files changed, 43 insertions, 34 deletions

diff --git a/src/com/gitblit/wicket/panels/BasePanel.java b/src/com/gitblit/wicket/panels/BasePanel.java
index 8a168ab4..43cd1263 100644
--- a/src/com/gitblit/wicket/panels/BasePanel.java
+++ b/src/com/gitblit/wicket/panels/BasePanel.java
@@ -25,9 +25,9 @@ public abstract class BasePanel extends Panel {
 

 	protected void setPersonSearchTooltip(Component component, String value, SearchType searchType) {

 		if (searchType.equals(SearchType.AUTHOR)) {

-			WicketUtils.setHtmlTitle(component, getString("gb.searchForAuthor") + " " + value);

+			WicketUtils.setHtmlTooltip(component, getString("gb.searchForAuthor") + " " + value);

 		} else if (searchType.equals(SearchType.COMMITTER)) {

-			WicketUtils.setHtmlTitle(component, getString("gb.searchForCommitter") + " " + value);

+			WicketUtils.setHtmlTooltip(component, getString("gb.searchForCommitter") + " " + value);

 		}

 	}

 }

diff --git a/src/com/gitblit/wicket/panels/HistoryPanel.java b/src/com/gitblit/wicket/panels/HistoryPanel.java
index f8592133..234e00ba 100644
--- a/src/com/gitblit/wicket/panels/HistoryPanel.java
+++ b/src/com/gitblit/wicket/panels/HistoryPanel.java
@@ -5,7 +5,6 @@ import java.util.List;
 import java.util.Map;

 

 import org.apache.wicket.markup.html.basic.Label;

-import org.apache.wicket.markup.html.image.ContextImage;

 import org.apache.wicket.markup.html.link.BookmarkablePageLink;

 import org.apache.wicket.markup.html.panel.Fragment;

 import org.apache.wicket.markup.repeater.Item;

@@ -43,7 +42,7 @@ public class HistoryPanel extends BasePanel {
 	public HistoryPanel(String wicketId, final String repositoryName, final String objectId, final String path, Repository r, int limit, int pageOffset) {

 		super(wicketId);

 		boolean pageResults = limit <= 0;

-		int itemsPerPage = GitBlit.self().settings().getInteger(Keys.web.logPageCommitCount, 50);

+		int itemsPerPage = GitBlit.self().settings().getInteger(Keys.web.itemsPerPage, 50);

 		if (itemsPerPage <= 1) {

 			itemsPerPage = 50;

 		}

@@ -107,16 +106,16 @@ public class HistoryPanel extends BasePanel {
 

 				// merge icon

 				if (entry.getParentCount() > 1) {

-					item.add(new ContextImage("commitIcon", "/com/gitblit/wicket/resources/commit_merge_16x16.png"));

+					item.add(WicketUtils.newImage("commitIcon", "commit_merge_16x16.png"));

 				} else {

-					item.add(new ContextImage("commitIcon", "/com/gitblit/wicket/resources/blank.png"));

+					item.add(WicketUtils.newBlankImage("commitIcon"));

 				}

 

 				String shortMessage = entry.getShortMessage();

 				String trimmedMessage = StringUtils.trimShortLog(shortMessage);

 				LinkPanel shortlog = new LinkPanel("commitShortMessage", "list subject", trimmedMessage, CommitPage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName()));

 				if (!shortMessage.equals(trimmedMessage)) {

-					WicketUtils.setHtmlTitle(shortlog, shortMessage);

+					WicketUtils.setHtmlTooltip(shortlog, shortMessage);

 				}

 				item.add(shortlog);

 

diff --git a/src/com/gitblit/wicket/panels/LogPanel.java b/src/com/gitblit/wicket/panels/LogPanel.java
index 8895dbcb..23afc377 100644
--- a/src/com/gitblit/wicket/panels/LogPanel.java
+++ b/src/com/gitblit/wicket/panels/LogPanel.java
@@ -5,7 +5,6 @@ import java.util.List;
 import java.util.Map;

 

 import org.apache.wicket.markup.html.basic.Label;

-import org.apache.wicket.markup.html.image.ContextImage;

 import org.apache.wicket.markup.html.link.BookmarkablePageLink;

 import org.apache.wicket.markup.repeater.Item;

 import org.apache.wicket.markup.repeater.data.DataView;

@@ -38,7 +37,7 @@ public class LogPanel extends BasePanel {
 	public LogPanel(String wicketId, final String repositoryName, final String objectId, Repository r, int limit, int pageOffset) {

 		super(wicketId);

 		boolean pageResults = limit <= 0;

-		int itemsPerPage = GitBlit.self().settings().getInteger(Keys.web.logPageCommitCount, 50);

+		int itemsPerPage = GitBlit.self().settings().getInteger(Keys.web.itemsPerPage, 50);

 		if (itemsPerPage <= 1) {

 			itemsPerPage = 50;

 		}

@@ -87,9 +86,9 @@ public class LogPanel extends BasePanel {
 

 				// merge icon

 				if (entry.getParentCount() > 1) {

-					item.add(new ContextImage("commitIcon", "/com/gitblit/wicket/resources/commit_merge_16x16.png"));

+					item.add(WicketUtils.newImage("commitIcon", "commit_merge_16x16.png"));

 				} else {

-					item.add(new ContextImage("commitIcon", "/com/gitblit/wicket/resources/blank.png"));

+					item.add(WicketUtils.newBlankImage("commitIcon"));

 				}

 				

 				// short message

@@ -97,7 +96,7 @@ public class LogPanel extends BasePanel {
 				String trimmedMessage = StringUtils.trimShortLog(shortMessage);

 				LinkPanel shortlog = new LinkPanel("commitShortMessage", "list subject", trimmedMessage, CommitPage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName()));

 				if (!shortMessage.equals(trimmedMessage)) {

-					WicketUtils.setHtmlTitle(shortlog, shortMessage);

+					WicketUtils.setHtmlTooltip(shortlog, shortMessage);

 				}

 				item.add(shortlog);

 

diff --git a/src/com/gitblit/wicket/panels/PageLinksPanel.html b/src/com/gitblit/wicket/panels/PageLinksPanel.html
index c467779a..7cad29f0 100644
--- a/src/com/gitblit/wicket/panels/PageLinksPanel.html
+++ b/src/com/gitblit/wicket/panels/PageLinksPanel.html
@@ -9,7 +9,7 @@
 	<form wicket:id="searchForm">

 		<div class="search">

 			<select wicket:id="searchType"/>			

-			<input type="text" id="searchBox" wicket:id="searchBox" value=""/>

+			<input type="text" id="searchBox" wicket:id="searchBox" size="25" value=""/>

 		</div>

 	</form>

 		

diff --git a/src/com/gitblit/wicket/panels/PageLinksPanel.java b/src/com/gitblit/wicket/panels/PageLinksPanel.java
index deb0f6d2..c2bae8fe 100644
--- a/src/com/gitblit/wicket/panels/PageLinksPanel.java
+++ b/src/com/gitblit/wicket/panels/PageLinksPanel.java
@@ -1,6 +1,5 @@
 package com.gitblit.wicket.panels;

 

-import java.text.MessageFormat;

 import java.util.ArrayList;

 import java.util.Arrays;

 import java.util.HashMap;

@@ -63,16 +62,20 @@ public class PageLinksPanel extends Panel {
 		add(new BookmarkablePageLink<Void>("tags", TagsPage.class, WicketUtils.newRepositoryParameter(repositoryName)));

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

 

-		// 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.getTicketsBranch(r) != null) {

+

+		// Get the repository tickets setting

+		boolean checkTickets = JGitUtils.getRepositoryUseTickets(r);

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

 			extras.add("tickets");

 		}

 

+		// Get the repository docs setting

+		boolean checkDocs = JGitUtils.getRepositoryUseDocs(r);

+		if (checkDocs && JGitUtils.getDocumentsBranch(r) != null) {

+			extras.add("docs");

+		}

+

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

 		DataView<String> extrasView = new DataView<String>("extra", extrasDp) {

 			private static final long serialVersionUID = 1L;

@@ -81,7 +84,10 @@ public class PageLinksPanel extends Panel {
 				String extra = item.getModelObject();

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

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

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

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

+				} else if (extra.equals("docs")) {

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

+					item.add(new LinkPanel("extraLink", null, getString("gb.docs"), TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName)));

 				}

 			}

 		};

@@ -110,7 +116,7 @@ public class PageLinksPanel extends Panel {
 		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) {

@@ -118,11 +124,11 @@ public class PageLinksPanel extends Panel {
 			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);

+			WicketUtils.setHtmlTooltip(searchType, getString("gb.searchTypeTooltip"));

+			add(searchType.setVisible(GitBlit.self().settings().getBoolean(Keys.web.showSearchTypeSelection, false)));

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

 			add(searchBox);

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

+			WicketUtils.setHtmlTooltip(searchBox, getString("gb.searchTooltip"));

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

 		}

 

@@ -130,6 +136,13 @@ public class PageLinksPanel extends Panel {
 		public void onSubmit() {

 			SearchType searchType = searchTypeModel.getObject();

 			String searchString = searchBoxModel.getObject();

+			for (SearchType type : SearchType.values()) {

+				if (searchString.toLowerCase().startsWith(type.name().toLowerCase() + ":")) {

+					searchType = type;

+					searchString = searchString.substring(type.name().toLowerCase().length() + 1).trim();

+					break;

+				}

+			}

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

 		}

 	}

diff --git a/src/com/gitblit/wicket/panels/RefsPanel.java b/src/com/gitblit/wicket/panels/RefsPanel.java
index b84d9df8..e8d8c7f3 100644
--- a/src/com/gitblit/wicket/panels/RefsPanel.java
+++ b/src/com/gitblit/wicket/panels/RefsPanel.java
@@ -57,7 +57,7 @@ public class RefsPanel extends Panel {
 					c = new LinkPanel("refName", null, entry, CommitPage.class, WicketUtils.newObjectParameter(repositoryName, entry));

 					WicketUtils.setCssClass(c, "otherRef");

 				}

-				WicketUtils.setHtmlTitle(c, entry);

+				WicketUtils.setHtmlTooltip(c, entry);

 				item.add(c);

 			}

 		};

diff --git a/src/com/gitblit/wicket/panels/SearchPanel.java b/src/com/gitblit/wicket/panels/SearchPanel.java
index c7e038d3..7a877324 100644
--- a/src/com/gitblit/wicket/panels/SearchPanel.java
+++ b/src/com/gitblit/wicket/panels/SearchPanel.java
@@ -4,7 +4,6 @@ import java.util.Date;
 import java.util.List;

 import java.util.Map;

 

-import org.apache.wicket.markup.html.image.ContextImage;

 import org.apache.wicket.markup.html.link.BookmarkablePageLink;

 import org.apache.wicket.markup.repeater.Item;

 import org.apache.wicket.markup.repeater.data.DataView;

@@ -34,7 +33,7 @@ public class SearchPanel extends BasePanel {
 	public SearchPanel(String wicketId, final String repositoryName, final String objectId, final String value, SearchType searchType, Repository r, int limit, int pageOffset) {

 		super(wicketId);

 		boolean pageResults = limit <= 0;

-		int itemsPerPage = GitBlit.self().settings().getInteger(Keys.web.logPageCommitCount, 50);

+		int itemsPerPage = GitBlit.self().settings().getInteger(Keys.web.itemsPerPage, 50);

 		if (itemsPerPage <= 1) {

 			itemsPerPage = 50;

 		}

@@ -77,9 +76,9 @@ public class SearchPanel extends BasePanel {
 

 				// merge icon

 				if (entry.getParentCount() > 1) {

-					item.add(new ContextImage("commitIcon", "/com/gitblit/wicket/resources/commit_merge_16x16.png"));

+					item.add(WicketUtils.newImage("commitIcon", "commit_merge_16x16.png"));

 				} else {

-					item.add(new ContextImage("commitIcon", "/com/gitblit/wicket/resources/blank.png"));

+					item.add(WicketUtils.newBlankImage("commitIcon"));

 				}

 

 				String shortMessage = entry.getShortMessage();

@@ -87,7 +86,7 @@ public class SearchPanel extends BasePanel {
 				// TODO highlight matches

 				LinkPanel shortlog = new LinkPanel("commitShortMessage", "list subject", trimmedMessage, CommitPage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName()));

 				if (!shortMessage.equals(trimmedMessage)) {

-					WicketUtils.setHtmlTitle(shortlog, shortMessage);

+					WicketUtils.setHtmlTooltip(shortlog, shortMessage);

 				}

 				item.add(shortlog);

 

diff --git a/src/com/gitblit/wicket/panels/TagsPanel.java b/src/com/gitblit/wicket/panels/TagsPanel.java
index 40871b1f..e55b672e 100644
--- a/src/com/gitblit/wicket/panels/TagsPanel.java
+++ b/src/com/gitblit/wicket/panels/TagsPanel.java
@@ -3,7 +3,6 @@ package com.gitblit.wicket.panels;
 import java.util.List;

 

 import org.apache.wicket.markup.html.basic.Label;

-import org.apache.wicket.markup.html.image.ContextImage;

 import org.apache.wicket.markup.html.link.BookmarkablePageLink;

 import org.apache.wicket.markup.html.panel.Fragment;

 import org.apache.wicket.markup.repeater.Item;

@@ -54,9 +53,9 @@ public class TagsPanel extends BasePanel {
 

 				// tag icon

 				if (entry.isAnnotatedTag()) {

-					item.add(new ContextImage("tagIcon", "/com/gitblit/wicket/resources/tag_16x16.png"));

+					item.add(WicketUtils.newImage("tagIcon", "tag_16x16.png"));

 				} else {

-					item.add(new ContextImage("tagIcon", "/com/gitblit/wicket/resources/blank.png"));

+					item.add(WicketUtils.newBlankImage("tagIcon"));

 				}

 				

 				item.add(new LinkPanel("tagName", "list name", entry.getDisplayName(), CommitPage.class, WicketUtils.newObjectParameter(repositoryName, entry.getCommitId().getName())));