diff options
Diffstat (limited to 'framework/src/onos/web/gui/src/main/webapp/app/fw')
5 files changed, 14 insertions, 4 deletions
diff --git a/framework/src/onos/web/gui/src/main/webapp/app/fw/layer/panel.css b/framework/src/onos/web/gui/src/main/webapp/app/fw/layer/panel.css index 46dbdb52..ded05cf1 100644 --- a/framework/src/onos/web/gui/src/main/webapp/app/fw/layer/panel.css +++ b/framework/src/onos/web/gui/src/main/webapp/app/fw/layer/panel.css @@ -34,6 +34,10 @@ border-radius: 6px; } +.floatpanel.dialog { + top: 180px; +} + html[data-platform='iPad'] .floatpanel { top: 80px; } diff --git a/framework/src/onos/web/gui/src/main/webapp/app/fw/layer/panel.js b/framework/src/onos/web/gui/src/main/webapp/app/fw/layer/panel.js index aef71eee..10f04813 100644 --- a/framework/src/onos/web/gui/src/main/webapp/app/fw/layer/panel.js +++ b/framework/src/onos/web/gui/src/main/webapp/app/fw/layer/panel.js @@ -171,7 +171,10 @@ } angular.module('onosLayer') - .factory('PanelService', ['$log', 'FnService', function (_$log_, _fs_) { + .factory('PanelService', + ['$log', '$window', 'FnService', + + function (_$log_, _$window_, _fs_) { $log = _$log_; fs = _fs_; @@ -210,5 +213,4 @@ destroyPanel: destroyPanel }; }]); - }()); diff --git a/framework/src/onos/web/gui/src/main/webapp/app/fw/svg/icon.js b/framework/src/onos/web/gui/src/main/webapp/app/fw/svg/icon.js index 15b44bc9..12536361 100644 --- a/framework/src/onos/web/gui/src/main/webapp/app/fw/svg/icon.js +++ b/framework/src/onos/web/gui/src/main/webapp/app/fw/svg/icon.js @@ -37,6 +37,8 @@ play: 'play', stop: 'stop', + topo: 'topo', + refresh: 'refresh', garbage: 'garbage', diff --git a/framework/src/onos/web/gui/src/main/webapp/app/fw/widget/table.css b/framework/src/onos/web/gui/src/main/webapp/app/fw/widget/table.css index 18b81ba6..356ac0f7 100644 --- a/framework/src/onos/web/gui/src/main/webapp/app/fw/widget/table.css +++ b/framework/src/onos/web/gui/src/main/webapp/app/fw/widget/table.css @@ -81,7 +81,7 @@ div.summary-list tr.no-data td { } .light div.summary-list tr.selected { - background-color: deepskyblue; + background-color: deepskyblue !important; } .dark div.summary-list tr.selected { diff --git a/framework/src/onos/web/gui/src/main/webapp/app/fw/widget/tableBuilder.js b/framework/src/onos/web/gui/src/main/webapp/app/fw/widget/tableBuilder.js index 24161bbb..6a5ffb1f 100644 --- a/framework/src/onos/web/gui/src/main/webapp/app/fw/widget/tableBuilder.js +++ b/framework/src/onos/web/gui/src/main/webapp/app/fw/widget/tableBuilder.js @@ -47,6 +47,7 @@ resp = o.tag + 'DataResponse', onSel = fs.isF(o.selCb), onResp = fs.isF(o.respCb), + idKey = o.idKey || 'id', oldTableData = [], loaded = false, refreshPromise, loadingPromise; @@ -104,7 +105,8 @@ // === selecting a row functions ---------------- function selCb($event, selRow) { - o.scope.selId = (o.scope.selId === selRow.id) ? null : selRow.id; + var selId = selRow[idKey]; + o.scope.selId = (o.scope.selId === selId) ? null : selId; onSel && onSel($event, selRow); } o.scope.selectCallback = selCb; |