x/compass-web
Code Issues Proposed changes

Change treenode popup position. Add IP in the popup div

Browse Source 
Change-Id: Ic124f8b99274c2a48755a143b026200778c5d9b8
This commit is contained in:
jiahuay 2014-10-24 17:36:09 -07:00
parent db010132f6
commit 7074f6b897
3 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
v2/assets/css/chart.css
View File

@ -97,6 +97,10 @@ treechart rect {
fill: none; fill: none;
cursor: pointer; cursor: pointer;
} }
treechart rect:hover {
stroke: #222;
stroke-width: 3px;
}
treechart rect[data-state='ok'] { treechart rect[data-state='ok'] {
fill: green; fill: green;
} }
@ -114,6 +118,8 @@ treechart text.info {
} }
treechart .tip { treechart .tip {
border: 2px dashed #aaaaaa; border: 2px dashed #aaaaaa;
border-radius: 8px;
opacity: 0.9;
padding: 8px 10px; padding: 8px 10px;
background-color: #eeeeee; background-color: #eeeeee;
} }

16
v2/src/app/appDev.js
View File

@ -1165,35 +1165,35 @@ compassAppDev.run(function($httpBackend, settings, $http) {
"name": "172.29.8.40", "name": "172.29.8.40",
"state": "warning", "state": "warning",
"children": [{ "children": [{
"name": "os-controller", "name": "os-controller@10.145.89.15",
"state": "warning", "state": "warning",
"children": [] "children": []
}, { }, {
"name": "os-db-node", "name": "os-db-node@10.145.89.16",
"state": "ok", "state": "ok",
"children": [] "children": []
}, { }, {
"name": "os-keystone", "name": "os-keystone@10.145.89.17",
"state": "ok", "state": "ok",
"children": [] "children": []
}, { }, {
"name": "os-network", "name": "os-network@10.145.89.18",
"state": "ok", "state": "ok",
"children": [] "children": []
}, { }, {
"name": "os-image", "name": "os-image@10.145.89.19",
"state": "ok", "state": "ok",
"children": [] "children": []
}, { }, {
"name": "os-mq", "name": "os-mq@10.145.89.20",
"state": "ok", "state": "ok",
"children": [] "children": []
}, { }, {
"name": "os-compute1", "name": "os-compute1@10.145.89.21",
"state": "warning", "state": "warning",
"children": [] "children": []
}, { }, {
"name": "os-compute2", "name": "os-compute2@10.145.89.22",
"state": "ok", "state": "ok",
"children": [] "children": []
}] }]

19
v2/src/common/charts.js
View File

@ -300,7 +300,7 @@ define(['angular', 'ganttChart'], function(angular, ganttChart) {
tree = d3.layout.tree(); tree = d3.layout.tree();
var margin = { var margin = {
top: 0, top: 20,
right: 120, right: 120,
bottom: 0, bottom: 0,
left: 130 left: 130
@ -407,8 +407,8 @@ define(['angular', 'ganttChart'], function(angular, ganttChart) {
var fo = svg.append("foreignObject") var fo = svg.append("foreignObject")
.attr({ .attr({
"x": d.y + 100, "x": d.y - 330,
"y": d.x + 25, "y": d.x - 37,
"width": foWidth, "width": foWidth,
"class": "svg-tooltip" "class": "svg-tooltip"
}); });
@ -426,7 +426,16 @@ define(['angular', 'ganttChart'], function(angular, ganttChart) {
.html("Hostname"); .html("Hostname");
tr_hostname.append("td") tr_hostname.append("td")
.attr("class", "padding-left-15") .attr("class", "padding-left-15")
.html(d.name); .html(d.name.split("@")[0]);
var tr_ip = table.append("tr");
tr_ip.append("td")
.attr("class", "pull-right")
.style("font-weight", "bold")
.html("IP");
tr_ip.append("td")
.attr("class", "padding-left-15")
.html(d.name.split("@")[1]);
var tr_state = table.append("tr"); var tr_state = table.append("tr");
tr_state.append("td") tr_state.append("td")
@ -467,7 +476,7 @@ define(['angular', 'ganttChart'], function(angular, ganttChart) {
return d.children || d._children ? "end" : "start"; return d.children || d._children ? "end" : "start";
}) })
.text(function(d) { .text(function(d) {
return d.name; return d.name.split("@")[0];
}) })
.style("font-size", "15px"); .style("font-size", "15px");