AMBARI-19260. Improve and Fix 'Dashboard page' after new guidelines.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ae143800 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ae143800 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ae143800 Branch: refs/heads/branch-dev-patch-upgrade Commit: ae14380074bcc626e0c24d13a92db7d31e04c5f5 Parents: c08df0e Author: Xi Wang <xiw...@apache.org> Authored: Tue Dec 20 15:48:28 2016 -0800 Committer: Xi Wang <xiw...@apache.org> Committed: Wed Dec 21 10:59:32 2016 -0800 ---------------------------------------------------------------------- ambari-web/app/styles/application.less | 4 ++++ ambari-web/app/styles/dashboard.less | 21 +++++++++++++++----- .../main/dashboard/plus_button_filter.hbs | 14 ++++--------- .../main/service/all_services_actions.hbs | 4 ++-- ambari-web/app/views/main/dashboard/widgets.js | 1 - 5 files changed, 26 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ae143800/ambari-web/app/styles/application.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index 4a50af7..c35f0d1 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -1331,6 +1331,10 @@ a:focus { .icon-medkit { padding-left:6px; } + + .services-menu-actions { + margin-left: 20%; + } } a.services-menu-blocks{ http://git-wip-us.apache.org/repos/asf/ambari/blob/ae143800/ambari-web/app/styles/dashboard.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/dashboard.less b/ambari-web/app/styles/dashboard.less index 9e1213e..53e55b1 100644 --- a/ambari-web/app/styles/dashboard.less +++ b/ambari-web/app/styles/dashboard.less @@ -24,6 +24,12 @@ overflow: auto; width: 210px; } + .add-widgets-apply-button { + margin: 0px 20px 20px 0px; + } + .nothing-to-add { + padding: 5px 15px; + } } #dashboard-widgets { @@ -104,7 +110,7 @@ } } .img-thumbnail .caption { - padding: 7px 0; + padding: 7px 5px; color: #555; font-weight:bold; font-size: 12px; @@ -159,7 +165,7 @@ display: block; } .caption{ - margin-left: -10px; + margin-left: -14.5px; z-index: 7; } .slots-caption{ @@ -223,22 +229,27 @@ z-index: 9; } .caption { - margin-left: -10px; + margin-left: -14.5px; } } } .links .img-thumbnail{ li{ - height:20px; + height:24px; } .link-button{ float: right; + margin-top: 5px; .disabled-hdfs-quick-link { pointer-events: none; color: #808080; cursor: default; } + button.btn { + font-size: 12px; + padding: 5px 10px; + } } .widget-content{ @@ -265,7 +276,7 @@ z-index: 9; } .caption{ - margin-left: -10px; + margin-left: -14.5px; } } .img-thumbnail .widget-content .svg { http://git-wip-us.apache.org/repos/asf/ambari/blob/ae143800/ambari-web/app/templates/main/dashboard/plus_button_filter.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/dashboard/plus_button_filter.hbs b/ambari-web/app/templates/main/dashboard/plus_button_filter.hbs index 81420ff..88d5756 100644 --- a/ambari-web/app/templates/main/dashboard/plus_button_filter.hbs +++ b/ambari-web/app/templates/main/dashboard/plus_button_filter.hbs @@ -26,17 +26,11 @@ {{/each}} </ul> </li> - <li> - <button class="btn btn-default" {{action "closeFilter" target="view"}}>{{t common.cancel}}</button> - <button class="btn btn-primary" {{action "applyFilter" target="view"}}>{{t common.apply}}</button> + <li class="add-widgets-apply-button"> + <button class="btn btn-primary pull-right" {{action "applyFilter" target="view"}}>{{t common.add}}</button> </li> {{else}} - <li> - <ul> - <li>{{t dashboard.widgets.nothing}}</li> - </ul> - </li> - <li> - <button class="btn btn-default" {{action "closeFilter" target="view"}}>{{t common.cancel}}</button> + <li class="nothing-to-add"> + <span>{{t dashboard.widgets.nothing}}</span> </li> {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/ae143800/ambari-web/app/templates/main/service/all_services_actions.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/all_services_actions.hbs b/ambari-web/app/templates/main/service/all_services_actions.hbs index f2ce0fd..7cd36c8 100644 --- a/ambari-web/app/templates/main/service/all_services_actions.hbs +++ b/ambari-web/app/templates/main/service/all_services_actions.hbs @@ -18,8 +18,8 @@ <div class="row"> {{#isAuthorized "SERVICE.START_STOP, SERVICE.ADD_DELETE_SERVICES"}} - <div class="dropdown"> - <button class="btn btn-default dropdown-toggle center-block" data-toggle="dropdown" href="#">{{t common.actions}} + <div class="dropdown services-menu-actions"> + <button class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#">{{t common.actions}} <span class="caret"></span> </button> <ul class="dropdown-menu"> http://git-wip-us.apache.org/repos/asf/ambari/blob/ae143800/ambari-web/app/views/main/dashboard/widgets.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/dashboard/widgets.js b/ambari-web/app/views/main/dashboard/widgets.js index 4e22aad..0c6b7aa 100644 --- a/ambari-web/app/views/main/dashboard/widgets.js +++ b/ambari-web/app/views/main/dashboard/widgets.js @@ -465,7 +465,6 @@ App.MainDashboardWidgetsView = Em.View.extend(App.UserPref, App.LocalStorage, Ap }); } }), - closeFilter: Em.K, applyFilter: function () { var parent = this.get('parentView'), hiddenWidgets = this.get('hiddenWidgets'),