Integrate GitHub Octicons

9 files changed, 164 insertions, 85 deletions

diff --git a/src/main/java/com/gitblit/wicket/freemarker/templates/FilterableRepositoryList.fm b/src/main/java/com/gitblit/wicket/freemarker/templates/FilterableRepositoryList.fm
index 1512adab..765def52 100644
--- a/src/main/java/com/gitblit/wicket/freemarker/templates/FilterableRepositoryList.fm
+++ b/src/main/java/com/gitblit/wicket/freemarker/templates/FilterableRepositoryList.fm
@@ -9,7 +9,13 @@
 	</div>

 	

 	<div ng-repeat="item in ${ngList} | filter:query" style="padding: 3px;border-top: 1px solid #ddd;">

-		<b><span class="repositorySwatch" style="background-color:{{item.c}};"><span ng-show="item.wc">!</span><span ng-show="!item.wc">&nbsp;</span></span></b>

+		<span class="octicon-centered" style="color:{{item.c}};padding-right:2px;">

+            <span ng-show="item.y == 0" class="octicon octicon-repo"></span>

+            <span ng-show="item.y == 1" class="octicon octicon-repo-forked"></span>

+            <span ng-show="item.y == 2" class="octicon octicon-mirror"></span>

+            <span ng-show="item.y == 3" class="octicon octicon-repo-push"></span>

+        </span>

+    

 		<a href="summary/?r={{item.r}}" title="{{item.i}}">{{item.p}}<b>{{item.n}}</b></a>

 		<span class="link hidden-tablet hidden-phone" style="color: #bbb;" title="{{item.d}}">{{item.t}}</span>

 		<span ng-show="item.s" class="pull-right">

diff --git a/src/main/java/com/gitblit/wicket/pages/BasePage.html b/src/main/java/com/gitblit/wicket/pages/BasePage.html
index 89a28b80..7aa78360 100644
--- a/src/main/java/com/gitblit/wicket/pages/BasePage.html
+++ b/src/main/java/com/gitblit/wicket/pages/BasePage.html
@@ -15,6 +15,7 @@
 		<link rel="stylesheet" href="bootstrap/css/bootstrap.css"/>

 		<link rel="stylesheet" href="bootstrap/css/iconic.css"/>

 		<link rel="stylesheet" href="fontawesome/css/font-awesome.min.css"/>

+        <link rel="stylesheet" href="octicons/octicons.css"/>

 		<link rel="stylesheet" type="text/css" href="gitblit.css"/>

 	</wicket:head>

 

diff --git a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.html b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.html
index 22544bc8..d4132421 100644
--- a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.html
@@ -24,13 +24,20 @@
 							</div>

 							

 							<div class="span7">

-								<div>

-									<span class="project" wicket:id="projectTitle">[project title]</span>/<span class="repository" wicket:id="repositoryName">[repository name]</span>

-									<a class="hidden-phone hidden-tablet" style="text-decoration: none;" wicket:id="syndication" wicket:message="title:gb.feed">

-										<img style="border:0px;vertical-align:baseline;" src="feed_16x16.png"></img>

-									</a>

+                                <div style="display:inline-block;vertical-align:top;padding-right:5px;">

+                                    <span wicket:id="repoIcon"></span>

+                                </div>

+								<div style="display:inline-block;">

+                                    <div>

+									   <span class="project" wicket:id="projectTitle">[project title]</span>/<span class="repository" wicket:id="repositoryName">[repository name]</span>

+									   <a class="hidden-phone hidden-tablet" style="text-decoration: none;" wicket:id="syndication" wicket:message="title:gb.feed">

+										  <img style="border:0px;vertical-align:baseline;" src="feed_16x16.png"></img>

+									   </a>

+                                    </div>

+                                    <div>

+                                        <span class="gray" wicket:id="originRepository">[origin repository]</span>   

+                                    </div>

 								</div>

-								<span wicket:id="originRepository">[origin repository]</span>								

 							</div>

 						</div>

 					</div>

@@ -60,6 +67,22 @@
 			<i wicket:id="icon" style="padding-right:3px;"></i><span wicket:id="label"></span>

 		</wicket:fragment>

 		

+        <wicket:fragment wicket:id="repoIconFragment">

+            <span class="gray mega-octicon octicon-repo"></span>

+        </wicket:fragment>

+

+        <wicket:fragment wicket:id="mirrorIconFragment">

+            <span class="gray mega-octicon octicon-mirror"></span>

+        </wicket:fragment>

+

+        <wicket:fragment wicket:id="forkIconFragment">

+            <span class="gray mega-octicon octicon-repo-forked"></span>

+        </wicket:fragment>

+

+        <wicket:fragment wicket:id="cloneIconFragment">

+            <span class="gray mega-octicon octicon-repo-push" wicket:message="title:gb.workingCopyWarning"></span>

+        </wicket:fragment>

+    

 		<wicket:fragment wicket:id="originFragment">

 			<p class="originRepository"><wicket:message key="gb.forkedFrom">[forked from]</wicket:message> <span wicket:id="originRepository">[origin repository]</span></p>

 		</wicket:fragment>

diff --git a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
index 134ee044..9639a0c1 100644
--- a/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RepositoryPage.java
@@ -73,6 +73,7 @@ import com.gitblit.wicket.WicketUtils;
 import com.gitblit.wicket.panels.LinkPanel;

 import com.gitblit.wicket.panels.NavigationPanel;

 import com.gitblit.wicket.panels.RefsPanel;

+import com.google.common.base.Optional;

 

 public abstract class RepositoryPage extends RootPage {

 

@@ -295,25 +296,38 @@ public abstract class RepositoryPage extends RootPage {
 		RepositoryModel model = getRepositoryModel();

 		if (StringUtils.isEmpty(model.originRepository)) {

 			if (model.isMirror) {

+				add(new Fragment("repoIcon", "mirrorIconFragment", this));

 				Fragment mirrorFrag = new Fragment("originRepository", "mirrorFragment", this);

 				Label lbl = new Label("originRepository", MessageFormat.format(getString("gb.mirrorOf"), "<b>" + model.origin + "</b>"));

 				mirrorFrag.add(lbl.setEscapeModelStrings(false));

 				add(mirrorFrag);

 			} else {

-				add(new Label("originRepository").setVisible(false));

+				if (model.isBare) {

+					add(new Fragment("repoIcon", "repoIconFragment", this));

+				} else {

+					add(new Fragment("repoIcon", "cloneIconFragment", this));

+				}

+				add(new Label("originRepository", Optional.of(model.description).or("")));

 			}

 		} else {

 			RepositoryModel origin = app().repositories().getRepositoryModel(model.originRepository);

 			if (origin == null) {

-				// no origin repository

-				add(new Label("originRepository").setVisible(false));

+				// no origin repository, show description if available

+				if (model.isBare) {

+					add(new Fragment("repoIcon", "repoIconFragment", this));

+				} else {

+					add(new Fragment("repoIcon", "cloneIconFragment", this));

+				}

+				add(new Label("originRepository", Optional.of(model.description).or("")));

 			} else if (!user.canView(origin)) {

 				// show origin repository without link

+				add(new Fragment("repoIcon", "forkIconFragment", this));

 				Fragment forkFrag = new Fragment("originRepository", "originFragment", this);

 				forkFrag.add(new Label("originRepository", StringUtils.stripDotGit(model.originRepository)));

 				add(forkFrag);

 			} else {

 				// link to origin repository

+				add(new Fragment("repoIcon", "forkIconFragment", this));

 				Fragment forkFrag = new Fragment("originRepository", "originFragment", this);

 				forkFrag.add(new LinkPanel("originRepository", null, StringUtils.stripDotGit(model.originRepository),

 						SummaryPage.class, WicketUtils.newRepositoryParameter(model.originRepository)));

diff --git a/src/main/java/com/gitblit/wicket/panels/FilterableRepositoryList.java b/src/main/java/com/gitblit/wicket/panels/FilterableRepositoryList.java
index 4433b043..e4ce5ced 100644
--- a/src/main/java/com/gitblit/wicket/panels/FilterableRepositoryList.java
+++ b/src/main/java/com/gitblit/wicket/panels/FilterableRepositoryList.java
@@ -125,7 +125,15 @@ public class FilterableRepositoryList extends BasePanel {
 			item.t = getTimeUtils().timeAgo(repo.lastChange);

 			item.d = df.format(repo.lastChange);

 			item.c = StringUtils.getColor(StringUtils.stripDotGit(repo.name));

-			item.wc = repo.isBare ? 0 : 1;

+			if (!repo.isBare) {

+				item.y = 3;

+			} else if (repo.isMirror) {

+				item.y = 2;

+			} else if (repo.isFork()) {

+				item.y = 1;

+			} else {

+				item.y = 0;

+			}

 			list.add(item);

 		}

 

@@ -147,6 +155,6 @@ public class FilterableRepositoryList extends BasePanel {
 		String i; // information/description

 		long s;   // stars

 		String c; // html color

-		int wc;   // working copy: 1 = true, 0 = false

+		int y;    // type: 0 = normal, 1 = fork, 2 = mirror, 3 = clone

 	}

 }
\ No newline at end of file
diff --git a/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.html b/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.html
index 33345a0a..88de3b4c 100644
--- a/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.html
@@ -24,13 +24,28 @@
 		<p class="originRepository" style="margin-left:20px;" ><wicket:message key="gb.forkedFrom">[forked from]</wicket:message> <span wicket:id="originRepository">[origin repository]</span></p>

 	</wicket:fragment>

 

+    <wicket:fragment wicket:id="repoIconFragment">

+        <span class="mega-octicon octicon-repo"></span>

+    </wicket:fragment>

+

+    <wicket:fragment wicket:id="mirrorIconFragment">

+        <span class="mega-octicon octicon-mirror"></span>

+    </wicket:fragment>

+

+    <wicket:fragment wicket:id="forkIconFragment">

+        <span class="mega-octicon octicon-repo-forked"></span>

+    </wicket:fragment>

+        

+    <wicket:fragment wicket:id="cloneIconFragment">

+        <span class="mega-octicon octicon-repo-push" wicket:message="title:gb.workingCopyWarning"></span>

+    </wicket:fragment>

+

 	<div>

 		<div style="padding-top:15px;padding-bottom:15px;margin-right:15px;">

 			<div class="pull-right" style="text-align:right;padding-right:15px;">

 				<span wicket:id="repositoryLinks"></span>

 				<div>

 					<img class="inlineIcon" wicket:id="sparkleshareIcon" />

-					<img class="inlineIcon" wicket:id="mirrorIcon" />

 					<img class="inlineIcon" wicket:id="frozenIcon" />

 					<img class="inlineIcon" wicket:id="federatedIcon" />

         						

@@ -42,11 +57,15 @@
 			</div>	

 			

 			<div class="pageTitle" style="border:0px;">

-				<div>

-					<span class="repositorySwatch" wicket:id="repositorySwatch"></span>

-					<span class="repository" style="padding-left:3px;color:black;" wicket:id="repositoryName">[repository name]</span>

-				</div>

-				<span wicket:id="originRepository">[origin repository]</span>

+                <div style="display:inline-block;vertical-align:top;padding-right:5px;">

+                    <span wicket:id="repoIcon"></span>

+                </div>

+                <div style="display:inline-block;">

+                    <div>

+					   <span class="repository" style="padding-left:3px;color:black;" wicket:id="repositoryName">[repository name]</span>

+                    </div>

+                    <span wicket:id="originRepository">[origin repository]</span>

+				</div>				

 			</div>

 			

 			<div style="padding-left:20px;">

diff --git a/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.java b/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.java
index 8630d201..91ce9864 100644
--- a/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/ProjectRepositoryPanel.java
@@ -51,24 +51,27 @@ public class ProjectRepositoryPanel extends BasePanel {
 		final boolean showSwatch = app().settings().getBoolean(Keys.web.repositoryListSwatches, true);

 		final boolean showSize = app().settings().getBoolean(Keys.web.showRepositorySizes, true);

 

-		// repository swatch

-		Component swatch;

-		if (entry.isBare) {

-			swatch = new Label("repositorySwatch", "&nbsp;").setEscapeModelStrings(false);

-		} else {

-			swatch = new Label("repositorySwatch", "!");

-			WicketUtils.setHtmlTooltip(swatch, localizer.getString("gb.workingCopyWarning", parent));

-		}

-		WicketUtils.setCssBackground(swatch, entry.toString());

-		add(swatch);

-		swatch.setVisible(showSwatch);

-

 		PageParameters pp = WicketUtils.newRepositoryParameter(entry.name);

 		add(new LinkPanel("repositoryName", "list", StringUtils.getRelativePath(entry.projectPath,

 				StringUtils.stripDotGit(entry.name)), SummaryPage.class, pp));

 		add(new Label("repositoryDescription", entry.description).setVisible(!StringUtils

 				.isEmpty(entry.description)));

 

+		Fragment iconFragment;

+		if (entry.isMirror) {

+			iconFragment = new Fragment("repoIcon", "mirrorIconFragment", this);

+		} else if (entry.isFork()) {

+			iconFragment = new Fragment("repoIcon", "forkIconFragment", this);

+		} else if (entry.isBare) {

+			iconFragment = new Fragment("repoIcon", "repoIconFragment", this);

+		} else {

+			iconFragment = new Fragment("repoIcon", "cloneIconFragment", this);

+		}

+		if (showSwatch) {

+			WicketUtils.setCssStyle(iconFragment, "color:" + StringUtils.getColor(entry.toString()));

+		}

+		add(iconFragment);

+

 		if (StringUtils.isEmpty(entry.originRepository)) {

 			add(new Label("originRepository").setVisible(false));

 		} else {

@@ -84,13 +87,7 @@ public class ProjectRepositoryPanel extends BasePanel {
 			add(WicketUtils.newClearPixel("sparkleshareIcon").setVisible(false));

 		}

 

-		if (entry.isMirror) {

-			add(WicketUtils.newImage("mirrorIcon", "mirror_16x16.png", localizer.getString("gb.isMirror", parent)));

-		} else {

-			add(WicketUtils.newClearPixel("mirrorIcon").setVisible(false));

-		}

-

-		if (entry.isFrozen) {

+		if (!entry.isMirror && entry.isFrozen) {

 			add(WicketUtils.newImage("frozenIcon", "cold_16x16.png", localizer.getString("gb.isFrozen", parent)));

 		} else {

 			add(WicketUtils.newClearPixel("frozenIcon").setVisible(false));

diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.html b/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.html
index e2e7b72b..2de52b09 100644
--- a/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.html
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.html
@@ -17,6 +17,22 @@
        		</tr>

     	</tbody>

 	</table>

+

+    <wicket:fragment wicket:id="repoIconFragment">

+        <span class="octicon octicon-centered octicon-repo"></span>

+    </wicket:fragment>

+

+    <wicket:fragment wicket:id="mirrorIconFragment">

+        <span class="octicon octicon-centered octicon-mirror"></span>

+    </wicket:fragment>

+

+    <wicket:fragment wicket:id="forkIconFragment">

+        <span class="octicon octicon-centered octicon-repo-forked"></span>

+    </wicket:fragment>

+        

+    <wicket:fragment wicket:id="cloneIconFragment">

+        <span class="octicon octicon-centered octicon-repo-push" wicket:message="title:gb.workingCopyWarning"></span>

+    </wicket:fragment>

 	

 	<wicket:fragment wicket:id="adminLinks">

 		<!-- page nav links -->	

@@ -76,10 +92,10 @@
 	</wicket:fragment>

 		

 	<wicket:fragment wicket:id="repositoryRow">

-        <td class="left" style="padding-left:3px;" ><b><span class="repositorySwatch" wicket:id="repositorySwatch"></span></b> <span style="padding-left:3px;" wicket:id="repositoryName">[repository name]</span></td>

+        <td class="left" style="padding-left:3px;" ><span wicket:id="repoIcon"></span><span style="padding-left:3px;" wicket:id="repositoryName">[repository name]</span></td>

         <td class="hidden-phone"><span class="list" wicket:id="repositoryDescription">[repository description]</span></td>

         <td class="hidden-tablet hidden-phone author"><span wicket:id="repositoryOwner">[repository owner]</span></td>

-        <td class="hidden-phone" style="text-align: right;padding-right:10px;"><img class="inlineIcon" wicket:id="sparkleshareIcon" /><img class="inlineIcon" wicket:id="mirrorIcon" /><img class="inlineIcon" wicket:id="forkIcon" /><img class="inlineIcon" wicket:id="frozenIcon" /><img class="inlineIcon" wicket:id="federatedIcon" /><img class="inlineIcon" wicket:id="accessRestrictionIcon" /></td>

+        <td class="hidden-phone" style="text-align: right;padding-right:10px;"><img class="inlineIcon" wicket:id="sparkleshareIcon" /><img class="inlineIcon" wicket:id="frozenIcon" /><img class="inlineIcon" wicket:id="federatedIcon" /><img class="inlineIcon" wicket:id="accessRestrictionIcon" /></td>

         <td><span wicket:id="repositoryLastChange">[last change]</span></td>

         <td class="rightAlign hidden-phone" style="text-align: right;padding-right:15px;"><span style="font-size:0.8em;" wicket:id="repositorySize">[repository size]</span></td>

 	</wicket:fragment>

diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java b/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java
index 8573e1a6..c3f07099 100644
--- a/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/RepositoriesPanel.java
@@ -24,7 +24,6 @@ import java.util.Iterator;
 import java.util.List;

 import java.util.Map;

 

-import org.apache.wicket.Component;

 import org.apache.wicket.PageParameters;

 import org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByBorder;

 import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;

@@ -183,24 +182,28 @@ public class RepositoriesPanel extends BasePanel {
 				Fragment row = new Fragment("rowContent", "repositoryRow", this);

 				item.add(row);

 

+				// show colored repository type icon

+				Fragment iconFragment;

+				if (entry.isMirror) {

+					iconFragment = new Fragment("repoIcon", "mirrorIconFragment", this);

+				} else if (entry.isFork()) {

+					iconFragment = new Fragment("repoIcon", "forkIconFragment", this);

+				} else if (entry.isBare) {

+					iconFragment = new Fragment("repoIcon", "repoIconFragment", this);

+				} else {

+					iconFragment = new Fragment("repoIcon", "cloneIconFragment", this);

+				}

+				if (showSwatch) {

+					WicketUtils.setCssStyle(iconFragment, "color:" + StringUtils.getColor(entry.toString()));

+				}

+				row.add(iconFragment);

+

 				// try to strip group name for less cluttered list

 				String repoName = entry.toString();

 				if (!StringUtils.isEmpty(currGroupName) && (repoName.indexOf('/') > -1)) {

 					repoName = repoName.substring(currGroupName.length() + 1);

 				}

 

-				// repository swatch

-				Component swatch;

-				if (entry.isBare){

-					swatch = new Label("repositorySwatch", "&nbsp;").setEscapeModelStrings(false);

-				} else {

-					swatch = new Label("repositorySwatch", "!");

-					WicketUtils.setHtmlTooltip(swatch, getString("gb.workingCopyWarning"));

-				}

-				WicketUtils.setCssBackground(swatch, entry.toString());

-				row.add(swatch);

-				swatch.setVisible(showSwatch);

-

 				if (linksActive) {

 					Class<? extends BasePage> linkPage = SummaryPage.class;

 					PageParameters pp = WicketUtils.newRepositoryParameter(entry.name);

@@ -228,21 +231,7 @@ public class RepositoriesPanel extends BasePanel {
 					row.add(WicketUtils.newClearPixel("sparkleshareIcon").setVisible(false));

 				}

 

-				if (entry.isMirror) {

-					row.add(WicketUtils.newImage("mirrorIcon", "mirror_16x16.png",

-							getString("gb.isMirror")));

-				} else {

-					row.add(WicketUtils.newClearPixel("mirrorIcon").setVisible(false));

-				}

-

-				if (entry.isFork()) {

-					row.add(WicketUtils.newImage("forkIcon", "commit_divide_16x16.png",

-							getString("gb.isFork")));

-				} else {

-					row.add(WicketUtils.newClearPixel("forkIcon").setVisible(false));

-				}

-

-				if (entry.isFrozen) {

+				if (!entry.isMirror && entry.isFrozen) {

 					row.add(WicketUtils.newImage("frozenIcon", "cold_16x16.png",

 							getString("gb.isFrozen")));

 				} else {

@@ -255,24 +244,30 @@ public class RepositoriesPanel extends BasePanel {
 				} else {

 					row.add(WicketUtils.newClearPixel("federatedIcon").setVisible(false));

 				}

-				switch (entry.accessRestriction) {

-				case NONE:

-					row.add(WicketUtils.newBlankImage("accessRestrictionIcon"));

-					break;

-				case PUSH:

-					row.add(WicketUtils.newImage("accessRestrictionIcon", "lock_go_16x16.png",

-							accessRestrictionTranslations.get(entry.accessRestriction)));

-					break;

-				case CLONE:

-					row.add(WicketUtils.newImage("accessRestrictionIcon", "lock_pull_16x16.png",

-							accessRestrictionTranslations.get(entry.accessRestriction)));

-					break;

-				case VIEW:

-					row.add(WicketUtils.newImage("accessRestrictionIcon", "shield_16x16.png",

-							accessRestrictionTranslations.get(entry.accessRestriction)));

-					break;

-				default:

-					row.add(WicketUtils.newBlankImage("accessRestrictionIcon"));

+

+				if (entry.isMirror) {

+					row.add(WicketUtils.newImage("accessRestrictionIcon", "mirror_16x16.png",

+							getString("gb.isMirror")));

+				} else {

+					switch (entry.accessRestriction) {

+					case NONE:

+						row.add(WicketUtils.newBlankImage("accessRestrictionIcon"));

+						break;

+					case PUSH:

+						row.add(WicketUtils.newImage("accessRestrictionIcon", "lock_go_16x16.png",

+								accessRestrictionTranslations.get(entry.accessRestriction)));

+						break;

+					case CLONE:

+						row.add(WicketUtils.newImage("accessRestrictionIcon", "lock_pull_16x16.png",

+								accessRestrictionTranslations.get(entry.accessRestriction)));

+						break;

+					case VIEW:

+						row.add(WicketUtils.newImage("accessRestrictionIcon", "shield_16x16.png",

+								accessRestrictionTranslations.get(entry.accessRestriction)));

+						break;

+					default:

+						row.add(WicketUtils.newBlankImage("accessRestrictionIcon"));

+					}

 				}

 

 				String owner = "";