Repository: qpid-dispatch Updated Branches: refs/heads/master 87cbf482f -> 80c0eed51
DISPATCH-486 Add white space to left side of entities grid Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/80c0eed5 Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/80c0eed5 Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/80c0eed5 Branch: refs/heads/master Commit: 80c0eed51bd32f3777196597dd37e0ae17410daf Parents: 87cbf48 Author: Ernest Allen <eal...@redhat.com> Authored: Mon Aug 29 16:32:37 2016 -0400 Committer: Ernest Allen <eal...@redhat.com> Committed: Mon Aug 29 16:32:37 2016 -0400 ---------------------------------------------------------------------- .../main/webapp/plugin/html/tmplListTree.html | 2 +- console/stand-alone/plugin/css/plugin.css | 4 +++ .../stand-alone/plugin/html/tmplListTree.html | 2 +- console/stand-alone/plugin/js/qdrService.js | 28 -------------------- 4 files changed, 6 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/80c0eed5/console/hawtio/src/main/webapp/plugin/html/tmplListTree.html ---------------------------------------------------------------------- diff --git a/console/hawtio/src/main/webapp/plugin/html/tmplListTree.html b/console/hawtio/src/main/webapp/plugin/html/tmplListTree.html index b523efe..5c855bf 100644 --- a/console/hawtio/src/main/webapp/plugin/html/tmplListTree.html +++ b/console/hawtio/src/main/webapp/plugin/html/tmplListTree.html @@ -5,4 +5,4 @@ <div ng-init="treeReady()"></div> </div> </hawtio-pane> -<ng-include src="'listGrid.html'"></ng-include> +<div class="list-grid" ng-include="'listGrid.html'"></div> http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/80c0eed5/console/stand-alone/plugin/css/plugin.css ---------------------------------------------------------------------- diff --git a/console/stand-alone/plugin/css/plugin.css b/console/stand-alone/plugin/css/plugin.css index 33d44ab..fa239dd 100644 --- a/console/stand-alone/plugin/css/plugin.css +++ b/console/stand-alone/plugin/css/plugin.css @@ -897,4 +897,8 @@ btn.disabled, .btn[disabled] { div#durationSlider, div#rateSlider { margin-top: 1em; +} + +.list-grid { + padding-left: 10px; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/80c0eed5/console/stand-alone/plugin/html/tmplListTree.html ---------------------------------------------------------------------- diff --git a/console/stand-alone/plugin/html/tmplListTree.html b/console/stand-alone/plugin/html/tmplListTree.html index 9aa8be5..3cad6ee 100644 --- a/console/stand-alone/plugin/html/tmplListTree.html +++ b/console/stand-alone/plugin/html/tmplListTree.html @@ -14,4 +14,4 @@ <div class="pane-bar"></div> </div> </div> -<ng-include src="'listGrid.html'"></ng-include> +<div class="list-grid" ng-include="'listGrid.html'"></div> http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/80c0eed5/console/stand-alone/plugin/js/qdrService.js ---------------------------------------------------------------------- diff --git a/console/stand-alone/plugin/js/qdrService.js b/console/stand-alone/plugin/js/qdrService.js index d74baaa..0293f48 100644 --- a/console/stand-alone/plugin/js/qdrService.js +++ b/console/stand-alone/plugin/js/qdrService.js @@ -292,34 +292,6 @@ var QDR = (function(QDR) { // use connection properties if available if (d.properties.console_identifier == 'Dispatch console') return true; - // do it the hard way: - var connid = d.connectionId; - if (connid && d.nodeType === 'normal') { - // find all the endpoint links for this router that have this connid - var linkInfo = self.topology.nodeInfo()[d.key]['.router.link'] - var outs = 0, ins = 0; - var outaddr, inaddr; - linkInfo.results.forEach( function (link) { - if (self.valFor(linkInfo.attributeNames, link, 'connectionId') == connid && - self.valFor(linkInfo.attributeNames, link, 'linkType') == 'endpoint') { - if (self.valFor(linkInfo.attributeNames, link, 'linkDir') == 'in') { - ++ins; - inaddr = self.valFor(linkInfo.attributeNames, link, 'owningAddr') - } - if (self.valFor(linkInfo.attributeNames, link, 'linkDir') == 'out') { - ++outs; - outaddr = self.valFor(linkInfo.attributeNames, link, 'owningAddr') - } - return true; - } - }) - // consoles have 1 out link with an address that starts with Ltemp. and - // 1 in link with no address - if (outs == 1 && ins == 1 && - inaddr == null && outaddr.startsWith('Ltemp.')) { - return true; - } - } return false; }, --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
