Show fork indicator on the repositories page

diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties
index 0478448baf22202b6240c67a8f0fa9e2dbf4cc29..166064279c913a711b0e40c6abfdb00a0a98e0e7 100644 (file)
--- a/src/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/com/gitblit/wicket/GitBlitWebApp.properties
@@ -336,4 +336,5 @@ gb.forksProhibitedWarning = this repository forbids forks
 gb.noForks = {0} has no forks\r
 gb.forkNotAuthorized = sorry, you are not authorized to fork {0}\r
 gb.forkInProgress = fork in progress\r
-gb.preparingFork = preparing your fork...
\ No newline at end of file
+gb.preparingFork = preparing your fork...\r
+gb.isFork = is fork
\ No newline at end of file

diff --git a/src/com/gitblit/wicket/panels/RepositoriesPanel.html b/src/com/gitblit/wicket/panels/RepositoriesPanel.html
index 6c19fc51585b15255c31f8bc059475d9562864ad..ddf1656e7e962dd19971681cca049402f5db2888 100644 (file)
--- a/src/com/gitblit/wicket/panels/RepositoriesPanel.html
+++ b/src/com/gitblit/wicket/panels/RepositoriesPanel.html
@@ -79,7 +79,7 @@
         <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>\r
         <td class="hidden-phone"><span class="list" wicket:id="repositoryDescription">[repository description]</span></td>\r
         <td class="hidden-tablet hidden-phone author"><span wicket:id="repositoryOwner">[repository owner]</span></td>\r
-        <td class="hidden-phone" style="text-align: right;padding-right:10px;"><img class="inlineIcon" wicket:id="ticketsIcon" /><img class="inlineIcon" wicket:id="docsIcon" /><img class="inlineIcon" wicket:id="frozenIcon" /><img class="inlineIcon" wicket:id="federatedIcon" /><img class="inlineIcon" wicket:id="accessRestrictionIcon" /></td>\r
+        <td class="hidden-phone" style="text-align: right;padding-right:10px;"><img class="inlineIcon" wicket:id="forkIcon" /><img class="inlineIcon" wicket:id="ticketsIcon" /><img class="inlineIcon" wicket:id="docsIcon" /><img class="inlineIcon" wicket:id="frozenIcon" /><img class="inlineIcon" wicket:id="federatedIcon" /><img class="inlineIcon" wicket:id="accessRestrictionIcon" /></td>\r
         <td><span wicket:id="repositoryLastChange">[last change]</span></td>\r
         <td class="hidden-phone" style="text-align: right;padding-right:15px;"><span style="font-size:0.8em;" wicket:id="repositorySize">[repository size]</span></td>\r
         <td class="rightAlign">\r

diff --git a/src/com/gitblit/wicket/panels/RepositoriesPanel.java b/src/com/gitblit/wicket/panels/RepositoriesPanel.java
index 3a62d8fdb42aff911e7032473a33468f9d7677e0..02ebf4f48b1192cc37b14a53135be38c555edfa7 100644 (file)
--- a/src/com/gitblit/wicket/panels/RepositoriesPanel.java
+++ b/src/com/gitblit/wicket/panels/RepositoriesPanel.java
@@ -224,6 +224,13 @@ public class RepositoriesPanel extends BasePanel {
                                                        .setEscapeModelStrings(false));\r
                                }\r
 \r
+                               if (entry.isFork()) {\r
+                                       row.add(WicketUtils.newImage("forkIcon", "commit_divide_16x16.png",\r
+                                                       getString("gb.isFork")));\r
+                               } else {\r
+                                       row.add(WicketUtils.newClearPixel("forkIcon").setVisible(false));\r
+                               }\r
+\r
                                if (entry.useTickets) {\r
                                        row.add(WicketUtils.newImage("ticketsIcon", "bug_16x16.png",\r
                                                        getString("gb.tickets")));\r