From abcb146f0c4e5c99e5e44349a65e6fd49e9296d9 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 30 Oct 2012 17:03:02 -0400
Subject: [PATCH] Moved owner field onto access permissions tab

---
 src/com/gitblit/wicket/panels/BranchesPanel.html |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/com/gitblit/wicket/panels/BranchesPanel.html b/src/com/gitblit/wicket/panels/BranchesPanel.html
index 91c34d2..58c86a4 100644
--- a/src/com/gitblit/wicket/panels/BranchesPanel.html
+++ b/src/com/gitblit/wicket/panels/BranchesPanel.html
@@ -8,15 +8,16 @@
 <wicket:panel>
 
 	<!-- header -->
-	<div class="header" wicket:id="branches">[branches header]</div>	
+	<div class="header"><i class="icon-random" style="vertical-align: middle;"></i> <b><span wicket:id="branches">[branches header]</span></b></div>	
 	
 	<table class="pretty">
 		<tbody>
        		<tr wicket:id="branch">
          		<td class="date"><span wicket:id="branchDate">[branch date]</span></td>
          		<td><span wicket:id="branchName">[branch name]</span></td>
-         		<td><span wicket:id="branchType">[branch type]</span></td>
-         		<td class="rightAlign">
+         		<td class="hidden-phone hidden-tablet author"><span wicket:id="branchAuthor">[branch author]</span></td>
+         		<td class="hidden-phone"><span wicket:id="branchLog">[branch log]</span></td>
+         		<td class="hidden-phone rightAlign">
          			<span wicket:id="branchLinks"></span>
 				</td>
        		</tr>
@@ -28,7 +29,14 @@
 	<!-- branch page links -->
 	<wicket:fragment wicket:id="branchPageLinks">
 		<span class="link">
-			<a wicket:id="log"><wicket:message key="gb.log"></wicket:message></a> | <a wicket:id="tree"><wicket:message key="gb.tree"></wicket:message></a> | <a wicket:id="metrics"><wicket:message key="gb.metrics"></wicket:message></a>
+			<a wicket:id="log"><wicket:message key="gb.log"></wicket:message></a> | <a wicket:id="tree"><wicket:message key="gb.tree"></wicket:message></a> | <a wicket:id="metrics"><wicket:message key="gb.metrics"></wicket:message></a> | <a wicket:id="syndication"><wicket:message key="gb.feed"></wicket:message></a>
+		</span>
+	</wicket:fragment>
+
+	<!-- branch page admin links -->
+	<wicket:fragment wicket:id="branchPageAdminLinks">
+		<span class="link">
+			<a wicket:id="log"><wicket:message key="gb.log"></wicket:message></a> | <a wicket:id="tree"><wicket:message key="gb.tree"></wicket:message></a> | <a wicket:id="metrics"><wicket:message key="gb.metrics"></wicket:message></a> | <a wicket:id="syndication"><wicket:message key="gb.feed"></wicket:message></a> | <a wicket:id="deleteBranch"><wicket:message key="gb.delete"></wicket:message></a>
 		</span>
 	</wicket:fragment>
 

--
Gitblit v1.9.1