From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 30 Apr 2016 04:19:14 -0400
Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates
---
src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java b/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java
index eaff206..f127517 100644
--- a/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java
@@ -148,6 +148,8 @@
setChangeTypeTooltip(changeType, entry.changeType);
item.add(changeType);
item.add(new DiffStatPanel("diffStat", entry.insertions, entry.deletions, true));
+ item.add(WicketUtils.setHtmlTooltip(new Label("filestore", ""), getString("gb.filestore"))
+ .setVisible(entry.isFilestoreItem()));
boolean hasSubmodule = false;
String submodulePath = null;
@@ -200,8 +202,6 @@
// quick links
if (entry.isSubmodule()) {
- item.add(new Label("filestore", getString("gb.filestore")).setVisible(false));
-
item.add(new ExternalLink("raw", "").setEnabled(false));
// submodule
item.add(new ExternalLink("patch", "").setEnabled(false));
@@ -219,8 +219,6 @@
&& !entry.changeType.equals(ChangeType.DELETE)));
if (entry.isFilestoreItem()) {
- item.add(new Label("filestore", getString("gb.filestore")).setVisible(true));
-
item.add(new Link<Object>("view", null) {
private static final long serialVersionUID = 1L;
@@ -269,9 +267,6 @@
getRequestCycle().setRequestTarget(new ResourceStreamRequestTarget(resourceStream, entry.path));
}});
} else {
-
- item.add(new Label("filestore", getString("gb.filestore")).setVisible(false));
-
item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils
.newPathParameter(repositoryName, entry.commitId, entry.path))
.setEnabled(!entry.changeType.equals(ChangeType.DELETE)));
--
Gitblit v1.9.1