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/pages/CommitPage.html |   40 ++++++++++++++++++++++++++++++++++------
 1 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/com/gitblit/wicket/pages/CommitPage.html b/src/com/gitblit/wicket/pages/CommitPage.html
index 059d77e..20e6b60 100644
--- a/src/com/gitblit/wicket/pages/CommitPage.html
+++ b/src/com/gitblit/wicket/pages/CommitPage.html
@@ -15,6 +15,10 @@
 	<!-- commit header -->
 	<div wicket:id="commitHeader">[commit header]</div>
 	
+	<div class="row">
+	
+	
+	<div class="span10">
 	<!-- commit info -->
 	<table class="plain">
 		<tr><th><wicket:message key="gb.refs">refs</wicket:message></th><td><div wicket:id="refsPanel">[references]</div></td></tr>
@@ -22,9 +26,14 @@
 		<tr><th></th><td><span class="sha1" wicket:id="commitAuthorDate">[author date]</span></td></tr>
 		<tr><th><wicket:message key="gb.committer">committer</wicket:message></th><td><span class="sha1" wicket:id="commitCommitter">[committer]</span></td></tr>
 		<tr><th></th><td><span class="sha1" wicket:id="commitCommitterDate">[commit date]</span></td></tr>
-		<tr><th><wicket:message key="gb.commit">commit</wicket:message></th><td><span class="sha1" wicket:id="commitId">[commit id]</span></td></tr>
-		<tr><th><wicket:message key="gb.tree">tree</wicket:message></th><td><span class="sha1" wicket:id="commitTree">[commit tree]</span></td></tr>
-		<tr><th valign="top"><wicket:message key="gb.parent">parent</wicket:message></th>
+		<tr class="hidden-phone"><th><wicket:message key="gb.commit">commit</wicket:message></th><td><span class="sha1" wicket:id="commitId">[commit id]</span></td></tr>
+		<tr class="hidden-phone"><th><wicket:message key="gb.tree">tree</wicket:message></th>
+			<td><span class="sha1" wicket:id="commitTree">[commit tree]</span>
+				<span class="link">
+					<a wicket:id="treeLink"><wicket:message key="gb.tree"></wicket:message></a> | <a wicket:id="zipLink"><wicket:message key="gb.zip"></wicket:message></a>
+				</span>
+			</td></tr>
+		<tr class="hidden-phone"><th valign="top"><wicket:message key="gb.parent">parent</wicket:message></th>
 			<td>
 				<span wicket:id="commitParents">
 					<span class="sha1" wicket:id="commitParent">[commit parents]</span>
@@ -35,22 +44,41 @@
 			</td>
 		</tr>
 	</table>
+	</div>
+	
+	</div>
 	
 	<!-- full message -->
 	<div class="commit_message" wicket:id="fullMessage">[commit message]</div>
 
+	<!--  git notes -->
+	<table class="gitnotes">
+		<tr wicket:id="notes">
+			<td class="info">
+				<table>
+					<tr><td><span wicket:id="refName"></span></td></tr>
+					<tr><td><span class="sha1" wicket:id="authorName"></span></td></tr>
+					<tr><td><span class="sha1" wicket:id="authorDate"></span></td></tr>
+				</table>
+				<!--  Note Author Gravatar -->
+				<span style="vertical-align: top;" wicket:id="noteAuthorAvatar" />				
+			</td>
+			<td class="message"><span class="sha1" wicket:id="noteContent"></span></td>
+		</tr>
+	</table>
+	
 	<!--  commit legend -->
-	<div style="text-align:right;" wicket:id="commitLegend"></div>
+	<div class="hidden-phone" style="text-align:right;" wicket:id="commitLegend"></div>
 	
 	<!-- header -->
-	<div class="header"><wicket:message key="gb.changedFiles">[changed files]</wicket:message></div>
+	<div class="header"><i class="icon-file"></i> <wicket:message key="gb.changedFiles">[changed files]</wicket:message></div>
 	
 	<!-- changed paths -->
 	<table class="pretty">
 		<tr wicket:id="changedPath">
 			<td class="changeType"><span wicket:id="changeType">[change type]</span></td>
 			<td class="path"><span wicket:id="pathName">[commit path]</span></td>			
-			<td class="rightAlign">
+			<td class="hidden-phone rightAlign">
 				<span class="link">
 					<a wicket:id="diff"><wicket:message key="gb.diff"></wicket:message></a> | <a wicket:id="view"><wicket:message key="gb.view"></wicket:message></a> | <a wicket:id="blame"><wicket:message key="gb.blame"></wicket:message></a> | <a wicket:id="history"><wicket:message key="gb.history"></wicket:message></a>
 				</span>

--
Gitblit v1.9.1