From ba6ae959b8e21c714c69f66254e82837d45a3ed2 Mon Sep 17 00:00:00 2001
From: mschaefers <mschaefers@scoop-gmbh.de>
Date: Mon, 03 Dec 2012 03:49:23 -0500
Subject: [PATCH] Merge branch 'master' of https://github.com/gitblit/gitblit into enhancedLdap

---
 src/com/gitblit/wicket/pages/BlobDiffPage.html |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/com/gitblit/wicket/pages/BlobDiffPage.html b/src/com/gitblit/wicket/pages/BlobDiffPage.html
index a20b24c..c633642 100644
--- a/src/com/gitblit/wicket/pages/BlobDiffPage.html
+++ b/src/com/gitblit/wicket/pages/BlobDiffPage.html
@@ -6,17 +6,14 @@
 
 <body>
 <wicket:extend>
-
-	<!-- page nav links -->	
-	<div wicket:id="pageLinks">[page links]</div>
 	
 	<!-- blob nav links -->	
 	<div class="page_nav2">
-		<span wicket:id="blameLink">[blame link]</span> | <a wicket:id="historyLink"><wicket:message key="gb.history"></wicket:message></a> | <a wicket:id="patchLink"><wicket:message key="gb.patch"></wicket:message></a> | <a wicket:id="commitLink"><wicket:message key="gb.commit"></wicket:message></a> | <a wicket:id="commitDiffLink"><wicket:message key="gb.commitdiff"></wicket:message></a>
+		<a wicket:id="blameLink"><wicket:message key="gb.blame"></wicket:message></a> | <a wicket:id="historyLink"><wicket:message key="gb.history"></wicket:message></a> | <a wicket:id="patchLink"><wicket:message key="gb.patch"></wicket:message></a> | <a wicket:id="commitLink"><wicket:message key="gb.commit"></wicket:message></a> | <a wicket:id="commitDiffLink"><wicket:message key="gb.commitdiff"></wicket:message></a>
 	</div>	
 	
-	<!-- shortlog header -->
-	<div class="header" wicket:id="shortlog">[shortlog header]</div>
+	<!-- commit header -->
+	<div wicket:id="commitHeader">[commit header]</div>
 
 	<!-- breadcrumbs -->
 	<div wicket:id="breadcrumbs">[breadcrumbs]</div>

--
Gitblit v1.9.1