홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Simon Hunt
b33b40bb 1 parent 71fbdb3b

GUI -- fixed bug where host (endstation) glyph was not showing up in details pane. 

- also tidied up index.html a little.

Change-Id: I35b10d85ef95807c18319321f028d464e174d27e
Inline Side-by-side
Showing 2 changed files with 10 additions and 15 deletions
...@@ -547,7 +547,7 @@ public abstract class TopologyViewMessages { ...@@ -547,7 +547,7 @@ public abstract class TopologyViewMessages {
547 String vlan = host.vlan().toString(); 547 String vlan = host.vlan().toString();
548 return envelope("showDetails", sid, 548 return envelope("showDetails", sid,
549 json(isNullOrEmpty(name) ? hostId.toString() : name, 549 json(isNullOrEmpty(name) ? hostId.toString() : name,
550 - isNullOrEmpty(type) ? "host" : type, 550 + isNullOrEmpty(type) ? "endstation" : type,
551 new Prop("MAC", host.mac().toString()), 551 new Prop("MAC", host.mac().toString()),
552 new Prop("IP", host.ipAddresses().toString().replaceAll("[\\[\\]]", "")), 552 new Prop("IP", host.ipAddresses().toString().replaceAll("[\\[\\]]", "")),
553 new Prop("VLAN", vlan.equals("-1") ? "none" : vlan), 553 new Prop("VLAN", vlan.equals("-1") ? "none" : vlan),
......
...@@ -24,9 +24,8 @@ ...@@ -24,9 +24,8 @@
24 <html> 24 <html>
25 <head> 25 <head>
26 <meta charset="utf-8"> 26 <meta charset="utf-8">
27 - <title>ONOS</title>
28 -
29 <link rel="shortcut icon" href="img/onos-logo.png"> 27 <link rel="shortcut icon" href="img/onos-logo.png">
28 + <title>ONOS</title>
30 29
31 <!-- Third party library code included here --> 30 <!-- Third party library code included here -->
32 <!--TODO: use the minified version of d3, once debugging is complete --> 31 <!--TODO: use the minified version of d3, once debugging is complete -->
...@@ -34,7 +33,10 @@ ...@@ -34,7 +33,10 @@
34 <script src="tp/topojson.v1.min.js"></script> 33 <script src="tp/topojson.v1.min.js"></script>
35 <script src="tp/jquery-2.1.1.min.js"></script> 34 <script src="tp/jquery-2.1.1.min.js"></script>
36 35
37 - <!-- Base library and framework stylesheets included here --> 36 + <!-- ONOS UI Framework included here -->
37 + <script src="onos.js"></script>
38 +
39 + <!-- Framework and library stylesheets included here -->
38 <link rel="stylesheet" href="base.css"> 40 <link rel="stylesheet" href="base.css">
39 <link rel="stylesheet" href="onos.css"> 41 <link rel="stylesheet" href="onos.css">
40 <link rel="stylesheet" href="onosMast.css"> 42 <link rel="stylesheet" href="onosMast.css">
...@@ -45,14 +47,6 @@ ...@@ -45,14 +47,6 @@
45 <!-- This is where contributed stylesheets get INJECTED --> 47 <!-- This is where contributed stylesheets get INJECTED -->
46 <!-- TODO: replace with template marker and inject refs server-side --> 48 <!-- TODO: replace with template marker and inject refs server-side -->
47 <link rel="stylesheet" href="topo.css"> 49 <link rel="stylesheet" href="topo.css">
48 -
49 -
50 - <!-- General library modules included here-->
51 - <script src="geometry.js"></script>
52 -
53 - <!-- ONOS UI Framework included here-->
54 - <script src="onos.js"></script>
55 -
56 </head> 50 </head>
57 <body> 51 <body>
58 <div id="frame"> 52 <div id="frame">
...@@ -86,11 +80,12 @@ ...@@ -86,11 +80,12 @@
86 }); 80 });
87 </script> 81 </script>
88 82
89 - <!-- Library module files included here --> 83 + <!-- Library modules included here -->
90 <script src="d3Utils.js"></script> 84 <script src="d3Utils.js"></script>
85 + <script src="geometry.js"></script>
91 <script src="glyphs.js"></script> 86 <script src="glyphs.js"></script>
92 87
93 - <!-- Framework module files included here --> 88 + <!-- Framework modules included here -->
94 <script src="onosMast.js"></script> 89 <script src="onosMast.js"></script>
95 <script src="onosFlash.js"></script> 90 <script src="onosFlash.js"></script>
96 <script src="onosQuickHelp.js"></script> 91 <script src="onosQuickHelp.js"></script>
...@@ -99,7 +94,7 @@ ...@@ -99,7 +94,7 @@
99 <script src="module-svg-template.js"></script> 94 <script src="module-svg-template.js"></script>
100 <script src="module-div-template.js"></script> 95 <script src="module-div-template.js"></script>
101 96
102 - <!-- Sample views; REMOVE THESE LINES, FOR PRODUCTION --> 97 + <!-- Sample Views; REMOVE THESE LINES, FOR PRODUCTION -->
103 <script src="sample.js"></script> 98 <script src="sample.js"></script>
104 <script src="sampleRadio.js"></script> 99 <script src="sampleRadio.js"></script>
105 <script src="sampleKeys.js"></script> 100 <script src="sampleKeys.js"></script>
......