modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java
| 15 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/MetricD3Graph.java
| 101 ----------
modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
| 64 +++++-
3 files changed, 62 insertions(+), 118 deletions(-)
New commits:
commit 2500ceada45227159402ce9cf9e101f2dc9e8af3
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Mon Sep 30 18:35:01 2013 -0700
[BZ 1003932] Metrics Screen Hovers 'stick' to first graph opened in graph
list. Switched from local svg coordinate system to global page html coordinate system.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java
index abd8dd6..df56937 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/graphtype/StackedBarMetricGraphImpl.java
@@ -323,8 +323,8 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph {
startDate = new Date(+d.x),
metricGraphTooltipDiv =
$wnd.d3.select("#metricGraphTooltip");
- metricGraphTooltipDiv.style("left", + timeScale(+d.x) + 55 +
"px")
- .style("top", "70px");
+ metricGraphTooltipDiv.style("left", + ($wnd.d3.event.pageX) +15
+ "px")
+ .style("top", ($wnd.d3.event.pageY)+"px");
metricGraphTooltipDiv.select("#metricGraphTooltipTimeLabel")
.text(chartContext.timeLabel);
@@ -368,8 +368,8 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph {
startDate = new Date(+d.x),
noDataTooltipDiv = $wnd.d3.select("#noDataTooltip");
- noDataTooltipDiv.style("left", + timeScale(+d.x)+55 +
"px")
- .style("top", "70px");
+ noDataTooltipDiv.style("left", + ($wnd.d3.event.pageX) + 15 +
"px")
+ .style("top", ($wnd.d3.event.pageY)+"px");
noDataTooltipDiv.select("#noDataTooltipTimeLabel")
.text(chartContext.timeLabel);
@@ -528,9 +528,10 @@ public class StackedBarMetricGraphImpl extends AbstractMetricGraph {
var timeFormatter =
$wnd.d3.time.format(chartContext.chartHoverTimeFormat),
dateFormatter =
$wnd.d3.time.format(chartContext.chartHoverDateFormat),
startDate = new Date(+d.x),
- singleValueGraphTooltipDiv =
$wnd.d3.select("#singleValueTooltip")
- .style("left", + timeScale(+d.x) +55 +
"px")
- .style("top", + yScale(+d.y)+
"px");
+ singleValueGraphTooltipDiv =
$wnd.d3.select("#singleValueTooltip");
+
+ singleValueGraphTooltipDiv.style("left", +
($wnd.d3.event.pageX) + 15 + "px")
+ .style("top",
($wnd.d3.event.pageY)+"px");
singleValueGraphTooltipDiv.select("#singleValueTooltipTimeLabel")
.text(chartContext.timeLabel);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/MetricD3Graph.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/MetricD3Graph.java
index 6081aef..f153022 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/MetricD3Graph.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/MetricD3Graph.java
@@ -168,112 +168,11 @@ public class MetricD3Graph<T extends AbstractD3GraphListView>
extends EnhancedVL
+ height + "px;\">");
divAndSvgDefs.append(getSvgDefs());
divAndSvgDefs.append("</svg>");
- divAndSvgDefs.append(createSingleValueTooltip());
- divAndSvgDefs.append(createNoDataTooltip());
- divAndSvgDefs.append(createMetricTooltip());
divAndSvgDefs.append("</div>");
return divAndSvgDefs.toString();
}
- private static String createMetricTooltip() {
- StringBuilder tooltipDivs = new StringBuilder();
-
- tooltipDivs.append("<div id=\"metricGraphTooltip\"
class=\"hidden\" >");
-
- tooltipDivs.append("<div>");
- tooltipDivs.append("<span id=\"metricGraphTooltipTimeLabel\"
></span>");
- tooltipDivs.append("<span>: </span>");
- tooltipDivs.append("<span id=\"metricGraphTooltipTimeValue\"
></span>");
- tooltipDivs.append("</div>");
-
- tooltipDivs.append("<div>");
- tooltipDivs.append("<span id=\"metricGraphTooltipDateLabel\"
></span>");
- tooltipDivs.append("<span>: </span>");
- tooltipDivs.append("<span id=\"metricGraphTooltipDateValue\"
></span>");
- tooltipDivs.append("</div>");
-
- tooltipDivs.append("<div>");
- tooltipDivs.append("<span
id=\"metricGraphTooltipDurationLabel\" ></span>");
- tooltipDivs.append("<span>: </span>");
- tooltipDivs.append("<span
id=\"metricGraphTooltipDurationValue\" ></span>");
- tooltipDivs.append("<div/>");
- tooltipDivs.append("<hr></hr>");
-
- tooltipDivs.append("<div >");
- tooltipDivs.append("<span id=\"metricGraphTooltipMaxLabel\"
></span>");
- tooltipDivs.append("<span> : </span>");
- tooltipDivs.append("<span id=\"metricGraphTooltipMaxValue\"
></span>");
- tooltipDivs.append("<div/>");
-
- tooltipDivs.append("<div>");
- tooltipDivs.append("<span id=\"metricGraphTooltipAvgLabel\"
></span>");
- tooltipDivs.append("<span> : </span>");
- tooltipDivs.append("<span id=\"metricGraphTooltipAvgValue\"
></span>");
- tooltipDivs.append("<div/>");
-
- tooltipDivs.append("<div>");
- tooltipDivs.append("<span id=\"metricGraphTooltipMinLabel\"
></span>");
- tooltipDivs.append("<span> : </span>");
- tooltipDivs.append("<span id=\"metricGraphTooltipMinValue\"
></span>");
- tooltipDivs.append("<div/>");
-
-
- tooltipDivs.append("</div>"); // end metricGraphTooltipDiv
- return tooltipDivs.toString();
- }
-
- private static String createNoDataTooltip() {
- StringBuilder tooltipDivs = new StringBuilder();
-
- tooltipDivs.append("<div id=\"noDataTooltip\"
class=\"hidden\" >");
-
- tooltipDivs.append("<div>");
- tooltipDivs.append("<span id=\"noDataTooltipTimeLabel\"
></span>");
- tooltipDivs.append("<span>: </span>");
- tooltipDivs.append("<span id=\"noDataTooltipTimeValue\"
></span>");
- tooltipDivs.append("</div>");
-
- tooltipDivs.append("<div>");
- tooltipDivs.append("<span id=\"noDataTooltipDateLabel\"
></span>");
- tooltipDivs.append("<span>: </span>");
- tooltipDivs.append("<span id=\"noDataTooltipDateValue\"
></span>");
- tooltipDivs.append("</div>");
- tooltipDivs.append("<hr></hr>");
-
- tooltipDivs.append("<div id=\"noDataLabel\"
></div>");
-
- tooltipDivs.append("</div>"); // end noDataTooltipDiv
- return tooltipDivs.toString();
- }
-
- private static String createSingleValueTooltip() {
- StringBuilder tooltipDivs = new StringBuilder();
-
- tooltipDivs.append("<div id=\"singleValueTooltip\"
class=\"hidden\" >");
-
- tooltipDivs.append("<div>");
- tooltipDivs.append("<span id=\"singleValueTooltipTimeLabel\"
></span>");
- tooltipDivs.append("<span>: </span>");
- tooltipDivs.append("<span id=\"singleValueTooltipTimeValue\"
></span>");
- tooltipDivs.append("</div>");
-
- tooltipDivs.append("<div>");
- tooltipDivs.append("<span id=\"singleValueTooltipDateLabel\"
></span>");
- tooltipDivs.append("<span>: </span>");
- tooltipDivs.append("<span id=\"singleValueTooltipDateValue\"
></span>");
- tooltipDivs.append("</div>");
- tooltipDivs.append("<hr></hr>");
-
- tooltipDivs.append("<div>");
- tooltipDivs.append("<span id=\"singleValueTooltipValueLabel\"
></span>");
- tooltipDivs.append("<span>: </span>");
- tooltipDivs.append("<span id=\"singleValueTooltipValue\"
></span>");
- tooltipDivs.append("</div>");
-
- tooltipDivs.append("</div>"); // end singleValueTooltipDiv
- return tooltipDivs.toString();
- }
/**
* Delegate the call to rendering the JSNI chart.
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
index 6499483..a8812a9 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
+++ b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
@@ -5,10 +5,10 @@
http://forums.smartclient.com/showthread.php?t=15973
2) solves initial app load issues that we experienced on some XP and
Vista/Windows7 flavors.
-->
- <meta http-equiv="X-UA-Compatible" content="IE=9" />
+ <meta http-equiv="X-UA-Compatible" content="IE=9"/>
<!-- support internationalized characters -->
- <meta http-equiv="Content-Type"
content="text/html;charset=UTF-8" />
+ <meta http-equiv="Content-Type"
content="text/html;charset=UTF-8"/>
<link rel="stylesheet" href="CoreGUI-4.9.0.css">
<!-- for d3 charting -->
@@ -17,18 +17,19 @@
<script type="text/javascript">
var search = location.search;
// only do this if you have not specified locale as query param
- if(search.indexOf("locale") == -1){
+ if (search.indexOf("locale") == -1) {
// IE uses browserLanguage
- var lang = navigator.language!=null ? navigator.language :
navigator.browserLanguage;
+ var lang = navigator.language != null ? navigator.language :
navigator.browserLanguage;
lang = lang.replace("-", "_");
- document.write("<meta name='gwt:property'
content='locale="+lang +"'>");
+ document.write("<meta name='gwt:property'
content='locale=" + lang + "'>");
}
</script>
<script type="text/javascript">
- (function() {
+ (function () {
var method;
- var noop = function () {};
+ var noop = function () {
+ };
var methods = [
'assert', 'clear', 'count', 'debug',
'dir', 'dirxml', 'error',
'exception', 'group', 'groupCollapsed',
'groupEnd', 'info', 'log',
@@ -50,21 +51,22 @@
</script>
<title>RHQ</title>
- <link rel="icon" type="image/png"
href="/images/favicon.png" />
- <link rel="apple-touch-icon" href="/images/favicon.png" />
+ <link rel="icon" type="image/png"
href="/images/favicon.png"/>
+ <link rel="apple-touch-icon" href="/images/favicon.png"/>
<script type="text/javascript">
var isomorphicDir = "org.rhq.enterprise.gui.coregui.CoreGUI/sc/";
</script>
-
</head>
<body>
<script type="text/javascript" language="javascript"
src="org.rhq.enterprise.gui.coregui.CoreGUI/org.rhq.enterprise.gui.coregui.CoreGUI.nocache.js"></script>
+
+
<div id="Loading-Panel" style="width: 214px; height: 90px; margin-top:
300px; margin-left: 40%; margin-right: 40%;">
<div style="text-align: center; border: 3px solid lightgray;">
<img src="images/rhq_logo_animated_100px.gif"
alt="Loading..." style="border: none;">
@@ -74,5 +76,47 @@
<iframe src="javascript:''" id="__gwt_historyFrame"
style="width:0;height:0;border:0"></iframe>
+<div id="singleValueTooltip" class="hidden">
+ <div><span
id="singleValueTooltipTimeLabel"></span><span>:
</span><span id="singleValueTooltipTimeValue"></span>
+ </div>
+ <div><span
id="singleValueTooltipDateLabel"></span><span>:
</span><span id="singleValueTooltipDateValue"></span>
+ </div>
+ <hr>
+ <div><span
id="singleValueTooltipValueLabel"></span><span>:
</span><span id="singleValueTooltipValue"></span></div>
+</div>
+<div id="noDataTooltip" class="hidden">
+ <div><span
id="noDataTooltipTimeLabel"></span><span>: </span><span
id="noDataTooltipTimeValue"></span></div>
+ <div><span
id="noDataTooltipDateLabel"></span><span>: </span><span
id="noDataTooltipDateValue"></span></div>
+ <hr>
+ <div id="noDataLabel"></div>
+</div>
+<div id="metricGraphTooltip" class="hidden">
+ <div><span
id="metricGraphTooltipTimeLabel"></span><span>:
</span><span id="metricGraphTooltipTimeValue"></span>
+ </div>
+ <div><span
id="metricGraphTooltipDateLabel"></span><span>:
</span><span id="metricGraphTooltipDateValue"></span>
+ </div>
+ <div><span
id="metricGraphTooltipDurationLabel"></span><span>:
</span><span
+ id="metricGraphTooltipDurationValue"></span>
+ <div>
+ <hr>
+ <div><span
id="metricGraphTooltipMaxLabel"></span><span> :
</span><span
+ id="metricGraphTooltipMaxValue"></span>
+ <div>
+ <div><span
id="metricGraphTooltipAvgLabel"></span><span> :
</span><span
+ id="metricGraphTooltipAvgValue"></span>
+
+ <div>
+ <div><span
id="metricGraphTooltipMinLabel"></span><span> :
</span><span
+
id="metricGraphTooltipMinValue"></span>
+ <div></div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
</body>
</html>