Thomas Vachuska
Committed by Gerrit Code Review

Tweaked summary panel on the GUI to place version information at the top.

Change-Id: Iffd2c8c566f353ef47a25b8a288b69186d90f014
...@@ -386,6 +386,8 @@ public abstract class TopologyViewMessageHandlerBase extends UiMessageHandler { ...@@ -386,6 +386,8 @@ public abstract class TopologyViewMessageHandlerBase extends UiMessageHandler {
386 Topology topology = topologyService.currentTopology(); 386 Topology topology = topologyService.currentTopology();
387 387
388 return new PropertyPanel("ONOS Summary", "node") 388 return new PropertyPanel("ONOS Summary", "node")
389 + .addProp(Properties.VERSION, version)
390 + .addSeparator()
389 .addProp(Properties.DEVICES, topology.deviceCount()) 391 .addProp(Properties.DEVICES, topology.deviceCount())
390 .addProp(Properties.LINKS, topology.linkCount()) 392 .addProp(Properties.LINKS, topology.linkCount())
391 .addProp(Properties.HOSTS, hostService.getHostCount()) 393 .addProp(Properties.HOSTS, hostService.getHostCount())
...@@ -393,8 +395,7 @@ public abstract class TopologyViewMessageHandlerBase extends UiMessageHandler { ...@@ -393,8 +395,7 @@ public abstract class TopologyViewMessageHandlerBase extends UiMessageHandler {
393 .addSeparator() 395 .addSeparator()
394 .addProp(Properties.INTENTS, intentService.getIntentCount()) 396 .addProp(Properties.INTENTS, intentService.getIntentCount())
395 .addProp(Properties.TUNNELS, tunnelService.tunnelCount()) 397 .addProp(Properties.TUNNELS, tunnelService.tunnelCount())
396 - .addProp(Properties.FLOWS, flowService.getFlowRuleCount()) 398 + .addProp(Properties.FLOWS, flowService.getFlowRuleCount());
397 - .addProp(Properties.VERSION, version);
398 } 399 }
399 400
400 // Returns property panel model for device details response. 401 // Returns property panel model for device details response.
......
...@@ -82,10 +82,10 @@ ...@@ -82,10 +82,10 @@
82 82
83 #topo-p-detail { 83 #topo-p-detail {
84 /* Base css from panel.css */ 84 /* Base css from panel.css */
85 - top: 320px; 85 + top: 338px;
86 } 86 }
87 html[data-platform='iPad'] #topo-p-detail { 87 html[data-platform='iPad'] #topo-p-detail {
88 - top: 336px; 88 + top: 354px;
89 } 89 }
90 90
91 #topo-p-detail .actionBtns .actionBtn { 91 #topo-p-detail .actionBtns .actionBtn {
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
32 panelOpts = { 32 panelOpts = {
33 width: 260 33 width: 260
34 }, 34 },
35 - sumMax = 240, 35 + sumMax = 262,
36 padTop = 20, 36 padTop = 20,
37 devPath = 'device'; 37 devPath = 'device';
38 38
......