Eliminate problematic HEAD links from the blob, blame, and tree pages

6 files changed, 3 insertions, 13 deletions

diff --git a/src/main/java/com/gitblit/wicket/pages/BlamePage.html b/src/main/java/com/gitblit/wicket/pages/BlamePage.html
index 1da9671b..126c337a 100644
--- a/src/main/java/com/gitblit/wicket/pages/BlamePage.html
+++ b/src/main/java/com/gitblit/wicket/pages/BlamePage.html
@@ -9,7 +9,7 @@
 	

 	<!-- blame nav links -->	

 	<div class="page_nav2">

-		<a wicket:id="blobLink"><wicket:message key="gb.view"></wicket:message></a> | <a wicket:id="historyLink"><wicket:message key="gb.history"></wicket:message></a> | <a wicket:id="headLink"><wicket:message key="gb.head"></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="blobLink"><wicket:message key="gb.view"></wicket:message></a> | <a wicket:id="historyLink"><wicket:message key="gb.history"></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>	

 	

 	<!-- commit header -->

diff --git a/src/main/java/com/gitblit/wicket/pages/BlamePage.java b/src/main/java/com/gitblit/wicket/pages/BlamePage.java
index ae85c433..c2280a2e 100644
--- a/src/main/java/com/gitblit/wicket/pages/BlamePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/BlamePage.java
@@ -35,7 +35,6 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 import org.apache.wicket.markup.repeater.Item;

 import org.apache.wicket.markup.repeater.data.DataView;

 import org.apache.wicket.markup.repeater.data.ListDataProvider;

-import org.eclipse.jgit.lib.Constants;

 import org.eclipse.jgit.lib.ObjectId;

 import org.eclipse.jgit.revwalk.RevCommit;

 

@@ -103,8 +102,6 @@ public class BlamePage extends RepositoryPage {
 				WicketUtils.newObjectParameter(repositoryName, objectId)));

 

 		// blame page links

-		add(new BookmarkablePageLink<Void>("headLink", BlamePage.class,

-				WicketUtils.newPathParameter(repositoryName, Constants.HEAD, blobPath)));

 		add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class,

 				WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));

 

diff --git a/src/main/java/com/gitblit/wicket/pages/BlobPage.html b/src/main/java/com/gitblit/wicket/pages/BlobPage.html
index d45e3c3b..3f9a959a 100644
--- a/src/main/java/com/gitblit/wicket/pages/BlobPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/BlobPage.html
@@ -46,7 +46,7 @@
 

 		<!-- blob nav links -->	

 		<div class="page_nav2">

-			<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="rawLink"><wicket:message key="gb.raw"></wicket:message></a> | <a wicket:id="headLink"><wicket:message key="gb.head"></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="rawLink"><wicket:message key="gb.raw"></wicket:message></a>

 		</div>	

 	

 		<!-- commit header -->

diff --git a/src/main/java/com/gitblit/wicket/pages/BlobPage.java b/src/main/java/com/gitblit/wicket/pages/BlobPage.java
index 6c73ec10..299d8dbc 100644
--- a/src/main/java/com/gitblit/wicket/pages/BlobPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/BlobPage.java
@@ -24,7 +24,6 @@ import org.apache.wicket.PageParameters;
 import org.apache.wicket.markup.html.basic.Label;

 import org.apache.wicket.markup.html.image.Image;

 import org.apache.wicket.markup.html.link.BookmarkablePageLink;

-import org.eclipse.jgit.lib.Constants;

 import org.eclipse.jgit.lib.Repository;

 import org.eclipse.jgit.revwalk.RevCommit;

 

@@ -60,7 +59,6 @@ public class BlobPage extends RepositoryPage {
 			add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class).setEnabled(false));

 			add(new BookmarkablePageLink<Void>("rawLink", RawPage.class,

 					WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));

-			add(new BookmarkablePageLink<Void>("headLink", BlobPage.class).setEnabled(false));

 			add(new CommitHeaderPanel("commitHeader", objectId));

 			add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, blobPath, objectId));

 			Component c = new Label("blobText", JGitUtils.getStringContent(r, objectId, encodings));

@@ -91,8 +89,6 @@ public class BlobPage extends RepositoryPage {
 					WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));

 			add(new BookmarkablePageLink<Void>("rawLink", RawPage.class,

 					WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));

-			add(new BookmarkablePageLink<Void>("headLink", BlobPage.class,

-					WicketUtils.newPathParameter(repositoryName, Constants.HEAD, blobPath)));

 

 			add(new CommitHeaderPanel("commitHeader", repositoryName, commit));

 

diff --git a/src/main/java/com/gitblit/wicket/pages/TreePage.html b/src/main/java/com/gitblit/wicket/pages/TreePage.html
index 282e28f8..51a996ff 100644
--- a/src/main/java/com/gitblit/wicket/pages/TreePage.html
+++ b/src/main/java/com/gitblit/wicket/pages/TreePage.html
@@ -9,7 +9,7 @@
 

 	<!-- blob nav links -->	

 	<div class="page_nav2">

-		<a wicket:id="historyLink"><wicket:message key="gb.history"></wicket:message></a> | <a wicket:id="headLink"><wicket:message key="gb.head"></wicket:message></a> | <span wicket:id="compressedLinks"></span>

+		<a wicket:id="historyLink"><wicket:message key="gb.history"></wicket:message></a> | <span wicket:id="compressedLinks"></span>

 	</div>	

 	

 	<!-- commit header -->

diff --git a/src/main/java/com/gitblit/wicket/pages/TreePage.java b/src/main/java/com/gitblit/wicket/pages/TreePage.java
index df6507f5..d6bf1fe1 100644
--- a/src/main/java/com/gitblit/wicket/pages/TreePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/TreePage.java
@@ -24,7 +24,6 @@ import org.apache.wicket.markup.html.panel.Fragment;
 import org.apache.wicket.markup.repeater.Item;

 import org.apache.wicket.markup.repeater.data.DataView;

 import org.apache.wicket.markup.repeater.data.ListDataProvider;

-import org.eclipse.jgit.lib.Constants;

 import org.eclipse.jgit.lib.FileMode;

 import org.eclipse.jgit.lib.Repository;

 import org.eclipse.jgit.revwalk.RevCommit;

@@ -56,8 +55,6 @@ public class TreePage extends RepositoryPage {
 		// tree page links

 		add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class,

 				WicketUtils.newPathParameter(repositoryName, objectId, path)));

-		add(new BookmarkablePageLink<Void>("headLink", TreePage.class,

-				WicketUtils.newPathParameter(repositoryName, Constants.HEAD, path)));

 		add(new CompressedDownloadsPanel("compressedLinks", getRequest()

 				.getRelativePathPrefixToContextRoot(), repositoryName, objectId, path));