summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit/wicket/panels
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-03-13 10:43:54 -0400
committerJames Moger <james.moger@gitblit.com>2014-03-13 10:43:54 -0400
commit51ef4603e0e24d128e195202daf3b9e8d21038cc (patch)
treeb8416c9ae01d8a599c628440b5ab9c9ad28558cf /src/main/java/com/gitblit/wicket/panels
parented882589e15422e03267ffb9ca6cb1a7376d1822 (diff)
downloadgitblit-51ef4603e0e24d128e195202daf3b9e8d21038cc.tar.gz
gitblit-51ef4603e0e24d128e195202daf3b9e8d21038cc.zip
Set tooltip for truncated tag and branch messages
Diffstat (limited to 'src/main/java/com/gitblit/wicket/panels')
-rw-r--r--src/main/java/com/gitblit/wicket/panels/BranchesPanel.java2
-rw-r--r--src/main/java/com/gitblit/wicket/panels/LinkPanel.java5
-rw-r--r--src/main/java/com/gitblit/wicket/panels/TagsPanel.java16
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 28751fab..6a7873ea 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 @@ public class BranchesPanel extends BasePanel {
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 cdcf574f..06159ac3 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 @@ public class LinkPanel extends Panel {
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 1e06a7fc..9f3987be 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 @@ public class TagsPanel extends BasePanel {
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 @@ public class TagsPanel extends BasePanel {
// 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,