ONOS-3755: use thousand separator for packet and byte counts, etc. Fix alignment (numbers right justified).
Change-Id: Idb407fb16a82d5e3fb6fd10a6599b263a777deb2
diff --git a/web/gui/src/main/webapp/app/view/flow/flow.css b/web/gui/src/main/webapp/app/view/flow/flow.css
index 3022622..a7867d4 100644
--- a/web/gui/src/main/webapp/app/view/flow/flow.css
+++ b/web/gui/src/main/webapp/app/view/flow/flow.css
@@ -78,8 +78,15 @@
background-color: #5A5600;
}
+#ov-flow td {
+ text-align: center;
+}
+#ov-flow td.right {
+ text-align: right;
+}
#ov-flow td.selector,
#ov-flow td.treatment {
+ text-align: left;
padding-left: 36px;
opacity: 0.65;
}
\ No newline at end of file
diff --git a/web/gui/src/main/webapp/app/view/flow/flow.html b/web/gui/src/main/webapp/app/view/flow/flow.html
index 374da0b..796a563 100644
--- a/web/gui/src/main/webapp/app/view/flow/flow.html
+++ b/web/gui/src/main/webapp/app/view/flow/flow.html
@@ -50,8 +50,8 @@
<td colId="timeout" sortable>Timeout </td>
<td colId="permanent" sortable>Permanent </td>
<td colId="state" sortable>State </td>
- <td colId="packets" sortable>Packets </td>
- <td colId="bytes" sortable>Bytes </td>
+ <td class="right" colId="packets" sortable>Packets </td>
+ <td class="right" colId="bytes" sortable>Bytes </td>
</tr>
</table>
</div>
@@ -74,8 +74,8 @@
<td>{{flow.timeout}}</td>
<td>{{flow.permanent}}</td>
<td>{{flow.state}}</td>
- <td>{{flow.packets}}</td>
- <td>{{flow.bytes}}</td>
+ <td class="right">{{flow.packets}}</td>
+ <td class="right">{{flow.bytes}}</td>
</tr>
<tr row-id="{{flow.id}}">
<td class="selector" colspan="10">{{flow.selector}}</td>
diff --git a/web/gui/src/main/webapp/app/view/group/group.css b/web/gui/src/main/webapp/app/view/group/group.css
index 6773aa8..a09345c 100644
--- a/web/gui/src/main/webapp/app/view/group/group.css
+++ b/web/gui/src/main/webapp/app/view/group/group.css
@@ -70,7 +70,14 @@
background-color: #5A5600;
}
+#ov-group td {
+ text-align: center;
+}
+#ov-group td.right {
+ text-align: right;
+}
#ov-group td.buckets {
+ text-align: left;
padding-left: 36px;
opacity: 0.65;
}
diff --git a/web/gui/src/main/webapp/app/view/group/group.html b/web/gui/src/main/webapp/app/view/group/group.html
index 9f4a70e..df5afeb 100644
--- a/web/gui/src/main/webapp/app/view/group/group.html
+++ b/web/gui/src/main/webapp/app/view/group/group.html
@@ -46,8 +46,8 @@
<td colId="app_id" sortable>App ID </td>
<td colId="state" sortable>State </td>
<td colId="type" sortable>Type </td>
- <td colId="packets" sortable>Packets </td>
- <td colId="bytes" sortable>Bytes </td>
+ <td class="right" colId="packets" sortable>Packets </td>
+ <td class="right" colId="bytes" sortable>Bytes </td>
</tr>
</table>
</div>
@@ -66,8 +66,8 @@
<td>{{group.app_id}}</td>
<td>{{group.state}}</td>
<td>{{group.type}}</td>
- <td>{{group.packets}}</td>
- <td>{{group.bytes}}</td>
+ <td class="right">{{group.packets}}</td>
+ <td class="right">{{group.bytes}}</td>
</tr>
<tr row-id="{{group.id}}" ng-repeat-end>
<td class="buckets" colspan="6"
diff --git a/web/gui/src/main/webapp/app/view/meter/meter.css b/web/gui/src/main/webapp/app/view/meter/meter.css
index b9e72cd..dc06443 100644
--- a/web/gui/src/main/webapp/app/view/meter/meter.css
+++ b/web/gui/src/main/webapp/app/view/meter/meter.css
@@ -70,7 +70,14 @@
background-color: #5A5600;
}
+#ov-meter td {
+ text-align: center;
+}
+#ov-meter td.right {
+ text-align: right;
+}
#ov-meter td.bands {
+ text-align: left;
padding-left: 36px;
opacity: 0.65;
}
\ No newline at end of file
diff --git a/web/gui/src/main/webapp/app/view/meter/meter.html b/web/gui/src/main/webapp/app/view/meter/meter.html
index bfa48ca..b068908 100644
--- a/web/gui/src/main/webapp/app/view/meter/meter.html
+++ b/web/gui/src/main/webapp/app/view/meter/meter.html
@@ -45,8 +45,8 @@
<td colId="id" sortable>Meter ID </td>
<td colId="app_id" sortable>App ID </td>
<td colId="state" sortable>State </td>
- <td colId="packets" sortable>Packets </td>
- <td colId="bytes" sortable>Bytes </td>
+ <td class="right" colId="packets" sortable>Packets </td>
+ <td class="right" colId="bytes" sortable>Bytes </td>
</tr>
</table>
</div>
@@ -64,8 +64,8 @@
<td>{{meter.id}}</td>
<td>{{meter.app_id}}</td>
<td>{{meter.state}}</td>
- <td>{{meter.packets}}</td>
- <td>{{meter.bytes}}</td>
+ <td class="right">{{meter.packets}}</td>
+ <td class="right">{{meter.bytes}}</td>
</tr>
<tr row-id="{{meter.id}}" ng-repeat-end>
<td class="bands" colspan="5"
diff --git a/web/gui/src/main/webapp/app/view/port/port.css b/web/gui/src/main/webapp/app/view/port/port.css
index 2aaacfc..0350731 100644
--- a/web/gui/src/main/webapp/app/view/port/port.css
+++ b/web/gui/src/main/webapp/app/view/port/port.css
@@ -40,6 +40,9 @@
}
#ov-port td {
+ text-align: center;
+}
+#ov-port td.right {
text-align: right;
}
diff --git a/web/gui/src/main/webapp/app/view/port/port.html b/web/gui/src/main/webapp/app/view/port/port.html
index 33ac24e..7400433 100644
--- a/web/gui/src/main/webapp/app/view/port/port.html
+++ b/web/gui/src/main/webapp/app/view/port/port.html
@@ -43,13 +43,13 @@
<table>
<tr>
<td colId="id" col-width="60px" sortable>Port ID </td>
- <td colId="pkt_rx" sortable>Pkts Received </td>
- <td colId="pkt_tx" sortable>Pkts Sent </td>
- <td colId="bytes_rx" sortable>Bytes Received </td>
- <td colId="bytes_tx" sortable>Bytes Sent </td>
- <td colId="pkt_rx_drp" sortable>Pkts Received Dropped </td>
- <td colId="pkt_tx_drp" sortable>Pkts Sent Dropped </td>
- <td colId="duration" sortable>Duration (sec) </td>
+ <td class="right" colId="pkt_rx" sortable>Pkts Received </td>
+ <td class="right" colId="pkt_tx" sortable>Pkts Sent </td>
+ <td class="right" colId="bytes_rx" sortable>Bytes Received </td>
+ <td class="right" colId="bytes_tx" sortable>Bytes Sent </td>
+ <td class="right" colId="pkt_rx_drp" sortable>Pkts Received Dropped </td>
+ <td class="right" colId="pkt_tx_drp" sortable>Pkts Sent Dropped </td>
+ <td class="right" colId="duration" sortable>Duration (sec) </td>
</tr>
</table>
</div>
@@ -65,13 +65,13 @@
<tr ng-repeat="port in tableData track by $index"
ng-repeat-complete row-id="{{port.id}}">
<td>{{port.id}}</td>
- <td>{{port.pkt_rx}}</td>
- <td>{{port.pkt_tx}}</td>
- <td>{{port.bytes_rx}}</td>
- <td>{{port.bytes_tx}}</td>
- <td>{{port.pkt_rx_drp}}</td>
- <td>{{port.pkt_tx_drp}}</td>
- <td>{{port.duration}}</td>
+ <td class="right">{{port.pkt_rx}}</td>
+ <td class="right">{{port.pkt_tx}}</td>
+ <td class="right">{{port.bytes_rx}}</td>
+ <td class="right">{{port.bytes_tx}}</td>
+ <td class="right">{{port.pkt_rx_drp}}</td>
+ <td class="right">{{port.pkt_tx_drp}}</td>
+ <td class="right">{{port.duration}}</td>
</tr>
</table>
</div>