From 2efe6af8bba41a8451ded7be9a4e3b40190900ab Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 13 Mar 2014 10:45:22 -0400
Subject: [PATCH] Merged #31 "Tag entries do not have tooltips for long messages"
---
src/main/java/com/gitblit/wicket/panels/TagsPanel.java | 16 ++++++++++++----
src/main/java/com/gitblit/wicket/panels/LinkPanel.java | 5 +++++
src/main/java/com/gitblit/wicket/panels/BranchesPanel.java | 2 +-
3 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/panels/BranchesPanel.java b/src/main/java/com/gitblit/wicket/panels/BranchesPanel.java
index 28751fa..6a7873e 100644
--- a/src/main/java/com/gitblit/wicket/panels/BranchesPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/BranchesPanel.java
@@ -133,7 +133,7 @@
CommitPage.class, WicketUtils.newObjectParameter(model.name,
entry.getName()));
if (!shortMessage.equals(trimmedMessage)) {
- WicketUtils.setHtmlTooltip(shortlog, shortMessage);
+ shortlog.setTooltip(shortMessage);
}
item.add(shortlog);
diff --git a/src/main/java/com/gitblit/wicket/panels/LinkPanel.java b/src/main/java/com/gitblit/wicket/panels/LinkPanel.java
index cdcf574..06159ac 100644
--- a/src/main/java/com/gitblit/wicket/panels/LinkPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/LinkPanel.java
@@ -113,4 +113,9 @@
c.add(new SimpleAttributeModifier("rel", "nofollow"));
}
+ public void setTooltip(String tooltip) {
+ Component c = get("link");
+ c.add(new SimpleAttributeModifier("title", tooltip));
+ }
+
}
diff --git a/src/main/java/com/gitblit/wicket/panels/TagsPanel.java b/src/main/java/com/gitblit/wicket/panels/TagsPanel.java
index 1e06a7f..9f3987b 100644
--- a/src/main/java/com/gitblit/wicket/panels/TagsPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/TagsPanel.java
@@ -96,9 +96,13 @@
if (linkClass.equals(BlobPage.class)) {
// Blob Tag Object
item.add(WicketUtils.newImage("tagIcon", "file_16x16.png"));
- item.add(new LinkPanel("tagDescription", "list", message, TagPage.class,
+ LinkPanel messageLink = new LinkPanel("tagDescription", "list", message, TagPage.class,
WicketUtils.newObjectParameter(repositoryName, entry.getObjectId()
- .getName())));
+ .getName()));
+ if (!entry.getShortMessage().equals(message)) {
+ messageLink.setTooltip(entry.getShortMessage());
+ }
+ item.add(messageLink);
Fragment fragment = new Fragment("tagLinks", "blobLinks", this);
fragment.add(new BookmarkablePageLink<Void>("tag", TagPage.class, WicketUtils
@@ -118,9 +122,13 @@
// Standard Tag Object
if (entry.isAnnotatedTag()) {
item.add(WicketUtils.newImage("tagIcon", "tag_16x16.png"));
- item.add(new LinkPanel("tagDescription", "list", message, TagPage.class,
+ LinkPanel messageLink = new LinkPanel("tagDescription", "list", message, TagPage.class,
WicketUtils.newObjectParameter(repositoryName, entry.getObjectId()
- .getName())));
+ .getName()));
+ if (!message.equals(entry.getShortMessage())) {
+ messageLink.setTooltip(entry.getShortMessage());
+ }
+ item.add(messageLink);
Fragment fragment = new Fragment("tagLinks", "annotatedLinks", this);
fragment.add(new BookmarkablePageLink<Void>("tag", TagPage.class,
--
Gitblit v1.9.1