From 30f9d25d77ccb5cd978d4cf8fa389ec819e90e95 Mon Sep 17 00:00:00 2001
From: Philip L. McMahon <philip.l.mcmahon@gmail.com>
Date: Fri, 27 Jan 2012 02:02:19 -0500
Subject: [PATCH] Correct update of HEAD symbolic reference when target is a tag.
---
src/com/gitblit/wicket/panels/BranchesPanel.html | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/BranchesPanel.html b/src/com/gitblit/wicket/panels/BranchesPanel.html
index 78774f2..01fb8ba 100644
--- a/src/com/gitblit/wicket/panels/BranchesPanel.html
+++ b/src/com/gitblit/wicket/panels/BranchesPanel.html
@@ -8,25 +8,38 @@
<wicket:panel>
<!-- header -->
- <div class="header" wicket:id="branches">[branches header]</div>
+ <div class="header"><img style="vertical-align: middle;" src="commit_branch_16x16.png"></img><span wicket:id="branches">[branches header]</span></div>
- <table style="width:100%;" class="pretty">
+ <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="author"><span wicket:id="branchAuthor">[branch author]</span></td>
+ <td><span wicket:id="branchLog">[branch log]</span></td>
<td class="rightAlign">
- <div 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>
- </div>
+ <span wicket:id="branchLinks"></span>
</td>
</tr>
</tbody>
</table>
<div wicket:id="allBranches">[all branches]</div>
-
+
+ <!-- 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="syndication"><wicket:message key="gb.feed"></wicket:message></a>
+ </span>
+ </wicket:fragment>
+
+ <!-- branch panel links -->
+ <wicket:fragment wicket:id="branchPanelLinks">
+ <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>
+ </span>
+ </wicket:fragment>
+
</wicket:panel>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1