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 7A654200B0F for ; Fri, 3 Jun 2016 01:37:16 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 78E71160A53; Thu, 2 Jun 2016 23:37:16 +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 BF618160A51 for ; Fri, 3 Jun 2016 01:37:15 +0200 (CEST) Received: (qmail 61593 invoked by uid 500); 2 Jun 2016 23:37:15 -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 61583 invoked by uid 99); 2 Jun 2016 23:37:14 -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, 02 Jun 2016 23:37:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D5569DFE65; Thu, 2 Jun 2016 23:37:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: xiwang@apache.org To: commits@ambari.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-17021. VDF: REgister Version UI inconsistencies + bug.(xiwang) Date: Thu, 2 Jun 2016 23:37:14 +0000 (UTC) archived-at: Thu, 02 Jun 2016 23:37:16 -0000 Repository: ambari Updated Branches: refs/heads/branch-2.4 1fe38e119 -> b05a9c04e AMBARI-17021. VDF: REgister Version UI inconsistencies + bug.(xiwang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b05a9c04 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b05a9c04 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b05a9c04 Branch: refs/heads/branch-2.4 Commit: b05a9c04e6e4bb9a19c04e674d8371657fb3170e Parents: 1fe38e1 Author: Xi Wang Authored: Thu Jun 2 16:04:41 2016 -0700 Committer: Xi Wang Committed: Thu Jun 2 16:04:51 2016 -0700 ---------------------------------------------------------------------- .../controllers/stackVersions/StackVersionsListCtrl.js | 10 ++++++---- .../main/resources/ui/admin-web/app/styles/main.css | 13 ++++++++++++- .../ui/admin-web/app/views/stackVersions/list.html | 8 +++++--- 3 files changed, 23 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b05a9c04/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsListCtrl.js ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsListCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsListCtrl.js index b759800..8b697f8 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsListCtrl.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsListCtrl.js @@ -137,10 +137,12 @@ angular.module('ambariAdminConsole') $scope.fillStacks = function() { var options = [{label: $t('common.all'), value: ''}]; angular.forEach($scope.stacks, function (stack) { - options.push({ - label: stack.displayName, - value: stack.displayName - }); + if (stack.active) { + options.push({ + label: stack.displayName, + value: stack.displayName + }); + } }); $scope.filter.stack.options = options; if (!$scope.filter.stack.current) { http://git-wip-us.apache.org/repos/asf/ambari/blob/b05a9c04/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css b/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css index 4f2812f..12f44bb 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css +++ b/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css @@ -1746,7 +1746,18 @@ thead.view-permission-header > tr > th { #stack-versions .no-version-alert { text-align: center; } - +#stack-versions table { + table-layout: fixed; +} +#stack-versions table .text-search-container { + font-weight: normal; + position: relative; +} +#stack-versions table .text-search-container .close { + position: absolute; + right: 15px; + top: 38px; +} .pull-up { margin-top: -2px; } http://git-wip-us.apache.org/repos/asf/ambari/blob/b05a9c04/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html index a992898..10d4a82 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html @@ -40,13 +40,15 @@ ng-options="item.label for item in filter.stack.options track by item.value" > - + + - + + @@ -56,7 +58,7 @@ ng-options="item.label for item in filter.cluster.options track by item.value" > - +