modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java | 2 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java | 5 +++-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-)
New commits: commit 4b778d4db50ad35b1f0293dc8c968dcd78cef5f0 Merge: 3d8c8fc... 78f624c... Author: John Mazzitelli mazz@redhat.com Date: Mon Nov 22 17:09:42 2010 -0500
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq.git
commit 3d8c8fcefc52a17c4aada0b8b4e7dbf8ecc7d78e Author: John Mazzitelli mazz@redhat.com Date: Mon Nov 22 17:09:23 2010 -0500
fix link to individual tags and tag cloud
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java index a5b2c95..8ab7e32 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java @@ -282,6 +282,6 @@ public class LinkManager { }
public static String getTagLink(String tag) { - return "#Reports/Inventory/Tag%20Cloud/" + tag; + return "#Reports/Subsystems/Tags/" + tag; } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java index b321314..81bf6e6 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TagCloudView.java @@ -32,6 +32,7 @@ import org.rhq.core.domain.criteria.TagCriteria; import org.rhq.core.domain.tagging.compsite.TagReportComposite; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.LinkManager; import org.rhq.enterprise.gui.coregui.client.components.HeaderLabel; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; @@ -110,8 +111,8 @@ public class TagCloudView extends LocatableVLayout {
int font = (int) ((((double) tag.getTotal()) / (double) max) * (maxFont - minFont)) + minFont;
- buf.append("<a href="#Reports/Inventory/Tag Cloud/").append(tag.getTag()).append("" style="font-size: ") - .append(font).append("pt; margin: 8px;""); + buf.append("<a href="").append(LinkManager.getTagLink(tag.getTag().toString())).append( + "" style="font-size: ").append(font).append("pt; margin: 8px;"");
buf.append(" title="").append(MSG.view_tagCloud_error_tagUsedCount(String.valueOf(tag.getTotal()))) .append("""); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java index 192b0f6..9f64b57 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java @@ -44,7 +44,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; */ public class TaggedView extends LocatableVLayout implements BookmarkableView {
- public static final ViewName VIEW_ID = new ViewName("Tag", MSG.view_tags_tags()); + public static final ViewName VIEW_ID = new ViewName("Tags", MSG.view_tags_tags());
private TagCloudView tagCloudView;
rhq-commits@lists.fedorahosted.org