From c658df9e87d65b08d5482cf04489cb0532ff83dd Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 13 Oct 2012 10:50:35 -0400
Subject: [PATCH] Merge branch 'master' of https://github.com/Mrbytes/gitblit
---
src/com/gitblit/wicket/panels/BranchesPanel.html | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/BranchesPanel.html b/src/com/gitblit/wicket/panels/BranchesPanel.html
index 114541f..58c86a4 100644
--- a/src/com/gitblit/wicket/panels/BranchesPanel.html
+++ b/src/com/gitblit/wicket/panels/BranchesPanel.html
@@ -15,9 +15,9 @@
<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 class="author"><span wicket:id="branchAuthor">[branch author]</span></td>
- <td><span wicket:id="branchLog">[branch log]</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>
@@ -33,6 +33,13 @@
</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>
+
<!-- branch panel links -->
<wicket:fragment wicket:id="branchPanelLinks">
<span class="link">
--
Gitblit v1.9.1