Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3DB901988E for ; Wed, 9 Mar 2016 23:49:57 +0000 (UTC) Received: (qmail 16953 invoked by uid 500); 9 Mar 2016 23:49:55 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 16906 invoked by uid 500); 9 Mar 2016 23:49:55 -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 15776 invoked by uid 99); 9 Mar 2016 23:49:54 -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; Wed, 09 Mar 2016 23:49:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B6695E0449; Wed, 9 Mar 2016 23:49:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jluniya@apache.org To: commits@ambari.apache.org Date: Wed, 09 Mar 2016 23:50:36 -0000 Message-Id: <692f2bcf698d4d27b921461585d92003@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [44/51] [abbrv] ambari git commit: AMBARI-15340. Register Version: multiple UI tweaks .(xiwang) AMBARI-15340. Register Version: multiple UI tweaks .(xiwang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e5d261f8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e5d261f8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e5d261f8 Branch: refs/heads/AMBARI-13364 Commit: e5d261f84c8f10d3276ece640659c7b53a6684d1 Parents: 6d3e291 Author: Xi Wang Authored: Tue Mar 8 14:16:52 2016 -0800 Committer: Xi Wang Committed: Wed Mar 9 14:53:26 2016 -0800 ---------------------------------------------------------------------- .../stackVersions/StackVersionsCreateCtrl.js | 10 ++++++++-- .../src/main/resources/ui/admin-web/app/styles/main.css | 11 +++++++++-- .../app/views/stackVersions/stackVersionPage.html | 12 ++++++------ 3 files changed, 23 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e5d261f8/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js index 038b197..46e4a11 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js @@ -39,7 +39,7 @@ angular.module('ambariAdminConsole') $scope.option1 = { index: 1, displayName: $t('versions.uploadFile'), - file: null, + file: '', hasError: false }; $scope.option2 = { @@ -64,7 +64,11 @@ angular.module('ambariAdminConsole') $scope.option2.hasError = false; }; $scope.readInfoButtonDisabled = function () { - return $scope.option1.index == $scope.selectedOption.index ? !$scope.option1.file : !$scope.option2.url; + return $scope.option1.index == $scope.selectedOption.index ? false : !$scope.option2.url; + }; + + $scope.allInfoCategoriesBlank = function () { + return !$scope.upgradeStack.stack_name; }; $scope.onFileSelect = function(e){ @@ -77,6 +81,8 @@ angular.module('ambariAdminConsole') }; })(file); reader.readAsText(file); + } else { + $scope.option1.file = ''; } }; http://git-wip-us.apache.org/repos/asf/ambari/blob/e5d261f8/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 e4db617..9348564 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 @@ -1433,9 +1433,13 @@ thead.view-permission-header > tr > th { .left-menu-all-repos .repos-table .repos-td.active > a { color: white; } - +#upload-definition-file-panel { + background-color: #f5f5f5; + padding: 20px 10px 5px 10px; + margin-bottom: 15px; +} .register-version-options .read-info-button { - margin-bottom: 10px; + margin-top: 10px; } .register-version-options .option-radio-button { @@ -1471,6 +1475,9 @@ thead.view-permission-header > tr > th { text-align: center; cursor: pointer; } +.register-version-form .repos-panel .repo-name-label { + text-align: left; +} .register-version-form .repos-panel .os-type-label { margin-top: 27px;; http://git-wip-us.apache.org/repos/asf/ambari/blob/e5d261f8/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html index c37006b..839b47d 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html @@ -40,10 +40,10 @@
- +
-
+
-
@@ -84,7 +84,7 @@ -
+

{{'common.details' | translate}}

@@ -129,7 +129,7 @@

{{'versions.repos' | translate}}

-
+
@@ -147,7 +147,7 @@
-
+