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 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) 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