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 44C0F200BBE
for ; Fri, 11 Nov 2016 13:14:54 +0100 (CET)
Received: by cust-asf.ponee.io (Postfix)
id 436D7160B01; Fri, 11 Nov 2016 12:14:54 +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 66416160AE4
for ; Fri, 11 Nov 2016 13:14:53 +0100 (CET)
Received: (qmail 91865 invoked by uid 500); 11 Nov 2016 12:14:52 -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 91856 invoked by uid 99); 11 Nov 2016 12:14:52 -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; Fri, 11 Nov 2016 12:14:52 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
id 80066DFF41; Fri, 11 Nov 2016 12:14:52 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: onechiporenko@apache.org
To: commits@ambari.apache.org
Date: Fri, 11 Nov 2016 12:14:52 -0000
Message-Id: <7f07923c8ea145e3acd629e2716ace24@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/2] ambari git commit: AMBARI-18861. Remove redundant css (part 1)
(onechiporenko)
archived-at: Fri, 11 Nov 2016 12:14:54 -0000
Repository: ambari
Updated Branches:
refs/heads/trunk 5dea886ef -> 2d948db31
http://git-wip-us.apache.org/repos/asf/ambari/blob/2d948db3/ambari-web/app/templates/wizard/step2.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step2.hbs b/ambari-web/app/templates/wizard/step2.hbs
index 55ebd79..4912851 100644
--- a/ambari-web/app/templates/wizard/step2.hbs
+++ b/ambari-web/app/templates/wizard/step2.hbs
@@ -36,13 +36,14 @@
-
+
{{view Ember.TextArea id="host-names" class="form-control" valueBinding="content.installOptions.hostNames" rows="5"
placeholder="host names"}}
-
{{#if hostsError}}
-
{{hostsError}}
+
{{/if}}
@@ -77,66 +78,76 @@
{{view App.SshKeyFileUploader disabledBinding="view.sshKeyState"}}
{{/if}}
+
+ {{! ssh key }}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/2d948db3/ambari-web/app/views/main/menu.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/menu.js b/ambari-web/app/views/main/menu.js
index f15e48a..bb27388 100644
--- a/ambari-web/app/views/main/menu.js
+++ b/ambari-web/app/views/main/menu.js
@@ -24,7 +24,7 @@ var App = require('app');
*/
App.MainMenuView = Em.CollectionView.extend({
tagName: 'ul',
- classNames: ['nav', 'top-nav-menu', 'navbar-nav'],
+ classNames: ['nav', 'top-nav-menu', 'navbar-nav', 'navbar-right'],
views: function () {
return App.router.get('mainViewsController.ambariViews');