Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4D581200D34 for ; Thu, 19 Oct 2017 14:54:51 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4C275160BF8; Thu, 19 Oct 2017 12:54:51 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 59831160BF1 for ; Thu, 19 Oct 2017 14:54:49 +0200 (CEST) Received: (qmail 80848 invoked by uid 500); 19 Oct 2017 12:54:48 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 80627 invoked by uid 99); 19 Oct 2017 12:54:48 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Oct 2017 12:54:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 58F8DDFFC0; Thu, 19 Oct 2017 12:54:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aonishuk@apache.org To: commits@ambari.apache.org Date: Thu, 19 Oct 2017 12:54:57 -0000 Message-Id: <84ddfcc431c94b41aed31e06cdee73d8@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [11/50] [abbrv] ambari git commit: AMBARI-22230 Hosts and Alerts tables UI tweaks. (atkach) archived-at: Thu, 19 Oct 2017 12:54:51 -0000 AMBARI-22230 Hosts and Alerts tables UI tweaks. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8f53bc45 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8f53bc45 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8f53bc45 Branch: refs/heads/branch-3.0-perf Commit: 8f53bc453c47a4f95d5e58825feb77d69e6a6a22 Parents: a8ba5e6 Author: Andrii Tkach Authored: Fri Oct 13 13:45:06 2017 +0300 Committer: Andrii Tkach Committed: Fri Oct 13 13:45:06 2017 +0300 ---------------------------------------------------------------------- ambari-web/app/models/alerts/alert_group.js | 2 +- ambari-web/app/styles/application.less | 5 + ambari-web/app/styles/dashboard.less | 6 +- .../app/styles/theme/bootstrap-ambari.css | 3 +- ambari-web/app/templates/main/alerts.hbs | 3 +- .../main/alerts/alert_definitions_actions.hbs | 2 +- ambari-web/app/templates/main/dashboard.hbs | 2 +- .../templates/main/dashboard/config_history.hbs | 2 +- ambari-web/app/templates/main/host.hbs | 2 +- .../templates/main/host/bulk_operation_menu.hbs | 132 ++++++++++--------- .../views/main/host/hosts_table_menu_view.js | 4 +- .../app/views/main/host/stack_versions_view.js | 2 +- .../test/models/alerts/alert_group_test.js | 5 +- 13 files changed, 93 insertions(+), 77 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8f53bc45/ambari-web/app/models/alerts/alert_group.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/alerts/alert_group.js b/ambari-web/app/models/alerts/alert_group.js index 49a850f..3277fc8 100644 --- a/ambari-web/app/models/alerts/alert_group.js +++ b/ambari-web/app/models/alerts/alert_group.js @@ -55,7 +55,7 @@ App.AlertGroup = DS.Model.extend({ * @type {string} */ displayName: function () { - var name = App.config.truncateGroupName(this.get('name')); + var name = App.config.truncateGroupName(App.format.role(this.get('name'), true)); return this.get('default') ? name + ' Default' : name; }.property('name', 'default'), http://git-wip-us.apache.org/repos/asf/ambari/blob/8f53bc45/ambari-web/app/styles/application.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index 7c9cc8e..099f3cf 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -2802,4 +2802,9 @@ a.abort-icon:hover { .breadcrumbs-forward-slash { display: inline; color: #D2D3D5; +} + +.container-wrap-table { + padding: 0 10px; + background-color: @diff-background-equal; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/8f53bc45/ambari-web/app/styles/dashboard.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/dashboard.less b/ambari-web/app/styles/dashboard.less index 02835bd..6deb30c 100644 --- a/ambari-web/app/styles/dashboard.less +++ b/ambari-web/app/styles/dashboard.less @@ -18,14 +18,12 @@ @import 'common.less'; -#dashboard-widgets-container{ - .tabs-left { - float: left; - } +#dashboard-widgets-container { .btn-toolbar { float: right; padding-top: 5px; margin-bottom: 20px; + margin-top: -60px; } .dashboard-widgets-box { clear: both; http://git-wip-us.apache.org/repos/asf/ambari/blob/8f53bc45/ambari-web/app/styles/theme/bootstrap-ambari.css ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/theme/bootstrap-ambari.css b/ambari-web/app/styles/theme/bootstrap-ambari.css index 70579e7..cff73ad 100644 --- a/ambari-web/app/styles/theme/bootstrap-ambari.css +++ b/ambari-web/app/styles/theme/bootstrap-ambari.css @@ -479,11 +479,12 @@ h2.table-title { } .nav.nav-tabs li a .badge.badge-important { display: inline; + vertical-align: baseline; } .nav.nav-tabs li.active a { color: #333; border-bottom: 3px solid #3FAE2A; - padding-bottom: 1px; + padding-bottom: 2px; } .nav-tabs-left li, .nav-tabs-right li { http://git-wip-us.apache.org/repos/asf/ambari/blob/8f53bc45/ambari-web/app/templates/main/alerts.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts.hbs b/ambari-web/app/templates/main/alerts.hbs index 40469d3..0f85e27 100644 --- a/ambari-web/app/templates/main/alerts.hbs +++ b/ambari-web/app/templates/main/alerts.hbs @@ -16,7 +16,7 @@ * limitations under the License. }} -
+

{{t menu.item.alerts}}

@@ -56,7 +56,6 @@ {{view App.AlertDefinitionSummary contentBinding="alertDefinition"}} - {{alertDefinition.label}} {{alertDefinition.serviceDisplayName}} http://git-wip-us.apache.org/repos/asf/ambari/blob/8f53bc45/ambari-web/app/templates/main/alerts/alert_definitions_actions.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/alert_definitions_actions.hbs b/ambari-web/app/templates/main/alerts/alert_definitions_actions.hbs index 0604ac2..f65b000 100644 --- a/ambari-web/app/templates/main/alerts/alert_definitions_actions.hbs +++ b/ambari-web/app/templates/main/alerts/alert_definitions_actions.hbs @@ -16,7 +16,7 @@ * limitations under the License. }} - +
    {{#each action in controller}}
  • http://git-wip-us.apache.org/repos/asf/ambari/blob/8f53bc45/ambari-web/app/templates/main/dashboard.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/dashboard.hbs b/ambari-web/app/templates/main/dashboard.hbs index 0226626..4b174cc 100644 --- a/ambari-web/app/templates/main/dashboard.hbs +++ b/ambari-web/app/templates/main/dashboard.hbs @@ -18,7 +18,7 @@
    -
      +
        {{#each category in view.categories}} {{#view view.NavItemView itemBinding="category.name" }} {{category.label}} http://git-wip-us.apache.org/repos/asf/ambari/blob/8f53bc45/ambari-web/app/templates/main/dashboard/config_history.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/dashboard/config_history.hbs b/ambari-web/app/templates/main/dashboard/config_history.hbs index 00f9c38..bc6ef7c 100644 --- a/ambari-web/app/templates/main/dashboard/config_history.hbs +++ b/ambari-web/app/templates/main/dashboard/config_history.hbs @@ -16,7 +16,7 @@ * limitations under the License. }} -
        +

        {{t dashboard.configHistory.title}}

        http://git-wip-us.apache.org/repos/asf/ambari/blob/8f53bc45/ambari-web/app/templates/main/host.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host.hbs b/ambari-web/app/templates/main/host.hbs index ae37a0f..b373c40 100644 --- a/ambari-web/app/templates/main/host.hbs +++ b/ambari-web/app/templates/main/host.hbs @@ -16,7 +16,7 @@ * limitations under the License. }} -
        +

        {{t common.hosts}}

        http://git-wip-us.apache.org/repos/asf/ambari/blob/8f53bc45/ambari-web/app/templates/main/host/bulk_operation_menu.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/bulk_operation_menu.hbs b/ambari-web/app/templates/main/host/bulk_operation_menu.hbs index 64ab4e9..89551ca 100644 --- a/ambari-web/app/templates/main/host/bulk_operation_menu.hbs +++ b/ambari-web/app/templates/main/host/bulk_operation_menu.hbs @@ -16,7 +16,7 @@ * limitations under the License. }} - +
          {{#isAuthorized "HOST.ADD_DELETE_HOSTS"}}
        • {{t hosts.host.add}}
          • @@ -29,32 +29,36 @@
            {{#view view.hostItemView}} {{view.label}} -
              - {{#each operation in view.operationsInfo}} - {{#if operation.label.length}} - {{#view view.operationView contentBinding="operation.operationData" selection="s"}} - {{operation.label}} - {{/view}} - {{/if}} - {{/each}} -
            - {{/view}} - {{#each component in view.components}} - {{#view view.slaveItemView contentBinding="component"}} - {{component.componentNameFormatted}} +
              {{#each operation in view.operationsInfo}} - {{#if operation.decommission}} - {{#view view.advancedOperationView contentBinding="operation.operationData" selection="s"}} - {{operation.label}} - {{/view}} - {{else}} - {{#view view.commonOperationView contentBinding="operation.operationData" selection="s"}} + {{#if operation.label.length}} + {{#view view.operationView contentBinding="operation.operationData" selection="s"}} {{operation.label}} {{/view}} {{/if}} {{/each}}
            +
            + {{/view}} + {{#each component in view.components}} + {{#view view.slaveItemView contentBinding="component"}} + {{component.componentNameFormatted}} +
            +
              + {{#each operation in view.operationsInfo}} + {{#if operation.decommission}} + {{#view view.advancedOperationView contentBinding="operation.operationData" selection="s"}} + {{operation.label}} + {{/view}} + {{else}} + {{#view view.commonOperationView contentBinding="operation.operationData" selection="s"}} + {{operation.label}} + {{/view}} + {{/if}} + {{/each}} +
            +
            {{/view}} {{/each}}
          @@ -67,32 +71,36 @@
            {{#view view.hostItemView}} {{view.label}} -
              - {{#each operation in view.operationsInfo}} - {{#if operation.label.length}} - {{#view view.operationView contentBinding="operation.operationData" selection="f"}} - {{operation.label}} - {{/view}} - {{/if}} - {{/each}} -
            - {{/view}} - {{#each component in view.components}} - {{#view view.slaveItemView contentBinding="component"}} - {{component.componentNameFormatted}} +
              {{#each operation in view.operationsInfo}} - {{#if operation.decommission}} - {{#view view.advancedOperationView contentBinding="operation.operationData" selection="f"}} - {{operation.label}} - {{/view}} - {{else}} - {{#view view.commonOperationView contentBinding="operation.operationData" selection="f"}} + {{#if operation.label.length}} + {{#view view.operationView contentBinding="operation.operationData" selection="f"}} {{operation.label}} {{/view}} {{/if}} {{/each}}
            +
            + {{/view}} + {{#each component in view.components}} + {{#view view.slaveItemView contentBinding="component"}} + {{component.componentNameFormatted}} +
            +
              + {{#each operation in view.operationsInfo}} + {{#if operation.decommission}} + {{#view view.advancedOperationView contentBinding="operation.operationData" selection="f"}} + {{operation.label}} + {{/view}} + {{else}} + {{#view view.commonOperationView contentBinding="operation.operationData" selection="f"}} + {{operation.label}} + {{/view}} + {{/if}} + {{/each}} +
            +
            {{/view}} {{/each}}
          @@ -105,34 +113,38 @@
            {{#view view.hostItemView}} {{view.label}} -
              - {{#each operation in view.operationsInfo}} - {{#if operation.label.length}} - {{#view view.operationView contentBinding="operation.operationData" selection="a"}} - {{operation.label}} - {{/view}} - {{/if}} - {{/each}} -
            - {{/view}} - {{#each component in view.components}} - {{#view view.slaveItemView contentBinding="component"}} - {{component.componentNameFormatted}} +
              {{#each operation in view.operationsInfo}} - {{#if operation.decommission}} - {{#view view.advancedOperationView contentBinding="operation.operationData" selection="a"}} + {{#if operation.label.length}} + {{#view view.operationView contentBinding="operation.operationData" selection="a"}} {{operation.label}} {{/view}} - {{else}} - {{#unless operation.delete}} - {{#view view.commonOperationView contentBinding="operation.operationData" selection="a"}} - {{operation.label}} - {{/view}} - {{/unless}} {{/if}} {{/each}}
            +
            + {{/view}} + {{#each component in view.components}} + {{#view view.slaveItemView contentBinding="component"}} + {{component.componentNameFormatted}} +
            +
              + {{#each operation in view.operationsInfo}} + {{#if operation.decommission}} + {{#view view.advancedOperationView contentBinding="operation.operationData" selection="a"}} + {{operation.label}} + {{/view}} + {{else}} + {{#unless operation.delete}} + {{#view view.commonOperationView contentBinding="operation.operationData" selection="a"}} + {{operation.label}} + {{/view}} + {{/unless}} + {{/if}} + {{/each}} +
            +
            {{/view}} {{/each}}
          http://git-wip-us.apache.org/repos/asf/ambari/blob/8f53bc45/ambari-web/app/views/main/host/hosts_table_menu_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/host/hosts_table_menu_view.js b/ambari-web/app/views/main/host/hosts_table_menu_view.js index 25b4052..08fd0d4 100644 --- a/ambari-web/app/views/main/host/hosts_table_menu_view.js +++ b/ambari-web/app/views/main/host/hosts_table_menu_view.js @@ -70,7 +70,7 @@ App.HostTableMenuView = Em.View.extend({ slaveItemView: Em.View.extend({ tagName: 'li', - classNames: ['dropdown-submenu'], + classNames: ['dropdown-submenu', 'submenu-left'], /** * Get third-level menu items ingo for slave components @@ -240,7 +240,7 @@ App.HostTableMenuView = Em.View.extend({ hostItemView: Em.View.extend({ tagName: 'li', - classNames: ['dropdown-submenu'], + classNames: ['dropdown-submenu', 'submenu-left'], label: Em.I18n.t('common.hosts'), http://git-wip-us.apache.org/repos/asf/ambari/blob/8f53bc45/ambari-web/app/views/main/host/stack_versions_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/host/stack_versions_view.js b/ambari-web/app/views/main/host/stack_versions_view.js index cebe8c7..62a88b4 100644 --- a/ambari-web/app/views/main/host/stack_versions_view.js +++ b/ambari-web/app/views/main/host/stack_versions_view.js @@ -22,7 +22,7 @@ var sort = require('views/common/sort_view'); App.MainHostStackVersionsView = App.TableView.extend({ templateName: require('templates/main/host/stack_versions'), - classNames: ['host-tab-content'], + classNames: ['host-tab-content', 'container-wrap-table'], /** * @type {Ember.Object} http://git-wip-us.apache.org/repos/asf/ambari/blob/8f53bc45/ambari-web/test/models/alerts/alert_group_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/models/alerts/alert_group_test.js b/ambari-web/test/models/alerts/alert_group_test.js index 6f64b7a..34237d2 100644 --- a/ambari-web/test/models/alerts/alert_group_test.js +++ b/ambari-web/test/models/alerts/alert_group_test.js @@ -35,8 +35,9 @@ describe('App.AlertGroup', function() { describe('#displayName', function () { [ - {name: 'abc', default: true, e: 'abc Default'}, - {name: 'abc', default: false, e: 'abc'}, + {name: 'abc', default: true, e: 'Abc Default'}, + {name: 'abc', default: false, e: 'Abc'}, + {name: 'ABC', default: false, e: 'Abc'}, {name: '12345678901234567890', default: true, e: '123456789...234567890 Default'}, {name: '12345678901234567890', default: false, e: '123456789...234567890'}, ].forEach(function (test) {