Repository: ambari Updated Branches: refs/heads/trunk fddf8fd00 -> 137613da0
AMBARI-20341 Main menu incorrectly displayed when cluster not installed. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/137613da Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/137613da Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/137613da Branch: refs/heads/trunk Commit: 137613da0acc109ebd6d69e51013a0b8212040b2 Parents: fddf8fd Author: Andrii Tkach <atk...@apache.org> Authored: Tue Mar 7 14:39:39 2017 +0200 Committer: Andrii Tkach <atk...@apache.org> Committed: Tue Mar 7 17:02:55 2017 +0200 ---------------------------------------------------------------------- ambari-web/app/styles/top-nav.less | 3 +++ ambari-web/app/views/application.js | 13 ++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/137613da/ambari-web/app/styles/top-nav.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/top-nav.less b/ambari-web/app/styles/top-nav.less index 4ad6c21..4ba11e5 100644 --- a/ambari-web/app/styles/top-nav.less +++ b/ambari-web/app/styles/top-nav.less @@ -114,5 +114,8 @@ .popup-arrow-up { right: 75px; } + .notifications-body .table-controls .state-filter .form-control.filter-select { + height: 34px; + } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/137613da/ambari-web/app/views/application.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/application.js b/ambari-web/app/views/application.js index 7a64584..a4b3b14 100644 --- a/ambari-web/app/views/application.js +++ b/ambari-web/app/views/application.js @@ -48,11 +48,14 @@ App.ApplicationView = Em.View.extend({ */ initNavigationBar: function () { if (App.get('router.mainController.isClusterDataLoaded')) { - Em.run.next(() => $('.navigation-bar').navigationBar({ - fitHeight: true, - collapseNavBarClass: 'icon-double-angle-left', - expandNavBarClass: 'icon-double-angle-right' - })); + $('body').on('DOMNodeInserted', '.navigation-bar', () => { + $('.navigation-bar').navigationBar({ + fitHeight: true, + collapseNavBarClass: 'icon-double-angle-left', + expandNavBarClass: 'icon-double-angle-right' + }); + $('body').off('DOMNodeInserted', '.navigation-bar'); + }); } }.observes('App.router.mainController.isClusterDataLoaded')
