from:"xiwang"

ambari git commit: AMBARI-20926. Ranger Quick links not showing load balancer in Ranger-admin HA.(xiwang)

2017-05-03 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk b0d7f0016 -> 0971f4139


AMBARI-20926. Ranger Quick links not showing load balancer in Ranger-admin 
HA.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0971f413
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0971f413
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0971f413

Branch: refs/heads/trunk
Commit: 0971f413934a1acc38266f7fcf4c34554a6ac1d8
Parents: b0d7f00
Author: Xi Wang <xiw...@apache.org>
Authored: Wed May 3 16:07:42 2017 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Wed May 3 17:41:40 2017 -0700

--
 ambari-web/app/views/common/quick_view_link_view.js  | 7 ++-
 ambari-web/test/views/common/quick_link_view_test.js | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0971f413/ambari-web/app/views/common/quick_view_link_view.js
--
diff --git a/ambari-web/app/views/common/quick_view_link_view.js 
b/ambari-web/app/views/common/quick_view_link_view.js
index 94cc2d3..47958f4 100644
--- a/ambari-web/app/views/common/quick_view_link_view.js
+++ b/ambari-web/app/views/common/quick_view_link_view.js
@@ -187,7 +187,7 @@ App.QuickLinksView = Em.View.extend({
 if (!Em.isNone(quickLinksConfig)) {
   var protocolConfig = Em.get(quickLinksConfig, 'protocol');
   var checks = Em.get(protocolConfig, 'checks');
-  var sites = ['core-site', 'hdfs-site'];
+  var sites = ['core-site', 'hdfs-site', 'admin-properties'];
   if (checks) {
 checks.forEach(function (check) {
   var protocolConfigSiteProp = Em.get(check, 'site');
@@ -359,6 +359,11 @@ App.QuickLinksView = Em.View.extend({
   host = hostObj.Hosts.public_host_name;
 }
   }
+} else if (serviceName === 'RANGER') {
+  var siteConfigs = this.get('configProperties').findProperty('type', 
'admin-properties').properties;
+  if (siteConfigs['policymgr_external_url']) {
+host = 
siteConfigs['policymgr_external_url'].split('://')[1].split(':')[0];
+  }
 }
 
 var linkPort = this.setPort(Em.get(link, 'port'), protocol, 
configProperties);

http://git-wip-us.apache.org/repos/asf/ambari/blob/0971f413/ambari-web/test/views/common/quick_link_view_test.js
--
diff --git a/ambari-web/test/views/common/quick_link_view_test.js 
b/ambari-web/test/views/common/quick_link_view_test.js
index fbdb711..48cdb28 100644
--- a/ambari-web/test/views/common/quick_link_view_test.js
+++ b/ambari-web/test/views/common/quick_link_view_test.js
@@ -205,7 +205,7 @@ describe('App.QuickViewLinks', function () {
   quickViewLinks.set('content.serviceName', 'YARN');
   mock.returns(quickLinksConfigYARN);
   quickViewLinks.loadQuickLinksConfigSuccessCallback({items: []});
-  expect(quickViewLinks.get('requiredSiteNames')).to.be.eql(["core-site", 
"hdfs-site", "hbase-site", "yarn-site"]);
+  expect(quickViewLinks.get('requiredSiteNames')).to.be.eql(["core-site", 
"hdfs-site", "admin-properties", "hbase-site", "yarn-site"]);
 });
   });

ambari git commit: AMBARI-20926. Ranger Quick links not showing load balancer in Ranger-admin HA.(xiwang)

2017-05-03 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 3f5ea585f -> baf8f9afa


AMBARI-20926. Ranger Quick links not showing load balancer in Ranger-admin 
HA.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/baf8f9af
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/baf8f9af
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/baf8f9af

Branch: refs/heads/branch-2.5
Commit: baf8f9afa85698f1fdec6342ce777d418be74e78
Parents: 3f5ea58
Author: Xi Wang <xiw...@apache.org>
Authored: Wed May 3 16:07:42 2017 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Wed May 3 16:07:53 2017 -0700

--
 ambari-web/app/views/common/quick_view_link_view.js  | 7 ++-
 ambari-web/test/views/common/quick_link_view_test.js | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/baf8f9af/ambari-web/app/views/common/quick_view_link_view.js
--
diff --git a/ambari-web/app/views/common/quick_view_link_view.js 
b/ambari-web/app/views/common/quick_view_link_view.js
index 86a7cb9..408c5e5 100644
--- a/ambari-web/app/views/common/quick_view_link_view.js
+++ b/ambari-web/app/views/common/quick_view_link_view.js
@@ -189,7 +189,7 @@ App.QuickLinksView = Em.View.extend({
 if (!Em.isNone(quickLinksConfig)) {
   var protocolConfig = Em.get(quickLinksConfig, 'protocol');
   var checks = Em.get(protocolConfig, 'checks');
-  var sites = ['core-site', 'hdfs-site'];
+  var sites = ['core-site', 'hdfs-site', 'admin-properties'];
   if (checks) {
 checks.forEach(function (check) {
   var protocolConfigSiteProp = Em.get(check, 'site');
@@ -361,6 +361,11 @@ App.QuickLinksView = Em.View.extend({
   host = hostObj.Hosts.public_host_name;
 }
   }
+} else if (serviceName === 'RANGER') {
+  var siteConfigs = this.get('configProperties').findProperty('type', 
'admin-properties').properties;
+  if (siteConfigs['policymgr_external_url']) {
+host = 
siteConfigs['policymgr_external_url'].split('://')[1].split(':')[0];
+  }
 }
 
 var linkPort = this.setPort(Em.get(link, 'port'), protocol, 
configProperties);

http://git-wip-us.apache.org/repos/asf/ambari/blob/baf8f9af/ambari-web/test/views/common/quick_link_view_test.js
--
diff --git a/ambari-web/test/views/common/quick_link_view_test.js 
b/ambari-web/test/views/common/quick_link_view_test.js
index 7179078..0904665 100644
--- a/ambari-web/test/views/common/quick_link_view_test.js
+++ b/ambari-web/test/views/common/quick_link_view_test.js
@@ -205,7 +205,7 @@ describe('App.QuickLinksView', function () {
   quickViewLinks.set('content.serviceName', 'YARN');
   mock.returns(quickLinksConfigYARN);
   quickViewLinks.loadQuickLinksConfigSuccessCallback({items: []});
-  expect(quickViewLinks.get('requiredSiteNames')).to.be.eql(["core-site", 
"hdfs-site", "hbase-site", "yarn-site"]);
+  expect(quickViewLinks.get('requiredSiteNames')).to.be.eql(["core-site", 
"hdfs-site", "admin-properties", "hbase-site", "yarn-site"]);
 });
   });

ambari git commit: AMBARI-20897. JDBC Driver Class and URL not updated automatically while selecting each database type. (XIWAMG)

2017-04-28 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 7d1850fd3 -> 54d7eb5a4


AMBARI-20897. JDBC Driver Class and URL not updated automatically while 
selecting each database type. (XIWAMG)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/54d7eb5a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/54d7eb5a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/54d7eb5a

Branch: refs/heads/branch-2.5
Commit: 54d7eb5a4791e9cfce1a503a813f38e6c11ecc3f
Parents: 7d1850f
Author: Xi Wang 
Authored: Fri Apr 28 15:08:38 2017 -0700
Committer: Xi Wang 
Committed: Fri Apr 28 16:53:33 2017 -0700

--
 .../src/main/resources/stacks/HDP/2.6/services/stack_advisor.py  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/54d7eb5a/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py
index 7f581da..ad44033 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py
@@ -58,8 +58,8 @@ class HDP26StackAdvisor(HDP25StackAdvisor):
   beaconServerHost = self.getHostWithComponent('BEACON', 'BEACON_SERVER', 
services, hosts)
   beaconDBConnectionURL = beaconEnvProperties['beacon_store_url']
   protocol = self.getProtocol(beaconEnvProperties['beacon_database'])
-  oldSchemaName = self.getOldValue(services, "beacon-env", 
"beacon_store_db_name")
-  oldDBType = self.getOldValue(services, "beacon-env", "beacon_database")
+  oldSchemaName = getOldValue(self, services, "beacon-env", 
"beacon_store_db_name")
+  oldDBType = getOldValue(self, services, "beacon-env", "beacon_database")
   # under these if constructions we are checking if beacon server hostname 
available,
   # if it's default db connection url with "localhost" or if schema name 
was changed or if db type was changed (only for db type change from default 
mysql to existing mysql)
   # or if protocol according to current db type differs with protocol in 
db connection url(other db types changes)

ambari git commit: AMBARI-20762. Add more database options for BEACON in stack advisor.(xiwang)

2017-04-13 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk 38f84bf12 -> c57300a35


AMBARI-20762. Add more database options for BEACON in stack advisor.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c57300a3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c57300a3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c57300a3

Branch: refs/heads/trunk
Commit: c57300a359bfdb3225e2660a661733fc58daac2c
Parents: 38f84bf
Author: Xi Wang <xiw...@apache.org>
Authored: Thu Apr 13 14:10:16 2017 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Thu Apr 13 16:11:44 2017 -0700

--
 .../stacks/HDP/2.6/services/stack_advisor.py| 33 +++-
 1 file changed, 32 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c57300a3/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py
index 38f46d7..4e1b4b6 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py
@@ -40,11 +40,42 @@ class HDP26StackAdvisor(HDP25StackAdvisor):
 "HIVE": self.recommendHIVEConfigurations,
 "HBASE": self.recommendHBASEConfigurations,
 "YARN": self.recommendYARNConfigurations,
-"KAFKA": self.recommendKAFKAConfigurations
+"KAFKA": self.recommendKAFKAConfigurations,
+"BEACON": self.recommendBEACONConfigurations
   }
   parentRecommendConfDict.update(childRecommendConfDict)
   return parentRecommendConfDict
 
+  def recommendBEACONConfigurations(self, configurations, clusterData, 
services, hosts):
+beaconEnvProperties = self.getSiteProperties(services['configurations'], 
'beacon-env')
+putbeaconEnvProperty = self.putProperty(configurations, "beacon-env", 
services)
+
+# database URL and driver class recommendations
+if beaconEnvProperties and self.checkSiteProperties(beaconEnvProperties, 
'beacon_store_driver') and self.checkSiteProperties(beaconEnvProperties, 
'beacon_database'):
+  putbeaconEnvProperty('beacon_store_driver', 
self.getDBDriver(beaconEnvProperties['beacon_database']))
+if beaconEnvProperties and self.checkSiteProperties(beaconEnvProperties, 
'beacon_store_db_name', 'beacon_store_url') and 
self.checkSiteProperties(beaconEnvProperties, 'beacon_database'):
+  beaconServerHost = self.getHostWithComponent('BEACON', 'BEACON_SERVER', 
services, hosts)
+  beaconDBConnectionURL = beaconEnvProperties['beacon_store_url']
+  protocol = self.getProtocol(beaconEnvProperties['beacon_database'])
+  oldSchemaName = self.getOldValue(services, "beacon-env", 
"beacon_store_db_name")
+  oldDBType = self.getOldValue(services, "beacon-env", "beacon_database")
+  # under these if constructions we are checking if beacon server hostname 
available,
+  # if it's default db connection url with "localhost" or if schema name 
was changed or if db type was changed (only for db type change from default 
mysql to existing mysql)
+  # or if protocol according to current db type differs with protocol in 
db connection url(other db types changes)
+  if beaconServerHost is not None:
+if (beaconDBConnectionURL and "//localhost" in beaconDBConnectionURL) 
or oldSchemaName or oldDBType or (protocol and beaconDBConnectionURL and not 
beaconDBConnectionURL.startswith(protocol)):
+  dbConnection = 
self.getDBConnectionStringBeacon(beaconEnvProperties['beacon_database']).format(beaconServerHost['Hosts']['host_name'],
 beaconEnvProperties['beacon_store_db_name'])
+  putbeaconEnvProperty('beacon_store_url', dbConnection)
+
+  def getDBConnectionStringBeacon(self, databaseType):
+driverDict = {
+  'NEW DERBY DATABASE': 
'jdbc:derby:${{beacon.data.dir}}/${{beacon.store.db.name}}-db;create=true',
+  'EXISTING MYSQL DATABASE': 'jdbc:mysql://{0}/{1}',
+  'EXISTING MYSQL / MARIADB DATABASE': 'jdbc:mysql://{0}/{1}',
+  'EXISTING ORACLE DATABASE': 'jdbc:oracle:thin:@//{0}:1521/{1}'
+}
+return driverDict.get(databaseType.upper())
+
   def recommendAtlasConfigurations(self, configurations, clusterData, 
services, hosts):
 super(HDP26StackAdvisor, 
self).recommendAtlasConfigurations(configurations, clusterData, services, hosts)
 servicesList = [service["StackServices"]["service_name"] for service in 
services["services"]]

ambari git commit: AMBARI-20762. Add more database options for BEACON in stack advisor.(xiwang)

2017-04-13 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 b313614c5 -> 777eacd2b


AMBARI-20762. Add more database options for BEACON in stack advisor.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/777eacd2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/777eacd2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/777eacd2

Branch: refs/heads/branch-2.5
Commit: 777eacd2be2c9477405ae53bd5faaa8b53b88aec
Parents: b313614
Author: Xi Wang <xiw...@apache.org>
Authored: Thu Apr 13 14:10:16 2017 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Thu Apr 13 16:10:33 2017 -0700

--
 .../stacks/HDP/2.6/services/stack_advisor.py| 33 +++-
 1 file changed, 32 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/777eacd2/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py
index 3f111de..33fc16c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py
@@ -41,11 +41,42 @@ class HDP26StackAdvisor(HDP25StackAdvisor):
 "HIVE": self.recommendHIVEConfigurations,
 "HBASE": self.recommendHBASEConfigurations,
 "YARN": self.recommendYARNConfigurations,
-"KAFKA": self.recommendKAFKAConfigurations
+"KAFKA": self.recommendKAFKAConfigurations,
+"BEACON": self.recommendBEACONConfigurations
   }
   parentRecommendConfDict.update(childRecommendConfDict)
   return parentRecommendConfDict
 
+  def recommendBEACONConfigurations(self, configurations, clusterData, 
services, hosts):
+beaconEnvProperties = self.getSiteProperties(services['configurations'], 
'beacon-env')
+putbeaconEnvProperty = self.putProperty(configurations, "beacon-env", 
services)
+
+# database URL and driver class recommendations
+if beaconEnvProperties and self.checkSiteProperties(beaconEnvProperties, 
'beacon_store_driver') and self.checkSiteProperties(beaconEnvProperties, 
'beacon_database'):
+  putbeaconEnvProperty('beacon_store_driver', 
self.getDBDriver(beaconEnvProperties['beacon_database']))
+if beaconEnvProperties and self.checkSiteProperties(beaconEnvProperties, 
'beacon_store_db_name', 'beacon_store_url') and 
self.checkSiteProperties(beaconEnvProperties, 'beacon_database'):
+  beaconServerHost = self.getHostWithComponent('BEACON', 'BEACON_SERVER', 
services, hosts)
+  beaconDBConnectionURL = beaconEnvProperties['beacon_store_url']
+  protocol = self.getProtocol(beaconEnvProperties['beacon_database'])
+  oldSchemaName = self.getOldValue(services, "beacon-env", 
"beacon_store_db_name")
+  oldDBType = self.getOldValue(services, "beacon-env", "beacon_database")
+  # under these if constructions we are checking if beacon server hostname 
available,
+  # if it's default db connection url with "localhost" or if schema name 
was changed or if db type was changed (only for db type change from default 
mysql to existing mysql)
+  # or if protocol according to current db type differs with protocol in 
db connection url(other db types changes)
+  if beaconServerHost is not None:
+if (beaconDBConnectionURL and "//localhost" in beaconDBConnectionURL) 
or oldSchemaName or oldDBType or (protocol and beaconDBConnectionURL and not 
beaconDBConnectionURL.startswith(protocol)):
+  dbConnection = 
self.getDBConnectionStringBeacon(beaconEnvProperties['beacon_database']).format(beaconServerHost['Hosts']['host_name'],
 beaconEnvProperties['beacon_store_db_name'])
+  putbeaconEnvProperty('beacon_store_url', dbConnection)
+
+  def getDBConnectionStringBeacon(self, databaseType):
+driverDict = {
+  'NEW DERBY DATABASE': 
'jdbc:derby:${{beacon.data.dir}}/${{beacon.store.db.name}}-db;create=true',
+  'EXISTING MYSQL DATABASE': 'jdbc:mysql://{0}/{1}',
+  'EXISTING MYSQL / MARIADB DATABASE': 'jdbc:mysql://{0}/{1}',
+  'EXISTING ORACLE DATABASE': 'jdbc:oracle:thin:@//{0}:1521/{1}'
+}
+return driverDict.get(databaseType.upper())
+
   def recommendAtlasConfigurations(self, configurations, clusterData, 
services, hosts):
 super(HDP26StackAdvisor, 
self).recommendAtlasConfigurations(configurations, clusterData, services, hosts)
 servicesList = [service["StackServices"]["service_name"] for service in 
services["services"]]

ambari git commit: AMBARI-20752. Update the Accordion styles in horton style.(xiwang)

2017-04-13 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk 7e46412dc -> 0c778e77a


AMBARI-20752. Update the Accordion styles in horton style.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0c778e77
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0c778e77
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0c778e77

Branch: refs/heads/trunk
Commit: 0c778e77ac05caf24e1a0a1028533ec42ff35da2
Parents: 7e46412
Author: Xi Wang <xiw...@apache.org>
Authored: Wed Apr 12 15:06:17 2017 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Thu Apr 13 13:42:29 2017 -0700

--
 .../app/styles/theme/bootstrap-ambari.css   | 20 
 1 file changed, 8 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0c778e77/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 b2f5ca4..3164584 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -1352,16 +1352,16 @@ input.radio:checked + label:after {
 .accordion .panel-group .panel,
 .wizard .wizard-body .wizard-content .accordion .panel-group .panel {
   border-radius: 0px;
-  border: 1px solid;
-  border-color: #ccc transparent;
-  border-bottom: none;
+  border: none;
   margin-top: 0px;
 }
 .accordion .panel-group .panel .panel-heading,
 .wizard .wizard-body .wizard-content .accordion .panel-group .panel 
.panel-heading {
   height: 50px;
   padding: 15px 10px;
-  border: 1px solid transparent;
+  border: 1px solid;
+  border-color: #ddd transparent;
+  border-top: none;
   background: #fff;
 }
 .accordion .panel-group .panel .panel-heading .panel-title,
@@ -1371,29 +1371,25 @@ input.radio:checked + label:after {
   font-style: normal;
   line-height: 1;
   color: #333;
-  color: #1491c1;
 }
 .accordion .panel-group .panel .panel-heading .panel-title > a,
 .wizard .wizard-body .wizard-content .accordion .panel-group .panel 
.panel-heading .panel-title > a {
   font-size: 18px;
+  color: #333;
 }
 .accordion .panel-group .panel .panel-heading .panel-title > i,
 .wizard .wizard-body .wizard-content .accordion .panel-group .panel 
.panel-heading .panel-title > i {
   font-size: 20px;
+  color: #1491c1;
 }
 .accordion .panel-group .panel .panel-heading:hover,
 .wizard .wizard-body .wizard-content .accordion .panel-group .panel 
.panel-heading:hover {
   background: #f3faff;
-  border: 1px solid #a7dff2;
   cursor: pointer;
 }
 .accordion .panel-group .panel .panel-body,
 .wizard .wizard-body .wizard-content .accordion .panel-group .panel 
.panel-body {
-  padding: 30px 20px;
-}
-.accordion .panel-group:last-child .panel,
-.wizard .wizard-body .wizard-content .accordion .panel-group:last-child .panel 
{
-  border-bottom: 1px solid #ccc;
+  padding: 15px 10px 20px 20px;
 }
 h1,
 h2,
@@ -1464,4 +1460,4 @@ a.disabled:hover,
 a:visited.disabled:hover,
 a:focus.disabled:hover {
   text-decoration: none;
-}
\ No newline at end of file
+}

ambari git commit: AMBARI-20699. Side Nav: improve views dropdown menu.(xiwang)

2017-04-06 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk bb614a0ff -> 97812020b


AMBARI-20699. Side Nav: improve views dropdown menu.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/97812020
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/97812020
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/97812020

Branch: refs/heads/trunk
Commit: 97812020b8a116694bff56e724a496bb9faf5bcf
Parents: bb614a0
Author: Xi Wang <xiw...@apache.org>
Authored: Thu Apr 6 19:31:53 2017 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Thu Apr 6 19:32:00 2017 -0700

--
 .../app/styles/theme/bootstrap-ambari.css   | 36 
 1 file changed, 15 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/97812020/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 b063fcf..b2f5ca4 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -766,9 +766,16 @@ input.radio:checked + label:after {
 .navigation-bar-container ul.nav.side-nav-header li.navigation-header > 
a.ambari-logo > img {
   height: 25px;
   float: left;
-  margin-top: -2px;
   margin-left: -3px;
 }
+.navigation-bar-container ul.nav.side-nav-header li.navigation-header 
.btn-group {
+  cursor: pointer;
+  margin-top: 3px;
+}
+.navigation-bar-container ul.nav.side-nav-header li.navigation-header 
.btn-group:hover span.ambari-header,
+.navigation-bar-container ul.nav.side-nav-header li.navigation-header 
.btn-group:hover span.toggle-icon {
+  color: #fff;
+}
 .navigation-bar-container ul.nav.side-nav-header li.navigation-header 
.btn-group span.ambari-header {
   font-family: 'Roboto', sans-serif;
   font-weight: normal;
@@ -777,15 +784,13 @@ input.radio:checked + label:after {
   color: #333;
   font-size: 20px;
   width: 55px;
-  cursor: pointer;
   display: inline;
-  color: #fff;
+  color: #b8bec4;
   padding: 0 8px 0 10px;
 }
 .navigation-bar-container ul.nav.side-nav-header li.navigation-header 
.btn-group span.toggle-icon {
   margin-bottom: 5px;
   font-size: 13px;
-  cursor: pointer;
   display: inline-block;
   vertical-align: middle;
   color: #b8bec4;
@@ -795,17 +800,7 @@ input.radio:checked + label:after {
   box-shadow: none;
 }
 .navigation-bar-container ul.nav.side-nav-header li.navigation-header 
ul.dropdown-menu {
-  min-width: 190px;
-  max-width: 190px;
-  width: 190px;
-  right: -43px;
-  left: auto;
   top: 30px;
-  background: #323543;
-  border: none;
-}
-.navigation-bar-container ul.nav.side-nav-header li.navigation-header 
ul.dropdown-menu li {
-  border: none;
 }
 .navigation-bar-container ul.nav.side-nav-header li.navigation-header 
ul.dropdown-menu li > a {
   font-family: 'Roboto', sans-serif;
@@ -813,17 +808,15 @@ input.radio:checked + label:after {
   font-style: normal;
   line-height: 1;
   color: #333;
-  font-size: 13px;
-  color: #999;
-  padding: 15px 10px;
-  height: auto;
+  font-size: 14px;
+  color: #666;
+  line-height: 1.42;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
 }
 .navigation-bar-container ul.nav.side-nav-header li.navigation-header 
ul.dropdown-menu li > a:hover {
-  background: #404351;
-  color: #fff;
+  background: #f5f5f5;
 }
 .navigation-bar-container ul.nav.side-nav-menu,
 .navigation-bar-container ul.nav.side-nav-footer {
@@ -1139,6 +1132,7 @@ input.radio:checked + label:after {
   position: fixed;
   top: 0;
   bottom: 0;
+  left: 0;
   z-index: 2079;
 }
 .navigation-bar-fit-height .side-nav-header {
@@ -1470,4 +1464,4 @@ a.disabled:hover,
 a:visited.disabled:hover,
 a:focus.disabled:hover {
   text-decoration: none;
-}
+}
\ No newline at end of file

ambari git commit: AMBARI-20614. Auto-Start Services Switch button broken.(xiwang)

2017-04-06 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 34f1377fc -> 1b23ff207


AMBARI-20614. Auto-Start Services Switch button broken.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1b23ff20
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1b23ff20
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1b23ff20

Branch: refs/heads/branch-2.5
Commit: 1b23ff207a2683062562080196f1a085809bff76
Parents: 34f1377
Author: Xi Wang <xiw...@apache.org>
Authored: Tue Mar 28 18:24:29 2017 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Thu Apr 6 10:46:38 2017 -0700

--
 ambari-web/app/styles/widgets.less | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1b23ff20/ambari-web/app/styles/widgets.less
--
diff --git a/ambari-web/app/styles/widgets.less 
b/ambari-web/app/styles/widgets.less
index 02a7f33..6086041 100644
--- a/ambari-web/app/styles/widgets.less
+++ b/ambari-web/app/styles/widgets.less
@@ -365,6 +365,7 @@
 }
 
 .bootstrap-switch {
+  white-space: nowrap;
   &,
   &.bootstrap-switch-focused {
 border-color: transparent;

[1/2] ambari git commit: AMBARI-20614. Auto-Start Services Switch button broken.(xiwang)

2017-03-29 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk 77dd10c29 -> 6ea7b42a1


AMBARI-20614. Auto-Start Services Switch button broken.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6ea7b42a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6ea7b42a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6ea7b42a

Branch: refs/heads/trunk
Commit: 6ea7b42a1409bb438e8dd0c4da2898032ca339e8
Parents: 8d075c6
Author: Xi Wang <xiw...@apache.org>
Authored: Tue Mar 28 18:24:29 2017 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Wed Mar 29 18:11:39 2017 -0700

--
 ambari-web/app/styles/widgets.less | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6ea7b42a/ambari-web/app/styles/widgets.less
--
diff --git a/ambari-web/app/styles/widgets.less 
b/ambari-web/app/styles/widgets.less
index af76e4f..9bf60f0 100644
--- a/ambari-web/app/styles/widgets.less
+++ b/ambari-web/app/styles/widgets.less
@@ -365,6 +365,7 @@
 }
 
 .bootstrap-switch {
+  white-space: nowrap;
   &,
   &.bootstrap-switch-focused {
 border-color: transparent;

[2/2] ambari git commit: AMBARI-20610. Unable to scroll down collapsed navigation bar if it's higher that viewport.(xiwang)

2017-03-29 Thread xiwang

AMBARI-20610. Unable to scroll down collapsed navigation bar if it's higher 
that viewport.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8d075c6a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8d075c6a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8d075c6a

Branch: refs/heads/trunk
Commit: 8d075c6a1ae8c6b1d2c8e64b717dac464496f415
Parents: 77dd10c
Author: Xi Wang <xiw...@apache.org>
Authored: Tue Mar 28 11:30:01 2017 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Wed Mar 29 18:11:39 2017 -0700

--
 .../app/styles/theme/bootstrap-ambari.css   |  6 +---
 .../vendor/scripts/theme/bootstrap-ambari.js| 29 +---
 2 files changed, 26 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8d075c6a/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 b289517..b063fcf 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -1092,10 +1092,6 @@ input.radio:checked + label:after {
   top: 0;
   left: 50px;
 }
-.navigation-bar-container.collapsed ul.nav.side-nav-menu li:hover ul.sub-menu,
-.navigation-bar-container.collapsed ul.nav.side-nav-footer li:hover 
ul.sub-menu {
-  display: block;
-}
 .navigation-bar-container.collapsed ul.nav.side-nav-menu li.submenu-li > a,
 .navigation-bar-container.collapsed ul.nav.side-nav-footer li.submenu-li > a {
   padding: 10px 5px 10px 25px;
@@ -1166,7 +1162,7 @@ input.radio:checked + label:after {
 .navigation-bar-fit-height .navigation-bar-container {
   height: 100%;
 }
-.navigation-bar-fit-height .navigation-bar-container:not(.collapsed) 
.side-nav-menu {
+.navigation-bar-fit-height .navigation-bar-container .side-nav-menu {
   overflow-y: auto;
 }
 .notifications-group {

http://git-wip-us.apache.org/repos/asf/ambari/blob/8d075c6a/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
--
diff --git a/ambari-web/vendor/scripts/theme/bootstrap-ambari.js 
b/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
index 5cdbb55..d7ffdd1 100644
--- a/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
+++ b/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
@@ -30,6 +30,7 @@ $(document).ready(function () {
 var settings = $.extend({}, $.fn.navigationBar.defaults, options);
 
 return this.each(function () {
+  var _this = this;
 
   var containerSelector = '.navigation-bar-container';
   var $navigationContainer = $(this).find(containerSelector);
@@ -48,10 +49,10 @@ $(document).ready(function () {
 $(this).addClass('navigation-bar-fit-height');
 
 // make scrolling effect on side nav ONLY, i.e. not effected on ambari 
main contents
-$(this).find('.side-nav-menu').on('DOMMouseScroll mousewheel', 
function(ev) {
+$(this).find('.side-nav-menu').on('DOMMouseScroll mousewheel', 
function (ev) {
   var $this = $(this),
-scrollTop = (this).scrollTop,
-scrollHeight = (this).scrollHeight,
+scrollTop = this.scrollTop,
+scrollHeight = this.scrollHeight,
 height = $this.innerHeight(),
 delta = ev.originalEvent.wheelDelta,
 up = delta > 0;
@@ -177,7 +178,9 @@ $(document).ready(function () {
   $dropdownMenu.on('click', function () {
 // some action was triggered, should hide this icon
 var moreIcon = $(this).parent();
-setTimeout(function(){ moreIcon.hide(); }, 1000);
+setTimeout(function () {
+  moreIcon.hide();
+}, 1000);
   });
   $navigationContainer.children('.side-nav-menu').scroll(function () {
 $moreActions.removeClass('open');
@@ -199,6 +202,16 @@ $(document).ready(function () {
 // set the hover effect when collapsed, should show sub-menu on 
hovering
 $subMenuItems.hover(function () {
   $(this).find(subMenuSelector).show();
+  // set sub-menu position
+  var $parent = $(this);
+  var $header = $('.side-nav-header');
+  if (settings.fitHeight) {
+$(this).find(subMenuSelector).css({
+  position: 'fixed',
+  top: $parent.offset().top - $header.offset().top + 'px',
+  left: 50 + 'px'
+});
+  }
 }, function () {
   $(this).find(subMenuSelector).hide();
 });
@@ -209,6 +222,14 @@ $(document).ready(function () {
 });

ambari git commit: AMBARI-20550. Test and fix new Accordions styles on Ambari.(xiwang)

2017-03-27 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk fe4b87c7f -> 1e9cebbed


AMBARI-20550. Test and fix new Accordions styles on Ambari.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1e9cebbe
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1e9cebbe
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1e9cebbe

Branch: refs/heads/trunk
Commit: 1e9cebbed3d3e766ecb5624c7f68763169130640
Parents: fe4b87c
Author: Xi Wang <xiw...@apache.org>
Authored: Thu Mar 23 15:13:45 2017 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Mon Mar 27 13:34:47 2017 -0700

--
 ambari-web/app/styles/application.less  |  5 --
 .../app/styles/theme/bootstrap-ambari.css   | 54 +++-
 .../common/configs/service_config_category.hbs  |  2 +-
 .../app/views/common/configs/services_config.js |  2 +
 .../vendor/scripts/theme/bootstrap-ambari.js| 12 +
 5 files changed, 67 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1e9cebbe/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index 0df1644..23c534b 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -744,11 +744,6 @@ h1 {
 text-decoration: underline;
   }
 }
-.category-name {
-  font-size: 14px;
-  margin-left: 10px;
-  color: #23527c;
-}
   }
 
   .enhanced-config-tab-content

http://git-wip-us.apache.org/repos/asf/ambari/blob/1e9cebbe/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 6a353a2..b289517 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -1014,7 +1014,6 @@ input.radio:checked + label:after {
   line-height: 25px;
   width: 20px;
   text-align: center;
-  line-height: 14px;
   font-size: 14px;
   cursor: pointer;
   vertical-align: middle;
@@ -1296,7 +1295,8 @@ input.radio:checked + label:after {
   display: block;
   display: -webkit-box;
   -webkit-line-clamp: 3;
-  max-height: 47px; /* For firefox */
+  max-height: 47px;
+  /* For firefox */
   -webkit-box-orient: vertical;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -1355,6 +1355,56 @@ input.radio:checked + label:after {
 .modal .modal-content .modal-footer .btn ~ .btn {
   margin-left: 10px;
 }
+.accordion .panel-group,
+.wizard .wizard-body .wizard-content .accordion .panel-group {
+  margin-bottom: 0px;
+}
+.accordion .panel-group .panel,
+.wizard .wizard-body .wizard-content .accordion .panel-group .panel {
+  border-radius: 0px;
+  border: 1px solid;
+  border-color: #ccc transparent;
+  border-bottom: none;
+  margin-top: 0px;
+}
+.accordion .panel-group .panel .panel-heading,
+.wizard .wizard-body .wizard-content .accordion .panel-group .panel 
.panel-heading {
+  height: 50px;
+  padding: 15px 10px;
+  border: 1px solid transparent;
+  background: #fff;
+}
+.accordion .panel-group .panel .panel-heading .panel-title,
+.wizard .wizard-body .wizard-content .accordion .panel-group .panel 
.panel-heading .panel-title {
+  font-family: 'Roboto', sans-serif;
+  font-weight: normal;
+  font-style: normal;
+  line-height: 1;
+  color: #333;
+  color: #1491c1;
+}
+.accordion .panel-group .panel .panel-heading .panel-title > a,
+.wizard .wizard-body .wizard-content .accordion .panel-group .panel 
.panel-heading .panel-title > a {
+  font-size: 18px;
+}
+.accordion .panel-group .panel .panel-heading .panel-title > i,
+.wizard .wizard-body .wizard-content .accordion .panel-group .panel 
.panel-heading .panel-title > i {
+  font-size: 20px;
+}
+.accordion .panel-group .panel .panel-heading:hover,
+.wizard .wizard-body .wizard-content .accordion .panel-group .panel 
.panel-heading:hover {
+  background: #f3faff;
+  border: 1px solid #a7dff2;
+  cursor: pointer;
+}
+.accordion .panel-group .panel .panel-body,
+.wizard .wizard-body .wizard-content .accordion .panel-group .panel 
.panel-body {
+  padding: 30px 20px;
+}
+.accordion .panel-group:last-child .panel,
+.wizard .wizard-body .wizard-content .accordion .panel-group:last-child .panel 
{
+  border-bottom: 1px solid #ccc;
+}
 h1,
 h2,
 h3,

http://git-wip-us.apache.org/repos/asf/ambari/blob/1e9cebbe/ambari-web/app/templates/common/configs/service_config_category.hbs
--
diff --git 
a/ambari-web/app/templates/common/configs/service_config_category.hbs 
b/ambari-web/a

ambari git commit: AMBARI-20464. Side Nav: several issues and adjustments.(xiwang)

2017-03-16 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk 5d629dc1e -> 9ed8c72f7


AMBARI-20464. Side Nav: several issues and adjustments.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9ed8c72f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9ed8c72f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9ed8c72f

Branch: refs/heads/trunk
Commit: 9ed8c72f758380003853ba477f623c192b806896
Parents: 5d629dc
Author: Xi Wang <xiw...@apache.org>
Authored: Wed Mar 15 11:26:11 2017 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Thu Mar 16 14:25:41 2017 -0700

--
 .../app/styles/theme/bootstrap-ambari.css   |  7 --
 .../vendor/scripts/theme/bootstrap-ambari.js| 26 
 2 files changed, 31 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9ed8c72f/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 98606e9..6a353a2 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -1009,8 +1009,11 @@ input.radio:checked + label:after {
 .navigation-bar-container ul.nav.side-nav-footer .more-actions {
   display: none;
   position: absolute;
-  top: 20px;
-  right: 35px;
+  top: 14px;
+  right: 33px;
+  line-height: 25px;
+  width: 20px;
+  text-align: center;
   line-height: 14px;
   font-size: 14px;
   cursor: pointer;

http://git-wip-us.apache.org/repos/asf/ambari/blob/9ed8c72f/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
--
diff --git a/ambari-web/vendor/scripts/theme/bootstrap-ambari.js 
b/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
index b6bff5c..f837ef5 100644
--- a/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
+++ b/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
@@ -34,6 +34,32 @@
 
   if (settings.fitHeight) {
 $(this).addClass('navigation-bar-fit-height');
+
+// make scrolling effect on side nav ONLY, i.e. not effected on ambari 
main contents
+$(this).find('.side-nav-menu').on('DOMMouseScroll mousewheel', 
function(ev) {
+  var $this = $(this),
+scrollTop = (this).scrollTop,
+scrollHeight = (this).scrollHeight,
+height = $this.innerHeight(),
+delta = ev.originalEvent.wheelDelta,
+up = delta > 0;
+  var prevent = function prevent() {
+ev.stopPropagation();
+ev.preventDefault();
+ev.returnValue = false;
+return false;
+  };
+
+  if (!up && -delta > scrollHeight - height - scrollTop) {
+// Scrolling down, but this will take us past the bottom.
+$this.scrollTop(scrollHeight);
+return prevent();
+  } else if (up && delta > scrollTop) {
+// Scrolling up, but this will take us past the top.
+$this.scrollTop(0);
+return prevent();
+  }
+});
   }
 
   //set main content left margin based on the width of side-nav

ambari git commit: AMBARI-20405. Side Nav: several issues tested on IE 11 .(XIWANG)

2017-03-10 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk b69ac43a6 -> 01ef69524


AMBARI-20405. Side Nav: several issues tested on IE 11 .(XIWANG)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/01ef6952
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/01ef6952
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/01ef6952

Branch: refs/heads/trunk
Commit: 01ef69524317f87b4223f9b0c9b26058ae6a73bd
Parents: b69ac43
Author: Xi Wang <xiw...@apache.org>
Authored: Fri Mar 10 16:27:39 2017 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Fri Mar 10 16:27:47 2017 -0800

--
 ambari-web/app/styles/theme/bootstrap-ambari.css| 1 +
 ambari-web/vendor/scripts/theme/bootstrap-ambari.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/01ef6952/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 3adcbe9..a0b24e5 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -750,6 +750,7 @@ input.radio:checked + label:after {
   width: 190px;
   background-color: #323544;
   padding: 0;
+  -ms-overflow-style: none;
 }
 .navigation-bar-container ul.nav.side-nav-header {
   width: 190px;

http://git-wip-us.apache.org/repos/asf/ambari/blob/01ef6952/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
--
diff --git a/ambari-web/vendor/scripts/theme/bootstrap-ambari.js 
b/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
index c193f7f..e75bd6b 100644
--- a/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
+++ b/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
@@ -49,7 +49,7 @@
 $navigationContainer.find('li a').each(function (index, link) {
   var $link = $(link);
   var href = $link.attr('data-href') || $link.attr('href');
-  if (path.indexOf(href) !== -1 && !['', '#'].includes(href)) {
+  if (path.indexOf(href) !== -1 && !['', '#'].contains(href)) {
 $link.parent().addClass('active');
   } else {
 $link.parent().removeClass('active');

ambari git commit: AMBARI-20160.Side Nav: multiple fixes after integrated to trunk.(xiwang)

2017-02-23 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk cce9489c2 -> 9c5f097a1


AMBARI-20160.Side Nav: multiple fixes after integrated to trunk.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9c5f097a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9c5f097a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9c5f097a

Branch: refs/heads/trunk
Commit: 9c5f097a10c19e38fa4920067afb351449c1d5e4
Parents: cce9489
Author: Xi Wang <xiw...@apache.org>
Authored: Thu Feb 23 16:25:45 2017 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Thu Feb 23 17:29:31 2017 -0800

--
 ambari-web/app/styles/application.less |  4 
 ambari-web/app/styles/theme/bootstrap-ambari.css   |  5 +++--
 ambari-web/app/styles/top-nav.less |  2 +-
 ambari-web/app/templates/main/admin.hbs| 17 ++---
 .../vendor/scripts/theme/bootstrap-ambari.js   |  6 +++---
 5 files changed, 13 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9c5f097a/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index cb94a54..8cb9388 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -350,6 +350,10 @@ footer {
   background: rgba(233,233,233,0.3);
 }
 
+.side-nav-menu::-webkit-scrollbar {
+  display: none;
+}
+
 #content {
   padding: 15px 0;
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/9c5f097a/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 d88a1ed..3adcbe9 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -1273,8 +1273,8 @@ input.radio:checked + label:after {
 }
 #notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table 
tbody td.content .name {
   font-weight: bold;
-  font-size: 12px;
-  color: #666;
+  font-size: 14px;
+  color: #333;
   margin-bottom: 5px;
 }
 #notifications-dropdown.dropdown-menu .notifications-body .table.alerts-table 
tbody td.content .description {
@@ -1284,6 +1284,7 @@ input.radio:checked + label:after {
   display: block;
   display: -webkit-box;
   -webkit-line-clamp: 3;
+  max-height: 47px; /* For firefox */
   -webkit-box-orient: vertical;
   overflow: hidden;
   text-overflow: ellipsis;

http://git-wip-us.apache.org/repos/asf/ambari/blob/9c5f097a/ambari-web/app/styles/top-nav.less
--
diff --git a/ambari-web/app/styles/top-nav.less 
b/ambari-web/app/styles/top-nav.less
index 8c373ce..4ad6c21 100644
--- a/ambari-web/app/styles/top-nav.less
+++ b/ambari-web/app/styles/top-nav.less
@@ -64,7 +64,7 @@
 
   .numberCircle {
 border-radius: 50%;
-width: 20px;
+min-width: 20px;
 height: 20px;
 padding: 0px 0px;
 color: @top-nav-ops-count-color;

http://git-wip-us.apache.org/repos/asf/ambari/blob/9c5f097a/ambari-web/app/templates/main/admin.hbs
--
diff --git a/ambari-web/app/templates/main/admin.hbs 
b/ambari-web/app/templates/main/admin.hbs
index d1dfe74..da23c78 100644
--- a/ambari-web/app/templates/main/admin.hbs
+++ b/ambari-web/app/templates/main/admin.hbs
@@ -17,20 +17,7 @@
 }}
 
 
-  
-  
-{{#each category in view.categories}}
-  {{#view view.NavItemView itemBinding="category.name" 
elementIdBinding="category.name"}}
-  {{category.label}}
-  {{/view}}
-{{/each}}
-  
-  
-  
-
-  
-{{outlet}}
-  
-
+  
+{{outlet}}
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/9c5f097a/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
--
diff --git a/ambari-web/vendor/scripts/theme/bootstrap-ambari.js 
b/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
index 1c81aeb..c193f7f 100644
--- a/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
+++ b/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
@@ -128,10 +128,10 @@
 if (settings.fitHeight) {
   // set actions submenu position
   var $moreIcon = $(this);
+  var $header = $('.side-nav-header');
   $moreIcon.children('.dropdown-menu').css('position', 'fixed');
-  var offset = $moreIcon.offset();
-  $moreIcon.children('.dropdown-menu'

[04/14] ambari git commit: AMBARI-19803. Side Nav: Long menu should be visible if longer than window height.(xiwang)

2017-02-21 Thread xiwang

AMBARI-19803. Side Nav: Long menu should be visible if longer than window 
height.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7691d94e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7691d94e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7691d94e

Branch: refs/heads/trunk
Commit: 7691d94ec4092033346e41339dd2945cfbf0a588
Parents: 9a70640
Author: Xi Wang <xiw...@apache.org>
Authored: Tue Jan 31 13:02:54 2017 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Fri Feb 3 15:51:20 2017 -0800

--
 ambari-web/app/styles/side_navigation.less  | 14 --
 .../app/styles/theme/bootstrap-ambari.css   | 29 ++--
 .../app/templates/main/side-menu-item.hbs   |  2 +-
 ambari-web/app/views/main/menu.js   |  2 +-
 4 files changed, 39 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7691d94e/ambari-web/app/styles/side_navigation.less
--
diff --git a/ambari-web/app/styles/side_navigation.less 
b/ambari-web/app/styles/side_navigation.less
index 5e188ac..48b8699 100644
--- a/ambari-web/app/styles/side_navigation.less
+++ b/ambari-web/app/styles/side_navigation.less
@@ -21,11 +21,19 @@
 #side-nav {
   position: fixed;
   top: 0px;
-  bottom: auto;
+  bottom: 0px;
   z-index: 2079;
-  padding-bottom: px;
-  margin-bottom: -px;
 
+  .side-nav-header {
+position: absolute;
+top: 0px;
+  }
+  .side-nav-menu {
+position: fixed;
+top: 55px;
+bottom: 50px;
+overflow-y: auto;
+  }
   .side-nav-footer {
 position: fixed;
 bottom: 0px;

http://git-wip-us.apache.org/repos/asf/ambari/blob/7691d94e/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 c3998a5..d3e6698 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -753,10 +753,13 @@ input.radio:checked + label:after {
   padding: 0px 0px;
   overflow: hidden;
 }
+.navigation-bar-container ul.nav.side-nav-header {
+  width: 190px;
+}
 .navigation-bar-container ul.nav.side-nav-header li.navigation-header {
   background: #313d54;
   padding: 15px 5px 15px 25px;
-  min-height: 50px;
+  height: 55px;
 }
 .navigation-bar-container ul.nav.side-nav-header li.navigation-header > 
a.ambari-logo {
   padding: 0px;
@@ -818,6 +821,11 @@ input.radio:checked + label:after {
   background: #404351;
   color: #fff;
 }
+.navigation-bar-container ul.nav.side-nav-menu,
+.navigation-bar-container ul.nav.side-nav-footer {
+  background-color: #323544;
+  width: 190px;
+}
 .navigation-bar-container ul.nav.side-nav-menu li,
 .navigation-bar-container ul.nav.side-nav-footer li {
   padding: 0px;
@@ -860,6 +868,7 @@ input.radio:checked + label:after {
 .navigation-bar-container ul.nav.side-nav-menu li.navigation-footer,
 .navigation-bar-container ul.nav.side-nav-footer li.navigation-footer {
   background: #313d54;
+  height: 50px;
 }
 .navigation-bar-container ul.nav.side-nav-menu li.navigation-footer a 
.navigation-icon,
 .navigation-bar-container ul.nav.side-nav-footer li.navigation-footer a 
.navigation-icon {
@@ -950,6 +959,9 @@ input.radio:checked + label:after {
   width: 50px;
   overflow: visible;
 }
+.navigation-bar-container.collapsed ul.nav.side-nav-header {
+  width: 50px;
+}
 .navigation-bar-container.collapsed ul.nav.side-nav-header 
li.navigation-header {
   padding: 15px 0px 15px 17px;
 }
@@ -958,6 +970,10 @@ input.radio:checked + label:after {
 .navigation-bar-container.collapsed ul.nav.side-nav-header 
li.navigation-header .dropdown-menu {
   display: none;
 }
+.navigation-bar-container.collapsed ul.nav.side-nav-menu,
+.navigation-bar-container.collapsed ul.nav.side-nav-footer {
+  width: 50px;
+}
 .navigation-bar-container.collapsed ul.nav.side-nav-menu li a,
 .navigation-bar-container.collapsed ul.nav.side-nav-footer li a {
   padding: 15px 0px 15px 17px;
@@ -978,9 +994,16 @@ input.radio:checked + label:after {
 .navigation-bar-container.collapsed ul.nav.side-nav-footer li ul.sub-menu {
   display: none;
   width: 190px;
-  position: absolute;
+  position: fixed;
   left: 50px;
-  top: 0px;
+}
+.navigation-bar-container.collapsed ul.nav.side-nav-menu li ul.admin-submenu,
+.navigation-bar-container.collapsed ul.nav.side-nav-footer li ul.admin-submenu 
{
+  top: 249px;
+}
+.navigation-bar-container.collapsed ul.nav.side-nav-menu li 
ul.services-submenu,
+.navigation-bar-container.collapsed ul.nav.side-nav-footer li 
ul.services-submenu {
+  top: 103px;
 }
 .navigation-bar-container.collapsed ul.na

[14/14] ambari git commit: Merge Side-Navigation-feature-branch 1

2017-02-21 Thread xiwang

Merge Side-Navigation-feature-branch 1


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4ff93b0a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4ff93b0a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4ff93b0a

Branch: refs/heads/trunk
Commit: 4ff93b0a291745ce18d36a73b1698fdea55539a3
Parents: b986a3c 65d9017
Author: Xi Wang 
Authored: Tue Feb 21 16:55:36 2017 -0800
Committer: Xi Wang 
Committed: Tue Feb 21 16:55:36 2017 -0800

--
 .../main/resources/ui/admin-web/app/index.html  |   2 +-
 ambari-web/app/assets/data/clusters/info.json   |  11 +
 ambari-web/app/assets/img/ambari-Logo.png   | Bin 0 -> 2779 bytes
 ambari-web/app/assets/img/logo-white.png| Bin 4538 -> 0 bytes
 ambari-web/app/config.js|   6 +-
 .../main/alert_definitions_controller.js|  14 +-
 .../main/alerts/alert_instances_controller.js   | 151 -
 ambari-web/app/messages.js  |   5 +
 ambari-web/app/routes/main.js   |   4 +
 ambari-web/app/styles/application.less  |  14 +-
 ambari-web/app/styles/common.less   |   7 +-
 .../app/styles/theme/bootstrap-ambari.css   | 634 ++-
 ambari-web/app/styles/top-nav.less  | 204 ++
 ambari-web/app/templates/application.hbs| 226 ---
 .../main/alerts/alert_notifications_popup.hbs   |  69 ++
 ambari-web/app/templates/main/dashboard.hbs |  26 +-
 ambari-web/app/templates/main/menu.hbs  |  23 -
 ambari-web/app/templates/main/menu_item.hbs |  50 --
 ambari-web/app/templates/main/service.hbs   |   6 +-
 .../main/service/all_services_actions.hbs   | 100 ++-
 .../app/templates/main/service/menu_item.hbs|   4 +-
 .../app/templates/main/side-menu-item.hbs   |  53 ++
 ambari-web/app/views.js |   1 +
 ambari-web/app/views/application.js | 125 +++-
 .../main/alerts/alert_instances_popup_view.js   | 190 ++
 ambari-web/app/views/main/menu.js   | 179 --
 .../views/main/service/all_services_actions.js  |   2 +
 ambari-web/app/views/main/service/menu.js   | 104 +--
 ambari-web/brunch-config.js |   3 +-
 .../alerts/alert_instances_controller_test.js   |  33 -
 ambari-web/test/views/main/menu_test.js |   2 +-
 .../vendor/scripts/theme/bootstrap-ambari.js| 204 ++
 32 files changed, 1692 insertions(+), 760 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4ff93b0a/ambari-web/app/messages.js
--

http://git-wip-us.apache.org/repos/asf/ambari/blob/4ff93b0a/ambari-web/app/routes/main.js
--

http://git-wip-us.apache.org/repos/asf/ambari/blob/4ff93b0a/ambari-web/app/styles/application.less
--

http://git-wip-us.apache.org/repos/asf/ambari/blob/4ff93b0a/ambari-web/app/views.js
--

http://git-wip-us.apache.org/repos/asf/ambari/blob/4ff93b0a/ambari-web/app/views/main/service/menu.js
--

[09/14] ambari git commit: AMBARI-20036. Side Nav: implement the Services Actions .(xiwang)

2017-02-21 Thread xiwang

AMBARI-20036. Side Nav: implement the Services Actions .(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a12c3efa
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a12c3efa
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a12c3efa

Branch: refs/heads/trunk
Commit: a12c3efa95792b97ee85545e08b09f9e7c215baa
Parents: 52093d1
Author: Xi Wang <xiw...@apache.org>
Authored: Thu Feb 16 15:20:27 2017 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Thu Feb 16 15:21:33 2017 -0800

--
 .../app/styles/theme/bootstrap-ambari.css   | 20 ++---
 .../main/service/all_services_actions.hbs   | 94 ++--
 .../app/templates/main/side-menu-item.hbs   |  2 +-
 .../views/main/service/all_services_actions.js  |  2 +
 .../vendor/scripts/theme/bootstrap-ambari.js| 40 ++---
 5 files changed, 86 insertions(+), 72 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a12c3efa/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 700ed1d..8fd301d 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -967,8 +967,8 @@ input.radio:checked + label:after {
 .navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) 
> a .toggle-icon {
   color: #fff;
 }
-.navigation-bar-container ul.nav.side-nav-menu .all-services-actions,
-.navigation-bar-container ul.nav.side-nav-footer .all-services-actions {
+.navigation-bar-container ul.nav.side-nav-menu .more-actions,
+.navigation-bar-container ul.nav.side-nav-footer .more-actions {
   display: none;
   position: absolute;
   top: 20px;
@@ -979,16 +979,16 @@ input.radio:checked + label:after {
   vertical-align: middle;
   color: #fff;
 }
-.navigation-bar-container ul.nav.side-nav-menu .all-services-actions 
.dropdown-menu > li > a,
-.navigation-bar-container ul.nav.side-nav-footer .all-services-actions 
.dropdown-menu > li > a {
+.navigation-bar-container ul.nav.side-nav-menu .more-actions .dropdown-menu > 
li > a,
+.navigation-bar-container ul.nav.side-nav-footer .more-actions .dropdown-menu 
> li > a {
   color: #666;
 }
-.navigation-bar-container ul.nav.side-nav-menu .all-services-actions 
.dropdown-menu > li > a i,
-.navigation-bar-container ul.nav.side-nav-footer .all-services-actions 
.dropdown-menu > li > a i {
+.navigation-bar-container ul.nav.side-nav-menu .more-actions .dropdown-menu > 
li > a i,
+.navigation-bar-container ul.nav.side-nav-footer .more-actions .dropdown-menu 
> li > a i {
   color: #666;
 }
-.navigation-bar-container ul.nav.side-nav-menu .all-services-actions 
.dropdown-menu > li > a:hover,
-.navigation-bar-container ul.nav.side-nav-footer .all-services-actions 
.dropdown-menu > li > a:hover {
+.navigation-bar-container ul.nav.side-nav-menu .more-actions .dropdown-menu > 
li > a:hover,
+.navigation-bar-container ul.nav.side-nav-footer .more-actions .dropdown-menu 
> li > a:hover {
   background: #f5f5f5;
 }
 .navigation-bar-container .nav-pills > li.active > a,
@@ -1075,8 +1075,8 @@ input.radio:checked + label:after {
 .navigation-bar-container.collapsed ul.nav.side-nav-footer 
li.submenu-li.active > a {
   padding-left: 19px;
 }
-.navigation-bar-container.collapsed ul.nav.side-nav-menu .all-services-actions,
-.navigation-bar-container.collapsed ul.nav.side-nav-footer 
.all-services-actions {
+.navigation-bar-container.collapsed ul.nav.side-nav-menu .more-actions,
+.navigation-bar-container.collapsed ul.nav.side-nav-footer .more-actions {
   display: none;
 }
 .navigation-bar-fit-height {

http://git-wip-us.apache.org/repos/asf/ambari/blob/a12c3efa/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 192400a..3e87cb2 100644
--- a/ambari-web/app/templates/main/service/all_services_actions.hbs
+++ b/ambari-web/app/templates/main/service/all_services_actions.hbs
@@ -17,53 +17,51 @@
 }}
 
 {{#isAuthorized "SERVICE.START_STOP, SERVICE.ADD_DELETE_SERVICES"}}
-  
-
-  
-
-
-  {{#isAuthorized "SERVICE.ADD_DELETE_SERVICES"}}
-
-  
- {{t 
services.service.add}}
-
-  {{/isAuthorized}}
-  {{#isAuthorized "SERVICE.START_STOP"}}
-
-
-  
-
-{{t s

[07/14] ambari git commit: AMBARI-20036. UX: design new Services Actions .(xiwang)

2017-02-21 Thread xiwang

AMBARI-20036. UX: design new Services Actions .(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4c08cead
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4c08cead
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4c08cead

Branch: refs/heads/trunk
Commit: 4c08ceadac683aedf8e7feae077b3cf91724b8a3
Parents: d8af6ab
Author: Xi Wang <xiw...@apache.org>
Authored: Wed Feb 15 17:45:49 2017 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Wed Feb 15 18:30:39 2017 -0800

--
 .../app/styles/theme/bootstrap-ambari.css   | 116 +--
 ambari-web/app/templates/application.hbs|   4 +-
 ambari-web/app/templates/main/dashboard.hbs |  26 ++---
 ambari-web/app/templates/main/service.hbs   |   6 +-
 .../main/service/all_services_actions.hbs   | 104 -
 .../app/templates/main/side-menu-item.hbs   |   7 +-
 .../vendor/scripts/theme/bootstrap-ambari.js|  71 +++-
 7 files changed, 217 insertions(+), 117 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4c08cead/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 36a63a3..d981fde 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -750,7 +750,6 @@ input.radio:checked + label:after {
   width: 190px;
   background-color: #323544;
   padding: 0;
-  overflow: hidden;
 }
 .navigation-bar-container ul.nav.side-nav-header {
   width: 190px;
@@ -835,8 +834,12 @@ input.radio:checked + label:after {
   padding: 0;
   margin: 0;
 }
-.navigation-bar-container ul.nav.side-nav-menu li a,
-.navigation-bar-container ul.nav.side-nav-footer li a {
+.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer > a,
+.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer > a,
+.navigation-bar-container ul.nav.side-nav-menu li.submenu-li > a,
+.navigation-bar-container ul.nav.side-nav-footer li.submenu-li > a,
+.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li > a,
+.navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li > a {
   padding: 15px 5px 15px 25px;
   display: table-cell;
   vertical-align: middle;
@@ -845,8 +848,12 @@ input.radio:checked + label:after {
   -moz-border-radius: 0;
   -webkit-border-radius: 0;
 }
-.navigation-bar-container ul.nav.side-nav-menu li a .navigation-menu-item,
-.navigation-bar-container ul.nav.side-nav-footer li a .navigation-menu-item {
+.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer > a 
.navigation-menu-item,
+.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer > a 
.navigation-menu-item,
+.navigation-bar-container ul.nav.side-nav-menu li.submenu-li > a 
.navigation-menu-item,
+.navigation-bar-container ul.nav.side-nav-footer li.submenu-li > a 
.navigation-menu-item,
+.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li > a 
.navigation-menu-item,
+.navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li > a 
.navigation-menu-item {
   font-family: 'Roboto', sans-serif;
   font-weight: normal;
   font-style: normal;
@@ -856,14 +863,22 @@ input.radio:checked + label:after {
   color: #b8bec4;
   padding-left: 8px;
 }
-.navigation-bar-container ul.nav.side-nav-menu li a .navigation-icon,
-.navigation-bar-container ul.nav.side-nav-footer li a .navigation-icon {
+.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer > a 
.navigation-icon,
+.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer > a 
.navigation-icon,
+.navigation-bar-container ul.nav.side-nav-menu li.submenu-li > a 
.navigation-icon,
+.navigation-bar-container ul.nav.side-nav-footer li.submenu-li > a 
.navigation-icon,
+.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li > a 
.navigation-icon,
+.navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li > a 
.navigation-icon {
   line-height: 18px;
   font-size: 18px;
   color: #b8bec4;
 }
-.navigation-bar-container ul.nav.side-nav-menu li a .toggle-icon,
-.navigation-bar-container ul.nav.side-nav-footer li a .toggle-icon {
+.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer > a 
.toggle-icon,
+.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer > a 
.toggle-icon,
+.navigation-bar-container ul.nav.side-nav-menu li.submenu-li > a .toggle-icon,
+.navigation-bar-container ul.nav.side-nav-footer li.submenu-li > a 
.toggle-icon,
+.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li > a .toggle-icon,
+.navigation-bar-c

[13/14] ambari git commit: AMBARI-20036. Side Nav: implement the Services Actions - 2.(xiwang)

2017-02-21 Thread xiwang

AMBARI-20036. Side Nav: implement the Services Actions - 2.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/65d90175
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/65d90175
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/65d90175

Branch: refs/heads/trunk
Commit: 65d901756c2b3bfb621bfd028094ffdbdcfca2fa
Parents: d7e9ef2
Author: Xi Wang <xiw...@apache.org>
Authored: Tue Feb 21 16:34:21 2017 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Tue Feb 21 16:34:21 2017 -0800

--
 ambari-web/vendor/scripts/theme/bootstrap-ambari.js | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/65d90175/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
--
diff --git a/ambari-web/vendor/scripts/theme/bootstrap-ambari.js 
b/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
index 77973a9..1c81aeb 100644
--- a/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
+++ b/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
@@ -126,6 +126,7 @@
   });
   $moreActions.on('click', function () {
 if (settings.fitHeight) {
+  // set actions submenu position
   var $moreIcon = $(this);
   $moreIcon.children('.dropdown-menu').css('position', 'fixed');
   var offset = $moreIcon.offset();
@@ -133,8 +134,10 @@
   $moreIcon.children('.dropdown-menu').css('left', offset.left);
 }
   });
-  $moreActions.children('.dropdown-menu').mouseleave(function () {
-$(this).parent().removeClass('open');
+  $moreActions.children('.dropdown-menu').on('click', function () {
+// some action was triggered, should hide this icon
+var moreIcon = $(this).parent();
+setTimeout(function(){ moreIcon.hide(); }, 1000);
   });
   $navigationContainer.children('.side-nav-menu').scroll(function () {
 $moreActions.removeClass('open');

[08/14] ambari git commit: AMBARI-20039. navigation bar interactiveness: clicking on an element should make it active (onechiporenko)

2017-02-21 Thread xiwang

AMBARI-20039. navigation bar interactiveness: clicking on an element should 
make it active (onechiporenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/52093d15
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/52093d15
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/52093d15

Branch: refs/heads/trunk
Commit: 52093d1518493bec21a5ea4662964dab5afbb50a
Parents: 4c08cea
Author: Oleg Nechiporenko 
Authored: Thu Feb 16 12:45:45 2017 +0200
Committer: Oleg Nechiporenko 
Committed: Thu Feb 16 12:45:45 2017 +0200

--
 .../app/styles/theme/bootstrap-ambari.css   | 24 +++
 ambari-web/app/templates/application.hbs|  2 +-
 .../app/templates/main/service/menu_item.hbs|  2 +-
 .../app/templates/main/side-menu-item.hbs   |  6 +-
 ambari-web/app/views/main/menu.js   | 71 ++--
 .../vendor/scripts/theme/bootstrap-ambari.js|  4 ++
 6 files changed, 55 insertions(+), 54 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/52093d15/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 d981fde..700ed1d 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -946,25 +946,25 @@ input.radio:checked + label:after {
 .navigation-bar-container ul.nav.side-nav-footer li > a:hover .submenu-item {
   color: #fff;
 }
-.navigation-bar-container ul.nav.side-nav-menu 
li.active:not(.no-active-effect),
-.navigation-bar-container ul.nav.side-nav-footer 
li.active:not(.no-active-effect) {
+.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu),
+.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) {
   background: #404351;
   cursor: pointer;
 }
-.navigation-bar-container ul.nav.side-nav-menu 
li.active:not(.no-active-effect) > a,
-.navigation-bar-container ul.nav.side-nav-footer 
li.active:not(.no-active-effect) > a {
+.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu) > 
a,
+.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) 
> a {
   border-left: 6px solid #3fae2a;
   padding-left: 19px;
   color: #fff;
 }
-.navigation-bar-container ul.nav.side-nav-menu 
li.active:not(.no-active-effect) > a .navigation-menu-item,
-.navigation-bar-container ul.nav.side-nav-footer 
li.active:not(.no-active-effect) > a .navigation-menu-item,
-.navigation-bar-container ul.nav.side-nav-menu 
li.active:not(.no-active-effect) > a .submenu-item,
-.navigation-bar-container ul.nav.side-nav-footer 
li.active:not(.no-active-effect) > a .submenu-item,
-.navigation-bar-container ul.nav.side-nav-menu 
li.active:not(.no-active-effect) > a .navigation-icon,
-.navigation-bar-container ul.nav.side-nav-footer 
li.active:not(.no-active-effect) > a .navigation-icon,
-.navigation-bar-container ul.nav.side-nav-menu 
li.active:not(.no-active-effect) > a .toggle-icon,
-.navigation-bar-container ul.nav.side-nav-footer 
li.active:not(.no-active-effect) > a .toggle-icon {
+.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu) > 
a .navigation-menu-item,
+.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) 
> a .navigation-menu-item,
+.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu) > 
a .submenu-item,
+.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) 
> a .submenu-item,
+.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu) > 
a .navigation-icon,
+.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) 
> a .navigation-icon,
+.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu) > 
a .toggle-icon,
+.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) 
> a .toggle-icon {
   color: #fff;
 }
 .navigation-bar-container ul.nav.side-nav-menu .all-services-actions,

http://git-wip-us.apache.org/repos/asf/ambari/blob/52093d15/ambari-web/app/templates/application.hbs
--
diff --git a/ambari-web/app/templates/application.hbs 
b/ambari-web/app/templates/application.hbs
index ce0e4e4..573d92b 100644
--- a/ambari-web/app/templates/application.hbs
+++ b/ambari-web/app/templates/application.hbs
@@ -54,7 +54,7 @@
   {{view App.MainSideMenuView}}
   
 
-  
+  
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/52093d15/ambari-web/app/templates/main/service/menu_item.hbs

[12/14] ambari git commit: AMBARI-20073. Side Nav: multiple changes based on feedback from UX - 2.(xiwang)

2017-02-21 Thread xiwang

AMBARI-20073. Side Nav: multiple changes based on feedback from UX - 2.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d7e9ef21
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d7e9ef21
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d7e9ef21

Branch: refs/heads/trunk
Commit: d7e9ef21dfa7bca1b91d94398b615f41908983c7
Parents: 36a01d4
Author: Xi Wang <xiw...@apache.org>
Authored: Tue Feb 21 14:53:45 2017 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Tue Feb 21 14:53:52 2017 -0800

--
 ambari-web/app/styles/application.less  |  1 -
 .../app/styles/theme/bootstrap-ambari.css   | 14 +++-
 ambari-web/app/templates/application.hbs| 76 ++--
 .../vendor/scripts/theme/bootstrap-ambari.js|  9 +++
 4 files changed, 59 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d7e9ef21/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index befbf5a..b2a7706 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -69,7 +69,6 @@ ul.typeahead.dropdown-menu {
   overflow: visible;
   padding-bottom: @footer-height;
   min-width: 980px;
-  margin-left: @side-navigation-width;
 
.clock-view {
  top: 10px;

http://git-wip-us.apache.org/repos/asf/ambari/blob/d7e9ef21/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 5297c77..af78310 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -823,7 +823,6 @@ input.radio:checked + label:after {
 .navigation-bar-container ul.nav.side-nav-footer li.submenu-li > a,
 .navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li > a,
 .navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li > a {
-  padding: 15px 5px 15px 25px;
   display: table-cell;
   vertical-align: middle;
   width: 190px;
@@ -868,6 +867,16 @@ input.radio:checked + label:after {
   color: #b8bec4;
   padding: 3px 5px 3px 10px;
 }
+.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer > a,
+.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer > a,
+.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li > a,
+.navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li > a {
+  padding: 15px 5px 15px 25px;
+}
+.navigation-bar-container ul.nav.side-nav-menu li.submenu-li > a,
+.navigation-bar-container ul.nav.side-nav-footer li.submenu-li > a {
+  padding: 10px 5px 10px 25px;
+}
 .navigation-bar-container ul.nav.side-nav-menu li.navigation-footer,
 .navigation-bar-container ul.nav.side-nav-footer li.navigation-footer {
   background: #313d54;
@@ -1005,6 +1014,7 @@ input.radio:checked + label:after {
 .navigation-bar-container ul.nav.side-nav-menu .menu-item-name,
 .navigation-bar-container ul.nav.side-nav-footer .menu-item-name {
   display: inline-block;
+  vertical-align: bottom;
   max-width: 94px;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -1068,7 +1078,7 @@ input.radio:checked + label:after {
 }
 .navigation-bar-container.collapsed ul.nav.side-nav-menu li.submenu-li > a,
 .navigation-bar-container.collapsed ul.nav.side-nav-footer li.submenu-li > a {
-  padding: 15px 5px 15px 25px;
+  padding: 10px 5px 10px 25px;
   width: 190px;
 }
 .navigation-bar-container.collapsed ul.nav.side-nav-menu li.active,

http://git-wip-us.apache.org/repos/asf/ambari/blob/d7e9ef21/ambari-web/app/templates/application.hbs
--
diff --git a/ambari-web/app/templates/application.hbs 
b/ambari-web/app/templates/application.hbs
index 573d92b..9d6db78 100644
--- a/ambari-web/app/templates/application.hbs
+++ b/ambari-web/app/templates/application.hbs
@@ -21,46 +21,46 @@
 {{/if}}
 
 {{#if App.router.mainController.isClusterDataLoaded}}
-
-  
-  
-
-  {{#if enableLinks}}
-
-  
-
-  {{else}}
-
-  
-
-  {{/if}}
-  
-
-  {{t 
app.name}}
-  
+  
+
+
+  
+{{#if enableLinks}}
+  
+
+  
+{{else}}
+  
+
+  
+{{/if}}
+
+  
+{{t 
app.name}}
+
+  
+  
+{{#if view.views.length}}
+  {{#each item in view.views}}
+{{item.label}}
+  {{/ea

[01/14] ambari git commit: AMBARI-19857. Side Nav: create clickable breadcrumbs on top showing current path.(xiwang)

2017-02-21 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk b986a3c2d -> 4ff93b0a2


AMBARI-19857. Side Nav: create clickable breadcrumbs on top showing current 
path.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cc4c04e5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cc4c04e5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cc4c04e5

Branch: refs/heads/trunk
Commit: cc4c04e5b35e2cd798f38b0740214f96b128215e
Parents: b50fbdb
Author: Xi Wang <xiw...@apache.org>
Authored: Thu Feb 2 17:50:05 2017 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Fri Feb 3 15:51:20 2017 -0800

--
 ambari-web/app/routes/main.js   |   4 +
 ambari-web/app/styles/top-nav.less  |  14 +++
 ambari-web/app/templates/application.hbs|   7 ++
 .../app/templates/main/side-menu-item.hbs   |   3 -
 ambari-web/app/views/application.js | 102 +++
 5 files changed, 127 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/cc4c04e5/ambari-web/app/routes/main.js
--
diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js
index 354198b..5083cec 100644
--- a/ambari-web/app/routes/main.js
+++ b/ambari-web/app/routes/main.js
@@ -407,6 +407,7 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
 route: '/',
 connectOutlets: function (router, context) {
   router.set('mainAdminController.category', "kerberos");
+  router.set('mainAdminController.categoryLabel', 
Em.I18n.t('common.kerberos'));
   router.get('mainAdminController').connectOutlet('mainAdminKerberos');
 }
   }),
@@ -501,6 +502,7 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
   route: '/stack',
   connectOutlets: function (router) {
 router.set('mainAdminController.category', "stackAndUpgrade");
+router.set('mainAdminController.categoryLabel', 
Em.I18n.t('admin.stackUpgrade.title'));
 
router.get('mainAdminController').connectOutlet('mainAdminStackAndUpgrade');
   },
 
@@ -555,6 +557,7 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
   },
   connectOutlets: function (router) {
 router.set('mainAdminController.category', "adminServiceAccounts");
+router.set('mainAdminController.categoryLabel', 
Em.I18n.t('common.serviceAccounts'));
 
router.get('mainAdminController').connectOutlet('mainAdminServiceAccounts');
   }
 }),
@@ -568,6 +571,7 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
   },
   connectOutlets: function (router) {
 router.set('mainAdminController.category', "serviceAutoStart");
+router.set('mainAdminController.categoryLabel', 
Em.I18n.t('admin.serviceAutoStart.title'));
 
router.get('mainAdminController').connectOutlet('mainAdminServiceAutoStart');
   },
   exitRoute: function (router, context, callback) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/cc4c04e5/ambari-web/app/styles/top-nav.less
--
diff --git a/ambari-web/app/styles/top-nav.less 
b/ambari-web/app/styles/top-nav.less
index 747caab..d1c723a 100644
--- a/ambari-web/app/styles/top-nav.less
+++ b/ambari-web/app/styles/top-nav.less
@@ -24,6 +24,20 @@
 border-top: 1px solid #e3e3e3;
 border-bottom: 1px solid #e3e3e3;
 
+.navbar-header {
+  padding: 15px 15px 15px 0px;
+  margin-top: 5px;
+  font-size: 20px;
+  a {
+color: #313D54;
+cursor: pointer;
+  }
+  a.disabled {
+cursor: default;
+color: #ccc;
+  }
+}
+
 .navbar-text.brand-wrapper {
   color: @top-nav-brand-color;
   font-size: 16px;

http://git-wip-us.apache.org/repos/asf/ambari/blob/cc4c04e5/ambari-web/app/templates/application.hbs
--
diff --git a/ambari-web/app/templates/application.hbs 
b/ambari-web/app/templates/application.hbs
index 99b65b6..f18d314 100644
--- a/ambari-web/app/templates/application.hbs
+++ b/ambari-web/app/templates/application.hbs
@@ -64,6 +64,13 @@
 
   
 
+  {{#if view.breadcrumbs.length}}
+{{#each item in view.breadcrumbs}}
+  
+{{{item.label}}}
+  {{#unless item.lastItem}}/{{/unless}}
+{{/each}}
+  {{/if}}
 
 
 {{! right offset. don't delete me! }}

http://git-wip-us.apache.org/repos/asf/ambari/blob/cc4c04e5/ambari-web/app/templates/main/side-menu-item.hbs
-

[06/14] ambari git commit: AMBARI-19974. Test and fix new Notifications/Alerts styles on Ambari.(xiwang)

2017-02-21 Thread xiwang

AMBARI-19974. Test and fix new Notifications/Alerts styles on Ambari.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d8af6aba
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d8af6aba
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d8af6aba

Branch: refs/heads/trunk
Commit: d8af6aba46fe3c62b9b5a4d42b2f716b649c20bd
Parents: c7164d8
Author: Xi Wang <xiw...@apache.org>
Authored: Fri Feb 10 14:13:13 2017 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Wed Feb 15 10:39:41 2017 -0800

--
 .../main/alert_definitions_controller.js|  14 +-
 .../main/alerts/alert_instances_controller.js   | 151 ---
 ambari-web/app/messages.js  |   5 +
 .../app/styles/theme/bootstrap-ambari.css   | 152 +++
 ambari-web/app/styles/top-nav.less  |  20 +-
 ambari-web/app/templates/application.hbs|  57 +++---
 .../main/alerts/alert_notifications_popup.hbs   |  69 +++
 ambari-web/app/views.js |   1 +
 .../main/alerts/alert_instances_popup_view.js   | 190 +++
 .../alerts/alert_instances_controller_test.js   |  33 
 10 files changed, 480 insertions(+), 212 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d8af6aba/ambari-web/app/controllers/main/alert_definitions_controller.js
--
diff --git a/ambari-web/app/controllers/main/alert_definitions_controller.js 
b/ambari-web/app/controllers/main/alert_definitions_controller.js
index 0cfff21..5488fbb 100644
--- a/ambari-web/app/controllers/main/alert_definitions_controller.js
+++ b/ambari-web/app/controllers/main/alert_definitions_controller.js
@@ -119,7 +119,7 @@ App.MainAlertDefinitionsController = 
Em.ArrayController.extend({
   },
 
   /**
-   *  == alerts popup dialog =
+   *  == alerts notifications dropdown dialog 
=
*/
 
   /**
@@ -128,8 +128,18 @@ App.MainAlertDefinitionsController = 
Em.ArrayController.extend({
* @type {Number}
*/
   unhealthyAlertInstancesCount: function () {
+return this.get('criticalAlertInstancesCount') + 
this.get('warningAlertInstancesCount');
+  }.property('criticalAlertInstancesCount', 'warningAlertInstancesCount'),
+
+  criticalAlertInstancesCount: function () {
+return this.get('content').map(function (alertDefinition) {
+  return alertDefinition.getWithDefault('summary.CRITICAL.count', 0);
+}).reduce(Em.sum, 0);
+  }.property('content.@each.summary'),
+
+  warningAlertInstancesCount: function () {
 return this.get('content').map(function (alertDefinition) {
-  return alertDefinition.getWithDefault('summary.CRITICAL.count', 0) + 
alertDefinition.getWithDefault('summary.WARNING.count', 0);
+  return alertDefinition.getWithDefault('summary.WARNING.count', 0);
 }).reduce(Em.sum, 0);
   }.property('content.@each.summary'),
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/d8af6aba/ambari-web/app/controllers/main/alerts/alert_instances_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/alerts/alert_instances_controller.js 
b/ambari-web/app/controllers/main/alerts/alert_instances_controller.js
index cbeb71a..30eb999 100644
--- a/ambari-web/app/controllers/main/alerts/alert_instances_controller.js
+++ b/ambari-web/app/controllers/main/alerts/alert_instances_controller.js
@@ -193,157 +193,6 @@ App.MainAlertInstancesController = Em.Controller.extend({
*/
   getAlertInstancesErrorCallback: function () {
 this.set('isLoaded', true);
-  },
-
-  /**
-   * Onclick handler for alerts number located right to bg ops number (see 
application.hbs)
-   * @method showPopup
-   * @return {App.ModalPopup}
-   */
-  showPopup: function () {
-
-var self = this;
-
-return App.ModalPopup.show({
-
-  alertsNumberBinding: 
'App.router.mainAlertDefinitionsController.unhealthyAlertInstancesCount',
-
-  header: Em.computed.i18nFormat('alerts.fastAccess.popup.header', 
'alertsNumber'),
-
-  classNames: ['common-modal-wrapper', 'alerts-popup'],
-  modalDialogClasses: ['modal-lg'],
-
-  secondary: Em.I18n.t('alerts.fastAccess.popup.body.showmore'),
-
-  autoHeight: false,
-
-  isHideBodyScroll: true,
-
-  onSecondary: function () {
-this._super();
-App.router.transitionTo('main.alerts.index');
-  },
-
-  bodyClass: App.TableView.extend(App.TableServerViewMixin, {
-
-updaterBinding: 'App.router.updateController',
-
-templateName: require('templates/common/modal_popups/alerts_popup'),
-
-controller: self,
-
-isPa

[10/14] ambari git commit: AMBARI-20073. Side Nav: multiple changes based on feedback from UX.(xiwang)

2017-02-21 Thread xiwang

AMBARI-20073. Side Nav: multiple changes based on feedback from UX.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ab7a6719
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ab7a6719
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ab7a6719

Branch: refs/heads/trunk
Commit: ab7a6719979fe87695537a498f19619219f81e38
Parents: a12c3ef
Author: Xi Wang <xiw...@apache.org>
Authored: Fri Feb 17 17:18:36 2017 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Fri Feb 17 17:18:36 2017 -0800

--
 ambari-web/app/styles/application.less  | 13 --
 .../app/styles/theme/bootstrap-ambari.css   | 49 
 ambari-web/app/styles/top-nav.less  |  2 +-
 .../app/templates/main/service/menu_item.hbs|  2 +-
 .../app/templates/main/side-menu-item.hbs   |  4 +-
 .../vendor/scripts/theme/bootstrap-ambari.js|  2 +-
 6 files changed, 55 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ab7a6719/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index 7a5b18e..befbf5a 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -333,17 +333,22 @@ footer {
 }
 
 ::-webkit-scrollbar:vertical {
-  width: 11px;
+  width: 10px;
 }
 
 ::-webkit-scrollbar:horizontal {
-  height: 11px;
+  height: 10px;
 }
 
 ::-webkit-scrollbar-thumb {
   border-radius: 8px;
-  border: 2px solid white;
-  background-color: rgba(0, 0, 0, .5);
+  -webkit-border-radius: 8px;
+  background: rgba(233,233,233,0.5);
+  -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.2);
+}
+
+::-webkit-scrollbar-thumb:window-inactive {
+  background: rgba(233,233,233,0.3);
 }
 
 #content {

http://git-wip-us.apache.org/repos/asf/ambari/blob/ab7a6719/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 8fd301d..2459808 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -847,6 +847,7 @@ input.radio:checked + label:after {
   border-radius: 0;
   -moz-border-radius: 0;
   -webkit-border-radius: 0;
+  white-space: nowrap;
 }
 .navigation-bar-container ul.nav.side-nav-menu li.navigation-footer > a 
.navigation-menu-item,
 .navigation-bar-container ul.nav.side-nav-footer li.navigation-footer > a 
.navigation-menu-item,
@@ -912,7 +913,7 @@ input.radio:checked + label:after {
   font-style: normal;
   line-height: 1;
   color: #333;
-  font-size: 13px;
+  font-size: 14px;
   color: #999;
 }
 .navigation-bar-container ul.nav.side-nav-menu li > ul > li a .submenu-icon,
@@ -953,8 +954,6 @@ input.radio:checked + label:after {
 }
 .navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu) > 
a,
 .navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) 
> a {
-  border-left: 6px solid #3fae2a;
-  padding-left: 19px;
   color: #fff;
 }
 .navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu) > 
a .navigation-menu-item,
@@ -967,6 +966,21 @@ input.radio:checked + label:after {
 .navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) 
> a .toggle-icon {
   color: #fff;
 }
+.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu) > 
a:after,
+.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) 
> a:after {
+  left: 0;
+  top: 50%;
+  border: solid transparent;
+  border-width: 12px 6px;
+  content: " ";
+  height: 0;
+  width: 0;
+  position: absolute;
+  pointer-events: none;
+  border-color: transparent;
+  border-left-color: #3fae2a;
+  margin-top: -12px;
+}
 .navigation-bar-container ul.nav.side-nav-menu .more-actions,
 .navigation-bar-container ul.nav.side-nav-footer .more-actions {
   display: none;
@@ -991,6 +1005,16 @@ input.radio:checked + label:after {
 .navigation-bar-container ul.nav.side-nav-footer .more-actions .dropdown-menu 
> li > a:hover {
   background: #f5f5f5;
 }
+.navigation-bar-container ul.nav.side-nav-menu .menu-item-name,
+.navigation-bar-container ul.nav.side-nav-footer .menu-item-name {
+  display: inline-block;
+  max-width: 94px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -o-text-overflow: ellipsis;
+  -ms-text-overflow: ellipsis;
+  white-space: nowrap;
+}
 .navigation-bar-container .nav-pills > li.active > a,
 .navigation-bar-container .nav-pills > li.active > a:focus,
 .navigation-bar-container .nav-

[11/14] ambari git commit: AMBARI-20039. navigation bar interactiveness: clicking on an element should make it active (onechiporenko)

2017-02-21 Thread xiwang

AMBARI-20039. navigation bar interactiveness: clicking on an element should 
make it active (onechiporenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/36a01d4b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/36a01d4b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/36a01d4b

Branch: refs/heads/trunk
Commit: 36a01d4b92ba0e8ecf4a24b55d533650d13fd97f
Parents: ab7a671
Author: Oleg Nechiporenko 
Authored: Mon Feb 20 13:24:48 2017 +0200
Committer: Oleg Nechiporenko 
Committed: Mon Feb 20 13:24:48 2017 +0200

--
 .../app/styles/theme/bootstrap-ambari.css   | 79 +---
 .../vendor/scripts/theme/bootstrap-ambari.js| 12 ++-
 2 files changed, 63 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/36a01d4b/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 2459808..5297c77 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -1,20 +1,3 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 @font-face {
   font-family: 'Roboto';
   font-weight: normal;
@@ -334,15 +317,15 @@ input.form-control:focus {
 }
 .has-warning input.form-control {
   color: #666;
-  border: 1px solid #E98A41;
+  border: 1px solid #E98A40;
 }
 .has-warning input.form-control:focus {
-  border-color: #E98A41;
+  border-color: #E98A40;
   box-shadow: none;
 }
 .has-warning .help-block.validation-block::before {
   content: '\e101';
-  color: #E98A41;
+  color: #E98A40;
 }
 .form-control[disabled],
 .form-control[readonly],
@@ -948,26 +931,40 @@ input.radio:checked + label:after {
   color: #fff;
 }
 .navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu),
-.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) {
+.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu),
+.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed,
+.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed {
   background: #404351;
   cursor: pointer;
 }
 .navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu) > 
a,
-.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) 
> a {
+.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) 
> a,
+.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed > a,
+.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed > a {
   color: #fff;
 }
 .navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu) > 
a .navigation-menu-item,
 .navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) 
> a .navigation-menu-item,
+.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed > a 
.navigation-menu-item,
+.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed > a 
.navigation-menu-item,
 .navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu) > 
a .submenu-item,
 .navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) 
> a .submenu-item,
+.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed > a 
.submenu-item,
+.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed > a 
.submenu-item,
 .navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu) > 
a .navigation-icon,
 .navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) 
> a .navigation-icon,
+.navigation-bar-container ul.nav.side-nav-menu li.active.collapsed > a 
.navigation-icon,
+.navigation-bar-container ul.nav.side-nav-footer li.active.collapsed > a 
.navigation-icon,
 .navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu) > 
a .toggle-icon,
-.navigation-bar-container

[05/14] ambari git commit: AMBARI-19983. Externalize the logic for making navigation bar interactive (onechiporenko)

2017-02-21 Thread xiwang

AMBARI-19983. Externalize the logic for making navigation bar interactive 
(onechiporenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c7164d8e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c7164d8e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c7164d8e

Branch: refs/heads/trunk
Commit: c7164d8eaaacc62e4d56f8f8ff03b74b1a0d46af
Parents: cc4c04e
Author: Oleg Nechiporenko 
Authored: Mon Feb 13 13:47:47 2017 +0200
Committer: Oleg Nechiporenko 
Committed: Mon Feb 13 13:47:47 2017 +0200

--
 ambari-web/app/assets/data/clusters/info.json   | 11 +++
 ambari-web/app/styles/side_navigation.less  | 41 
 .../app/styles/theme/bootstrap-ambari.css   | 54 +++
 ambari-web/app/templates/application.hbs|  8 +-
 .../app/templates/main/side-menu-item.hbs   |  4 +-
 ambari-web/app/views/application.js | 39 +++-
 ambari-web/app/views/main/menu.js   |  8 --
 ambari-web/brunch-config.js |  3 +-
 .../vendor/scripts/theme/bootstrap-ambari.js| 99 
 9 files changed, 168 insertions(+), 99 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c7164d8e/ambari-web/app/assets/data/clusters/info.json
--
diff --git a/ambari-web/app/assets/data/clusters/info.json 
b/ambari-web/app/assets/data/clusters/info.json
new file mode 100644
index 000..95003f9
--- /dev/null
+++ b/ambari-web/app/assets/data/clusters/info.json
@@ -0,0 +1,11 @@
+{
+  "items": [
+{
+  "Clusters": {
+"cluster_name": "tdk",
+"provisioning_state": "INSTALLED",
+"version": "HDP2.0.1"
+  }
+}
+  ]
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/c7164d8e/ambari-web/app/styles/side_navigation.less
--
diff --git a/ambari-web/app/styles/side_navigation.less 
b/ambari-web/app/styles/side_navigation.less
deleted file mode 100644
index 48b8699..000
--- a/ambari-web/app/styles/side_navigation.less
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-@import 'common.less';
-
-#side-nav {
-  position: fixed;
-  top: 0px;
-  bottom: 0px;
-  z-index: 2079;
-
-  .side-nav-header {
-position: absolute;
-top: 0px;
-  }
-  .side-nav-menu {
-position: fixed;
-top: 55px;
-bottom: 50px;
-overflow-y: auto;
-  }
-  .side-nav-footer {
-position: fixed;
-bottom: 0px;
-  }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/c7164d8e/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 adbddcd..d17e423 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -749,7 +749,7 @@ input.radio:checked + label:after {
   height: auto;
   width: 190px;
   background-color: #323544;
-  padding: 0px 0px;
+  padding: 0;
   overflow: hidden;
 }
 .navigation-bar-container ul.nav.side-nav-header {
@@ -761,7 +761,7 @@ input.radio:checked + label:after {
   height: 55px;
 }
 .navigation-bar-container ul.nav.side-nav-header li.navigation-header > 
a.ambari-logo {
-  padding: 0px;
+  padding: 0;
 }
 .navigation-bar-container ul.nav.side-nav-header li.navigation-header > 
a.ambari-logo > img {
   height: 25px;
@@ -780,7 +780,7 @@ input.radio:checked + label:after {
   cursor: pointer;
   display: inline;
   color: #fff;
-  padding: 0px 8px 0px 10px;
+  padding: 0 8px 0 10px;
 }
 .navigation-bar-container ul.nav.side-nav-header li.navigation-header 
.btn-group span.toggle-icon {
   margin-bottom: 5px;
@@ -832,8 +832,8 @@ input.radio:checked + label:after {
 }
 .navigation-bar-container ul.nav.side-nav-menu

[02/14] ambari git commit: AMBARI-19826. Side Nav: menu should be collapsed(expanded) on clicking.(xiwang)

2017-02-21 Thread xiwang

AMBARI-19826. Side Nav: menu should be collapsed(expanded) on clicking.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b50fbdb4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b50fbdb4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b50fbdb4

Branch: refs/heads/trunk
Commit: b50fbdb48ba52d2eb83ce6e4b0939d84012239d6
Parents: 7691d94
Author: Xi Wang <xiw...@apache.org>
Authored: Wed Feb 1 13:47:21 2017 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Fri Feb 3 15:51:20 2017 -0800

--
 .../app/styles/theme/bootstrap-ambari.css   | 14 +++---
 ambari-web/app/templates/application.hbs|  8 ++--
 .../app/templates/main/side-menu-item.hbs   | 46 
 ambari-web/app/views/application.js |  4 +-
 ambari-web/app/views/main/menu.js   |  4 +-
 5 files changed, 44 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b50fbdb4/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 d3e6698..adbddcd 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -15,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 @font-face {
   font-family: 'Roboto';
   font-weight: normal;
@@ -770,7 +769,7 @@ input.radio:checked + label:after {
   margin-top: -2px;
   margin-left: -3px;
 }
-.navigation-bar-container ul.nav.side-nav-header li.navigation-header > 
a.ambari-header {
+.navigation-bar-container ul.nav.side-nav-header li.navigation-header 
.btn-group span.ambari-header {
   font-family: 'Roboto', sans-serif;
   font-weight: normal;
   font-style: normal;
@@ -778,11 +777,12 @@ input.radio:checked + label:after {
   color: #333;
   font-size: 20px;
   width: 55px;
+  cursor: pointer;
   display: inline;
   color: #fff;
-  padding: 0px 8px;
+  padding: 0px 8px 0px 10px;
 }
-.navigation-bar-container ul.nav.side-nav-header li.navigation-header 
span.toggle-icon {
+.navigation-bar-container ul.nav.side-nav-header li.navigation-header 
.btn-group span.toggle-icon {
   margin-bottom: 5px;
   font-size: 13px;
   cursor: pointer;
@@ -790,6 +790,10 @@ input.radio:checked + label:after {
   vertical-align: middle;
   color: #b8bec4;
 }
+.navigation-bar-container ul.nav.side-nav-header li.navigation-header 
.btn-group.open .dropdown-toggle {
+  -webkit-box-shadow: none;
+  box-shadow: none;
+}
 .navigation-bar-container ul.nav.side-nav-header li.navigation-header 
ul.dropdown-menu {
   min-width: 190px;
   max-width: 190px;
@@ -965,7 +969,7 @@ input.radio:checked + label:after {
 .navigation-bar-container.collapsed ul.nav.side-nav-header 
li.navigation-header {
   padding: 15px 0px 15px 17px;
 }
-.navigation-bar-container.collapsed ul.nav.side-nav-header 
li.navigation-header a.ambari-header,
+.navigation-bar-container.collapsed ul.nav.side-nav-header 
li.navigation-header span.ambari-header,
 .navigation-bar-container.collapsed ul.nav.side-nav-header 
li.navigation-header span.toggle-icon,
 .navigation-bar-container.collapsed ul.nav.side-nav-header 
li.navigation-header .dropdown-menu {
   display: none;

http://git-wip-us.apache.org/repos/asf/ambari/blob/b50fbdb4/ambari-web/app/templates/application.hbs
--
diff --git a/ambari-web/app/templates/application.hbs 
b/ambari-web/app/templates/application.hbs
index b2210b7..99b65b6 100644
--- a/ambari-web/app/templates/application.hbs
+++ b/ambari-web/app/templates/application.hbs
@@ -27,16 +27,16 @@
 
   
 
-{{t app.name}}
   {{else}}
 
   
 
-{{t app.name}}
   {{/if}}
-
   
-
+
+  {{t 
app.name}}
+  
+
 
   {{#if view.views.length}}
 {{#each item in view.views}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/b50fbdb4/ambari-web/app/templates/main/side-menu-item.hbs
--
diff --git a/ambari-web/app/templates/main/side-menu-item.hbs 
b/ambari-web/app/templates/main/side-menu-item.hbs
index 19f0a8d..86aaedd 100644
--- a/ambari-web/app/templates/main/side-menu-item.hbs
+++ b/ambari-web/app/templates/main/side-menu-item.hbs
@@ -17,30 +17,38 @@
 }}
 
 
-
-  
-  {{{unbound view.content.label}}}
-  {{#if view.isServicesItem}}
-
-  {{/if}}
-  {{#if view.isAdminItem}}
-
-  {{/if}}
-
+
 
 
 {{#if view.isServicesItem}}
+  
+
+{{{unbound vie

[1/2] ambari git commit: AMBARI-20073. Side Nav: multiple changes based on feedback from UX - 2.(xiwang)

2017-02-21 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/side-navigation-feature-branch 36a01d4b9 -> 65d901756


AMBARI-20073. Side Nav: multiple changes based on feedback from UX - 2.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d7e9ef21
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d7e9ef21
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d7e9ef21

Branch: refs/heads/side-navigation-feature-branch
Commit: d7e9ef21dfa7bca1b91d94398b615f41908983c7
Parents: 36a01d4
Author: Xi Wang <xiw...@apache.org>
Authored: Tue Feb 21 14:53:45 2017 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Tue Feb 21 14:53:52 2017 -0800

--
 ambari-web/app/styles/application.less  |  1 -
 .../app/styles/theme/bootstrap-ambari.css   | 14 +++-
 ambari-web/app/templates/application.hbs| 76 ++--
 .../vendor/scripts/theme/bootstrap-ambari.js|  9 +++
 4 files changed, 59 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d7e9ef21/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index befbf5a..b2a7706 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -69,7 +69,6 @@ ul.typeahead.dropdown-menu {
   overflow: visible;
   padding-bottom: @footer-height;
   min-width: 980px;
-  margin-left: @side-navigation-width;
 
.clock-view {
  top: 10px;

http://git-wip-us.apache.org/repos/asf/ambari/blob/d7e9ef21/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 5297c77..af78310 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -823,7 +823,6 @@ input.radio:checked + label:after {
 .navigation-bar-container ul.nav.side-nav-footer li.submenu-li > a,
 .navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li > a,
 .navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li > a {
-  padding: 15px 5px 15px 25px;
   display: table-cell;
   vertical-align: middle;
   width: 190px;
@@ -868,6 +867,16 @@ input.radio:checked + label:after {
   color: #b8bec4;
   padding: 3px 5px 3px 10px;
 }
+.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer > a,
+.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer > a,
+.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li > a,
+.navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li > a {
+  padding: 15px 5px 15px 25px;
+}
+.navigation-bar-container ul.nav.side-nav-menu li.submenu-li > a,
+.navigation-bar-container ul.nav.side-nav-footer li.submenu-li > a {
+  padding: 10px 5px 10px 25px;
+}
 .navigation-bar-container ul.nav.side-nav-menu li.navigation-footer,
 .navigation-bar-container ul.nav.side-nav-footer li.navigation-footer {
   background: #313d54;
@@ -1005,6 +1014,7 @@ input.radio:checked + label:after {
 .navigation-bar-container ul.nav.side-nav-menu .menu-item-name,
 .navigation-bar-container ul.nav.side-nav-footer .menu-item-name {
   display: inline-block;
+  vertical-align: bottom;
   max-width: 94px;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -1068,7 +1078,7 @@ input.radio:checked + label:after {
 }
 .navigation-bar-container.collapsed ul.nav.side-nav-menu li.submenu-li > a,
 .navigation-bar-container.collapsed ul.nav.side-nav-footer li.submenu-li > a {
-  padding: 15px 5px 15px 25px;
+  padding: 10px 5px 10px 25px;
   width: 190px;
 }
 .navigation-bar-container.collapsed ul.nav.side-nav-menu li.active,

http://git-wip-us.apache.org/repos/asf/ambari/blob/d7e9ef21/ambari-web/app/templates/application.hbs
--
diff --git a/ambari-web/app/templates/application.hbs 
b/ambari-web/app/templates/application.hbs
index 573d92b..9d6db78 100644
--- a/ambari-web/app/templates/application.hbs
+++ b/ambari-web/app/templates/application.hbs
@@ -21,46 +21,46 @@
 {{/if}}
 
 {{#if App.router.mainController.isClusterDataLoaded}}
-
-  
-  
-
-  {{#if enableLinks}}
-
-  
-
-  {{else}}
-
-  
-
-  {{/if}}
-  
-
-  {{t 
app.name}}
-  
+  
+
+
+  
+{{#if enableLinks}}
+  
+
+  
+{{else}}
+  
+
+  
+{{/if}}
+
+  
+{{t 
app.name}}
+
+

[2/2] ambari git commit: AMBARI-20036. Side Nav: implement the Services Actions - 2.(xiwang)

2017-02-21 Thread xiwang

AMBARI-20036. Side Nav: implement the Services Actions - 2.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/65d90175
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/65d90175
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/65d90175

Branch: refs/heads/side-navigation-feature-branch
Commit: 65d901756c2b3bfb621bfd028094ffdbdcfca2fa
Parents: d7e9ef2
Author: Xi Wang <xiw...@apache.org>
Authored: Tue Feb 21 16:34:21 2017 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Tue Feb 21 16:34:21 2017 -0800

--
 ambari-web/vendor/scripts/theme/bootstrap-ambari.js | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/65d90175/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
--
diff --git a/ambari-web/vendor/scripts/theme/bootstrap-ambari.js 
b/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
index 77973a9..1c81aeb 100644
--- a/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
+++ b/ambari-web/vendor/scripts/theme/bootstrap-ambari.js
@@ -126,6 +126,7 @@
   });
   $moreActions.on('click', function () {
 if (settings.fitHeight) {
+  // set actions submenu position
   var $moreIcon = $(this);
   $moreIcon.children('.dropdown-menu').css('position', 'fixed');
   var offset = $moreIcon.offset();
@@ -133,8 +134,10 @@
   $moreIcon.children('.dropdown-menu').css('left', offset.left);
 }
   });
-  $moreActions.children('.dropdown-menu').mouseleave(function () {
-$(this).parent().removeClass('open');
+  $moreActions.children('.dropdown-menu').on('click', function () {
+// some action was triggered, should hide this icon
+var moreIcon = $(this).parent();
+setTimeout(function(){ moreIcon.hide(); }, 1000);
   });
   $navigationContainer.children('.side-nav-menu').scroll(function () {
 $moreActions.removeClass('open');

ambari git commit: AMBARI-20073. Side Nav: multiple changes based on feedback from UX.(xiwang)

2017-02-17 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/side-navigation-feature-branch a12c3efa9 -> ab7a67199


AMBARI-20073. Side Nav: multiple changes based on feedback from UX.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ab7a6719
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ab7a6719
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ab7a6719

Branch: refs/heads/side-navigation-feature-branch
Commit: ab7a6719979fe87695537a498f19619219f81e38
Parents: a12c3ef
Author: Xi Wang <xiw...@apache.org>
Authored: Fri Feb 17 17:18:36 2017 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Fri Feb 17 17:18:36 2017 -0800

--
 ambari-web/app/styles/application.less  | 13 --
 .../app/styles/theme/bootstrap-ambari.css   | 49 
 ambari-web/app/styles/top-nav.less  |  2 +-
 .../app/templates/main/service/menu_item.hbs|  2 +-
 .../app/templates/main/side-menu-item.hbs   |  4 +-
 .../vendor/scripts/theme/bootstrap-ambari.js|  2 +-
 6 files changed, 55 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ab7a6719/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index 7a5b18e..befbf5a 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -333,17 +333,22 @@ footer {
 }
 
 ::-webkit-scrollbar:vertical {
-  width: 11px;
+  width: 10px;
 }
 
 ::-webkit-scrollbar:horizontal {
-  height: 11px;
+  height: 10px;
 }
 
 ::-webkit-scrollbar-thumb {
   border-radius: 8px;
-  border: 2px solid white;
-  background-color: rgba(0, 0, 0, .5);
+  -webkit-border-radius: 8px;
+  background: rgba(233,233,233,0.5);
+  -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.2);
+}
+
+::-webkit-scrollbar-thumb:window-inactive {
+  background: rgba(233,233,233,0.3);
 }
 
 #content {

http://git-wip-us.apache.org/repos/asf/ambari/blob/ab7a6719/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 8fd301d..2459808 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -847,6 +847,7 @@ input.radio:checked + label:after {
   border-radius: 0;
   -moz-border-radius: 0;
   -webkit-border-radius: 0;
+  white-space: nowrap;
 }
 .navigation-bar-container ul.nav.side-nav-menu li.navigation-footer > a 
.navigation-menu-item,
 .navigation-bar-container ul.nav.side-nav-footer li.navigation-footer > a 
.navigation-menu-item,
@@ -912,7 +913,7 @@ input.radio:checked + label:after {
   font-style: normal;
   line-height: 1;
   color: #333;
-  font-size: 13px;
+  font-size: 14px;
   color: #999;
 }
 .navigation-bar-container ul.nav.side-nav-menu li > ul > li a .submenu-icon,
@@ -953,8 +954,6 @@ input.radio:checked + label:after {
 }
 .navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu) > 
a,
 .navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) 
> a {
-  border-left: 6px solid #3fae2a;
-  padding-left: 19px;
   color: #fff;
 }
 .navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu) > 
a .navigation-menu-item,
@@ -967,6 +966,21 @@ input.radio:checked + label:after {
 .navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) 
> a .toggle-icon {
   color: #fff;
 }
+.navigation-bar-container ul.nav.side-nav-menu li.active:not(.has-sub-menu) > 
a:after,
+.navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) 
> a:after {
+  left: 0;
+  top: 50%;
+  border: solid transparent;
+  border-width: 12px 6px;
+  content: " ";
+  height: 0;
+  width: 0;
+  position: absolute;
+  pointer-events: none;
+  border-color: transparent;
+  border-left-color: #3fae2a;
+  margin-top: -12px;
+}
 .navigation-bar-container ul.nav.side-nav-menu .more-actions,
 .navigation-bar-container ul.nav.side-nav-footer .more-actions {
   display: none;
@@ -991,6 +1005,16 @@ input.radio:checked + label:after {
 .navigation-bar-container ul.nav.side-nav-footer .more-actions .dropdown-menu 
> li > a:hover {
   background: #f5f5f5;
 }
+.navigation-bar-container ul.nav.side-nav-menu .menu-item-name,
+.navigation-bar-container ul.nav.side-nav-footer .menu-item-name {
+  display: inline-block;
+  max-width: 94px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  -o-text-overflow: ellipsis;
+  -ms-text-overflow: ellipsis;
+  white-space: nowrap;
+}
 .navigation-bar-container .nav

ambari git commit: AMBARI-20036. Side Nav: implement the Services Actions .(xiwang)

2017-02-16 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/side-navigation-feature-branch 52093d151 -> a12c3efa9


AMBARI-20036. Side Nav: implement the Services Actions .(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a12c3efa
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a12c3efa
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a12c3efa

Branch: refs/heads/side-navigation-feature-branch
Commit: a12c3efa95792b97ee85545e08b09f9e7c215baa
Parents: 52093d1
Author: Xi Wang <xiw...@apache.org>
Authored: Thu Feb 16 15:20:27 2017 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Thu Feb 16 15:21:33 2017 -0800

--
 .../app/styles/theme/bootstrap-ambari.css   | 20 ++---
 .../main/service/all_services_actions.hbs   | 94 ++--
 .../app/templates/main/side-menu-item.hbs   |  2 +-
 .../views/main/service/all_services_actions.js  |  2 +
 .../vendor/scripts/theme/bootstrap-ambari.js| 40 ++---
 5 files changed, 86 insertions(+), 72 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a12c3efa/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 700ed1d..8fd301d 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -967,8 +967,8 @@ input.radio:checked + label:after {
 .navigation-bar-container ul.nav.side-nav-footer li.active:not(.has-sub-menu) 
> a .toggle-icon {
   color: #fff;
 }
-.navigation-bar-container ul.nav.side-nav-menu .all-services-actions,
-.navigation-bar-container ul.nav.side-nav-footer .all-services-actions {
+.navigation-bar-container ul.nav.side-nav-menu .more-actions,
+.navigation-bar-container ul.nav.side-nav-footer .more-actions {
   display: none;
   position: absolute;
   top: 20px;
@@ -979,16 +979,16 @@ input.radio:checked + label:after {
   vertical-align: middle;
   color: #fff;
 }
-.navigation-bar-container ul.nav.side-nav-menu .all-services-actions 
.dropdown-menu > li > a,
-.navigation-bar-container ul.nav.side-nav-footer .all-services-actions 
.dropdown-menu > li > a {
+.navigation-bar-container ul.nav.side-nav-menu .more-actions .dropdown-menu > 
li > a,
+.navigation-bar-container ul.nav.side-nav-footer .more-actions .dropdown-menu 
> li > a {
   color: #666;
 }
-.navigation-bar-container ul.nav.side-nav-menu .all-services-actions 
.dropdown-menu > li > a i,
-.navigation-bar-container ul.nav.side-nav-footer .all-services-actions 
.dropdown-menu > li > a i {
+.navigation-bar-container ul.nav.side-nav-menu .more-actions .dropdown-menu > 
li > a i,
+.navigation-bar-container ul.nav.side-nav-footer .more-actions .dropdown-menu 
> li > a i {
   color: #666;
 }
-.navigation-bar-container ul.nav.side-nav-menu .all-services-actions 
.dropdown-menu > li > a:hover,
-.navigation-bar-container ul.nav.side-nav-footer .all-services-actions 
.dropdown-menu > li > a:hover {
+.navigation-bar-container ul.nav.side-nav-menu .more-actions .dropdown-menu > 
li > a:hover,
+.navigation-bar-container ul.nav.side-nav-footer .more-actions .dropdown-menu 
> li > a:hover {
   background: #f5f5f5;
 }
 .navigation-bar-container .nav-pills > li.active > a,
@@ -1075,8 +1075,8 @@ input.radio:checked + label:after {
 .navigation-bar-container.collapsed ul.nav.side-nav-footer 
li.submenu-li.active > a {
   padding-left: 19px;
 }
-.navigation-bar-container.collapsed ul.nav.side-nav-menu .all-services-actions,
-.navigation-bar-container.collapsed ul.nav.side-nav-footer 
.all-services-actions {
+.navigation-bar-container.collapsed ul.nav.side-nav-menu .more-actions,
+.navigation-bar-container.collapsed ul.nav.side-nav-footer .more-actions {
   display: none;
 }
 .navigation-bar-fit-height {

http://git-wip-us.apache.org/repos/asf/ambari/blob/a12c3efa/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 192400a..3e87cb2 100644
--- a/ambari-web/app/templates/main/service/all_services_actions.hbs
+++ b/ambari-web/app/templates/main/service/all_services_actions.hbs
@@ -17,53 +17,51 @@
 }}
 
 {{#isAuthorized "SERVICE.START_STOP, SERVICE.ADD_DELETE_SERVICES"}}
-  
-
-  
-
-
-  {{#isAuthorized "SERVICE.ADD_DELETE_SERVICES"}}
-
-  
- {{t 
services.service.add}}
-
-  {{/isAuthorized}}
-  {{#isAut

ambari git commit: AMBARI-20036. UX: design new Services Actions .(xiwang)

2017-02-15 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/side-navigation-feature-branch d8af6aba4 -> 4c08ceada


AMBARI-20036. UX: design new Services Actions .(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4c08cead
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4c08cead
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4c08cead

Branch: refs/heads/side-navigation-feature-branch
Commit: 4c08ceadac683aedf8e7feae077b3cf91724b8a3
Parents: d8af6ab
Author: Xi Wang <xiw...@apache.org>
Authored: Wed Feb 15 17:45:49 2017 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Wed Feb 15 18:30:39 2017 -0800

--
 .../app/styles/theme/bootstrap-ambari.css   | 116 +--
 ambari-web/app/templates/application.hbs|   4 +-
 ambari-web/app/templates/main/dashboard.hbs |  26 ++---
 ambari-web/app/templates/main/service.hbs   |   6 +-
 .../main/service/all_services_actions.hbs   | 104 -
 .../app/templates/main/side-menu-item.hbs   |   7 +-
 .../vendor/scripts/theme/bootstrap-ambari.js|  71 +++-
 7 files changed, 217 insertions(+), 117 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4c08cead/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 36a63a3..d981fde 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -750,7 +750,6 @@ input.radio:checked + label:after {
   width: 190px;
   background-color: #323544;
   padding: 0;
-  overflow: hidden;
 }
 .navigation-bar-container ul.nav.side-nav-header {
   width: 190px;
@@ -835,8 +834,12 @@ input.radio:checked + label:after {
   padding: 0;
   margin: 0;
 }
-.navigation-bar-container ul.nav.side-nav-menu li a,
-.navigation-bar-container ul.nav.side-nav-footer li a {
+.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer > a,
+.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer > a,
+.navigation-bar-container ul.nav.side-nav-menu li.submenu-li > a,
+.navigation-bar-container ul.nav.side-nav-footer li.submenu-li > a,
+.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li > a,
+.navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li > a {
   padding: 15px 5px 15px 25px;
   display: table-cell;
   vertical-align: middle;
@@ -845,8 +848,12 @@ input.radio:checked + label:after {
   -moz-border-radius: 0;
   -webkit-border-radius: 0;
 }
-.navigation-bar-container ul.nav.side-nav-menu li a .navigation-menu-item,
-.navigation-bar-container ul.nav.side-nav-footer li a .navigation-menu-item {
+.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer > a 
.navigation-menu-item,
+.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer > a 
.navigation-menu-item,
+.navigation-bar-container ul.nav.side-nav-menu li.submenu-li > a 
.navigation-menu-item,
+.navigation-bar-container ul.nav.side-nav-footer li.submenu-li > a 
.navigation-menu-item,
+.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li > a 
.navigation-menu-item,
+.navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li > a 
.navigation-menu-item {
   font-family: 'Roboto', sans-serif;
   font-weight: normal;
   font-style: normal;
@@ -856,14 +863,22 @@ input.radio:checked + label:after {
   color: #b8bec4;
   padding-left: 8px;
 }
-.navigation-bar-container ul.nav.side-nav-menu li a .navigation-icon,
-.navigation-bar-container ul.nav.side-nav-footer li a .navigation-icon {
+.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer > a 
.navigation-icon,
+.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer > a 
.navigation-icon,
+.navigation-bar-container ul.nav.side-nav-menu li.submenu-li > a 
.navigation-icon,
+.navigation-bar-container ul.nav.side-nav-footer li.submenu-li > a 
.navigation-icon,
+.navigation-bar-container ul.nav.side-nav-menu li.mainmenu-li > a 
.navigation-icon,
+.navigation-bar-container ul.nav.side-nav-footer li.mainmenu-li > a 
.navigation-icon {
   line-height: 18px;
   font-size: 18px;
   color: #b8bec4;
 }
-.navigation-bar-container ul.nav.side-nav-menu li a .toggle-icon,
-.navigation-bar-container ul.nav.side-nav-footer li a .toggle-icon {
+.navigation-bar-container ul.nav.side-nav-menu li.navigation-footer > a 
.toggle-icon,
+.navigation-bar-container ul.nav.side-nav-footer li.navigation-footer > a 
.toggle-icon,
+.navigation-bar-container ul.nav.side-nav-menu li.submenu-li > a .toggle-icon,
+.navigation-bar-container ul.nav.side-nav-footer li

ambari git commit: AMBARI-19974. Test and fix new Notifications/Alerts styles on Ambari.(xiwang)

2017-02-15 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/side-navigation-feature-branch c7164d8ea -> d8af6aba4


AMBARI-19974. Test and fix new Notifications/Alerts styles on Ambari.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d8af6aba
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d8af6aba
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d8af6aba

Branch: refs/heads/side-navigation-feature-branch
Commit: d8af6aba46fe3c62b9b5a4d42b2f716b649c20bd
Parents: c7164d8
Author: Xi Wang <xiw...@apache.org>
Authored: Fri Feb 10 14:13:13 2017 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Wed Feb 15 10:39:41 2017 -0800

--
 .../main/alert_definitions_controller.js|  14 +-
 .../main/alerts/alert_instances_controller.js   | 151 ---
 ambari-web/app/messages.js  |   5 +
 .../app/styles/theme/bootstrap-ambari.css   | 152 +++
 ambari-web/app/styles/top-nav.less  |  20 +-
 ambari-web/app/templates/application.hbs|  57 +++---
 .../main/alerts/alert_notifications_popup.hbs   |  69 +++
 ambari-web/app/views.js |   1 +
 .../main/alerts/alert_instances_popup_view.js   | 190 +++
 .../alerts/alert_instances_controller_test.js   |  33 
 10 files changed, 480 insertions(+), 212 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d8af6aba/ambari-web/app/controllers/main/alert_definitions_controller.js
--
diff --git a/ambari-web/app/controllers/main/alert_definitions_controller.js 
b/ambari-web/app/controllers/main/alert_definitions_controller.js
index 0cfff21..5488fbb 100644
--- a/ambari-web/app/controllers/main/alert_definitions_controller.js
+++ b/ambari-web/app/controllers/main/alert_definitions_controller.js
@@ -119,7 +119,7 @@ App.MainAlertDefinitionsController = 
Em.ArrayController.extend({
   },
 
   /**
-   *  == alerts popup dialog =
+   *  == alerts notifications dropdown dialog 
=
*/
 
   /**
@@ -128,8 +128,18 @@ App.MainAlertDefinitionsController = 
Em.ArrayController.extend({
* @type {Number}
*/
   unhealthyAlertInstancesCount: function () {
+return this.get('criticalAlertInstancesCount') + 
this.get('warningAlertInstancesCount');
+  }.property('criticalAlertInstancesCount', 'warningAlertInstancesCount'),
+
+  criticalAlertInstancesCount: function () {
+return this.get('content').map(function (alertDefinition) {
+  return alertDefinition.getWithDefault('summary.CRITICAL.count', 0);
+}).reduce(Em.sum, 0);
+  }.property('content.@each.summary'),
+
+  warningAlertInstancesCount: function () {
 return this.get('content').map(function (alertDefinition) {
-  return alertDefinition.getWithDefault('summary.CRITICAL.count', 0) + 
alertDefinition.getWithDefault('summary.WARNING.count', 0);
+  return alertDefinition.getWithDefault('summary.WARNING.count', 0);
 }).reduce(Em.sum, 0);
   }.property('content.@each.summary'),
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/d8af6aba/ambari-web/app/controllers/main/alerts/alert_instances_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/alerts/alert_instances_controller.js 
b/ambari-web/app/controllers/main/alerts/alert_instances_controller.js
index cbeb71a..30eb999 100644
--- a/ambari-web/app/controllers/main/alerts/alert_instances_controller.js
+++ b/ambari-web/app/controllers/main/alerts/alert_instances_controller.js
@@ -193,157 +193,6 @@ App.MainAlertInstancesController = Em.Controller.extend({
*/
   getAlertInstancesErrorCallback: function () {
 this.set('isLoaded', true);
-  },
-
-  /**
-   * Onclick handler for alerts number located right to bg ops number (see 
application.hbs)
-   * @method showPopup
-   * @return {App.ModalPopup}
-   */
-  showPopup: function () {
-
-var self = this;
-
-return App.ModalPopup.show({
-
-  alertsNumberBinding: 
'App.router.mainAlertDefinitionsController.unhealthyAlertInstancesCount',
-
-  header: Em.computed.i18nFormat('alerts.fastAccess.popup.header', 
'alertsNumber'),
-
-  classNames: ['common-modal-wrapper', 'alerts-popup'],
-  modalDialogClasses: ['modal-lg'],
-
-  secondary: Em.I18n.t('alerts.fastAccess.popup.body.showmore'),
-
-  autoHeight: false,
-
-  isHideBodyScroll: true,
-
-  onSecondary: function () {
-this._super();
-App.router.transitionTo('main.alerts.index');
-  },
-
-  bodyClass: App.TableView.extend(App.TableServerViewMixin, {
-
-updaterBinding: 'App.router.u

[2/4] ambari git commit: AMBARI-19803. Side Nav: Long menu should be visible if longer than window height.(xiwang)

2017-02-03 Thread xiwang

AMBARI-19803. Side Nav: Long menu should be visible if longer than window 
height.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7691d94e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7691d94e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7691d94e

Branch: refs/heads/side-navigation-feature-branch
Commit: 7691d94ec4092033346e41339dd2945cfbf0a588
Parents: 9a70640
Author: Xi Wang <xiw...@apache.org>
Authored: Tue Jan 31 13:02:54 2017 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Fri Feb 3 15:51:20 2017 -0800

--
 ambari-web/app/styles/side_navigation.less  | 14 --
 .../app/styles/theme/bootstrap-ambari.css   | 29 ++--
 .../app/templates/main/side-menu-item.hbs   |  2 +-
 ambari-web/app/views/main/menu.js   |  2 +-
 4 files changed, 39 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7691d94e/ambari-web/app/styles/side_navigation.less
--
diff --git a/ambari-web/app/styles/side_navigation.less 
b/ambari-web/app/styles/side_navigation.less
index 5e188ac..48b8699 100644
--- a/ambari-web/app/styles/side_navigation.less
+++ b/ambari-web/app/styles/side_navigation.less
@@ -21,11 +21,19 @@
 #side-nav {
   position: fixed;
   top: 0px;
-  bottom: auto;
+  bottom: 0px;
   z-index: 2079;
-  padding-bottom: px;
-  margin-bottom: -px;
 
+  .side-nav-header {
+position: absolute;
+top: 0px;
+  }
+  .side-nav-menu {
+position: fixed;
+top: 55px;
+bottom: 50px;
+overflow-y: auto;
+  }
   .side-nav-footer {
 position: fixed;
 bottom: 0px;

http://git-wip-us.apache.org/repos/asf/ambari/blob/7691d94e/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 c3998a5..d3e6698 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -753,10 +753,13 @@ input.radio:checked + label:after {
   padding: 0px 0px;
   overflow: hidden;
 }
+.navigation-bar-container ul.nav.side-nav-header {
+  width: 190px;
+}
 .navigation-bar-container ul.nav.side-nav-header li.navigation-header {
   background: #313d54;
   padding: 15px 5px 15px 25px;
-  min-height: 50px;
+  height: 55px;
 }
 .navigation-bar-container ul.nav.side-nav-header li.navigation-header > 
a.ambari-logo {
   padding: 0px;
@@ -818,6 +821,11 @@ input.radio:checked + label:after {
   background: #404351;
   color: #fff;
 }
+.navigation-bar-container ul.nav.side-nav-menu,
+.navigation-bar-container ul.nav.side-nav-footer {
+  background-color: #323544;
+  width: 190px;
+}
 .navigation-bar-container ul.nav.side-nav-menu li,
 .navigation-bar-container ul.nav.side-nav-footer li {
   padding: 0px;
@@ -860,6 +868,7 @@ input.radio:checked + label:after {
 .navigation-bar-container ul.nav.side-nav-menu li.navigation-footer,
 .navigation-bar-container ul.nav.side-nav-footer li.navigation-footer {
   background: #313d54;
+  height: 50px;
 }
 .navigation-bar-container ul.nav.side-nav-menu li.navigation-footer a 
.navigation-icon,
 .navigation-bar-container ul.nav.side-nav-footer li.navigation-footer a 
.navigation-icon {
@@ -950,6 +959,9 @@ input.radio:checked + label:after {
   width: 50px;
   overflow: visible;
 }
+.navigation-bar-container.collapsed ul.nav.side-nav-header {
+  width: 50px;
+}
 .navigation-bar-container.collapsed ul.nav.side-nav-header 
li.navigation-header {
   padding: 15px 0px 15px 17px;
 }
@@ -958,6 +970,10 @@ input.radio:checked + label:after {
 .navigation-bar-container.collapsed ul.nav.side-nav-header 
li.navigation-header .dropdown-menu {
   display: none;
 }
+.navigation-bar-container.collapsed ul.nav.side-nav-menu,
+.navigation-bar-container.collapsed ul.nav.side-nav-footer {
+  width: 50px;
+}
 .navigation-bar-container.collapsed ul.nav.side-nav-menu li a,
 .navigation-bar-container.collapsed ul.nav.side-nav-footer li a {
   padding: 15px 0px 15px 17px;
@@ -978,9 +994,16 @@ input.radio:checked + label:after {
 .navigation-bar-container.collapsed ul.nav.side-nav-footer li ul.sub-menu {
   display: none;
   width: 190px;
-  position: absolute;
+  position: fixed;
   left: 50px;
-  top: 0px;
+}
+.navigation-bar-container.collapsed ul.nav.side-nav-menu li ul.admin-submenu,
+.navigation-bar-container.collapsed ul.nav.side-nav-footer li ul.admin-submenu 
{
+  top: 249px;
+}
+.navigation-bar-container.collapsed ul.nav.side-nav-menu li 
ul.services-submenu,
+.navigation-bar-container.collapsed ul.nav.side-nav-footer li 
ul.services-submenu {
+  top: 103px;
 }

[1/4] ambari git commit: AMBARI-19857. Side Nav: create clickable breadcrumbs on top showing current path.(xiwang)

2017-02-03 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/side-navigation-feature-branch [created] cc4c04e5b


AMBARI-19857. Side Nav: create clickable breadcrumbs on top showing current 
path.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cc4c04e5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cc4c04e5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cc4c04e5

Branch: refs/heads/side-navigation-feature-branch
Commit: cc4c04e5b35e2cd798f38b0740214f96b128215e
Parents: b50fbdb
Author: Xi Wang <xiw...@apache.org>
Authored: Thu Feb 2 17:50:05 2017 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Fri Feb 3 15:51:20 2017 -0800

--
 ambari-web/app/routes/main.js   |   4 +
 ambari-web/app/styles/top-nav.less  |  14 +++
 ambari-web/app/templates/application.hbs|   7 ++
 .../app/templates/main/side-menu-item.hbs   |   3 -
 ambari-web/app/views/application.js | 102 +++
 5 files changed, 127 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/cc4c04e5/ambari-web/app/routes/main.js
--
diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js
index 354198b..5083cec 100644
--- a/ambari-web/app/routes/main.js
+++ b/ambari-web/app/routes/main.js
@@ -407,6 +407,7 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
 route: '/',
 connectOutlets: function (router, context) {
   router.set('mainAdminController.category', "kerberos");
+  router.set('mainAdminController.categoryLabel', 
Em.I18n.t('common.kerberos'));
   router.get('mainAdminController').connectOutlet('mainAdminKerberos');
 }
   }),
@@ -501,6 +502,7 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
   route: '/stack',
   connectOutlets: function (router) {
 router.set('mainAdminController.category', "stackAndUpgrade");
+router.set('mainAdminController.categoryLabel', 
Em.I18n.t('admin.stackUpgrade.title'));
 
router.get('mainAdminController').connectOutlet('mainAdminStackAndUpgrade');
   },
 
@@ -555,6 +557,7 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
   },
   connectOutlets: function (router) {
 router.set('mainAdminController.category', "adminServiceAccounts");
+router.set('mainAdminController.categoryLabel', 
Em.I18n.t('common.serviceAccounts'));
 
router.get('mainAdminController').connectOutlet('mainAdminServiceAccounts');
   }
 }),
@@ -568,6 +571,7 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
   },
   connectOutlets: function (router) {
 router.set('mainAdminController.category', "serviceAutoStart");
+router.set('mainAdminController.categoryLabel', 
Em.I18n.t('admin.serviceAutoStart.title'));
 
router.get('mainAdminController').connectOutlet('mainAdminServiceAutoStart');
   },
   exitRoute: function (router, context, callback) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/cc4c04e5/ambari-web/app/styles/top-nav.less
--
diff --git a/ambari-web/app/styles/top-nav.less 
b/ambari-web/app/styles/top-nav.less
index 747caab..d1c723a 100644
--- a/ambari-web/app/styles/top-nav.less
+++ b/ambari-web/app/styles/top-nav.less
@@ -24,6 +24,20 @@
 border-top: 1px solid #e3e3e3;
 border-bottom: 1px solid #e3e3e3;
 
+.navbar-header {
+  padding: 15px 15px 15px 0px;
+  margin-top: 5px;
+  font-size: 20px;
+  a {
+color: #313D54;
+cursor: pointer;
+  }
+  a.disabled {
+cursor: default;
+color: #ccc;
+  }
+}
+
 .navbar-text.brand-wrapper {
   color: @top-nav-brand-color;
   font-size: 16px;

http://git-wip-us.apache.org/repos/asf/ambari/blob/cc4c04e5/ambari-web/app/templates/application.hbs
--
diff --git a/ambari-web/app/templates/application.hbs 
b/ambari-web/app/templates/application.hbs
index 99b65b6..f18d314 100644
--- a/ambari-web/app/templates/application.hbs
+++ b/ambari-web/app/templates/application.hbs
@@ -64,6 +64,13 @@
 
   
 
+  {{#if view.breadcrumbs.length}}
+{{#each item in view.breadcrumbs}}
+  
+{{{item.label}}}
+  {{#unless item.lastItem}}/{{/unless}}
+{{/each}}
+  {{/if}}
 
 
 {{! right offset. don't delete me! }}

http://git-wip-us.apache.org/repos/asf/ambari/blob/cc4c0

[4/4] ambari git commit: AMBARI-19735.Create new Navigation Bar for 3.0.0.(xiwang)

2017-02-03 Thread xiwang

AMBARI-19735.Create new Navigation Bar for 3.0.0.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9a706402
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9a706402
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9a706402

Branch: refs/heads/side-navigation-feature-branch
Commit: 9a706402c71c2a9c948a3d675b892e93156d66a7
Parents: eba6388
Author: Xi Wang <xiw...@apache.org>
Authored: Tue Jan 17 16:20:52 2017 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Fri Feb 3 15:51:20 2017 -0800

--
 .../main/resources/ui/admin-web/app/index.html  |   2 +-
 ambari-web/app/assets/img/ambari-Logo.png   | Bin 0 -> 2779 bytes
 ambari-web/app/assets/img/logo-white.png| Bin 4538 -> 0 bytes
 ambari-web/app/config.js|   6 +-
 ambari-web/app/styles/application.less  |   2 +
 ambari-web/app/styles/common.less   |   7 +-
 ambari-web/app/styles/side_navigation.less  |  33 +++
 .../app/styles/theme/bootstrap-ambari.css   | 285 ++-
 ambari-web/app/styles/top-nav.less  | 178 ++--
 ambari-web/app/templates/application.hbs| 178 +++-
 ambari-web/app/templates/main/menu.hbs  |  23 --
 ambari-web/app/templates/main/menu_item.hbs |  50 
 .../app/templates/main/side-menu-item.hbs   |  47 +++
 ambari-web/app/views/application.js |  34 +++
 ambari-web/app/views/main/menu.js   | 150 --
 ambari-web/app/views/main/service/menu.js   | 104 +--
 ambari-web/test/views/main/menu_test.js |   2 +-
 17 files changed, 660 insertions(+), 441 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9a706402/ambari-admin/src/main/resources/ui/admin-web/app/index.html
--
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/index.html 
b/ambari-admin/src/main/resources/ui/admin-web/app/index.html
index ba16103..d17ec53 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/index.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/index.html
@@ -48,7 +48,7 @@
   
 
   
-
+
 {{'common.ambari' | 
translate}}
 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/9a706402/ambari-web/app/assets/img/ambari-Logo.png
--
diff --git a/ambari-web/app/assets/img/ambari-Logo.png 
b/ambari-web/app/assets/img/ambari-Logo.png
new file mode 100644
index 000..07d31ee
Binary files /dev/null and b/ambari-web/app/assets/img/ambari-Logo.png differ

http://git-wip-us.apache.org/repos/asf/ambari/blob/9a706402/ambari-web/app/assets/img/logo-white.png
--
diff --git a/ambari-web/app/assets/img/logo-white.png 
b/ambari-web/app/assets/img/logo-white.png
deleted file mode 100644
index a562ba7..000
Binary files a/ambari-web/app/assets/img/logo-white.png and /dev/null differ

http://git-wip-us.apache.org/repos/asf/ambari/blob/9a706402/ambari-web/app/config.js
--
diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js
index c7b41e6..6afa810 100644
--- a/ambari-web/app/config.js
+++ b/ambari-web/app/config.js
@@ -55,9 +55,9 @@ App.healthIconClassOrange = 'glyphicon glyphicon-minus-sign'; 
// bootstrap icon
 App.healthIconClassYellow = 'glyphicon glyphicon-question-sign'; // bootstrap 
icon class for heartbeat lost service/host/host-component
 App.isManagedMySQLForHiveEnabled = false;
 App.isStormMetricsSupported = true;
-App.healthStatusRed = '#ff';
-App.healthStatusGreen = '#5AB400';
-App.healthStatusOrange = '#FF8E00';
+App.healthStatusRed = '#EF6162';
+App.healthStatusGreen = '#1EB475';
+App.healthStatusOrange = '#E98A41';
 App.inactivityRemainTime = 60; // in seconds
 App.enableLogger = true;
 App.stackVersionsAvailable = true;

http://git-wip-us.apache.org/repos/asf/ambari/blob/9a706402/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index 612c09c..7a5b18e 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -69,6 +69,7 @@ ul.typeahead.dropdown-menu {
   overflow: visible;
   padding-bottom: @footer-height;
   min-width: 980px;
+  margin-left: @side-navigation-width;
 
.clock-view {
  top: 10px;
@@ -89,6 +90,7 @@ footer {
   color: #666;
   margin-top: -1 * @footer-height - 1;
   height: @footer-height - 60px;
+  margin-left: @side-navigation-width;
 }
 
 .editable-list

[3/4] ambari git commit: AMBARI-19826. Side Nav: menu should be collapsed(expanded) on clicking.(xiwang)

2017-02-03 Thread xiwang

AMBARI-19826. Side Nav: menu should be collapsed(expanded) on clicking.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b50fbdb4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b50fbdb4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b50fbdb4

Branch: refs/heads/side-navigation-feature-branch
Commit: b50fbdb48ba52d2eb83ce6e4b0939d84012239d6
Parents: 7691d94
Author: Xi Wang <xiw...@apache.org>
Authored: Wed Feb 1 13:47:21 2017 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Fri Feb 3 15:51:20 2017 -0800

--
 .../app/styles/theme/bootstrap-ambari.css   | 14 +++---
 ambari-web/app/templates/application.hbs|  8 ++--
 .../app/templates/main/side-menu-item.hbs   | 46 
 ambari-web/app/views/application.js |  4 +-
 ambari-web/app/views/main/menu.js   |  4 +-
 5 files changed, 44 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b50fbdb4/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 d3e6698..adbddcd 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -15,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 @font-face {
   font-family: 'Roboto';
   font-weight: normal;
@@ -770,7 +769,7 @@ input.radio:checked + label:after {
   margin-top: -2px;
   margin-left: -3px;
 }
-.navigation-bar-container ul.nav.side-nav-header li.navigation-header > 
a.ambari-header {
+.navigation-bar-container ul.nav.side-nav-header li.navigation-header 
.btn-group span.ambari-header {
   font-family: 'Roboto', sans-serif;
   font-weight: normal;
   font-style: normal;
@@ -778,11 +777,12 @@ input.radio:checked + label:after {
   color: #333;
   font-size: 20px;
   width: 55px;
+  cursor: pointer;
   display: inline;
   color: #fff;
-  padding: 0px 8px;
+  padding: 0px 8px 0px 10px;
 }
-.navigation-bar-container ul.nav.side-nav-header li.navigation-header 
span.toggle-icon {
+.navigation-bar-container ul.nav.side-nav-header li.navigation-header 
.btn-group span.toggle-icon {
   margin-bottom: 5px;
   font-size: 13px;
   cursor: pointer;
@@ -790,6 +790,10 @@ input.radio:checked + label:after {
   vertical-align: middle;
   color: #b8bec4;
 }
+.navigation-bar-container ul.nav.side-nav-header li.navigation-header 
.btn-group.open .dropdown-toggle {
+  -webkit-box-shadow: none;
+  box-shadow: none;
+}
 .navigation-bar-container ul.nav.side-nav-header li.navigation-header 
ul.dropdown-menu {
   min-width: 190px;
   max-width: 190px;
@@ -965,7 +969,7 @@ input.radio:checked + label:after {
 .navigation-bar-container.collapsed ul.nav.side-nav-header 
li.navigation-header {
   padding: 15px 0px 15px 17px;
 }
-.navigation-bar-container.collapsed ul.nav.side-nav-header 
li.navigation-header a.ambari-header,
+.navigation-bar-container.collapsed ul.nav.side-nav-header 
li.navigation-header span.ambari-header,
 .navigation-bar-container.collapsed ul.nav.side-nav-header 
li.navigation-header span.toggle-icon,
 .navigation-bar-container.collapsed ul.nav.side-nav-header 
li.navigation-header .dropdown-menu {
   display: none;

http://git-wip-us.apache.org/repos/asf/ambari/blob/b50fbdb4/ambari-web/app/templates/application.hbs
--
diff --git a/ambari-web/app/templates/application.hbs 
b/ambari-web/app/templates/application.hbs
index b2210b7..99b65b6 100644
--- a/ambari-web/app/templates/application.hbs
+++ b/ambari-web/app/templates/application.hbs
@@ -27,16 +27,16 @@
 
   
 
-{{t app.name}}
   {{else}}
 
   
 
-{{t app.name}}
   {{/if}}
-
   
-
+
+  {{t 
app.name}}
+  
+
 
   {{#if view.views.length}}
 {{#each item in view.views}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/b50fbdb4/ambari-web/app/templates/main/side-menu-item.hbs
--
diff --git a/ambari-web/app/templates/main/side-menu-item.hbs 
b/ambari-web/app/templates/main/side-menu-item.hbs
index 19f0a8d..86aaedd 100644
--- a/ambari-web/app/templates/main/side-menu-item.hbs
+++ b/ambari-web/app/templates/main/side-menu-item.hbs
@@ -17,30 +17,38 @@
 }}
 
 
-
-  
-  {{{unbound view.content.label}}}
-  {{#if view.isServicesItem}}
-
-  {{/if}}
-  {{#if view.isAdminItem}}
-
-  {{/if}}
-
+
 
 
 {{#if view.isServicesItem}}
+  
+

ambari git commit: AMBARI-19754. Remove white border from the content area in popup wizards.(xiwang)

2017-01-27 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk 9d8a54c23 -> b3391f0dd


AMBARI-19754. Remove white border from the content area in popup 
wizards.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b3391f0d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b3391f0d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b3391f0d

Branch: refs/heads/trunk
Commit: b3391f0dd030130add23b9ffb09fb7a776dfe969
Parents: 9d8a54c
Author: Xi Wang <xiw...@apache.org>
Authored: Fri Jan 27 11:16:49 2017 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Fri Jan 27 14:22:02 2017 -0800

--
 ambari-web/app/styles/modal_popups.less | 42 +++-
 .../views/common/modal_popups/log_tail_popup.js |  2 +-
 .../admin/stack_upgrade/upgrade_history_view.js |  2 +-
 3 files changed, 42 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b3391f0d/ambari-web/app/styles/modal_popups.less
--
diff --git a/ambari-web/app/styles/modal_popups.less 
b/ambari-web/app/styles/modal_popups.less
index c10ef30..a6a0196 100644
--- a/ambari-web/app/styles/modal_popups.less
+++ b/ambari-web/app/styles/modal_popups.less
@@ -81,10 +81,14 @@
   margin: 0;
 }
 
-/*90% width modal window start*/
+/*90% width wizard modal window start*/
 .wizard-modal-wrapper {
   .modal {
 .modal-body {
+  padding: 0;
+  .wizard {
+border: none;
+  }
   div.error {
 color: #b94a48;
 .help-block {
@@ -114,8 +118,42 @@
   }
 
 }
+/*90% width wizard modal window end*/
+
+/*90% width modal (non-wizard) window start*/
+
+.wide-modal-wrapper {
+  .modal {
+.modal-body {
+  div.error {
+color: #b94a48;
+.help-block {
+  color: #b94a48;
+}
+  }
+
+  div.error input{
+border-color: #b94a48;
+-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  }
+}
+  }
+
+  .content {
+padding: 0;
+  }
 
-/*90% width modal window end*/
+  //fix stripped in inner table
+  .table-striped tbody tr:nth-child(odd)
+  td .table-striped tbody
+  tr:nth-child(odd) td,
+  tr:nth-child(even) th {
+background-color: transparent;
+  }
+}
+/*90% width modal window (non-wizard) end*/
 
 /*700px width modal window start*/
 .modal-690px-width {

http://git-wip-us.apache.org/repos/asf/ambari/blob/b3391f0d/ambari-web/app/views/common/modal_popups/log_tail_popup.js
--
diff --git a/ambari-web/app/views/common/modal_popups/log_tail_popup.js 
b/ambari-web/app/views/common/modal_popups/log_tail_popup.js
index 1e6924f..6510ac9 100644
--- a/ambari-web/app/views/common/modal_popups/log_tail_popup.js
+++ b/ambari-web/app/views/common/modal_popups/log_tail_popup.js
@@ -22,7 +22,7 @@ var fileUtils = require('utils/file_utils');
 
 App.showLogTailPopup = function(content) {
   return App.ModalPopup.show({
-classNames: ['log-tail-popup', 'wizard-modal-wrapper', 
'full-height-modal'],
+classNames: ['log-tail-popup', 'wide-modal-wrapper', 'full-height-modal'],
 modalDialogClasses: ['modal-xlg'],
 header: fileUtils.fileNameFromPath(content.get('filePath')),
 primary: false,

http://git-wip-us.apache.org/repos/asf/ambari/blob/b3391f0d/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js
--
diff --git 
a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js 
b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js
index c4a428e..aeee96e 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js
@@ -297,7 +297,7 @@ App.MainAdminStackUpgradeHistoryView = 
App.TableView.extend(App.TableServerViewM
 this.get('controller').set('currentUpgradeRecord', record);
 
 App.ModalPopup.show({
-  classNames: ['wizard-modal-wrapper'],
+  classNames: ['wide-modal-wrapper'],
   modalDialogClasses: ['modal-xlg'],
   header: 
Em.I18n.t('admin.stackVersions.upgradeHistory.record.title').format(displayName,
 direction, toVersion),
   bodyClass: App.MainAdminStackUpgradeHistoryDetailsView,

ambari git commit: AMBARI-19536. Improve 'Install Wizard step 2-10' after new guidelines.(xiwang)

2017-01-13 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk 629cf6870 -> 03f48a26e


AMBARI-19536. Improve 'Install Wizard step 2-10' 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/03f48a26
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/03f48a26
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/03f48a26

Branch: refs/heads/trunk
Commit: 03f48a26e40fa526551e9597fe4feabb5023ba05
Parents: 629cf68
Author: Xi Wang <xiw...@apache.org>
Authored: Thu Jan 12 10:54:15 2017 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Fri Jan 13 10:11:21 2017 -0800

--
 ambari-web/app/messages.js  |   2 +-
 .../app/styles/theme/bootstrap-ambari.css   |  10 +-
 ambari-web/app/styles/wizard.less   |  53 +++-
 ambari-web/app/templates/wizard/step1.hbs   |  28 ++---
 ambari-web/app/templates/wizard/step2.hbs   | 120 ++-
 ambari-web/app/templates/wizard/step3.hbs   |  45 ---
 ambari-web/app/views/wizard/step2_view.js   |   7 +-
 7 files changed, 163 insertions(+), 102 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/03f48a26/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index bd60f90..7ed5826 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -638,7 +638,7 @@ Em.I18n.translations = {
   'installer.step1.advancedRepo.localRepo.label.baseUrl':'Repository Base URL',
   'installer.step1.advancedRepo.localRepo.label.stack':'Stack',
   'installer.step1.advancedRepo.localRepo.placeholder': 'Enter Base URL or 
remove this OS',
-  'installer.step1.advancedRepo.skipValidation.tooltip':'Warning: This 
is for advanced users only. Use this option if you want to skip validation for 
Repository Base URLs.',
+  'installer.step1.advancedRepo.skipValidation.tooltip':'Warning: This is for 
advanced users only. Use this option if you want to skip validation for 
Repository Base URLs.',
   'installer.step1.advancedRepo.useRedhatSatellite.tooltip':'Disable 
distributed repositories and use RedHat Satellite/Spacewalk channels instead',
   'installer.step1.advancedRepo.useRedhatSatellite.disabled.tooltip':'Use of 
RedHat Satellite/Spacewalk is not available when is using Public Repositories',
   'installer.step1.advancedRepo.skipValidation.message':'Skip Repository Base 
URL validation (Advanced)',

http://git-wip-us.apache.org/repos/asf/ambari/blob/03f48a26/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 5b18417..cd5179a 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -589,7 +589,7 @@ h2.table-title {
   color: #999;
 }
 .wizard .wizard-body .wizard-nav .nav li .step-index {
-  line-height: 18px;
+  line-height: 16px;
 }
 .wizard .wizard-body .wizard-nav .nav li .step-description {
   font-family: 'Roboto', sans-serif;
@@ -699,6 +699,9 @@ input[type="radio"].disabled + label:hover:before {
   background-color: #b2b8c1;
   border-color: #b2b8c1;
 }
+input[type="checkbox"] + label {
+  margin-top: -2px;
+}
 input[type="checkbox"] + label:before {
   content: '';
   position: absolute;
@@ -719,13 +722,14 @@ input[type="checkbox"]:checked + label:after {
   top: 2px;
   left: 2px;
   font-size: 9px;
+  line-height: 1.42;
 }
 input[type="radio"] + label:before,
 input.radio + label:before {
   content: '';
   position: absolute;
   left: 0;
-  top: 0;
+  top: 2px;
   width: 12px;
   height: 12px;
   box-sizing: border-box;
@@ -739,7 +743,7 @@ input.radio:checked + label:after {
   content: '';
   background-color: #FFF;
   position: absolute;
-  top: 3px;
+  top: 5px;
   left: 3px;
   width: 6px;
   height: 6px;

http://git-wip-us.apache.org/repos/asf/ambari/blob/03f48a26/ambari-web/app/styles/wizard.less
--
diff --git a/ambari-web/app/styles/wizard.less 
b/ambari-web/app/styles/wizard.less
index b3a833d..2dbdd03 100644
--- a/ambari-web/app/styles/wizard.less
+++ b/ambari-web/app/styles/wizard.less
@@ -59,21 +59,53 @@
   }
 
   #installOptions {
+#targetHosts {
+  .step-title {
+margin-bottom: 10px;
+  }
+}
+.radio-button-options {
+  margin-top: 10px;
+  margin-bottom: 10px;
+}
+.wizard-plain-text {
+  color: #666;
+}
 .ssh-user, .ssh-port {
-  padding-top: 5px;
+  padding-top: 8px;
 }
 
 #sshKey {
-

ambari git commit: AMBARI-19432. Improve 'Install Wizard step 1' after new guidelines.(xiwang)

2017-01-10 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk 8f8582bb8 -> 784cae2b0


AMBARI-19432. Improve 'Install Wizard step 1' 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/784cae2b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/784cae2b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/784cae2b

Branch: refs/heads/trunk
Commit: 784cae2b01b0c5defcab1ea5219b3fdf2c6dac73
Parents: 8f8582b
Author: Xi Wang <xiw...@apache.org>
Authored: Mon Jan 9 16:27:44 2017 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Tue Jan 10 14:10:51 2017 -0800

--
 ambari-web/app/messages.js|   3 +-
 ambari-web/app/styles/wizard.less |  48 ++--
 ambari-web/app/templates/wizard/step1.hbs | 322 -
 3 files changed, 187 insertions(+), 186 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/784cae2b/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index f02ba2a..fa82003 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -591,7 +591,8 @@ Em.I18n.translations = {
   'installer.step0.clusterName.error.specialChar':'Cluster Name cannot contain 
special characters',
 
   'installer.step1.header':'Select Version',
-  'installer.step1.body':'Select the software version and method of delivery 
for your cluster. Using a Public Repository requires Internet connectivity. 
Using a Local Repository requires you have configured the software in a 
repository available in your network.',
+  'installer.step1.body':'Select the software version and method of delivery 
for your cluster.',
+  'installer.step1.repo.body':'Using a Public Repository requires Internet 
connectivity. Using a Local Repository requires you have configured the 
software in a repository available in your network.',
   'installer.step1.addVersion.title':'Add Version',
   'installer.step1.changeVersion.defaultVersion':'Default Version Definition',
   'installer.step1.selectUseRepoOptions.public':'Use Public Repository',

http://git-wip-us.apache.org/repos/asf/ambari/blob/784cae2b/ambari-web/app/styles/wizard.less
--
diff --git a/ambari-web/app/styles/wizard.less 
b/ambari-web/app/styles/wizard.less
index bc228c1..b3a833d 100644
--- a/ambari-web/app/styles/wizard.less
+++ b/ambari-web/app/styles/wizard.less
@@ -540,34 +540,36 @@
 }
 
 #select-stack {
-  .panel-heading {
-font-weight: bold;
-p {
-  margin-bottom: 0;
-  display: block;
-}
-  }
-  .details-panel .patch-icon {
-color: #ff4500;
+  .stacks-options {
+margin-bottom: 30px;
   }
-  .details-panel .version-contents-section {
-border: 1px solid #ddd;
-max-height: 200px;
-overflow: auto;
-margin: 8px 0;
-.table {
-  margin-bottom: 0;
-  tr:first-child td {
-border-top: none;
-  }
+  .stacks-options .details-panel {
+.patch-icon {
+  color: #ff4500;
 }
-  }
-  .inner-table {
-td {
-  vertical-align: middle;
+.version-contents-section {
+  border: 1px solid #ddd;
+  max-height: 200px;
+  overflow: auto;
+  margin: 8px 0;
+  .table {
+margin-bottom: 0;
+tr:first-child td {
+  border-top: none;
+}
+  }
 }
   }
   .repos-panel {
+.version-contents-body {
+  padding: 0px 10px;
+  .radio-group {
+padding-bottom: 10px;
+  }
+}
+table > tbody > tr > td {
+vertical-align: middle;
+}
 .remove-icon {
   color: red;
   margin: 30px 0;

http://git-wip-us.apache.org/repos/asf/ambari/blob/784cae2b/ambari-web/app/templates/wizard/step1.hbs
--
diff --git a/ambari-web/app/templates/wizard/step1.hbs 
b/ambari-web/app/templates/wizard/step1.hbs
index 3b85895..6900624 100644
--- a/ambari-web/app/templates/wizard/step1.hbs
+++ b/ambari-web/app/templates/wizard/step1.hbs
@@ -22,191 +22,189 @@
   
 
   {{! left tabs }}
-  
-
-  
-{{#each stack in availableStackTypes}}
-  {{stack.stackName}}
-{{/each}}
-  
-
-
-  
-
-  
-{{controller.selectedStack.displayName}} 
-
-  {{#each stack in selectedStackType.stacks}}
-
-  {{!view view.stackRadioButton stackBinding="stack"}}
-  {{stack.displayName}}
-{{#if stack.stackDefault}}
-  ({{t installer.

ambari git commit: AMBARI-19410. Improve 'Install Wizard step 0' after new guidelines.(xiwang)

2017-01-09 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk 1535bc982 -> 55747a5c2


AMBARI-19410. Improve 'Install Wizard step 0' 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/55747a5c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/55747a5c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/55747a5c

Branch: refs/heads/trunk
Commit: 55747a5c2563c867e2a0d9418abfa2a792a92cb1
Parents: 1535bc9
Author: Xi Wang <xiw...@apache.org>
Authored: Thu Jan 5 16:56:58 2017 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Mon Jan 9 10:07:50 2017 -0800

--
 .../app/controllers/wizard/step0_controller.js  |  3 ++
 .../app/styles/theme/bootstrap-ambari.css   | 33 +++-
 ambari-web/app/styles/wizard.less   | 10 +++---
 ambari-web/app/templates/wizard/step0.hbs   |  4 ++-
 4 files changed, 31 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/55747a5c/ambari-web/app/controllers/wizard/step0_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step0_controller.js 
b/ambari-web/app/controllers/wizard/step0_controller.js
index 1ddb4fc..270c7a4 100644
--- a/ambari-web/app/controllers/wizard/step0_controller.js
+++ b/ambari-web/app/controllers/wizard/step0_controller.js
@@ -38,6 +38,8 @@ App.WizardStep0Controller = Em.Controller.extend({
 if (clusterName == '' && this.get('hasSubmitted')) {
   this.set('clusterNameError', 
Em.I18n.t('installer.step0.clusterName.error.required'));
   return true;
+} else if (clusterName == '' ) {
+  return true;
 } else if (clusterName.length > MAX_CLUSTER_NAME_LENGTH) {
   this.set('clusterNameError', 
Em.I18n.t('installer.step0.clusterName.error.tooLong'));
   return true;
@@ -64,6 +66,7 @@ App.WizardStep0Controller = Em.Controller.extend({
 this.set('clusterNameError', '');
   },
 
+
   /**
* @type {boolean}
*/

http://git-wip-us.apache.org/repos/asf/ambari/blob/55747a5c/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 5a641b3..5b18417 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -527,8 +527,7 @@ h2.table-title {
   line-height: 1;
   color: #333;
   font-weight: bold;
-  font-size: 16px;
-  padding-left: 10px;
+  font-size: 18px;
   color: #666;
 }
 .wizard .wizard-body .wizard-content .step-description {
@@ -537,17 +536,20 @@ h2.table-title {
   font-style: normal;
   line-height: 1;
   color: #333;
-  font-size: 12px;
-  padding-left: 10px;
-  line-height: 1.3;
+  line-height: 1.4;
+  font-size: 14px;
   color: #999;
 }
 .wizard .wizard-body .wizard-content .panel.panel-default {
   border: none;
   box-shadow: none;
+  margin-top: 20px;
+}
+.wizard .wizard-body .wizard-content .panel.panel-default .panel-body {
+  padding: 30px 20px;
 }
 .wizard .wizard-body .wizard-nav {
-  min-height: 650px;
+  min-height: 550px;
   padding-top: 25px;
   background-color: #323544;
   float: left;
@@ -555,7 +557,7 @@ h2.table-title {
   padding-bottom: 9px;
 }
 .wizard .wizard-body .wizard-nav .nav li {
-  padding: 10px 0;
+  padding: 0px 15px;
 }
 .wizard .wizard-body .wizard-nav .nav li a {
   height: 48px;
@@ -582,10 +584,9 @@ h2.table-title {
   font-weight: normal;
   font-style: normal;
   line-height: 1;
-  color: #333;
-  font-size: 16px;
-  color: #bb;
   margin-left: 30px;
+  font-size: 14px;
+  color: #999;
 }
 .wizard .wizard-body .wizard-nav .nav li .step-index {
   line-height: 18px;
@@ -622,8 +623,8 @@ h2.table-title {
   position: absolute;
   background-color: #1EB475;
   content: "";
-  top: 39px;
-  left: 14px;
+  top: 25px;
+  left: 29px;
 }
 .wizard .wizard-body .wizard-nav .nav li.completed:last-child:after {
   content: none;
@@ -632,8 +633,12 @@ h2.table-title {
   font-weight: bold;
 }
 .wizard .wizard-body .wizard-nav .nav li.disabled .step-marker {
-  color: #bb;
-  border-color: #bb;
+  color: #666;
+  border-color: #666;
+}
+.wizard .wizard-body .wizard-nav .nav li.disabled .step-name,
+.wizard .wizard-body .wizard-nav .nav li.disabled .step-description {
+  color: #666;
 }
 .wizard .wizard-body .wizard-nav .nav li.disabled.completed .step-marker {
   background-color: #1EB475;

http://git-wip-us.apache.org/repos/asf/ambari/blob/55747a5c/ambari-web/app/styles/wizard.less
--
diff --git a/ambari-web/app/styles/wizard.less 
b/ambari-web/app/styles/wizar

ambari git commit: AMBARI-19409. Auto refresh yarn queues when capacity scheduler config is changed from hive configs page.(Vivek Subramanian via xiwang)

2017-01-06 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 00a9399dc -> 3f28809f2


AMBARI-19409. Auto refresh yarn queues when capacity scheduler config is 
changed from hive configs page.(Vivek Subramanian via xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3f28809f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3f28809f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3f28809f

Branch: refs/heads/branch-2.5
Commit: 3f28809f2d225f790daf03a0523f718a19f15191
Parents: 00a9399
Author: Xi Wang <xiw...@apache.org>
Authored: Fri Jan 6 17:08:06 2017 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Fri Jan 6 17:08:06 2017 -0800

--
 .../configs/component_actions_by_configs.js | 11 ---
 .../app/models/configs/theme/config_action.js   | 20 
 2 files changed, 28 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3f28809f/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
--
diff --git 
a/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js 
b/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
index 11ee3ac..ba30dcd 100644
--- a/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
+++ b/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
@@ -61,10 +61,15 @@ App.ComponentActionsByConfigs = Em.Mixin.create({
 
 if (configs.length) {
   if(config_action.get('fileName') === 'capacity-scheduler.xml' && 
!self.isYarnQueueRefreshed) {
-self.configAction = config_action;
-App.showConfirmationPopup(function () {
+if(self.get('content.serviceName') === 'HIVE') {
+  // Auto refresh yarn capacity scheduler if capacity-scheduler 
configs are changed from Hive configs page
   self.popupPrimaryButtonCallback(config_action);
-}, config_action.get('popupProperties').body, null, 
Em.I18n.t('popup.confirmation.commonHeader'), 
config_action.get('popupProperties').primaryButton.label, false, 
'refresh_yarn_queues')
+} else {
+  self.configAction = config_action;
+  App.showConfirmationPopup(function () {
+self.popupPrimaryButtonCallback(config_action);
+  }, config_action.get('popupProperties').body, null, 
Em.I18n.t('popup.confirmation.commonHeader'), 
config_action.get('popupProperties').primaryButton.label, false, 
'refresh_yarn_queues')
+}
   }
 }
   });

http://git-wip-us.apache.org/repos/asf/ambari/blob/3f28809f/ambari-web/app/models/configs/theme/config_action.js
--
diff --git a/ambari-web/app/models/configs/theme/config_action.js 
b/ambari-web/app/models/configs/theme/config_action.js
index 27955d5..905fecb 100644
--- a/ambari-web/app/models/configs/theme/config_action.js
+++ b/ambari-web/app/models/configs/theme/config_action.js
@@ -64,5 +64,25 @@ App.ConfigAction.FIXTURES = [
 if:'${hive-interactive-env/enable_hive_interactive}',
 then:'add',
 else: 'delete'
+  },
+  {
+id: 2,
+service_name: 'YARN',
+component_name: 'RESOURCEMANAGER',
+config_name: "capacity-scheduler",
+file_name: "capacity-scheduler.xml",
+action_type: "showPopup",
+popup_properties: {
+  primaryButton: {
+label: Em.I18n.t('popup.confirmation.refreshYarnQueues.buttonText'),
+metaData: {
+  name: 'service.item.refreshQueueYarnRequest',
+  command: "REFRESHQUEUES",
+  context: 
Em.I18n.t('services.service.actions.run.yarnRefreshQueues.context')
+}
+  },
+  body: Em.I18n.t('popup.confirmation.refreshYarnQueues.body'),
+  errorMessage: 
Em.I18n.t('services.service.actions.run.yarnRefreshQueues.error')
+}
   }
 ];

ambari git commit: AMBARI-19409. Auto refresh yarn queues when capacity scheduler config is changed from hive configs page.(Vivek Subramanian via xiwang )

2017-01-06 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk fbcad4fb4 -> 688224127


AMBARI-19409. Auto refresh yarn queues when capacity scheduler config is 
changed from hive configs page.(Vivek Subramanian via xiwang )


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/68822412
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/68822412
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/68822412

Branch: refs/heads/trunk
Commit: 688224127de729640904648907788b9f31c60a5c
Parents: fbcad4f
Author: Xi Wang <xiw...@apache.org>
Authored: Fri Jan 6 17:03:48 2017 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Fri Jan 6 17:05:13 2017 -0800

--
 .../main/service/configs/component_actions_by_configs.js | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/68822412/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
--
diff --git 
a/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js 
b/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
index 347bdde..8b014c2 100644
--- a/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
+++ b/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
@@ -61,10 +61,15 @@ App.ComponentActionsByConfigs = Em.Mixin.create({
 
 if (configs.length) {
   if(config_action.get('fileName') === 'capacity-scheduler.xml' && 
!self.isYarnQueueRefreshed) {
-self.configAction = config_action;
-App.showConfirmationPopup(function () {
+if(self.get('content.serviceName') === 'HIVE') {
+  // Auto refresh yarn capacity scheduler if capacity-scheduler 
configs are changed from Hive configs page
   self.popupPrimaryButtonCallback(config_action);
-}, config_action.get('popupProperties').body, null, 
Em.I18n.t('popup.confirmation.commonHeader'), 
config_action.get('popupProperties').primaryButton.label, false, 
'refresh_yarn_queues')
+} else {
+  self.configAction = config_action;
+  App.showConfirmationPopup(function () {
+self.popupPrimaryButtonCallback(config_action);
+  }, config_action.get('popupProperties').body, null, 
Em.I18n.t('popup.confirmation.commonHeader'), 
config_action.get('popupProperties').primaryButton.label, false, 
'refresh_yarn_queues')
+}
   }
 }
   });

ambari git commit: AMBARI-19313. Improve and Fix 'Hosts page' after new guidelines.(xiwang)

2017-01-05 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk cae80946c -> d243fea75


AMBARI-19313. Improve and Fix 'Hosts 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/d243fea7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d243fea7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d243fea7

Branch: refs/heads/trunk
Commit: d243fea753edb39155f003058ee2e87828aa1955
Parents: cae8094
Author: Xi Wang <xiw...@apache.org>
Authored: Thu Jan 5 13:59:54 2017 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Thu Jan 5 18:34:28 2017 -0800

--
 ambari-web/app/styles/application.less | 26 --
 1 file changed, 24 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d243fea7/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index 7d18cf5..cf84c5b 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -2523,19 +2523,35 @@ input[type="radio"].align-checkbox, 
input[type="checkbox"].align-checkbox {
   border: 1px solid #ccc;
   border-radius: 4px;
   box-shadow: 0 0 1px #fff inset;
+  min-height: 34px;
+}
+.VS-icon-search, .VS-icon-cancel {
+top: 10px;
 }
-
 .VS-placeholder {
   color: #ccc;
+  top: 9px;
+}
+.search_input input {
+  height: 32px;
+  margin-top: 0px;
 }
-
 .search_facet {
   border-radius: 4px;
+  margin: 5px -3px 3px 0;
+  height: 22px;
   .category {
 margin-left: 3px;
+padding: 4px 0 0;
+  }
+  input {
+font: inherit;
+font-family: 'Roboto', sans-serif;
+height: 20px;
   }
   .search_facet_remove {
 left: 3px;
+top: 4px;
   }
   &.not_selected {
 border: 1px solid #d2d2d2;
@@ -2550,6 +2566,12 @@ input[type="radio"].align-checkbox, 
input[type="checkbox"].align-checkbox {
   }
 }
 
+.VS-interface.ui-autocomplete.ui-menu{
+  li.ui-menu-item, li.ui-autocomplete-category {
+font-family: 'Roboto', sans-serif;
+  }
+}
+
 .delete-service-progress {
   .modal-body {
 text-align: center;

ambari git commit: AMBARI-19322. Improve and Fix 'Admin page' after new guidelines.(xiwang)

2016-12-29 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk 96f7f5f6f -> 3ab08abe4


AMBARI-19322. Improve and Fix 'Admin 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/3ab08abe
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3ab08abe
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3ab08abe

Branch: refs/heads/trunk
Commit: 3ab08abe4d84bb5dd9fb0a0966b582102510c0b8
Parents: 96f7f5f
Author: Xi Wang <xiw...@apache.org>
Authored: Thu Dec 29 17:51:20 2016 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Thu Dec 29 17:51:30 2016 -0800

--
 ambari-web/app/styles/stack_versions.less   | 34 
 .../stack_upgrade/upgrade_version_column.hbs|  2 --
 .../main/admin/stack_upgrade/versions.hbs   |  2 +-
 .../upgrade_version_column_view.js  | 10 +++---
 4 files changed, 20 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3ab08abe/ambari-web/app/styles/stack_versions.less
--
diff --git a/ambari-web/app/styles/stack_versions.less 
b/ambari-web/app/styles/stack_versions.less
index 6698dfa..0e1d2d0 100644
--- a/ambari-web/app/styles/stack_versions.less
+++ b/ambari-web/app/styles/stack_versions.less
@@ -135,9 +135,6 @@
 padding: 0;
 margin: 0;
 border: none;
-.hosts-section {
-  padding-bottom: 16px;
-}
 .out-of-sync-badge {
   top: 0;
   left: 0;
@@ -160,9 +157,15 @@
   .left-menu-table {
 padding: 10px 0;
 margin-top: 122px;
-td.service-display-name {
-  border-top: 2px solid #e4e4e4;
-  border-bottom: 2px solid #e4e4e4;
+.border-extended-table {
+  width: 100%;
+  position: relative;
+  z-index: 999;
+  background: transparent;
+  td.service-display-name {
+border-top: 1px solid #d2d9dd;
+border-bottom: 1px solid #d2d9dd;
+  }
 }
   }
   div.current-version-box {
@@ -258,15 +261,16 @@
 }
 .hosts-section {
   margin-top: 16px;
+  padding-bottom: 8px;
   width: 100%;
   text-align: center;
   background: #f8f8f8;
   border-top: 1px solid #e4e4e4;
-  padding-bottom: 4px;
 }
 .hosts-section .hosts-bar {
   font-size: 14px;
   font-weight: 500;
+  padding: 8px;
 }
 .hosts-section .host-link {
   margin: 0;
@@ -318,9 +322,11 @@
   width: 100%;
   text-align: center;
   padding-bottom: 4px;
+  margin-top: -5px;
   .service-version-info {
 line-height: 20px;
-margin-bottom: 12px;
+margin-bottom: 9px;
+padding-top: 6px;
 text-align: center;
 span.label {
   padding: 5px 15px;
@@ -329,18 +335,6 @@
   position: relative;
 }
   }
-  .line-separator, .line-separator-bottom{
-height: 2px;
-background: #e4e4e4;
-position: relative;
-margin: 0 0 0 -15px;
-  }
-  .line-separator {
-top: -7px;
-  }
-  .line-separator-bottom {
-top: -5px;
-  }
 }
   }
   div.current-version-box.version-column {

http://git-wip-us.apache.org/repos/asf/ambari/blob/3ab08abe/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
--
diff --git 
a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs 
b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
index 7cd9ffb..185b4f3 100644
--- 
a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
+++ 
b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
@@ -79,10 +79,8 @@
 
 
   {{#each service in view.services}}
-
 
{{service.latestVersion}}
 
-
   {{/each}}
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/3ab08abe/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs
--
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs 
b/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs
index a82aad6..acb6e78 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs
@@ -43,7 +43,7 @@
 
 
   
-
+
   
   
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/3ab08abe/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js
--
diff --git 
a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js 
b/ambari-web/app/views/main/admi

[1/2] ambari git commit: AMBARI-19312. Improve and Fix 'Alerts page' after new guidelines. (xiwang)

2016-12-28 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk 74d636392 -> 6add93ea4


AMBARI-19312. Improve and Fix 'Alerts 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/6add93ea
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6add93ea
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6add93ea

Branch: refs/heads/trunk
Commit: 6add93ea482555084e5d001c47bf1f86f2dfe99b
Parents: a2c907b
Author: Xi Wang <xiw...@apache.org>
Authored: Wed Dec 28 13:52:46 2016 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Wed Dec 28 13:52:53 2016 -0800

--
 ambari-web/app/styles/alerts.less  | 16 
 ambari-web/app/styles/application.less |  4 +---
 2 files changed, 17 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6add93ea/ambari-web/app/styles/alerts.less
--
diff --git a/ambari-web/app/styles/alerts.less 
b/ambari-web/app/styles/alerts.less
index a04db8a..c13c8c9 100644
--- a/ambari-web/app/styles/alerts.less
+++ b/ambari-web/app/styles/alerts.less
@@ -87,6 +87,16 @@
 }
   }
 
+  > thead > tr > th,  > thead > tr > td,
+  > tbody > tr > th,  > tbody > tr > td,
+  > tfoot > tr > th,  > tfoot > tr > td {
+vertical-align: middle;
+  }
+
+  a.ui-icon-circle-close {
+visibility: hidden;
+  }
+
   .filter-input-width {
 width: ~"calc(100% - 20px)";
   }
@@ -135,6 +145,12 @@
 }
 
 #alert-instances-table {
+  > thead > tr > th,  > thead > tr > td,
+  > tbody > tr > th,  > tbody > tr > td,
+  > tfoot > tr > th,  > tfoot > tr > td {
+vertical-align: middle;
+  }
+
   .col0,
   td:first-child,
   th:first-child {

http://git-wip-us.apache.org/repos/asf/ambari/blob/6add93ea/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index c35f0d1..a89296c 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -1745,7 +1745,7 @@ ul.inline li {
 opacity: 0.2;
 padding: 1px;
 position: relative;
-margin-top: 6px;
+margin-top: 8px;
 z-index: 10;
 &:hover {
   opacity: 0.7;
@@ -1765,7 +1765,6 @@ ul.inline li {
 .active-sort {
   color: #555;
   text-decoration: none;
-  background-color: #e5e5e5;
   border-radius: 0;
 }
   }
@@ -1777,7 +1776,6 @@ ul.inline li {
   color: #555;
   text-decoration: none;
   background-color: #e5e5e5;
-  box-shadow: inset 0 -5px 8px rgba(0, 0, 0, 0.05);
 }
 .filter-btn {
   color: #999;

[2/2] ambari git commit: AMBARI-19305. Improve and Fix 'Services page' after new guidelines.(xiwang)

2016-12-28 Thread xiwang

AMBARI-19305. Improve and Fix 'Services 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/a2c907b2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a2c907b2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a2c907b2

Branch: refs/heads/trunk
Commit: a2c907b2d9c2da58c7907e0ee9a3b5ad5376f361
Parents: 74d6363
Author: Xi Wang <xiw...@apache.org>
Authored: Tue Dec 27 18:44:57 2016 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Wed Dec 28 13:52:53 2016 -0800

--
 .../app/styles/enhanced_service_dashboard.less  | 40 +++-
 .../service/widgets/create/expression_view.js   |  1 +
 2 files changed, 39 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a2c907b2/ambari-web/app/styles/enhanced_service_dashboard.less
--
diff --git a/ambari-web/app/styles/enhanced_service_dashboard.less 
b/ambari-web/app/styles/enhanced_service_dashboard.less
index 0d549d7..dfbe042 100644
--- a/ambari-web/app/styles/enhanced_service_dashboard.less
+++ b/ambari-web/app/styles/enhanced_service_dashboard.less
@@ -180,6 +180,8 @@
 
 #widget-preview {
   max-width: 200px;
+  margin: auto;
+  margin-bottom: 20px;
   .widget {
 .img-thumbnail .corner-icon {
   display: none;
@@ -475,12 +477,46 @@
 }
 
 .add-metric-menu{
-  .select-options-dropdown {
+  .dropdown-menu.select-options-dropdown {
 width: 240px;
-border: none;
+padding: 0px;
+-moz-background-clip: padding;
+-webkit-background-clip: padding;
+background-clip: padding-box;
+border-bottom: 250px transparent solid;
+border-left: none;
+border-right: none;
+-webkit-box-shadow: none;
+-moz-box-shadow: none;
+box-shadow: none;
 &>li>div {
   padding: 3px;
 }
+li.metric-select {
+  padding: 5px;
+  padding-bottom: 0px;
+  border-left: 1px #ccc solid;
+  border-right: 1px #ccc solid;
+  border-bottom: none;
+  border-top: none;
+}
+li.aggregator-select {
+  padding: 5px;
+  padding-bottom: 0px;
+  border-left: 1px #ccc solid;
+  border-right: 1px #ccc solid;
+  border-bottom: none;
+  border-top: none;
+}
+li.actions-buttons{
+  padding: 5px;
+  padding-left: 8px;
+  border: 1px #ccc solid;
+  border-top: none;
+  button {
+margin-right: 5px;
+  }
+}
   }
 }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/a2c907b2/ambari-web/app/views/main/service/widgets/create/expression_view.js
--
diff --git 
a/ambari-web/app/views/main/service/widgets/create/expression_view.js 
b/ambari-web/app/views/main/service/widgets/create/expression_view.js
index 436e3e9..c4a1a3e 100644
--- a/ambari-web/app/views/main/service/widgets/create/expression_view.js
+++ b/ambari-web/app/views/main/service/widgets/create/expression_view.js
@@ -266,6 +266,7 @@ App.AddMetricExpressionView = Em.View.extend({
 var component = this.get('componentMap').findProperty('serviceName', 
event.context.get('serviceName'))
   .get('components').findProperty('id', event.context.get('id'));
 this.set('currentSelectedComponent', component);
+event.stopPropagation();
   },
 
   /**

ambari git commit: AMBARI-19260. Improve and Fix 'Dashboard page' after new guidelines.(xiwang)

2016-12-21 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk c08df0ef4 -> ae1438007


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/trunk
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}}
   
 
-
-  {{t common.cancel}}
-  {{t common.apply}}
+
+  {{t common.add}}
 
   {{else}}
-
-  
-{{t dashboard.widgets.nothing}}
-  
-
-
-  {{t common.cancel}}
+
+  {{t dashboard.widgets.nothing}}
 
   {{/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 @@
 
 
 {{#isAuthorized "SERVICE.START_STOP, SERVICE.ADD_DELETE_SERVICES"}}
-  
-{{t common.actions}}
+  
+

ambari git commit: AMBARI-19117. Implement Create Alerts: PORT alert configs page (step 2) (xiwang)

2016-12-20 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk d48b8d9b0 -> 688830c63


AMBARI-19117. Implement Create Alerts: PORT alert configs page (step 2) (xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/688830c6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/688830c6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/688830c6

Branch: refs/heads/trunk
Commit: 688830c63f784588aa4c0b47a68c884df5fd5516
Parents: d48b8d9
Author: Xi Wang <xiw...@apache.org>
Authored: Tue Nov 29 15:11:13 2016 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Tue Dec 20 10:31:10 2016 -0800

--
 ambari-web/app/config.js|   1 +
 .../alert_definitions_actions_controller.js |  48 ++---
 .../alerts/definition_configs_controller.js | 182 +++
 ambari-web/app/models/alerts/alert_config.js|  34 ++--
 ambari-web/app/styles/alerts.less   |   2 +-
 .../definitions_configs_controller_test.js  |  76 +---
 6 files changed, 155 insertions(+), 188 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/688830c6/ambari-web/app/config.js
--
diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js
index 130cb39..c7b41e6 100644
--- a/ambari-web/app/config.js
+++ b/ambari-web/app/config.js
@@ -90,6 +90,7 @@ App.supports = {
   kerberosStackAdvisor: true,
   logCountVizualization: false,
   manageJournalNode: true,
+  createAlerts: false,
   enabledWizardForHostOrderedUpgrade: true
 };
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/688830c6/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js
 
b/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js
index 7fb4b2d..a397b7b 100644
--- 
a/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js
+++ 
b/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js
@@ -26,32 +26,36 @@ App.MainAlertDefinitionActionsController = 
Em.ArrayController.extend({
* List of available actions for alert definitions
* @type {{title: string, icon: string, action: string, showDivider: 
boolean}[]}
*/
-  content: [
-{
-  title: Em.I18n.t('alerts.actions.create'),
-  icon: 'glyphicon glyphicon-plus',
-  action: 'createNewAlertDefinition',
-  showDivider: true
-},
-{
+  content: function() {
+var content = [];
+if (App.supports.createAlerts) {
+  content = [{
+title: Em.I18n.t('alerts.actions.create'),
+icon: 'glyphicon glyphicon-plus',
+action: 'createNewAlertDefinition',
+showDivider: true
+  }];
+}
+content = content.concat([{
   title: Em.I18n.t('alerts.actions.manageGroups'),
   icon: 'glyphicon glyphicon-th-large',
   action: 'manageAlertGroups',
   showDivider: false
-},
-{
-  title: Em.I18n.t('alerts.actions.manageNotifications'),
-  icon: 'glyphicon glyphicon-envelope',
-  action: 'manageNotifications',
-  showDivider: false
-},
-{
-  title: Em.I18n.t('alerts.actions.manageSettings'),
-  icon: 'glyphicon glyphicon-cog',
-  action: 'manageSettings',
-  showDivider: false
-}
-  ],
+  },
+  {
+title: Em.I18n.t('alerts.actions.manageNotifications'),
+icon: 'glyphicon glyphicon-envelope',
+action: 'manageNotifications',
+showDivider: false
+  },
+  {
+title: Em.I18n.t('alerts.actions.manageSettings'),
+icon: 'glyphicon glyphicon-cog',
+action: 'manageSettings',
+showDivider: false
+  }]);
+return content;
+  }.property('App.supports.createAlerts'),
 
   /**
* Common handler for menu item click

http://git-wip-us.apache.org/repos/asf/ambari/blob/688830c6/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/alerts/definition_configs_controller.js 
b/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
index 138aaa4..31e34a9 100644
--- a/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
+++ b/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
@@ -54,7 +54,7 @@ App.MainAlertDefinitionConfigsController = 
Em.Controller.extend({
* @type {Array}
*/
   allServices: function () {
-return App.Service.find().mapProperty('displayName');
+return App.Service.find().mapProperty('displayName').concat('CUSTOM')

ambari git commit: AMBARI-19099. Improve and Fix 'Wizard pages' after new guidelines. (xiwang)

2016-12-06 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk a62119ab9 -> 1e261db06


AMBARI-19099. Improve and Fix 'Wizard pages' 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/1e261db0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1e261db0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1e261db0

Branch: refs/heads/trunk
Commit: 1e261db06128143a4e631aff899704cf12709413
Parents: a62119a
Author: Xi Wang <xiw...@apache.org>
Authored: Mon Dec 5 16:01:52 2016 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Tue Dec 6 17:25:21 2016 -0800

--
 .../app/styles/theme/bootstrap-ambari.css   | 25 +++-
 ambari-web/app/styles/wizard.less   | 13 --
 ambari-web/app/templates/wizard/step8.hbs   |  2 +-
 3 files changed, 26 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1e261db0/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 738fa59..5a641b3 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -510,19 +510,15 @@ h2.table-title {
   margin: 15px 20px;
 }
 .wizard .wizard-body {
-  background: #ebecf1;
-  /* Old browsers */
-  background: -moz-linear-gradient(to right, #323544, #323544 25%, #ebecf1 
25%, #ebecf1);
-  /* FF3.6-15 */
-  background: -webkit-linear-gradient(to right, #323544, #323544 25%, #ebecf1 
25%, #ebecf1);
-  /* Chrome10-25,Safari5.1-6 */
-  background: linear-gradient(to right, #323544, #323544 25%, #ebecf1 25%, 
#ebecf1);
-  /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
+  overflow: hidden;
   margin: 0;
 }
 .wizard .wizard-body .wizard-content {
   background: #ebecf1;
   padding-top: 25px;
+  float: left;
+  margin-bottom: -9px;
+  padding-bottom: 9px;
 }
 .wizard .wizard-body .wizard-content .step-title {
   font-family: 'Roboto', sans-serif;
@@ -554,6 +550,9 @@ h2.table-title {
   min-height: 650px;
   padding-top: 25px;
   background-color: #323544;
+  float: left;
+  margin-bottom: -9px;
+  padding-bottom: 9px;
 }
 .wizard .wizard-body .wizard-nav .nav li {
   padding: 10px 0;
@@ -588,6 +587,9 @@ h2.table-title {
   color: #bb;
   margin-left: 30px;
 }
+.wizard .wizard-body .wizard-nav .nav li .step-index {
+  line-height: 18px;
+}
 .wizard .wizard-body .wizard-nav .nav li .step-description {
   font-family: 'Roboto', sans-serif;
   font-weight: normal;
@@ -602,7 +604,7 @@ h2.table-title {
   background-color: #1EB475;
   color: white;
   font-size: 10px;
-  padding-left: 3px;
+  padding-left: 2px;
 }
 .wizard .wizard-body .wizard-nav .nav li.completed .step-marker .step-index {
   display: none;
@@ -634,8 +636,9 @@ h2.table-title {
   border-color: #bb;
 }
 .wizard .wizard-body .wizard-nav .nav li.disabled.completed .step-marker {
-  background-color: #bb;
-  color: #323544;
+  background-color: #1EB475;
+  border: 2px solid #1EB475;
+  color: white;
 }
 .wizard .wizard-body .wizard-nav .nav-pills > li.active > a,
 .wizard .wizard-body .wizard-nav .nav-pills > li.active > a:focus,

http://git-wip-us.apache.org/repos/asf/ambari/blob/1e261db0/ambari-web/app/styles/wizard.less
--
diff --git a/ambari-web/app/styles/wizard.less 
b/ambari-web/app/styles/wizard.less
index 57dae45..9920319 100644
--- a/ambari-web/app/styles/wizard.less
+++ b/ambari-web/app/styles/wizard.less
@@ -36,7 +36,6 @@
 padding-right: 15px;
   }
   .btn-area {
-margin-top: 20px;
 .btn.btn-info {
   margin-right: 10px;
 }
@@ -433,7 +432,7 @@
 color: #fff;
 cursor: pointer;
 font-weight: bold;
-text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+line-height: 16px;
 &:hover {
   background-color: @green;
 }
@@ -471,6 +470,12 @@
   ul {
 li {
   list-style: none;
+  span.text {
+line-height: 1.5;
+  }
+  b.service-name {
+line-height: 2;
+  }
 }
   }
   max-height: 440px;
@@ -490,6 +495,10 @@
   ul {
 li {
   list-style: none;
+  span.text-info,
+  span.text-success {
+line-height: 1.5;
+  }
 }
   }
   max-height: 440px;

http://git-wip-us.apache.org/repos/asf/ambari/blob/1e261db0/ambari-web/app/templates/wizard/step8.hbs
--
diff --git a/ambari-web/app/templates/wizard/step8.hbs 
b/ambari-web/app/templates/wizard/step8.hbs
index 5c2e8e6..9e50e30 100644
--- a/ambari-web/app/templates/wizard/step8.hbs
+++ b/ambari

[2/2] ambari git commit: Revert "AMBARI-18903. Implement Create Alerts: Create a base wizard for all steps.(xiwang)"

2016-11-29 Thread xiwang

Revert "AMBARI-18903. Implement Create Alerts: Create a base wizard for all 
steps.(xiwang)"

This reverts commit 521995f4a9884ee62bd92f9f226b152f0155afc9.


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/40fde4a6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/40fde4a6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/40fde4a6

Branch: refs/heads/branch-2.5
Commit: 40fde4a65a4d21477db53d402af422348f1821eb
Parents: be8354a
Author: Xi Wang <xiw...@apache.org>
Authored: Tue Nov 29 17:22:39 2016 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Tue Nov 29 17:23:52 2016 -0800

--
 .../main/alerts/alert_definitions_actions_controller.js  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/40fde4a6/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js
 
b/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js
index ad239c6..f3f0387 100644
--- 
a/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js
+++ 
b/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js
@@ -27,12 +27,12 @@ App.MainAlertDefinitionActionsController = 
Em.ArrayController.extend({
* @type {{title: string, icon: string, action: string, showDivider: 
boolean}[]}
*/
   content: [
-{
+/*{
   title: Em.I18n.t('alerts.actions.create'),
   icon: 'icon-plus',
   action: 'createNewAlertDefinition',
   showDivider: true
-},
+},*/
 {
   title: Em.I18n.t('alerts.actions.manageGroups'),
   icon: 'icon-th-large',

[1/2] ambari git commit: Revert "AMBARI-18912. Implement Create Alerts: step 1 select alert type.(XIWANG)"

2016-11-29 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 207358870 -> 40fde4a65


Revert "AMBARI-18912. Implement Create Alerts: step 1 select alert 
type.(XIWANG)"

This reverts commit 86ecd898e7045c67cee85ca25c6c746298bd5ef8.


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/be8354a5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/be8354a5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/be8354a5

Branch: refs/heads/branch-2.5
Commit: be8354a5a987e9e92ca79cffb72496fc9a34fb4f
Parents: 2073588
Author: Xi Wang <xiw...@apache.org>
Authored: Tue Nov 29 17:07:33 2016 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Tue Nov 29 17:09:19 2016 -0800

--
 .../add_alert_definition/step1_controller.js| 41 +++-
 .../alerts/definition_configs_controller.js | 40 ++--
 ambari-web/app/messages.js  | 17 ++---
 .../app/models/alerts/alert_definition.js   | 54 
 ambari-web/app/styles/alerts.less   | 66 +---
 .../main/alerts/add_alert_definition/step1.hbs  | 29 +++--
 .../alerts/add_alert_definition/step1_view.js   |  3 -
 .../step1_controller_test.js| 24 ++-
 8 files changed, 80 insertions(+), 194 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/be8354a5/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
 
b/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
index c758fc0..43e25c8 100644
--- 
a/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
+++ 
b/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
@@ -24,25 +24,34 @@ App.AddAlertDefinitionStep1Controller = 
Em.Controller.extend({
 
   /**
* List of available alert definition types
-   * @type {{name: string, isActive: boolean}[]}
+   * @type {{value: string, isActive: boolean}[]}
*/
-  alertDefinitionsTypes: function () {
-return App.AlertType.find().map(function(option) {
-  return Em.Object.create({
-name: option.get('name'),
-displayName: option.get('displayName'),
-icon: option.get('iconPath'),
-description: option.get('description')
-  });
-});
-  }.property(),
+  alertDefinitionsTypes: [
+Em.Object.create({value: 'PORT', isActive: false, icon: 'icon-signal'}),
+Em.Object.create({value: 'METRIC', isActive: false, icon: 'icon-bolt'}),
+Em.Object.create({value: 'WEB', isActive: false, icon: 'icon-globe'}),
+Em.Object.create({value: 'AGGREGATE', isActive: false, icon: 
'icon-plus-sign-alt'}),
+Em.Object.create({value: 'SCRIPT', isActive: false, icon: 'icon-code'}),
+Em.Object.create({value: 'SERVER', isActive: false, icon: 'icon-desktop'}),
+Em.Object.create({value: 'RECOVERY', isActive: false, icon: 
'icon-desktop'})
+  ],
+
+  /**
+   * "Next"-button is disabled if user doesn't select any alert definition type
+   * @type {boolean}
+   */
+  isSubmitDisabled: Em.computed.everyBy('alertDefinitionsTypes', 'isActive', 
false),
 
   /**
* Set selectedType if it exists in the wizard controller
* @method loadStep
*/
   loadStep: function() {
-this.set('content.selectedType', '');
+this.get('alertDefinitionsTypes').setEach('isActive', false);
+var selectedType = this.get('content.selectedType');
+if(selectedType) {
+  this.selectType({context: {value: selectedType}});
+}
   },
 
   /**
@@ -52,10 +61,10 @@ App.AddAlertDefinitionStep1Controller = 
Em.Controller.extend({
*/
   selectType: function(e) {
 var type = e.context,
-types = this.get('alertDefinitionsTypes');
-this.set('content.selectedType', type.name);
-$("[rel='selectable-tooltip']").trigger('mouseleave');
-App.router.send('next');
+  types = this.get('alertDefinitionsTypes');
+types.setEach('isActive', false);
+types.findProperty('value', type.value).set('isActive', true);
+this.set('content.selectedType', type.value);
   }
 
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/be8354a5/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/alerts/definition_configs_controller.js 
b/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
index 138aaa4..4c82556 100644
--- a/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
+++ b/ambari-web/app/controllers/main/alerts/defi

ambari git commit: AMBARI-18912. Implement Create Alerts: step 1 select alert type.(XIWANG)

2016-11-22 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 809d4c4f0 -> 86ecd898e


AMBARI-18912. Implement Create Alerts: step 1 select alert type.(XIWANG)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/86ecd898
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/86ecd898
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/86ecd898

Branch: refs/heads/branch-2.5
Commit: 86ecd898e7045c67cee85ca25c6c746298bd5ef8
Parents: 809d4c4
Author: Xi Wang <xiw...@apache.org>
Authored: Wed Nov 16 18:31:35 2016 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Tue Nov 22 14:22:13 2016 -0800

--
 .../add_alert_definition/step1_controller.js| 41 +---
 .../alerts/definition_configs_controller.js | 40 ++--
 ambari-web/app/messages.js  | 17 +++--
 .../app/models/alerts/alert_definition.js   | 54 
 ambari-web/app/styles/alerts.less   | 66 +++-
 .../main/alerts/add_alert_definition/step1.hbs  | 29 ++---
 .../alerts/add_alert_definition/step1_view.js   |  3 +
 .../step1_controller_test.js| 24 +--
 8 files changed, 194 insertions(+), 80 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/86ecd898/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
 
b/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
index 43e25c8..c758fc0 100644
--- 
a/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
+++ 
b/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
@@ -24,34 +24,25 @@ App.AddAlertDefinitionStep1Controller = 
Em.Controller.extend({
 
   /**
* List of available alert definition types
-   * @type {{value: string, isActive: boolean}[]}
+   * @type {{name: string, isActive: boolean}[]}
*/
-  alertDefinitionsTypes: [
-Em.Object.create({value: 'PORT', isActive: false, icon: 'icon-signal'}),
-Em.Object.create({value: 'METRIC', isActive: false, icon: 'icon-bolt'}),
-Em.Object.create({value: 'WEB', isActive: false, icon: 'icon-globe'}),
-Em.Object.create({value: 'AGGREGATE', isActive: false, icon: 
'icon-plus-sign-alt'}),
-Em.Object.create({value: 'SCRIPT', isActive: false, icon: 'icon-code'}),
-Em.Object.create({value: 'SERVER', isActive: false, icon: 'icon-desktop'}),
-Em.Object.create({value: 'RECOVERY', isActive: false, icon: 
'icon-desktop'})
-  ],
-
-  /**
-   * "Next"-button is disabled if user doesn't select any alert definition type
-   * @type {boolean}
-   */
-  isSubmitDisabled: Em.computed.everyBy('alertDefinitionsTypes', 'isActive', 
false),
+  alertDefinitionsTypes: function () {
+return App.AlertType.find().map(function(option) {
+  return Em.Object.create({
+name: option.get('name'),
+displayName: option.get('displayName'),
+icon: option.get('iconPath'),
+description: option.get('description')
+  });
+});
+  }.property(),
 
   /**
* Set selectedType if it exists in the wizard controller
* @method loadStep
*/
   loadStep: function() {
-this.get('alertDefinitionsTypes').setEach('isActive', false);
-var selectedType = this.get('content.selectedType');
-if(selectedType) {
-  this.selectType({context: {value: selectedType}});
-}
+this.set('content.selectedType', '');
   },
 
   /**
@@ -61,10 +52,10 @@ App.AddAlertDefinitionStep1Controller = 
Em.Controller.extend({
*/
   selectType: function(e) {
 var type = e.context,
-  types = this.get('alertDefinitionsTypes');
-types.setEach('isActive', false);
-types.findProperty('value', type.value).set('isActive', true);
-this.set('content.selectedType', type.value);
+types = this.get('alertDefinitionsTypes');
+this.set('content.selectedType', type.name);
+$("[rel='selectable-tooltip']").trigger('mouseleave');
+App.router.send('next');
   }
 
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/86ecd898/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/alerts/definition_configs_controller.js 
b/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
index 4c82556..138aaa4 100644
--- a/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
+++ b/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
@@ -225,7 +225,7 @@ App.MainAlertDefinitionConfigsController = 
Em.

ambari git commit: AMBARI-18912. Implement Create Alerts: step 1 select alert type.(XIWANG)

2016-11-22 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk e73e783a8 -> 31ce5f7d3


AMBARI-18912. Implement Create Alerts: step 1 select alert type.(XIWANG)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/31ce5f7d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/31ce5f7d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/31ce5f7d

Branch: refs/heads/trunk
Commit: 31ce5f7d3d087af5d0f03f295fe5d680a6ee453d
Parents: e73e783
Author: Xi Wang <xiw...@apache.org>
Authored: Wed Nov 16 18:31:35 2016 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Tue Nov 22 14:21:01 2016 -0800

--
 .../add_alert_definition/step1_controller.js| 41 ++---
 .../alerts/definition_configs_controller.js | 40 ++---
 ambari-web/app/messages.js  | 17 --
 .../app/models/alerts/alert_definition.js   | 54 ++
 ambari-web/app/styles/alerts.less   | 60 
 .../main/alerts/add_alert_definition/step1.hbs  | 30 +-
 .../alerts/add_alert_definition/step1_view.js   |  3 +
 .../step1_controller_test.js| 24 +---
 8 files changed, 186 insertions(+), 83 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/31ce5f7d/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
 
b/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
index 2d4f338..c758fc0 100644
--- 
a/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
+++ 
b/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
@@ -24,34 +24,25 @@ App.AddAlertDefinitionStep1Controller = 
Em.Controller.extend({
 
   /**
* List of available alert definition types
-   * @type {{value: string, isActive: boolean}[]}
+   * @type {{name: string, isActive: boolean}[]}
*/
-  alertDefinitionsTypes: [
-Em.Object.create({value: 'PORT', isActive: false, icon: 'glyphicon 
glyphicon-signal'}),
-Em.Object.create({value: 'METRIC', isActive: false, icon: 'icon-bolt'}),
-Em.Object.create({value: 'WEB', isActive: false, icon: 'glyphicon 
glyphicon-globe'}),
-Em.Object.create({value: 'AGGREGATE', isActive: false, icon: 'glyphicon 
glyphicon-plus-sign-alt'}),
-Em.Object.create({value: 'SCRIPT', isActive: false, icon: 'glyphicon 
glyphicon-code'}),
-Em.Object.create({value: 'SERVER', isActive: false, icon: 'glyphicon 
glyphicon-desktop'}),
-Em.Object.create({value: 'RECOVERY', isActive: false, icon: 'glyphicon 
glyphicon-desktop'})
-  ],
-
-  /**
-   * "Next"-button is disabled if user doesn't select any alert definition type
-   * @type {boolean}
-   */
-  isSubmitDisabled: Em.computed.everyBy('alertDefinitionsTypes', 'isActive', 
false),
+  alertDefinitionsTypes: function () {
+return App.AlertType.find().map(function(option) {
+  return Em.Object.create({
+name: option.get('name'),
+displayName: option.get('displayName'),
+icon: option.get('iconPath'),
+description: option.get('description')
+  });
+});
+  }.property(),
 
   /**
* Set selectedType if it exists in the wizard controller
* @method loadStep
*/
   loadStep: function() {
-this.get('alertDefinitionsTypes').setEach('isActive', false);
-var selectedType = this.get('content.selectedType');
-if(selectedType) {
-  this.selectType({context: {value: selectedType}});
-}
+this.set('content.selectedType', '');
   },
 
   /**
@@ -61,10 +52,10 @@ App.AddAlertDefinitionStep1Controller = 
Em.Controller.extend({
*/
   selectType: function(e) {
 var type = e.context,
-  types = this.get('alertDefinitionsTypes');
-types.setEach('isActive', false);
-types.findProperty('value', type.value).set('isActive', true);
-this.set('content.selectedType', type.value);
+types = this.get('alertDefinitionsTypes');
+this.set('content.selectedType', type.name);
+$("[rel='selectable-tooltip']").trigger('mouseleave');
+App.router.send('next');
   }
 
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/31ce5f7d/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/alerts/definition_configs_controller.js 
b/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
index 4c82556..138aaa4 100644
--- a/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
+++ b/ambari-web/app/controllers/main/alerts/definition_con

ambari git commit: AMBARI-18903. Implement Create Alerts: Create a base wizard for all steps.(xiwang)

2016-11-16 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 61a703600 -> 521995f4a


AMBARI-18903. Implement Create Alerts: Create a base wizard for all 
steps.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/521995f4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/521995f4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/521995f4

Branch: refs/heads/branch-2.5
Commit: 521995f4a9884ee62bd92f9f226b152f0155afc9
Parents: 61a7036
Author: Xi Wang <xiw...@apache.org>
Authored: Tue Nov 15 16:54:12 2016 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Wed Nov 16 18:39:56 2016 -0800

--
 .../main/alerts/alert_definitions_actions_controller.js  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/521995f4/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js
 
b/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js
index f3f0387..ad239c6 100644
--- 
a/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js
+++ 
b/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js
@@ -27,12 +27,12 @@ App.MainAlertDefinitionActionsController = 
Em.ArrayController.extend({
* @type {{title: string, icon: string, action: string, showDivider: 
boolean}[]}
*/
   content: [
-/*{
+{
   title: Em.I18n.t('alerts.actions.create'),
   icon: 'icon-plus',
   action: 'createNewAlertDefinition',
   showDivider: true
-},*/
+},
 {
   title: Em.I18n.t('alerts.actions.manageGroups'),
   icon: 'icon-th-large',

ambari git commit: AMBARI-18903. Implement Create Alerts: Create a base wizard for all steps.(xiwang)

2016-11-16 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk dbf9e66b2 -> 33d8c56c5


AMBARI-18903. Implement Create Alerts: Create a base wizard for all 
steps.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/33d8c56c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/33d8c56c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/33d8c56c

Branch: refs/heads/trunk
Commit: 33d8c56c5bd47e466e126079d457ae4bf4e904de
Parents: dbf9e66
Author: Xi Wang <xiw...@apache.org>
Authored: Tue Nov 15 16:54:12 2016 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Wed Nov 16 18:31:42 2016 -0800

--
 .../main/alerts/alert_definitions_actions_controller.js  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/33d8c56c/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js
 
b/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js
index 36bc232..7fb4b2d 100644
--- 
a/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js
+++ 
b/ambari-web/app/controllers/main/alerts/alert_definitions_actions_controller.js
@@ -27,12 +27,12 @@ App.MainAlertDefinitionActionsController = 
Em.ArrayController.extend({
* @type {{title: string, icon: string, action: string, showDivider: 
boolean}[]}
*/
   content: [
-/*{
+{
   title: Em.I18n.t('alerts.actions.create'),
   icon: 'glyphicon glyphicon-plus',
   action: 'createNewAlertDefinition',
   showDivider: true
-},*/
+},
 {
   title: Em.I18n.t('alerts.actions.manageGroups'),
   icon: 'glyphicon glyphicon-th-large',

ambari git commit: AMBARI-18743. Improve wizard styles and apply on Ambari - add 'move master wizard' (xiwang)

2016-11-09 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk 620329c5b -> 2e3a29ef5


AMBARI-18743. Improve wizard styles and apply on Ambari - add 'move master 
wizard' (xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2e3a29ef
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2e3a29ef
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2e3a29ef

Branch: refs/heads/trunk
Commit: 2e3a29ef5aa4f3c74f358fe03ce9a12d83bd0c30
Parents: 620329c
Author: Xi Wang <xiw...@apache.org>
Authored: Wed Nov 9 15:18:11 2016 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Wed Nov 9 15:18:11 2016 -0800

--
 .../templates/main/service/reassign/step1.hbs   | 21 
 .../templates/main/service/reassign/step3.hbs   | 52 +++-
 .../templates/main/service/reassign/step5.hbs   | 22 ++---
 3 files changed, 56 insertions(+), 39 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2e3a29ef/ambari-web/app/templates/main/service/reassign/step1.hbs
--
diff --git a/ambari-web/app/templates/main/service/reassign/step1.hbs 
b/ambari-web/app/templates/main/service/reassign/step1.hbs
index 9862cbe..f34a9a1 100644
--- a/ambari-web/app/templates/main/service/reassign/step1.hbs
+++ b/ambari-web/app/templates/main/service/reassign/step1.hbs
@@ -15,13 +15,16 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 }}
-
-{{t services.reassign.step1.header}}
-
-  {{#each message in view.message}}
-{{{message}}}
-  {{/each}}
-
-
-  {{t common.next}} 
+
+  {{t services.reassign.step1.header}}
+  
+{{#each message in view.message}}
+  {{{message}}}
+{{/each}}
+  
 
+
+  
+{{t common.next}} 
+  
+
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/2e3a29ef/ambari-web/app/templates/main/service/reassign/step3.hbs
--
diff --git a/ambari-web/app/templates/main/service/reassign/step3.hbs 
b/ambari-web/app/templates/main/service/reassign/step3.hbs
index 1e8dfe0..1f88fb5 100644
--- a/ambari-web/app/templates/main/service/reassign/step3.hbs
+++ b/ambari-web/app/templates/main/service/reassign/step3.hbs
@@ -15,31 +15,37 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 }}
+
+  {{t services.reassign.step3.header}}
+  
+{{t services.reassign.step3.body}}
+  
+  {{#if view.jdbcSetupMessage}}
+
+  {{{view.jdbcSetupMessage}}}
+
+  {{/if}}
+  
+
+  
+
+  {{t common.print}} 
+
+
+  {{t services.reassign.step3.component}} 
{{controller.content.reassign.display_name}}
 
-{{t services.reassign.step3.header}}
+  {{t services.reassign.step3.sourceHost}} 
{{view.sourceHost}}
 
-
-  {{t services.reassign.step3.body}}
-
-{{#if view.jdbcSetupMessage}}
-  
-{{{view.jdbcSetupMessage}}}
-  
-{{/if}}
-
-  
-{{t common.print}} 
-  
-  
-{{t services.reassign.step3.component}} 
{{controller.content.reassign.display_name}}
-
-{{t services.reassign.step3.sourceHost}} {{view.sourceHost}}
-
-{{t services.reassign.step3.targetHost}} {{view.targetHost}}
+  {{t services.reassign.step3.targetHost}} 
{{view.targetHost}}
+
+  
+
   
 
-
-   {{t 
common.back}}
-  {{t common.deploy}} 
+
+  
+ 
{{t common.back}}
+{{t common.deploy}} 
+  
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/2e3a29ef/ambari-web/app/templates/main/service/reassign/step5.hbs
--
diff --git a/ambari-web/app/templates/main/service/reassign/step5.hbs 
b/ambari-web/app/templates/main/service/reassign/step5.hbs
index aee9c5b..a9cfb45 100644
--- a/ambari-web/app/templates/main/service/reassign/step5.hbs
+++ b/ambari-web/app/templates/main/service/reassign/step5.hbs
@@ -15,12 +15,20 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 }}
-{{t services.reassign.step5.header}}
-{{{view.manualCommands}}}
-{{!#if view.securityNotice}}
-  {{!{view.securityNotice}}
-{{!/if}}
-
-  {{t common.next}} 
+
+  {{t services.reassign.step5.header}}
+  
+
+  {{{view.manualCommands}}}
+  {{!#if view.securityNotice}}
+  {{!{view.securityNotice}}
+  {{!/if}}
+
+  
+
+
+  
+{{t common.next}} 
+

ambari git commit: AMBARI-18743. Improve wizard styles and apply on Ambari - update theme.(xiwang)

2016-11-02 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk 4e96cf51c -> 7f931ba89


AMBARI-18743. Improve wizard styles and apply on Ambari - update theme.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7f931ba8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7f931ba8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7f931ba8

Branch: refs/heads/trunk
Commit: 7f931ba896d7a1cfdc8c6d3e58b5e7db3241028e
Parents: 4e96cf5
Author: Xi Wang <xiw...@apache.org>
Authored: Wed Nov 2 14:34:27 2016 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Wed Nov 2 14:48:15 2016 -0700

--
 ambari-web/app/styles/theme/bootstrap-ambari.css | 17 -
 1 file changed, 12 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7f931ba8/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 acc487e..8ae609a 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -421,6 +421,9 @@ h2.table-title {
 .table.table-hover > tbody > tr:first-of-type:hover > td {
   border-color: #A7DFF2;
 }
+.wizard {
+  border: 2px solid #ebecf1;
+}
 .wizard .wizard-header h3 {
   font-family: 'Roboto', sans-serif;
   font-weight: normal;
@@ -433,15 +436,16 @@ h2.table-title {
 .wizard .wizard-body {
   background: #ebecf1;
   /* Old browsers */
-  background: -moz-linear-gradient(to right, #323544 0%, #323544 24.9%, 
#ebecf1 25%, #ebecf1 100%);
+  background: -moz-linear-gradient(to right, #323544, #323544 25%, #ebecf1 
25%, #ebecf1);
   /* FF3.6-15 */
-  background: -webkit-linear-gradient(to right, #323544 0%, #323544 24.9%, 
#ebecf1 25%, #ebecf1 100%);
+  background: -webkit-linear-gradient(to right, #323544, #323544 25%, #ebecf1 
25%, #ebecf1);
   /* Chrome10-25,Safari5.1-6 */
-  background: linear-gradient(to right, #323544 0%, #323544 24.9%, #ebecf1 
25%, #ebecf1 100%);
+  background: linear-gradient(to right, #323544, #323544 25%, #ebecf1 25%, 
#ebecf1);
   /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
   margin: 0;
 }
 .wizard .wizard-body .wizard-content {
+  background: #ebecf1;
   padding-top: 25px;
 }
 .wizard .wizard-body .wizard-content .step-title {
@@ -463,10 +467,12 @@ h2.table-title {
   color: #333;
   font-size: 12px;
   padding-left: 10px;
+  line-height: 1.3;
   color: #999;
 }
 .wizard .wizard-body .wizard-content .panel.panel-default {
   border: none;
+  box-shadow: none;
 }
 .wizard .wizard-body .wizard-nav {
   min-height: 650px;
@@ -562,10 +568,11 @@ h2.table-title {
 .wizard .wizard-body .wizard-nav .nav > li > a:hover {
   background-color: inherit;
 }
-.wizard .wizard-footer {
+.wizard .wizard-body .wizard-footer {
+  background: white;
   padding: 15px 20px;
 }
-.wizard .wizard-footer button {
+.wizard .wizard-body .wizard-footer button {
   margin: 0 10px;
 }
 .checkbox-disabled-style {

[1/3] ambari git commit: AMBARI-18743. Improve wizard styles and apply on Ambari.(xiwang)

2016-10-31 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk 4ffc8ffb4 -> 334d4ccd3


http://git-wip-us.apache.org/repos/asf/ambari/blob/334d4ccd/ambari-web/app/templates/wizard/step3.hbs
--
diff --git a/ambari-web/app/templates/wizard/step3.hbs 
b/ambari-web/app/templates/wizard/step3.hbs
index 72881cf..275c6af 100644
--- a/ambari-web/app/templates/wizard/step3.hbs
+++ b/ambari-web/app/templates/wizard/step3.hbs
@@ -16,133 +16,138 @@
 * limitations under the License.
 }}
 
-
-  {{t installer.step3.header}}
+
+  {{t installer.step3.header}}
+  {{t installer.step3.body}}
 
-  {{t installer.step3.body}}
+  
+
+  
+
+  
+{{#unless isBackDisabled}}
+  
+{{t installer.step3.removeSelected}}
+  
+{{/unless}}
+{{#unless isRetryDisabled}}
+  
+{{t installer.step3.retryFailed}}
+  
+{{/unless}}
 
-  
-
-  
-{{#unless isBackDisabled}}
-  
-{{t installer.step3.removeSelected}}
-  
-{{/unless}}
-{{#unless isRetryDisabled}}
-  
-{{t installer.step3.retryFailed}}
-  
-{{/unless}}
-
-
-  
-{{t common.show}}:
-{{#each category in view.categories}}
-  
-
-  {{category.label}}
-
-  
-  {{#unless category.last}}
-|
-  {{/unless}}
-{{/each}}
-  
+
+  
+{{t common.show}}:
+{{#each category in view.categories}}
+  
+
+  {{category.label}}
+
+  
+  {{#unless category.last}}
+|
+  {{/unless}}
+{{/each}}
+  
+
+  
 
-  
-
 
-
-  
-
-
-  {{t common.host}}
-  
-  {{t common.progress}}
-  {{t common.status}}
-  
-  
-  
-  
-  
-{{view App.CheckboxView checkedBinding="view.pageChecked"}}
-  
-
-
-
-  {{#if view.pageContent}}
-{{#each host in view.pageContent}}
-  {{#view App.WizardHostView categoryBinding="controller.category" 
hostInfoBinding="host"}}
-  
-{{host.name}}
-  
-  
-
-  
-  
-
-  
-  
-{{host.bootStatusForDisplay}}
-  
-  
-
-  
+
+  
+
+
+  {{t common.host}}
+  
+  {{t common.progress}}
+  {{t common.status}}
+  
+  {{t common.action}}
+  
+  
+  
+{{view App.CheckboxView checkedBinding="view.pageChecked"}}
+  
+
+
+
+  {{#if view.pageContent}}
+{{#each host in view.pageContent}}
+  {{#view App.WizardHostView 
categoryBinding="controller.category" hostInfoBinding="host"}}
+  
+{{host.name}}
+  
+  
+
+  
+  
+
+  
+  
+{{host.bootStatusForDisplay}}
+  
+  
+
+  
+
+  
+  
+{{view App.CheckboxView checkedBinding="host.isChecked"}}
+  
+  {{/view}}
+{{/each}}
+  {{else}}
+  
+
+  {{t hosts.table.noHosts}}
+
+  
+  {{/if}}
+
+  
+
+
+  
+
+  {{#if view.selectedHostsCount}}
+
+  {{view.selectedHostsCount}}
+  {{pluralize view.selectedHostsCount 
singular="t:hosts.filters.selectedHostInfo" 
plural="t:hosts.filters.selectedHostsInfo"}}
 
-  
-  
-{{view App.CheckboxView checkedBinding="host.isChecked"}}
-  
-  {{/view}}
-{{/each}}
-  {{else}}
-  
-
-  {{t hosts.table.noHosts}}
-
-  
-  {{/if}}
-
-  
-
-
-  
-
-  {{#if view.selectedHostsCount}}
-
-

[3/3] ambari git commit: AMBARI-18743. Improve wizard styles and apply on Ambari.(xiwang)

2016-10-31 Thread xiwang

AMBARI-18743. Improve wizard styles and apply on Ambari.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/334d4ccd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/334d4ccd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/334d4ccd

Branch: refs/heads/trunk
Commit: 334d4ccd3d54035b5bc6bfc23ab4548366f37c0d
Parents: 4ffc8ff
Author: Xi Wang <xiw...@apache.org>
Authored: Fri Oct 28 15:34:15 2016 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Mon Oct 31 16:50:21 2016 -0700

--
 .../common/assign_master_components.hbs | 223 +--
 ambari-web/app/templates/common/progress.hbs|  95 ++---
 ambari-web/app/templates/installer.hbs  |   5 +-
 .../hawq/activateStandby/step1.hbs  |  12 +-
 .../hawq/activateStandby/step2.hbs  |  52 +--
 .../hawq/activateStandby/wizard.hbs |   2 -
 .../highAvailability/hawq/addStandby/step1.hbs  |  12 +-
 .../highAvailability/hawq/addStandby/step3.hbs  |  71 ++--
 .../highAvailability/hawq/addStandby/wizard.hbs |   2 -
 .../hawq/removeStandby/step1.hbs|  12 +-
 .../hawq/removeStandby/step2.hbs|  46 +--
 .../hawq/removeStandby/wizard.hbs   |   2 -
 .../highAvailability/journalNode/step1.hbs  |  10 +-
 .../highAvailability/journalNode/step2.hbs  |  37 +-
 .../highAvailability/journalNode/step3.hbs  |  31 +-
 .../highAvailability/journalNode/step5.hbs  |  20 +-
 .../highAvailability/journalNode/wizard.hbs |   4 +-
 .../nameNode/rollbackHA/rollback_wizard.hbs |   4 +-
 .../nameNode/rollbackHA/step1.hbs   |  22 +-
 .../nameNode/rollbackHA/step2.hbs   |   6 +-
 .../nameNode/rollbackHA/step3.hbs   |   7 +-
 .../admin/highAvailability/nameNode/step1.hbs   |  31 +-
 .../admin/highAvailability/nameNode/step3.hbs   | 121 +++---
 .../admin/highAvailability/nameNode/step4.hbs   |  10 +-
 .../admin/highAvailability/nameNode/step6.hbs   |   6 +-
 .../admin/highAvailability/nameNode/step8.hbs   |   6 +-
 .../admin/highAvailability/nameNode/wizard.hbs  |   4 +-
 .../highAvailability/rangerAdmin/step1.hbs  |  36 +-
 .../highAvailability/rangerAdmin/step3.hbs  |  68 ++--
 .../highAvailability/rangerAdmin/wizard.hbs |   4 +-
 .../highAvailability/resourceManager/step1.hbs  |  12 +-
 .../highAvailability/resourceManager/step3.hbs  |  46 +--
 .../highAvailability/resourceManager/wizard.hbs |   2 -
 .../app/templates/main/admin/kerberos/step1.hbs |  63 ++--
 .../app/templates/main/admin/kerberos/step2.hbs |  24 +-
 .../app/templates/main/admin/kerberos/step3.hbs | 117 +++---
 .../app/templates/main/admin/kerberos/step4.hbs |  19 +-
 .../app/templates/main/admin/kerberos/step5.hbs |  40 +-
 .../templates/main/admin/kerberos/wizard.hbs|   4 +-
 .../add_alert_definition.hbs|   4 +-
 .../main/alerts/add_alert_definition/step1.hbs  |  26 +-
 .../main/alerts/add_alert_definition/step2.hbs  |  21 +-
 .../main/alerts/add_alert_definition/step3.hbs  |  29 +-
 ambari-web/app/templates/main/host/add.hbs  |   2 -
 ambari-web/app/templates/main/service/add.hbs   |   4 +-
 .../app/templates/main/service/reassign.hbs |  12 +-
 .../main/service/widgets/create/step1.hbs   |  40 +-
 .../main/service/widgets/create/step2.hbs   |  35 +-
 .../main/service/widgets/create/step2_graph.hbs |  50 +--
 .../service/widgets/create/step2_number.hbs |  24 +-
 .../service/widgets/create/step2_template.hbs   |  56 +--
 .../main/service/widgets/create/step3.hbs   |  82 ++--
 .../main/service/widgets/create/wizard.hbs  |   4 +-
 .../app/templates/main/service/widgets/edit.hbs |   4 +-
 ambari-web/app/templates/wizard/step0.hbs   |  52 +--
 ambari-web/app/templates/wizard/step1.hbs   | 371 ++-
 ambari-web/app/templates/wizard/step10.hbs  |  61 +--
 ambari-web/app/templates/wizard/step2.hbs   | 237 ++--
 ambari-web/app/templates/wizard/step3.hbs   | 239 ++--
 ambari-web/app/templates/wizard/step4.hbs   |  79 ++--
 ambari-web/app/templates/wizard/step6.hbs   | 137 +++
 ambari-web/app/templates/wizard/step7.hbs   |  24 +-
 ambari-web/app/templates/wizard/step8.hbs   | 106 +++---
 ambari-web/app/templates/wizard/step9.hbs   | 209 ++-
 64 files changed, 1660 insertions(+), 1536 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/334d4ccd/ambari-web/app/templates/common/assign_master_components.hbs
--
diff --git a/ambari-web/app/templates/common/assign_master_components.hbs 
b/ambari-web/app/templates/common/assign_master_components.hbs
index a9da3e5..b3470a8 100644
--- a/ambari-web/app/temp

[2/3] ambari git commit: AMBARI-18743. Improve wizard styles and apply on Ambari.(xiwang)

2016-10-31 Thread xiwang

http://git-wip-us.apache.org/repos/asf/ambari/blob/334d4ccd/ambari-web/app/templates/main/admin/kerberos/step3.hbs
--
diff --git a/ambari-web/app/templates/main/admin/kerberos/step3.hbs 
b/ambari-web/app/templates/main/admin/kerberos/step3.hbs
index 4fd35a0..ef51818 100644
--- a/ambari-web/app/templates/main/admin/kerberos/step3.hbs
+++ b/ambari-web/app/templates/main/admin/kerberos/step3.hbs
@@ -16,9 +16,8 @@
 * limitations under the License.
 }}
 
-
-{{view.headerTitle}}
-
+
+{{view.headerTitle}}
 {{{view.notice}}}
   {{#if controller.showRetry}}
   
@@ -27,64 +26,70 @@
   {{/if}}
 
   {{#if controller.isLoaded}}
-  
-{{#each task in controller.tasks}}
-  {{#view view.taskView contentBinding="task"}}
-  
-  
-  
-  {{task.title}}
-  
-  
-  
-  
-  
+
+  
+  
+{{#each task in controller.tasks}}
+  {{#view view.taskView contentBinding="task"}}
+  
+  
+  
+  {{task.title}}
+  
+  
+  
+  
+  
+  
   
+  {{task.progress}}
   
-  {{task.progress}}
-  
-  
-{{#if task.showRetry}}
-
-
-  {{t common.retry}}
-
+  
+{{#if task.showRetry}}
+
+
+  {{t common.retry}}
+
 
-{{/if}}
-{{#if task.showRollback}}
-
-
-  {{t common.rollBack}}
-
-{{/if}}
-{{#if task.showSkip}}
-
-
-  {{t common.skip}}
-
-{{/if}}
+{{/if}}
+{{#if task.showRollback}}
+
+
+  {{t common.rollBack}}
+
+{{/if}}
+{{#if task.showSkip}}
+
+
+  {{t common.skip}}
+
+{{/if}}
+  
   
-  
-  {{/view}}
+  {{/view}}
 
-{{/each}}
-  
-{{#if showIgnore}}
-
-{{view Em.Checkbox classNames="checkbox" 
checkedBinding="ignore"}} {{t 
admin.kerberos.wizard.step3.checkbox.ignoreAndProceed.label}}
-
-{{/if}}
-{{#if view.isHostHeartbeatLost}}
-  {{view.resultMsg}}
-{{t common.showDetails}}
-  
-{{/if}}
-  {{else}}
-  {{view App.SpinnerView}}
-  {{/if}}
+{{/each}}
+  
+{{#if showIgnore}}
+
+{{view Em.Checkbox classNames="checkbox" 
checkedBinding="ignore"}} {{t 
admin.kerberos.wizard.step3.checkbox.ignoreAndProceed.label}}
+
+{{/if}}
+{{#if view.isHostHeartbeatLost}}
+  {{view.resultMsg}}
+{{t common.showDetails}}
+  
+{{/if}}
+  {{else}}
+  {{view App.SpinnerView}}
+  {{/if}}
+
+  
+
+
 
   {{#if view.showBackButton}}
{{t common.back}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/334d4ccd/ambari-web/app/templates/main/admin/kerberos/step4.hbs
--
diff --git a/ambari-web/app/templates/main/admin/kerberos/step4.hbs 
b/ambari-web/app/templates/main/admin/kerberos/step4.hbs
index 1c5d281..1e6f956 100644
--- a/ambari-web/app/templates/main/admin/kerberos/step4.hbs
+++ b/ambari-web/app/templates/main/admin/kerberos/step4.hbs
@@ -16,15

ambari git commit: AMBARI-18639. Ambari UI does not allow to modify EMPTY threshold text of OK and WARNING.(xiwang)

2016-10-20 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 affca7689 -> 017b620ab


AMBARI-18639. Ambari UI does not allow to modify EMPTY threshold text of OK and 
WARNING.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/017b620a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/017b620a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/017b620a

Branch: refs/heads/branch-2.4
Commit: 017b620ab366382795a38b5d6ffbf9179c6a926b
Parents: affca76
Author: Xi Wang <xiw...@apache.org>
Authored: Tue Oct 18 17:00:19 2016 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Thu Oct 20 14:57:51 2016 -0700

--
 .../app/controllers/main/alerts/definition_configs_controller.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/017b620a/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/alerts/definition_configs_controller.js 
b/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
index 9b48b35..4c82556 100644
--- a/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
+++ b/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
@@ -128,7 +128,7 @@ App.MainAlertDefinitionConfigsController = 
Em.Controller.extend({
*/
   getThresholdsProperty: function (type, property) {
 var warning = this.get('content.reporting').findProperty('type', type);
-return warning && !Ember.isEmpty(warning.get(property)) ? 
warning.get(property) : null;
+return warning && !Ember.isNone(warning.get(property)) ? 
warning.get(property) : null;
   },
 
   /**

ambari git commit: AMBARI-18639. Ambari UI does not allow to modify EMPTY threshold text of OK and WARNING.(xiwang)

2016-10-20 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 014f3f7f8 -> ec5d70add


AMBARI-18639. Ambari UI does not allow to modify EMPTY threshold text of OK and 
WARNING.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ec5d70ad
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ec5d70ad
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ec5d70ad

Branch: refs/heads/branch-2.5
Commit: ec5d70add9179e9eec567bf5deb2afd6cff4b65b
Parents: 014f3f7
Author: Xi Wang <xiw...@apache.org>
Authored: Tue Oct 18 17:00:19 2016 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Thu Oct 20 14:56:59 2016 -0700

--
 .../app/controllers/main/alerts/definition_configs_controller.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ec5d70ad/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/alerts/definition_configs_controller.js 
b/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
index 9b48b35..4c82556 100644
--- a/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
+++ b/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
@@ -128,7 +128,7 @@ App.MainAlertDefinitionConfigsController = 
Em.Controller.extend({
*/
   getThresholdsProperty: function (type, property) {
 var warning = this.get('content.reporting').findProperty('type', type);
-return warning && !Ember.isEmpty(warning.get(property)) ? 
warning.get(property) : null;
+return warning && !Ember.isNone(warning.get(property)) ? 
warning.get(property) : null;
   },
 
   /**

ambari git commit: AMBARI-18639. Ambari UI does not allow to modify EMPTY threshold text of OK and WARNING.(xiwang)

2016-10-20 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk 03f7b9095 -> 5256a7890


AMBARI-18639. Ambari UI does not allow to modify EMPTY threshold text of OK and 
WARNING.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5256a789
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5256a789
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5256a789

Branch: refs/heads/trunk
Commit: 5256a78908ec9a635bf7e59480511d2ca0d33363
Parents: 03f7b90
Author: Xi Wang <xiw...@apache.org>
Authored: Tue Oct 18 17:00:19 2016 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Thu Oct 20 14:02:10 2016 -0700

--
 .../app/controllers/main/alerts/definition_configs_controller.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5256a789/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/alerts/definition_configs_controller.js 
b/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
index 9b48b35..4c82556 100644
--- a/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
+++ b/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
@@ -128,7 +128,7 @@ App.MainAlertDefinitionConfigsController = 
Em.Controller.extend({
*/
   getThresholdsProperty: function (type, property) {
 var warning = this.get('content.reporting').findProperty('type', type);
-return warning && !Ember.isEmpty(warning.get(property)) ? 
warning.get(property) : null;
+return warning && !Ember.isNone(warning.get(property)) ? 
warning.get(property) : null;
   },
 
   /**

ambari git commit: AMBARI-17934. UI issue on clicking back while installing a cluster.(xiwang)

2016-07-27 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk 3d4ab478c -> ba8b03d72


AMBARI-17934. UI issue on clicking back while installing a cluster.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ba8b03d7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ba8b03d7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ba8b03d7

Branch: refs/heads/trunk
Commit: ba8b03d72468ea13e0ccfa83a314d39ffe31faf4
Parents: 3d4ab47
Author: Xi Wang <xiw...@apache.org>
Authored: Wed Jul 27 15:20:32 2016 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Wed Jul 27 15:42:18 2016 -0700

--
 ambari-web/app/controllers/installer.js | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ba8b03d7/ambari-web/app/controllers/installer.js
--
diff --git a/ambari-web/app/controllers/installer.js 
b/ambari-web/app/controllers/installer.js
index 3253de2..a2bac41 100644
--- a/ambari-web/app/controllers/installer.js
+++ b/ambari-web/app/controllers/installer.js
@@ -333,9 +333,12 @@ App.InstallerController = App.WizardController.extend({
 _oses.forEach(function (os) {
   App.OperatingSystem.find().findProperty('id', os.id).set('isSelected', 
os.is_selected);
 });
-App.OperatingSystem.find().filterProperty('isSelected', 
false).forEach(function (os) {
-  App.stackMapper.deleteRecord(os);
-});
+//should delete the record on going to step 2, on going back to step 1, 
still need the record
+if (App.router.get('currentState.name') != "step1") {
+  App.OperatingSystem.find().filterProperty('isSelected', 
false).forEach(function (os) {
+App.stackMapper.deleteRecord(os);
+  });
+}
 _stacks.forEach(function (_stack) {
   var stack = App.Stack.find().findProperty('id', _stack.id);
   if (stack) {

ambari git commit: AMBARI-17934. UI issue on clicking back while installing a cluster.(xiwang)

2016-07-27 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 806a62c78 -> 5fc7dbf42


AMBARI-17934. UI issue on clicking back while installing a cluster.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5fc7dbf4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5fc7dbf4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5fc7dbf4

Branch: refs/heads/branch-2.4
Commit: 5fc7dbf425d0f2d8d3e9f1ed2c02d1c456ee8b22
Parents: 806a62c
Author: Xi Wang <xiw...@apache.org>
Authored: Wed Jul 27 15:20:32 2016 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Wed Jul 27 15:20:42 2016 -0700

--
 ambari-web/app/controllers/installer.js | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5fc7dbf4/ambari-web/app/controllers/installer.js
--
diff --git a/ambari-web/app/controllers/installer.js 
b/ambari-web/app/controllers/installer.js
index 3253de2..a2bac41 100644
--- a/ambari-web/app/controllers/installer.js
+++ b/ambari-web/app/controllers/installer.js
@@ -333,9 +333,12 @@ App.InstallerController = App.WizardController.extend({
 _oses.forEach(function (os) {
   App.OperatingSystem.find().findProperty('id', os.id).set('isSelected', 
os.is_selected);
 });
-App.OperatingSystem.find().filterProperty('isSelected', 
false).forEach(function (os) {
-  App.stackMapper.deleteRecord(os);
-});
+//should delete the record on going to step 2, on going back to step 1, 
still need the record
+if (App.router.get('currentState.name') != "step1") {
+  App.OperatingSystem.find().filterProperty('isSelected', 
false).forEach(function (os) {
+App.stackMapper.deleteRecord(os);
+  });
+}
 _stacks.forEach(function (_stack) {
   var stack = App.Stack.find().findProperty('id', _stack.id);
   if (stack) {

ambari git commit: AMBARI-17698. Button to restart services with stale configs is not functional.(xiwang)

2016-07-13 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 e3a26f57f -> e7f225e54


AMBARI-17698. Button to restart services with stale configs is not 
functional.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e7f225e5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e7f225e5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e7f225e5

Branch: refs/heads/branch-2.4
Commit: e7f225e5468b59677b79f0e40eaa84a3ea69f277
Parents: e3a26f5
Author: Xi Wang <xiw...@apache.org>
Authored: Wed Jul 13 14:40:49 2016 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Wed Jul 13 14:55:15 2016 -0700

--
 ambari-web/app/controllers/main/service.js | 6 --
 ambari-web/app/utils/ajax/ajax.js  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e7f225e5/ambari-web/app/controllers/main/service.js
--
diff --git a/ambari-web/app/controllers/main/service.js 
b/ambari-web/app/controllers/main/service.js
index 7d9b737..7fe5b68 100644
--- a/ambari-web/app/controllers/main/service.js
+++ b/ambari-web/app/controllers/main/service.js
@@ -333,7 +333,7 @@ App.MainServiceController = Em.ArrayController.extend({
 }
   ]
 };
-
+
 if (isYARNQueueRefreshRequired) {
   batches = [
 {
@@ -375,7 +375,9 @@ App.MainServiceController = Em.ArrayController.extend({
   App.ajax.send({
 name: 'request.post',
 sender: this,
-data: ajaxData,
+data: {
+  data: ajaxData
+},
 success: 'restartAllRequiredSuccessCallback'
   });
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/e7f225e5/ambari-web/app/utils/ajax/ajax.js
--
diff --git a/ambari-web/app/utils/ajax/ajax.js 
b/ambari-web/app/utils/ajax/ajax.js
index 677c609..e432e0c 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -2302,7 +2302,7 @@ var urls = {
   'request.post': {
 'real': "/clusters/{clusterName}/requests",
 'mock': "",
-'format': function () {
+'format': function (data) {
   return {
 type: 'POST',
 data: JSON.stringify(data.data)

ambari git commit: AMBARI-17698. Button to restart services with stale configs is not functional.(xiwang)

2016-07-13 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk 2b3324181 -> d1207f550


AMBARI-17698. Button to restart services with stale configs is not 
functional.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d1207f55
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d1207f55
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d1207f55

Branch: refs/heads/trunk
Commit: d1207f5502cb75d29463c01ec9bb923010204381
Parents: 2b33241
Author: Xi Wang <xiw...@apache.org>
Authored: Wed Jul 13 14:40:49 2016 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Wed Jul 13 14:54:05 2016 -0700

--
 ambari-web/app/controllers/main/service.js | 6 --
 ambari-web/app/utils/ajax/ajax.js  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d1207f55/ambari-web/app/controllers/main/service.js
--
diff --git a/ambari-web/app/controllers/main/service.js 
b/ambari-web/app/controllers/main/service.js
index 7d9b737..7fe5b68 100644
--- a/ambari-web/app/controllers/main/service.js
+++ b/ambari-web/app/controllers/main/service.js
@@ -333,7 +333,7 @@ App.MainServiceController = Em.ArrayController.extend({
 }
   ]
 };
-
+
 if (isYARNQueueRefreshRequired) {
   batches = [
 {
@@ -375,7 +375,9 @@ App.MainServiceController = Em.ArrayController.extend({
   App.ajax.send({
 name: 'request.post',
 sender: this,
-data: ajaxData,
+data: {
+  data: ajaxData
+},
 success: 'restartAllRequiredSuccessCallback'
   });
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/d1207f55/ambari-web/app/utils/ajax/ajax.js
--
diff --git a/ambari-web/app/utils/ajax/ajax.js 
b/ambari-web/app/utils/ajax/ajax.js
index de8a0a6..521ec9a 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -2316,7 +2316,7 @@ var urls = {
   'request.post': {
 'real': "/clusters/{clusterName}/requests",
 'mock': "",
-'format': function () {
+'format': function (data) {
   return {
 type: 'POST',
 data: JSON.stringify(data.data)

ambari git commit: AMBARI-17613. Alerts ordering works incorrect in some cases on Host Alerts page.(xiwang)

2016-07-08 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 ea58887a2 -> fb813c3d2


AMBARI-17613. Alerts ordering works incorrect in some cases on Host Alerts 
page.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fb813c3d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fb813c3d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fb813c3d

Branch: refs/heads/branch-2.4
Commit: fb813c3d2515ae085eacd9d251ac234e02a3a4c5
Parents: ea58887
Author: Xi Wang <xiw...@apache.org>
Authored: Thu Jul 7 18:24:12 2016 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Fri Jul 8 11:17:15 2016 -0700

--
 .../app/views/main/alert_definitions_view.js| 20 
 .../app/views/main/host/host_alerts_view.js | 24 
 .../views/main/alert_definitions_view_test.js   |  7 ++
 .../views/main/host/host_alerts_view_test.js| 11 +++--
 4 files changed, 47 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/fb813c3d/ambari-web/app/views/main/alert_definitions_view.js
--
diff --git a/ambari-web/app/views/main/alert_definitions_view.js 
b/ambari-web/app/views/main/alert_definitions_view.js
index b65b8cf..6e8c21e 100644
--- a/ambari-web/app/views/main/alert_definitions_view.js
+++ b/ambari-web/app/views/main/alert_definitions_view.js
@@ -39,6 +39,16 @@ App.MainAlertDefinitionsView = App.TableView.extend({
 if (!this.get('controller.showFilterConditionsFirstLoad')) {
   this.clearFilterConditionsFromLocalStorage();
 }
+// on load alters should be sorted by status
+var controllerName = this.get('controller.name'),
+  savedSortConditions = App.db.getSortingStatuses(controllerName) || [];
+if (savedSortConditions.everyProperty('status', 'sorting')) {
+  savedSortConditions.push({
+name: "summary",
+status: "sorting_asc"
+  });
+  App.db.setSortingStatuses(controllerName, savedSortConditions);
+}
 this._super();
   },
 
@@ -79,15 +89,7 @@ App.MainAlertDefinitionsView = App.TableView.extend({
 
   colPropAssoc: ['', 'label', 'summary', 'serviceName', 'type', 
'lastTriggered', 'enabled', 'groups'],
 
-  sortView: sort.wrapperView.extend({
-didInsertElement: function () {
-  this._super();
-  // set default sorting to status sorting
-  var statusSortingView = this.get('childViews').findProperty('name', 
'summary');
-  this.set('controller.sortingColumn', statusSortingView);
-  this.addSortingObserver(statusSortingView.get('name'))
-}
-  }),
+  sortView: sort.wrapperView,
 
   /**
* Define whether initial view rendering has finished

http://git-wip-us.apache.org/repos/asf/ambari/blob/fb813c3d/ambari-web/app/views/main/host/host_alerts_view.js
--
diff --git a/ambari-web/app/views/main/host/host_alerts_view.js 
b/ambari-web/app/views/main/host/host_alerts_view.js
index 6ae2ddd..34a2a3e 100644
--- a/ambari-web/app/views/main/host/host_alerts_view.js
+++ b/ambari-web/app/views/main/host/host_alerts_view.js
@@ -24,9 +24,10 @@ App.MainHostAlertsView = App.TableView.extend({
   templateName: require('templates/main/host/host_alerts'),
 
   content: function () {
-var criticalAlerts = [];
-var warningAlerts = [];
-var otherAlerts = [];
+var criticalAlerts = [],
+  warningAlerts = [],
+  okAlerts = [],
+  otherAlerts = [];
 var content = this.get('controller.content');
 if (content) {
   content.forEach(function (alert) {
@@ -37,11 +38,14 @@ App.MainHostAlertsView = App.TableView.extend({
   case 'WARNING':
 warningAlerts.push(alert);
 break;
+  case 'OK':
+okAlerts.push(alert);
+break;
   default:
 otherAlerts.push(alert);
 }
   });
-  return [].concat(criticalAlerts, warningAlerts, otherAlerts);
+  return [].concat(criticalAlerts, warningAlerts, okAlerts, otherAlerts);
 } else {
   return [];
 }
@@ -51,6 +55,18 @@ App.MainHostAlertsView = App.TableView.extend({
 var hostName = this.get('parentView.controller.content.hostName');
 
App.router.get('mainAlertInstancesController').loadAlertInstancesByHost(hostName);
 App.router.set('mainAlertInstancesController.isUpdating', true);
+
+// on load alters should be sorted by state
+var controllerName = this.get('controller.name'),
+  savedSortConditions = App.db.getSortingStatuses(controllerName) || [];
+if (savedSortConditions.everyProperty('status', 'sorting')) {
+  savedSortConditions.push({
+name: &qu

ambari git commit: AMBARI-17613. Alerts ordering works incorrect in some cases on Host Alerts page.(xiwang)

2016-07-08 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk 7ab2c06b9 -> 5bd13d1a2


AMBARI-17613. Alerts ordering works incorrect in some cases on Host Alerts 
page.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5bd13d1a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5bd13d1a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5bd13d1a

Branch: refs/heads/trunk
Commit: 5bd13d1a2f83422112243e3afc27aba7e66c831a
Parents: 7ab2c06
Author: Xi Wang <xiw...@apache.org>
Authored: Thu Jul 7 18:24:12 2016 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Fri Jul 8 11:15:26 2016 -0700

--
 .../app/views/main/alert_definitions_view.js| 20 
 .../app/views/main/host/host_alerts_view.js | 24 
 .../views/main/alert_definitions_view_test.js   |  7 ++
 .../views/main/host/host_alerts_view_test.js| 11 +++--
 4 files changed, 47 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5bd13d1a/ambari-web/app/views/main/alert_definitions_view.js
--
diff --git a/ambari-web/app/views/main/alert_definitions_view.js 
b/ambari-web/app/views/main/alert_definitions_view.js
index 82de557..36ee036 100644
--- a/ambari-web/app/views/main/alert_definitions_view.js
+++ b/ambari-web/app/views/main/alert_definitions_view.js
@@ -39,6 +39,16 @@ App.MainAlertDefinitionsView = App.TableView.extend({
 if (!this.get('controller.showFilterConditionsFirstLoad')) {
   this.clearFilterConditionsFromLocalStorage();
 }
+// on load alters should be sorted by status
+var controllerName = this.get('controller.name'),
+  savedSortConditions = App.db.getSortingStatuses(controllerName) || [];
+if (savedSortConditions.everyProperty('status', 'sorting')) {
+  savedSortConditions.push({
+name: "summary",
+status: "sorting_asc"
+  });
+  App.db.setSortingStatuses(controllerName, savedSortConditions);
+}
 this._super();
   },
 
@@ -79,15 +89,7 @@ App.MainAlertDefinitionsView = App.TableView.extend({
 
   colPropAssoc: ['', 'label', 'summary', 'serviceName', 'type', 
'lastTriggered', 'enabled', 'groups'],
 
-  sortView: sort.wrapperView.extend({
-didInsertElement: function () {
-  this._super();
-  // set default sorting to status sorting
-  var statusSortingView = this.get('childViews').findProperty('name', 
'summary');
-  this.set('controller.sortingColumn', statusSortingView);
-  this.addSortingObserver(statusSortingView.get('name'))
-}
-  }),
+  sortView: sort.wrapperView,
 
   /**
* Define whether initial view rendering has finished

http://git-wip-us.apache.org/repos/asf/ambari/blob/5bd13d1a/ambari-web/app/views/main/host/host_alerts_view.js
--
diff --git a/ambari-web/app/views/main/host/host_alerts_view.js 
b/ambari-web/app/views/main/host/host_alerts_view.js
index 6ae2ddd..34a2a3e 100644
--- a/ambari-web/app/views/main/host/host_alerts_view.js
+++ b/ambari-web/app/views/main/host/host_alerts_view.js
@@ -24,9 +24,10 @@ App.MainHostAlertsView = App.TableView.extend({
   templateName: require('templates/main/host/host_alerts'),
 
   content: function () {
-var criticalAlerts = [];
-var warningAlerts = [];
-var otherAlerts = [];
+var criticalAlerts = [],
+  warningAlerts = [],
+  okAlerts = [],
+  otherAlerts = [];
 var content = this.get('controller.content');
 if (content) {
   content.forEach(function (alert) {
@@ -37,11 +38,14 @@ App.MainHostAlertsView = App.TableView.extend({
   case 'WARNING':
 warningAlerts.push(alert);
 break;
+  case 'OK':
+okAlerts.push(alert);
+break;
   default:
 otherAlerts.push(alert);
 }
   });
-  return [].concat(criticalAlerts, warningAlerts, otherAlerts);
+  return [].concat(criticalAlerts, warningAlerts, okAlerts, otherAlerts);
 } else {
   return [];
 }
@@ -51,6 +55,18 @@ App.MainHostAlertsView = App.TableView.extend({
 var hostName = this.get('parentView.controller.content.hostName');
 
App.router.get('mainAlertInstancesController').loadAlertInstancesByHost(hostName);
 App.router.set('mainAlertInstancesController.isUpdating', true);
+
+// on load alters should be sorted by state
+var controllerName = this.get('controller.name'),
+  savedSortConditions = App.db.getSortingStatuses(controllerName) || [];
+if (savedSortConditions.everyProperty('status', 'sorting')) {
+  savedSortConditions.push({
+name: "state",
+status: "sortin

ambari git commit: AMBARI-17575. Refresh YARN queue is not happening when HSI is enabled at cluster install time.(xiwang)

2016-07-05 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 64ea518ad -> 068df6d16


AMBARI-17575. Refresh YARN queue is not happening when HSI is enabled at 
cluster install time.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/068df6d1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/068df6d1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/068df6d1

Branch: refs/heads/branch-2.4
Commit: 068df6d16e1976c1b1c9afb77be3ffe4ad941650
Parents: 64ea518
Author: Xi Wang <xiw...@apache.org>
Authored: Tue Jul 5 17:48:41 2016 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Tue Jul 5 18:22:56 2016 -0700

--
 ambari-web/app/controllers/wizard/step7_controller.js | 5 -
 ambari-web/app/messages.js| 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/068df6d1/ambari-web/app/controllers/wizard/step7_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js 
b/ambari-web/app/controllers/wizard/step7_controller.js
index 7f9c17e..aac869d 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -553,9 +553,12 @@ App.WizardStep7Controller = 
Em.Controller.extend(App.ServerValidatorMixin, App.E
   var config = configs.filterProperty('filename', 
fileName).findProperty('name', configName);
   if (config) {
 var isServiceInstalled = 
App.Service.find().findProperty('serviceName', config.serviceName);
-if (isServiceInstalled) {
+// service already installed or is being added in add service wizard
+if (isServiceInstalled || stepConfigs.someProperty("serviceName", 
config.serviceName)) {
   var serviceConfigs = stepConfigs.findProperty('serviceName', 
config.serviceName).get('configs');
   var serviceConfig = serviceConfigs.filterProperty('filename', 
fileName).findProperty('name', configName);
+  var notEditableText = " " + 
Em.I18n.t('installer.step7.addWizard.notEditable');
+  serviceConfig.set('description', serviceConfig.get('description') + 
notEditableText);
   serviceConfig.set('isReconfigurable', false);
   config.isReconfigurable = false;
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/068df6d1/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 7addf9b..9436cef 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -899,6 +899,7 @@ Em.I18n.translations = {
   'installer.step7.oozie.database.new': 'New Derby Database',
   'installer.step7.hive.database.new.mysql': 'New MySQL Database',
   'installer.step7.hive.database.new.postgres': 'New PostgreSQL Database',
+  'installer.step7.addWizard.notEditable': 'This configuration cannot be 
edited on Add Service wizard',
   'installer.step7.misc.notification.configure':'Configure email 
notifications',
   'installer.step7.misc.notification.configure.later':'Configure email 
notifications later',
   'installer.step7.misc.notification.use_tls':'Use TLS',

ambari git commit: AMBARI-17575. Refresh YARN queue is not happening when HSI is enabled at cluster install time.(xiwang)

2016-07-05 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk a709f6078 -> c6d15394a


AMBARI-17575. Refresh YARN queue is not happening when HSI is enabled at 
cluster install time.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c6d15394
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c6d15394
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c6d15394

Branch: refs/heads/trunk
Commit: c6d15394a3a5b8405e4ad212e7d1a3764994e236
Parents: a709f60
Author: Xi Wang <xiw...@apache.org>
Authored: Tue Jul 5 17:48:41 2016 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Tue Jul 5 18:18:51 2016 -0700

--
 ambari-web/app/controllers/wizard/step7_controller.js | 5 -
 ambari-web/app/messages.js| 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c6d15394/ambari-web/app/controllers/wizard/step7_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js 
b/ambari-web/app/controllers/wizard/step7_controller.js
index 7f9c17e..aac869d 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -553,9 +553,12 @@ App.WizardStep7Controller = 
Em.Controller.extend(App.ServerValidatorMixin, App.E
   var config = configs.filterProperty('filename', 
fileName).findProperty('name', configName);
   if (config) {
 var isServiceInstalled = 
App.Service.find().findProperty('serviceName', config.serviceName);
-if (isServiceInstalled) {
+// service already installed or is being added in add service wizard
+if (isServiceInstalled || stepConfigs.someProperty("serviceName", 
config.serviceName)) {
   var serviceConfigs = stepConfigs.findProperty('serviceName', 
config.serviceName).get('configs');
   var serviceConfig = serviceConfigs.filterProperty('filename', 
fileName).findProperty('name', configName);
+  var notEditableText = " " + 
Em.I18n.t('installer.step7.addWizard.notEditable');
+  serviceConfig.set('description', serviceConfig.get('description') + 
notEditableText);
   serviceConfig.set('isReconfigurable', false);
   config.isReconfigurable = false;
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/c6d15394/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index dcf0426..888aa52 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -899,6 +899,7 @@ Em.I18n.translations = {
   'installer.step7.oozie.database.new': 'New Derby Database',
   'installer.step7.hive.database.new.mysql': 'New MySQL Database',
   'installer.step7.hive.database.new.postgres': 'New PostgreSQL Database',
+  'installer.step7.addWizard.notEditable': 'This configuration cannot be 
edited on Add Service wizard',
   'installer.step7.misc.notification.configure':'Configure email 
notifications',
   'installer.step7.misc.notification.configure.later':'Configure email 
notifications later',
   'installer.step7.misc.notification.use_tls':'Use TLS',

ambari git commit: AMBARI-17542. Host components on Assign Master page on ASW does not appear in fixed order.(xiwang)

2016-07-01 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk 1d8cc66ea -> e0ef7b3e7


AMBARI-17542. Host components on Assign Master page on ASW does not appear in 
fixed order.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e0ef7b3e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e0ef7b3e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e0ef7b3e

Branch: refs/heads/trunk
Commit: e0ef7b3e716582dc08fd93b75deb2014a28010d6
Parents: 1d8cc66
Author: Xi Wang <xiw...@apache.org>
Authored: Fri Jul 1 17:18:20 2016 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Fri Jul 1 17:39:49 2016 -0700

--
 ambari-web/app/models/stack_service.js   | 14 +-
 ambari-web/test/mappers/stack_service_mapper_test.js |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e0ef7b3e/ambari-web/app/models/stack_service.js
--
diff --git a/ambari-web/app/models/stack_service.js 
b/ambari-web/app/models/stack_service.js
index 529da48..c63df3d 100644
--- a/ambari-web/app/models/stack_service.js
+++ b/ambari-web/app/models/stack_service.js
@@ -197,7 +197,19 @@ App.StackService.displayOrder = [
   'ZOOKEEPER',
   'FALCON',
   'STORM',
-  'FLUME'
+  'FLUME',
+  'ACCUMULO',
+  'AMBARI_METRICS',
+  'ATLAS',
+  'KAFKA',
+  'KNOX',
+  'LOGSEARCH',
+  'RANGER',
+  'RANGER_KMS',
+  'SMARTSENSE',
+  'SPARK',
+  'SPARK2',
+  'ZEPPELIN'
 ];
 
 App.StackService.componentsOrderForService = {

http://git-wip-us.apache.org/repos/asf/ambari/blob/e0ef7b3e/ambari-web/test/mappers/stack_service_mapper_test.js
--
diff --git a/ambari-web/test/mappers/stack_service_mapper_test.js 
b/ambari-web/test/mappers/stack_service_mapper_test.js
index b64688f..41bcf58 100644
--- a/ambari-web/test/mappers/stack_service_mapper_test.js
+++ b/ambari-web/test/mappers/stack_service_mapper_test.js
@@ -168,7 +168,7 @@ describe('App.stackServiceMapper', function () {
   }
 ]
   },
-  sortedServiceNames = ["HDFS", "HIVE", "ZOOKEEPER", "KAFKA", "KERBEROS", 
"ACCUMULO"],
+  sortedServiceNames = ["HDFS", "HIVE", "ZOOKEEPER", "ACCUMULO", "KAFKA", 
"KERBEROS"],
   serviceResult = {
 id: "KAFKA",
 serviceName: "KAFKA",

ambari git commit: AMBARI-17542. Host components on Assign Master page on ASW does not appear in fixed order.(xiwang)

2016-07-01 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 a7d49797c -> eac3959d3


AMBARI-17542. Host components on Assign Master page on ASW does not appear in 
fixed order.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/eac3959d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/eac3959d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/eac3959d

Branch: refs/heads/branch-2.4
Commit: eac3959d3422d746aab8d8794bf1d9df7b27e1a9
Parents: a7d4979
Author: Xi Wang <xiw...@apache.org>
Authored: Fri Jul 1 17:18:20 2016 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Fri Jul 1 17:28:57 2016 -0700

--
 ambari-web/app/models/stack_service.js   | 14 +-
 ambari-web/test/mappers/stack_service_mapper_test.js |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/eac3959d/ambari-web/app/models/stack_service.js
--
diff --git a/ambari-web/app/models/stack_service.js 
b/ambari-web/app/models/stack_service.js
index 529da48..c63df3d 100644
--- a/ambari-web/app/models/stack_service.js
+++ b/ambari-web/app/models/stack_service.js
@@ -197,7 +197,19 @@ App.StackService.displayOrder = [
   'ZOOKEEPER',
   'FALCON',
   'STORM',
-  'FLUME'
+  'FLUME',
+  'ACCUMULO',
+  'AMBARI_METRICS',
+  'ATLAS',
+  'KAFKA',
+  'KNOX',
+  'LOGSEARCH',
+  'RANGER',
+  'RANGER_KMS',
+  'SMARTSENSE',
+  'SPARK',
+  'SPARK2',
+  'ZEPPELIN'
 ];
 
 App.StackService.componentsOrderForService = {

http://git-wip-us.apache.org/repos/asf/ambari/blob/eac3959d/ambari-web/test/mappers/stack_service_mapper_test.js
--
diff --git a/ambari-web/test/mappers/stack_service_mapper_test.js 
b/ambari-web/test/mappers/stack_service_mapper_test.js
index b64688f..41bcf58 100644
--- a/ambari-web/test/mappers/stack_service_mapper_test.js
+++ b/ambari-web/test/mappers/stack_service_mapper_test.js
@@ -168,7 +168,7 @@ describe('App.stackServiceMapper', function () {
   }
 ]
   },
-  sortedServiceNames = ["HDFS", "HIVE", "ZOOKEEPER", "KAFKA", "KERBEROS", 
"ACCUMULO"],
+  sortedServiceNames = ["HDFS", "HIVE", "ZOOKEEPER", "ACCUMULO", "KAFKA", 
"KERBEROS"],
   serviceResult = {
 id: "KAFKA",
 serviceName: "KAFKA",

ambari git commit: AMBARI-17022. VDF: install wizard 'Select Version' UI issues.(xiwang)

2016-06-07 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 5666d2523 -> 4d0fca3a7


AMBARI-17022. VDF: install wizard 'Select Version' UI issues.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4d0fca3a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4d0fca3a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4d0fca3a

Branch: refs/heads/branch-2.4
Commit: 4d0fca3a7990168cb7b704ae9fc122ec8b46b8c8
Parents: 5666d25
Author: Xi Wang <xiw...@apache.org>
Authored: Mon Jun 6 17:36:21 2016 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Tue Jun 7 14:22:07 2016 -0700

--
 ambari-web/app/models/stack.js | 2 +-
 ambari-web/app/styles/application.less | 9 +
 ambari-web/app/styles/common.less  | 4 
 3 files changed, 14 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4d0fca3a/ambari-web/app/models/stack.js
--
diff --git a/ambari-web/app/models/stack.js b/ambari-web/app/models/stack.js
index df217f2..5081f19 100644
--- a/ambari-web/app/models/stack.js
+++ b/ambari-web/app/models/stack.js
@@ -70,7 +70,7 @@ App.Stack = DS.Model.extend({
   restoreReposBaseUrls: function () {
 this.get('operatingSystems').forEach(function (os) {
   os.get('repositories').forEach(function (repo) {
-repo.set('baseUrl', repo.get('latestBaseUrl'));
+repo.set('baseUrl', repo.get('baseUrlInit'));
   });
 });
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/4d0fca3a/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index 5ee09cc..d525fd4 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -6234,6 +6234,12 @@ input[type="radio"].align-checkbox, 
input[type="checkbox"].align-checkbox {
 cursor: not-allowed;
   }
 }
+#select-stack {
+  .tabs-left {
+height: 271px;
+margin-bottom: 5px;
+  }
+}
 
 .public-disabled-message {
   padding: 5px;
@@ -6358,6 +6364,9 @@ input[type="radio"].align-checkbox, 
input[type="checkbox"].align-checkbox {
   button.disabled {
 cursor: not-allowed;
   }
+  .dropdown-menu a {
+cursor: pointer;
+  }
 }
 #skip-validation {
   margin-top: 13px;

http://git-wip-us.apache.org/repos/asf/ambari/blob/4d0fca3a/ambari-web/app/styles/common.less
--
diff --git a/ambari-web/app/styles/common.less 
b/ambari-web/app/styles/common.less
index 738edce..bc11d4d 100644
--- a/ambari-web/app/styles/common.less
+++ b/ambari-web/app/styles/common.less
@@ -436,6 +436,10 @@
 .tabs-right>li {
   margin-left: -1px;
 }
+.tabs-left>li>a:hover,
+.tabs-left>li>a:focus {
+  border-bottom-color: transparent;
+}
 .tabs-left>li.active>a,
 .tabs-left>li.active>a:hover,
 .tabs-left>li.active>a:focus {

ambari git commit: AMBARI-17022. VDF: install wizard 'Select Version' UI issues.(xiwang)

2016-06-07 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk 62e124c98 -> edf85a383


AMBARI-17022. VDF: install wizard 'Select Version' UI issues.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/edf85a38
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/edf85a38
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/edf85a38

Branch: refs/heads/trunk
Commit: edf85a3837519b9c4e5704531627f4985a56b5ea
Parents: 62e124c
Author: Xi Wang <xiw...@apache.org>
Authored: Mon Jun 6 17:36:21 2016 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Tue Jun 7 14:12:49 2016 -0700

--
 ambari-web/app/models/stack.js | 2 +-
 ambari-web/app/styles/application.less | 9 +
 ambari-web/app/styles/common.less  | 4 
 3 files changed, 14 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/edf85a38/ambari-web/app/models/stack.js
--
diff --git a/ambari-web/app/models/stack.js b/ambari-web/app/models/stack.js
index df217f2..5081f19 100644
--- a/ambari-web/app/models/stack.js
+++ b/ambari-web/app/models/stack.js
@@ -70,7 +70,7 @@ App.Stack = DS.Model.extend({
   restoreReposBaseUrls: function () {
 this.get('operatingSystems').forEach(function (os) {
   os.get('repositories').forEach(function (repo) {
-repo.set('baseUrl', repo.get('latestBaseUrl'));
+repo.set('baseUrl', repo.get('baseUrlInit'));
   });
 });
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/edf85a38/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index e7fe6f4..d1a2f21 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -6238,6 +6238,12 @@ input[type="radio"].align-checkbox, 
input[type="checkbox"].align-checkbox {
 cursor: not-allowed;
   }
 }
+#select-stack {
+  .tabs-left {
+height: 271px;
+margin-bottom: 5px;
+  }
+}
 
 .public-disabled-message {
   padding: 5px;
@@ -6362,6 +6368,9 @@ input[type="radio"].align-checkbox, 
input[type="checkbox"].align-checkbox {
   button.disabled {
 cursor: not-allowed;
   }
+  .dropdown-menu a {
+cursor: pointer;
+  }
 }
 #skip-validation {
   margin-top: 13px;

http://git-wip-us.apache.org/repos/asf/ambari/blob/edf85a38/ambari-web/app/styles/common.less
--
diff --git a/ambari-web/app/styles/common.less 
b/ambari-web/app/styles/common.less
index 738edce..bc11d4d 100644
--- a/ambari-web/app/styles/common.less
+++ b/ambari-web/app/styles/common.less
@@ -436,6 +436,10 @@
 .tabs-right>li {
   margin-left: -1px;
 }
+.tabs-left>li>a:hover,
+.tabs-left>li>a:focus {
+  border-bottom-color: transparent;
+}
 .tabs-left>li.active>a,
 .tabs-left>li.active>a:hover,
 .tabs-left>li.active>a:focus {

ambari git commit: AMBARI-17021. VDF: REgister Version UI inconsistencies + bug.(xiwang)

2016-06-02 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk 396adbedf -> 9bb8524b9


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/9bb8524b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9bb8524b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9bb8524b

Branch: refs/heads/trunk
Commit: 9bb8524b9c0a2241f266c53b4e57669d7efa4164
Parents: 396adbe
Author: Xi Wang <xiw...@apache.org>
Authored: Thu Jun 2 16:04:41 2016 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Thu Jun 2 16:37:58 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/9bb8524b/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/9bb8524b/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/9bb8524b/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"
   >
   
-  
+  
 {{'common.name' | translate}}
 
+{{'common.controls.close' | translate}}
   
-  
+  
 {{'common.version' | translate}}
 
+{{'common.controls.close' | translate}}
   
   
 {{'common.cluster' | translate}}
@@ -56,7 +58,7 @@
 ng-options="item.label for item in filter.cluster.options 
track by item.value"
   >
   
-  
+

ambari git commit: AMBARI-17021. VDF: REgister Version UI inconsistencies + bug.(xiwang)

2016-06-02 Thread xiwang

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 <xiw...@apache.org>
Authored: Thu Jun 2 16:04:41 2016 -0700
Committer: Xi Wang <xiw...@apache.org>
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"
   >
   
-  
+  
 {{'common.name' | translate}}
 
+{{'common.controls.close' | translate}}
   
-  
+  
 {{'common.version' | translate}}
 
+{{'common.controls.close' | translate}}
   
   
 {{'common.cluster' | translate}}
@@ -56,7 +58,7 @@
 ng-options="item.label for item in filter.cluster.options 
track by item.value"
   >
   
-  
+

ambari git commit: AMBARI-16908. Different repositories show same versions of services.(xiwang)

2016-05-31 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 996d20a8d -> 0ebe85494


AMBARI-16908. Different repositories show same versions of services.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0ebe8549
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0ebe8549
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0ebe8549

Branch: refs/heads/branch-2.4
Commit: 0ebe85494b72a0785c9811f04f4e98174746bbfe
Parents: 996d20a
Author: Xi Wang <xiw...@apache.org>
Authored: Fri May 27 13:50:55 2016 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Tue May 31 11:20:29 2016 -0700

--
 ambari-web/app/mappers/repository_version_mapper.js| 4 ++--
 .../main/admin/stack_upgrade/upgrade_version_column.hbs| 2 +-
 ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs | 2 +-
 ambari-web/app/views/main/admin/stack_upgrade/versions_view.js | 6 ++
 4 files changed, 10 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0ebe8549/ambari-web/app/mappers/repository_version_mapper.js
--
diff --git a/ambari-web/app/mappers/repository_version_mapper.js 
b/ambari-web/app/mappers/repository_version_mapper.js
index 248d646..19ff672 100644
--- a/ambari-web/app/mappers/repository_version_mapper.js
+++ b/ambari-web/app/mappers/repository_version_mapper.js
@@ -121,7 +121,7 @@ App.repoVersionMapper = App.QuickDataMapper.create({
   if (item[repoVersionsKey].stack_services) {
 item[repoVersionsKey].stack_services.forEach(function (service) {
   var serviceObj = {
-id: service.name,
+id: item[repoVersionsKey].repository_version + service.name,
 name: service.name,
 display_name: service.display_name,
 latest_version: service.versions[0] ? service.versions[0] : ''
@@ -132,7 +132,7 @@ App.repoVersionMapper = App.QuickDataMapper.create({
   } else if (item[repoVersionsKey].services) {
 item[repoVersionsKey].services.forEach(function (service) {
   var serviceObj = {
-id: service.name,
+id: item[repoVersionsKey].repository_version + service.name,
 name: service.name,
 display_name: service.display_name,
 latest_version: service.versions[0] ? 
service.versions[0].version: ''

http://git-wip-us.apache.org/repos/asf/ambari/blob/0ebe8549/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
--
diff --git 
a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs 
b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
index 0af63cd..0878733 100644
--- 
a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
+++ 
b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
@@ -34,7 +34,7 @@
   {{bindAttr disabled="view.stateElement.isDisabled"}}>
   {{view.stateElement.text}}
 
- {{/if}}
+  {{/if}}
   {{#if view.stateElement.isButtonGroup}}
 
   http://git-wip-us.apache.org/repos/asf/ambari/blob/0ebe8549/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs
--
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs 
b/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs
index ac7cb82..bcc4b63 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs
@@ -58,7 +58,7 @@
   
 {{#if isLoaded}}
   
-{{#each version in view.repoVersions}}
+{{#each version in view.repoVersionsDisplay}}
   {{#if version.isVisible}}
 {{view App.UpgradeVersionColumnView contentBinding="version"}}
   {{/if}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/0ebe8549/ambari-web/app/views/main/admin/stack_upgrade/versions_view.js
--
diff --git a/ambari-web/app/views/main/admin/stack_upgrade/versions_view.js 
b/ambari-web/app/views/main/admin/stack_upgrade/versions_view.js
index 17010ba..bdf8d7d 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/versions_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/versions_view.js
@@ -127,6 +127,12 @@ App.MainAdminStackVersionsView = Em.View.extend({
*/
   repoVersions: App.RepositoryVersion.find(),
 
+  repoVersionsDisplay: function () {
+return this.get('repoVersions').toArray().sort(

ambari git commit: AMBARI-16908. Different repositories show same versions of services.(xiwang)

2016-05-31 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk 66f240568 -> 2b8a59332


AMBARI-16908. Different repositories show same versions of services.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2b8a5933
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2b8a5933
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2b8a5933

Branch: refs/heads/trunk
Commit: 2b8a5933227fd37010578a16c64c30344a13fefd
Parents: 66f2405
Author: Xi Wang <xiw...@apache.org>
Authored: Fri May 27 13:50:55 2016 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Tue May 31 11:18:57 2016 -0700

--
 ambari-web/app/mappers/repository_version_mapper.js| 4 ++--
 .../main/admin/stack_upgrade/upgrade_version_column.hbs| 2 +-
 ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs | 2 +-
 ambari-web/app/views/main/admin/stack_upgrade/versions_view.js | 6 ++
 4 files changed, 10 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2b8a5933/ambari-web/app/mappers/repository_version_mapper.js
--
diff --git a/ambari-web/app/mappers/repository_version_mapper.js 
b/ambari-web/app/mappers/repository_version_mapper.js
index 248d646..19ff672 100644
--- a/ambari-web/app/mappers/repository_version_mapper.js
+++ b/ambari-web/app/mappers/repository_version_mapper.js
@@ -121,7 +121,7 @@ App.repoVersionMapper = App.QuickDataMapper.create({
   if (item[repoVersionsKey].stack_services) {
 item[repoVersionsKey].stack_services.forEach(function (service) {
   var serviceObj = {
-id: service.name,
+id: item[repoVersionsKey].repository_version + service.name,
 name: service.name,
 display_name: service.display_name,
 latest_version: service.versions[0] ? service.versions[0] : ''
@@ -132,7 +132,7 @@ App.repoVersionMapper = App.QuickDataMapper.create({
   } else if (item[repoVersionsKey].services) {
 item[repoVersionsKey].services.forEach(function (service) {
   var serviceObj = {
-id: service.name,
+id: item[repoVersionsKey].repository_version + service.name,
 name: service.name,
 display_name: service.display_name,
 latest_version: service.versions[0] ? 
service.versions[0].version: ''

http://git-wip-us.apache.org/repos/asf/ambari/blob/2b8a5933/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
--
diff --git 
a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs 
b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
index 0af63cd..0878733 100644
--- 
a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
+++ 
b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
@@ -34,7 +34,7 @@
   {{bindAttr disabled="view.stateElement.isDisabled"}}>
   {{view.stateElement.text}}
 
- {{/if}}
+  {{/if}}
   {{#if view.stateElement.isButtonGroup}}
 
   http://git-wip-us.apache.org/repos/asf/ambari/blob/2b8a5933/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs
--
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs 
b/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs
index ac7cb82..bcc4b63 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs
@@ -58,7 +58,7 @@
   
 {{#if isLoaded}}
   
-{{#each version in view.repoVersions}}
+{{#each version in view.repoVersionsDisplay}}
   {{#if version.isVisible}}
 {{view App.UpgradeVersionColumnView contentBinding="version"}}
   {{/if}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/2b8a5933/ambari-web/app/views/main/admin/stack_upgrade/versions_view.js
--
diff --git a/ambari-web/app/views/main/admin/stack_upgrade/versions_view.js 
b/ambari-web/app/views/main/admin/stack_upgrade/versions_view.js
index 17010ba..bdf8d7d 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/versions_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/versions_view.js
@@ -127,6 +127,12 @@ App.MainAdminStackVersionsView = Em.View.extend({
*/
   repoVersions: App.RepositoryVersion.find(),
 
+  repoVersionsDisplay: function () {
+return this.get('repoVersions').toArray().sort(

[1/3] ambari git commit: AMBARI-15724. Integrate Version Registration in Select Stack Page.(xiwang)

2016-04-20 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk c6c4d5ecf -> 7046b2ba1


http://git-wip-us.apache.org/repos/asf/ambari/blob/7046b2ba/ambari-web/test/views/wizard/step1_view_test.js
--
diff --git a/ambari-web/test/views/wizard/step1_view_test.js 
b/ambari-web/test/views/wizard/step1_view_test.js
index 0dacad8..070cb59 100644
--- a/ambari-web/test/views/wizard/step1_view_test.js
+++ b/ambari-web/test/views/wizard/step1_view_test.js
@@ -28,20 +28,18 @@ function getView() {
 
 describe('App.WizardStep1View', function () {
 
-  App.TestAliases.testAsComputedAnd(getView(), 'showErrorsWarningCount', 
['isSubmitDisabled', 'totalErrorCnt']);
-
   describe('#operatingSystems', function () {
 beforeEach(function () {
   sinon.stub(App.Stack, 'find', function () {
 return [
   Ember.Object.create({
-id: 'HDP-1.3',
+id: 'HDP-1.3-1234',
 stackName: 'HDP',
 stackVersion: '1.3',
 active: true,
 operatingSystems: [
   Ember.Object.create({
-id: 'HDP-1.3-redhat5',
+id: 'HDP-1.3-1234-redhat5',
 osType: 'redhat5',
 isSelected: false,
 repositories: [
@@ -56,7 +54,7 @@ describe('App.WizardStep1View', function () {
 ]
   }),
   Ember.Object.create({
-id: 'HDP-1.3-redhat6',
+id: 'HDP-1.3-1234-redhat6',
 osType: 'redhat6',
 isSelected: false,
 repositories: [
@@ -154,25 +152,9 @@ describe('App.WizardStep1View', function () {
   App.Stack.find.restore();
 });
 
-it('should create empty array if there is no stacks', function () {
-  controller = App.WizardStep1Controller.create({
-content: {
-  stacks: []
-},
-selectedStack: []
-  });
-  view = App.WizardStep1View.create();
-  view.reopen({
-controller: controller
-  });
-  expect(view.get('allRepositories.length')).to.equal(0);
-  expect(view.get('operatingSystems.length')).to.equal(0);
-});
-
 describe('should create repo groups from repo list', function () {
 
   var repositories;
-
   beforeEach(function () {
 controller = App.WizardStep1Controller.create({
   content: {
@@ -184,7 +166,6 @@ describe('App.WizardStep1View', function () {
 view.set('$', function () {
   return Em.Object.create({hide: Em.K, toggle: Em.K});
 });
-
 repositories = view.get('allRepositories');
   });
 
@@ -242,296 +223,12 @@ describe('App.WizardStep1View', function () {
 
   App.TestAliases.testAsComputedEveryBy(getView(), 'isNoOsChecked', 
'operatingSystems', 'isSelected', false);
 
-  App.TestAliases.testAsComputedOr(getView(), 'isSubmitDisabled', 
['invalidFormatUrlExist', 'isNoOsChecked', 'invalidUrlExist', 
'controller.content.isCheckInProgress']);
-
-  describe('#stacks', function () {
-
-var tests = Em.A([
-  {
-m: 'Stack with 2 HDP',
-stacks: [
-  Em.Object.create({isSelected: true, id: 'HDP-2.0.1'}),
-  Em.Object.create({isSelected: false, id: 'HDP-1.3.3'})
-],
-e: {
-  names: ['HDP 2.0.1', 'HDP 1.3.3'],
-  selected: [true, false]
-}
-  },
-  {
-m: 'No HDP',
-stacks: [],
-e: {
-  names: [],
-  selected: []
-}
-  }
-]);
-
-tests.forEach(function (test) {
-  it(test.m, function () {
-view.set('controller.content.stacks', test.stacks);
-var stacks = view.get('stacks');
-expect(stacks.mapProperty('name')).to.eql(test.e.names);
-expect(stacks.mapProperty('isSelected')).to.eql(test.e.selected);
-  });
-});
-
-  });
+  App.TestAliases.testAsComputedOr(getView(), 'isSubmitDisabled', 
['controller.content.isCheckInProgress']);
 
   App.TestAliases.testAsComputedSomeBy(getView(), 'invalidUrlExist', 
'allRepositories', 'validation', App.Repository.validation.INVALID);
 
   App.TestAliases.testAsComputedSomeBy(getView(), 'invalidFormatUrlExist', 
'allRepositories', 'invalidFormatError', true);
 
-  describe('#totalErrorCnt', function () {
-var tests = Em.A([
-  {
-allRepositories: [
-  {}
-],
-m: 'isNoOsChecked',
-isNoOsChecked: true,
-e: 1
-  },
-  {
-allRepositories: [
-  {'invalidFormatError': true},
-  {'invalidFormatError': true}
-],
-isNoOsChecked: false,
-m: 'two with empty-error',
-e: 2
-  },
-  {
-allRepositories: [
-  {'validation': 'icon-exclamation-sign'},
-  {'validation': 'icon-exclamation-sign'}
-],
-isNoOsChecked: false,
-m: 'two with validation="icon-exclamation-sign"',
-e: 2
-  },
-  {
-

[2/3] ambari git commit: AMBARI-15724. Integrate Version Registration in Select Stack Page.(xiwang)

2016-04-20 Thread xiwang

http://git-wip-us.apache.org/repos/asf/ambari/blob/7046b2ba/ambari-web/app/templates/wizard/step1.hbs
--
diff --git a/ambari-web/app/templates/wizard/step1.hbs 
b/ambari-web/app/templates/wizard/step1.hbs
index ab9a0dd..7e257fd 100644
--- a/ambari-web/app/templates/wizard/step1.hbs
+++ b/ambari-web/app/templates/wizard/step1.hbs
@@ -17,109 +17,190 @@
 }}
 
   {{t installer.step1.header}}
-  
-{{t installer.step1.body}}
-  
-  {{t common.stacks}}
-  
-{{#each stack in view.stacks}}
-  {{view view.stackRadioButton 
contentBinding="stack"}} {{stack.name}}
-{{/each}}
-  
+  {{t installer.step1.body}}
 
+  {{view view.usePublicRepoRadioButton}} {{t 
installer.step1.selectUseRepoOptions.public}}
+  {{#unless view.selectedPublicRepoVersion}}
+  {{t 
installer.step1.selectUseRepoOptions.public.networkLost}}
+  {{/unless}}
+  
 
-  
-
-  
-
-
-  {{t installer.step1.advancedRepo.title}}
-  {{#if view.showErrorsWarningCount}}
-{{view.totalErrorCnt}}
+
+  
+{{t installer.step1.selectUseRepoOptions.public.select}}
+  
+  
+
+  {{#if view.selectedPublicRepoVersion}}
+
+  {{view.selectedPublicRepoVersion.displayName}} 
+
+  {{else}}
+
+ {{t 
installer.step1.selectUseRepoOptions.public.networkLost.button}}
+
   {{/if}}
-
+  
+{{#if view.availableStackRepoList}}
+  {{#each repo in view.availableStackRepoList}}
+{{#if repo.repositoryVersion}}
+  {{repo.repositoryVersion}}
+{{/if}}
+  {{/each}}
+{{else}}
+  {{t 
installer.step1.usePublicRepo.ReposList.empty}}
+{{/if}}
+  
+
   
-  
-
-  {{t 
installer.step1.advancedRepo.message}}
-  {{t 
installer.step1.advancedRepo.importantMassage}}
+
 
-  
-
-  
-  {{t common.os}}
-  {{t common.name}}
-  {{t 
installer.step1.advancedRepo.localRepo.column.baseUrl}}
+{{!--Local repo loaded info below--}}
+  {{view view.useLocalRepoRadioButton}} {{t 
installer.step1.selectUseRepoOptions.local}}
+
+
+  
+
+  
+{{view view.uploadFileRadioButton}} {{t 
installer.step1.useLocalRepo.uploadFile}}
+  
+
+
+  {{#if view.isFileApi}}
+{{view App.VersionDefinitionFileUploader 
disabledBinding="view.fileBrowserDisabled"}}
+  {{/if}}
+
+  
+  
+
+  
+{{view view.enterUrlRadioButton}} {{t 
installer.step1.useLocalRepo.enterUrl}}
+  
+
+
+  
+{{view Ember.TextField 
valueBinding="optionsToSelect.useLocalRepo.enterUrl.url" 
disabledBinding="view.enterUrlFieldDisabled"}}
+  
+
+
+   {{t 
installer.step1.useLocalRepo.readButton}}
+
+  
+
+
+
+  
+
+  {{t installer.step1.useLocalRepo.infoForm.details.title}}
+
+
+  
+
+  
+
+  {{t 
installer.step1.useLocalRepo.infoForm.details.stackName}}
+  {{controller.selectedStack.stackNameVersion}}
+  {{#if controller.selectedStack.isPatch}}
+  {{t common.patch}}
+  {{/if}}
+
+
+  {{t 
installer.step1.useLocalRepo.infoForm.details.displayName}}
+  {{controller.selectedStack.displayName}}
+
+
+  {{t 
installer.step1.useLocalRepo.infoForm.details.version}}
+  {{controller.selectedStack.repositoryVersion}}
+
+  
+  
+{{#unless view.selectedServices}}
+  {{t 
installer.step1.useLocalRepo.infoForm.content.empty}}
+{{/unless}}
+{{#each service in view.selectedServices}}
+  
+  {{service.displayName}} 
({{service.version}})
+  
+{{/each}}
+  
 
-
+  
+
+  
+  
+
+  {{t common.repositories}}
+
+  
+
+  {{t 
installer.step1.useLocalRepo.infoForm.alert.baseUrl}}
+  {{#if view.hasValidationErrors}}
+{{t 
installer.step1.useLocalRepo.infoForm.alert.warning}}
+  {{/if}}
+
+  
+{{t common.os}}
+{{t common.name}}
+{{t 
installer.step1.advancedRepo.localRepo.column.baseUrl}}
+  
+
   {{#each operatingSystem in view.operatingSystems}}
-

[3/3] ambari git commit: AMBARI-15724. Integrate Version Registration in Select Stack Page.(xiwang)

2016-04-20 Thread xiwang

AMBARI-15724. Integrate Version Registration in Select Stack Page.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7046b2ba
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7046b2ba
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7046b2ba

Branch: refs/heads/trunk
Commit: 7046b2ba1728218d3550210a761e8dbcb8411e54
Parents: c6c4d5e
Author: Xi Wang <xiw...@apache.org>
Authored: Fri Apr 15 15:30:42 2016 -0700
Committer: Xi Wang <xiw...@apache.org>
Committed: Wed Apr 20 13:34:36 2016 -0700

--
 .../stackVersions/StackVersionsCreateCtrl.js|   9 +
 .../stackVersions/StackVersionsEditCtrl.js  |  10 +
 .../resources/ui/admin-web/app/styles/main.css  |  33 +-
 .../views/stackVersions/stackVersionPage.html   |  52 +-
 .../wizard/stack/HDP_version_definitions.json   | 556 +++
 ambari-web/app/controllers/installer.js | 256 ++-
 .../main/admin/stack_and_upgrade_controller.js  |  33 +-
 .../controllers/main/service/add_controller.js  |   8 +-
 ambari-web/app/controllers/wizard.js|  29 +
 .../app/controllers/wizard/step1_controller.js  |  86 ++-
 .../app/controllers/wizard/step8_controller.js  |  64 +-
 .../app/mappers/repository_version_mapper.js|  11 +
 ambari-web/app/mappers/stack_mapper.js  |  53 +-
 ambari-web/app/messages.js  |  32 +-
 ambari-web/app/models/stack.js  |  51 +-
 ambari-web/app/routes/add_service_routes.js |   9 +-
 ambari-web/app/styles/application.less  | 155 +
 .../main/admin/stack_upgrade/services.hbs   |   2 +-
 .../main/admin/stack_upgrade/versions.hbs   |  10 +-
 ambari-web/app/templates/wizard/step1.hbs   | 259 ---
 ambari-web/app/templates/wizard/step4.hbs   |   2 +-
 ambari-web/app/utils/ajax/ajax.js   |  76 +++
 ambari-web/app/utils/db.js  |   8 +
 .../main/admin/stack_upgrade/services_view.js   |  11 +-
 ambari-web/app/views/wizard/step1_view.js   | 351 ++
 ambari-web/test/controllers/installer_test.js   |  27 +-
 .../test/controllers/wizard/step8_test.js   |  54 +-
 ambari-web/test/mappers/stack_mapper_test.js| 674 ++-
 .../admin/stack_upgrade/services_view_test.js   |  25 +-
 ambari-web/test/views/wizard/step1_view_test.js | 311 +
 30 files changed, 2388 insertions(+), 869 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7046b2ba/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 5596a7f..58e75e1 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
@@ -66,6 +66,15 @@ angular.module('ambariAdminConsole')
   $scope.readInfoButtonDisabled = function () {
 return $scope.option1.index == $scope.selectedOption.index ? 
!$scope.option1.file : !$scope.option2.url;
   };
+  $scope.isAddOsButtonDisabled = function () {
+var selectedCnt = 0;
+angular.forEach($scope.osList, function (os) {
+  if (os.selected) {
+selectedCnt ++;
+  }
+});
+return $scope.osList.length == selectedCnt;
+  };
 
   $scope.allInfoCategoriesBlank = function () {
 return !$scope.upgradeStack.stack_name;

http://git-wip-us.apache.org/repos/asf/ambari/blob/7046b2ba/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js
 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js
index 3da088b..8246c2b 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsEditCtrl.js
@@ -236,6 +236,16 @@ angular.module('ambariAdminConsole')
 }
   };
 
+  $scope.isAddOsButtonDisabled = function () {
+var selectedCnt = 0;
+angular.forEach($scope.osList, function (os) {
+  if (os.selected) {
+selectedCnt ++;
+  }
+});
+return $scope.osList.length == selectedCnt;
+  };
+
   $scope.hasNotDeletedRep

[1/2] ambari git commit: AMBARI-15724. Integrate Version Registration in Select Stack Page.(xiwang)

2016-04-12 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk 81279faed -> 391b45e93


http://git-wip-us.apache.org/repos/asf/ambari/blob/391b45e9/ambari-web/app/utils/ajax/ajax.js
--
diff --git a/ambari-web/app/utils/ajax/ajax.js 
b/ambari-web/app/utils/ajax/ajax.js
index a1d3f5f..9a23278 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -1371,6 +1371,10 @@ var urls = {
 'real': 
'/clusters/{clusterName}/stack_versions?ClusterStackVersions/state=CURRENT=repository_versions/RepositoryVersions/repository_version_response=true',
 'mock': '/data/stack_versions/stack_version_all.json'
   },
+  'cluster.load_current_repo_stack_services': {
+'real': 
'/clusters/{clusterName}/stack_versions?ClusterStackVersions/state=CURRENT=repository_versions/RepositoryVersions/stack_services',
+'mock': '/data/stack_versions/stack_version_all.json'
+  },
   'cluster.save_provisioning_state': {
 'real': '/clusters/{clusterName}',
 'type': 'PUT',
@@ -1858,6 +1862,42 @@ var urls = {
 }
   },
 
+  'wizard.step1.post_version_definition_file.xml': {
+'real': '/version_definitions',
+'mock': '',
+'format': function (data) {
+  return {
+headers: {
+  'X-Requested-By': 'ambari',
+  'Content-Type': 'text/xml'
+},
+type: 'POST',
+data: data.data
+  }
+}
+  },
+  'wizard.step1.post_version_definition_file.url': {
+'real': '/version_definitions',
+'mock': '',
+'format': function (data) {
+  return {
+type: 'POST',
+data: JSON.stringify(data.data)
+  }
+}
+  },
+  'wizard.step1.get_repo_version_by_id': {
+'real': 
'/stacks/{stackName}/versions?fields=repository_versions/operating_systems/repositories/*'
 +
+',repository_versions/RepositoryVersions/*' +
+
'_versions/RepositoryVersions/id={repoId}/stack_version={stackVersion}',
+'mock': ''
+  },
+
+  'wizard.step1.get_supported_os_types': {
+'real': 
'/stacks/{stackName}/versions/{stackVersion}?fields=operating_systems/repositories/Repositories',
+'mock': ''
+  },
+
   'wizard.advanced_repositories.valid_url': {
 'real': 
'/stacks/{stackName}/versions/{stackVersion}/operating_systems/{osType}/repositories/{repoId}',
 'mock': '',
@@ -1868,6 +1908,12 @@ var urls = {
   }
 }
   },
+  'wizard.get_shown_version_definition': {
+real: 
'/version_definitions?fields=VersionDefinition/stack_services/repository_version={repositoryVersion}/show_available=true'
+  },
+  'wizard.get_version_definition': {
+real: 
'/version_definitions?fields=VersionDefinition/stack_services/repository_version={repositoryVersion}'
+  },
   'wizard.service_components': {
 'real': 
'{stackUrl}/services?fields=StackServices/*,components/*,components/dependencies/Dependencies/scope,artifacts/Artifacts/artifact_name',
 'mock': '/data/stacks/HDP-2.1/service_components.json'
@@ -2109,6 +2155,12 @@ var urls = {
 'real': 
'/stacks/{stackName}/versions?fields=Versions,operating_systems/repositories/Repositories',
 'mock': '/data/wizard/stack/{stackName}_versions.json'
   },
+
+  'wizard.stacks_versions_definitions': {
+'real': 
'/version_definitions?fields=operating_systems/repositories/Repositories/*,VersionDefinition/stack_services,VersionDefinition/repository_version'
 +
+  
'/show_available=true/stack_name={stackName}',
+'mock': '/data/wizard/stack/{stackName}_version_definitions.json'
+  },
   'wizard.launch_bootstrap': {
 'real': '/bootstrap',
 'mock': '/data/wizard/bootstrap/bootstrap.json',

http://git-wip-us.apache.org/repos/asf/ambari/blob/391b45e9/ambari-web/app/views/main/admin/stack_upgrade/services_view.js
--
diff --git a/ambari-web/app/views/main/admin/stack_upgrade/services_view.js 
b/ambari-web/app/views/main/admin/stack_upgrade/services_view.js
index 8805c47..f566814 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/services_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/services_view.js
@@ -31,10 +31,15 @@ App.MainAdminStackServicesView = Em.View.extend({
*/
   services: function() {
 var services = App.supports.installGanglia ? App.StackService.find() : 
App.StackService.find().without(App.StackService.find('GANGLIA'));
-return services.map(function(s) {
-  s.set('isInstalled', App.Service.find().someProperty('serviceName', 
s.get('serviceName')));
-  return s;
+var controller = this.get('controller');
+controller.loadServiceVersionFromVersionDefinitions().complete(function () 
{
+  return services.map(function(s) {
+s.set('serviceVersionDisplay', 
controller.get('serviceVersionsMap')[s.get('serviceName')]);
+s.set('isInstalled', App.Service.find().someProperty('serviceName', 
s.get('serviceName')));
+return s;
+  });
 });
+return

ambari git commit: AMBARI-15414. Version Register/manage: UX edits #1.(xiwang)

2016-03-14 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk b88aaa3ea -> c612a462c


AMBARI-15414. Version Register/manage: UX edits #1.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c612a462
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c612a462
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c612a462

Branch: refs/heads/trunk
Commit: c612a462cbb1cef67a245b78234e66ab541577b8
Parents: b88aaa3
Author: Xi Wang <xiw...@apache.org>
Authored: Fri Mar 11 14:34:44 2016 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Mon Mar 14 15:52:47 2016 -0700

--
 .../stackVersions/StackVersionsCreateCtrl.js|  2 +-
 .../ui/admin-web/app/scripts/i18n.config.js |  1 +
 .../resources/ui/admin-web/app/styles/main.css  |  7 +-
 .../views/stackVersions/stackVersionPage.html   |  1 +
 ambari-web/app/styles/stack_versions.less   | 24 +---
 .../stack_upgrade/upgrade_version_column.hbs|  3 ++-
 .../upgrade_version_column_view.js  | 12 ++
 7 files changed, 39 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c612a462/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 544e282..6feeeac 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
@@ -64,7 +64,7 @@ angular.module('ambariAdminConsole')
 $scope.option2.hasError = false;
   };
   $scope.readInfoButtonDisabled = function () {
-return $scope.option1.index == $scope.selectedOption.index ? false : 
!$scope.option2.url;
+return $scope.option1.index == $scope.selectedOption.index ? 
!$scope.option1.file : !$scope.option2.url;
   };
 
   $scope.allInfoCategoriesBlank = function () {

http://git-wip-us.apache.org/repos/asf/ambari/blob/c612a462/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js 
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
index 4b42f2e..228be5c 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js
@@ -326,6 +326,7 @@ angular.module('ambariAdminConsole')
   'skipValidation': 'Skip Repository Base URL validation (Advanced)',
   'noVersions': 'Select version to display details.',
   'patch': 'Patch',
+  'introduction': 'To register a new version in Ambari, provide a Version 
Definition File, confirm the software repository information and save the 
version.',
   'contents': {
 'title': 'Contents',
 'empty': 'No contents to display'

http://git-wip-us.apache.org/repos/asf/ambari/blob/c612a462/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 07eb607..b705a90 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
@@ -1444,10 +1444,15 @@ thead.view-permission-header > tr > th {
   color: white;
 }
 #upload-definition-file-panel {
-  background-color: #f5f5f5;
+  background-color: #f9f9f9;
   padding: 20px 10px 5px 10px;
   margin-bottom: 15px;
 }
+#upload-definition-file-panel .introduction-info {
+  padding: 10px 10px 15px 15px;
+  font-size: 15px;
+  line-height: 1.7;
+}
 .register-version-options .read-info-button {
   margin-top: 10px;
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/c612a462/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 1eac23f..a7dcaa5 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html
+++ 
b/

ambari git commit: AMBARI-15394. Add second parameter to App.format.role. (Joe Wang via xiwang)

2016-03-11 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk 0f0d77660 -> c17e227cb


AMBARI-15394. Add second parameter to App.format.role.  (Joe Wang via xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c17e227c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c17e227c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c17e227c

Branch: refs/heads/trunk
Commit: c17e227cb61875804e88f7b67c7663252863f456
Parents: 0f0d776
Author: Xi Wang <xiw...@apache.org>
Authored: Fri Mar 11 15:49:09 2016 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Fri Mar 11 15:50:13 2016 -0800

--
 .../global/background_operations_controller.js  |  4 +-
 .../hawq/activateStandby/step3_controller.js|  2 +-
 .../hawq/addStandby/step4_controller.js |  2 +-
 .../hawq/removeStandby/step3_controller.js  |  2 +-
 .../nameNode/step5_controller.js|  2 +-
 .../nameNode/step9_controller.js|  6 +--
 .../rangerAdmin/step4_controller.js |  2 +-
 .../resourceManager/step4_controller.js |  2 +-
 .../main/admin/kerberos/step3_controller.js |  2 +-
 .../main/admin/service_auto_start.js|  4 +-
 .../alerts/manage_alert_groups_controller.js|  4 +-
 .../app/controllers/main/charts/heatmap.js  |  2 +-
 ambari-web/app/controllers/main/host.js |  2 +-
 ambari-web/app/controllers/main/host/details.js |  6 +--
 .../controllers/main/service/add_controller.js  |  2 +-
 ambari-web/app/controllers/main/service/item.js | 12 ++---
 .../service/manage_config_groups_controller.js  |  4 +-
 .../main/service/reassign/step4_controller.js   |  4 +-
 .../main/service/reassign/step6_controller.js   |  2 +-
 ambari-web/app/controllers/wizard.js|  6 +--
 .../app/controllers/wizard/step10_controller.js |  2 +-
 .../app/controllers/wizard/step6_controller.js  |  4 +-
 .../app/controllers/wizard/step8_controller.js  |  2 +-
 .../app/controllers/wizard/step9_controller.js  |  4 +-
 .../app/mappers/configs/config_groups_mapper.js |  2 +-
 .../app/mappers/service_metrics_mapper.js   |  2 +-
 .../app/mixins/common/configs/configs_saver.js  |  2 +-
 .../details/host_components/decommissionable.js |  2 +-
 .../main/service/configs/config_overridable.js  |  2 +-
 .../mixins/wizard/assign_master_components.js   |  2 +-
 .../wizard/wizardProgressPageController.js  |  2 +-
 .../app/models/alerts/alert_definition.js   |  2 +-
 .../models/configs/service_config_version.js|  2 +-
 ambari-web/app/models/root_service.js   |  4 +-
 ambari-web/app/models/service.js|  2 +-
 ambari-web/app/models/stack_service.js  |  2 +-
 .../app/utils/batch_scheduled_requests.js   |  4 +-
 ambari-web/app/utils/ember_computed.js  |  7 +--
 ambari-web/app/utils/helper.js  | 51 +++-
 ambari-web/app/utils/host_progress_popup.js |  2 +-
 .../app/views/common/rolling_restart_view.js|  2 +-
 .../stack_upgrade/failed_hosts_modal_view.js|  4 +-
 .../admin/stack_upgrade/upgrade_wizard_view.js  |  2 +-
 .../views/main/charts/heatmap/heatmap_host.js   |  2 +-
 ambari-web/app/views/main/host.js   |  2 +-
 .../app/views/main/host/combo_search_box.js |  4 +-
 .../views/main/host/hosts_table_menu_view.js|  2 +-
 ambari-web/app/views/main/host/summary.js   |  2 +-
 .../app/views/main/service/info/configs.js  |  2 +-
 .../app/views/main/service/info/summary.js  |  2 +-
 ambari-web/app/views/main/service/item.js   | 10 ++--
 .../views/main/service/reassign/step4_view.js   |  2 +-
 .../views/main/service/reassign/step6_view.js   |  2 +-
 ambari-web/app/views/wizard/step6_view.js   |  2 +-
 .../views/wizard/step9/hostLogPopupBody_view.js |  2 +-
 .../test/controllers/wizard/step4_test.js   |  2 +-
 ambari-web/test/utils/ember_computed_test.js|  8 +--
 ambari-web/test/utils/helper_test.js| 10 ++--
 58 files changed, 124 insertions(+), 112 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c17e227c/ambari-web/app/controllers/global/background_operations_controller.js
--
diff --git 
a/ambari-web/app/controllers/global/background_operations_controller.js 
b/ambari-web/app/controllers/global/background_operations_controller.js
index 4156e46..518f5ba 100644
--- a/ambari-web/app/controllers/global/background_operations_controller.js
+++ b/ambari-web/app/controllers/global/background_operations_controller.js
@@ -338,11 +338,11 @@ App.BackgroundOperationsController = 
Em.Controller.extend({
   if (service === 'ALL_SERVICES') {
 parsedRequestContext = Em.I18n.t("requestInfo." + 
contextCommand.toLowe

ambari git commit: AMBARI-15394. Add second parameter to App.format.role(). (Joe Wang via xiwang)

2016-03-11 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 94f5bb7d5 -> e5d143e97


AMBARI-15394. Add second parameter to App.format.role(). (Joe Wang via xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e5d143e9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e5d143e9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e5d143e9

Branch: refs/heads/branch-2.2
Commit: e5d143e979541b96043daa8a6823c657254d4a57
Parents: 94f5bb7
Author: Xi Wang <xiw...@apache.org>
Authored: Fri Mar 11 12:02:03 2016 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Fri Mar 11 12:02:03 2016 -0800

--
 .../global/background_operations_controller.js  |  4 +-
 .../hawq/activateStandby/step3_controller.js|  2 +-
 .../hawq/addStandby/step4_controller.js |  2 +-
 .../hawq/removeStandby/step3_controller.js  |  2 +-
 .../nameNode/step5_controller.js|  2 +-
 .../nameNode/step9_controller.js|  6 +--
 .../rangerAdmin/step4_controller.js |  2 +-
 .../resourceManager/step4_controller.js |  2 +-
 .../main/admin/kerberos/step3_controller.js |  2 +-
 .../main/admin/security/add/step3.js|  2 +-
 .../alerts/manage_alert_groups_controller.js|  4 +-
 ambari-web/app/controllers/main/host/details.js |  4 +-
 .../controllers/main/service/add_controller.js  |  2 +-
 .../service/manage_config_groups_controller.js  |  4 +-
 .../main/service/reassign/step4_controller.js   |  4 +-
 .../main/service/reassign/step6_controller.js   |  2 +-
 ambari-web/app/controllers/wizard.js|  6 +--
 .../wizard/slave_component_groups_controller.js |  2 +-
 .../app/controllers/wizard/step10_controller.js |  2 +-
 .../app/controllers/wizard/step6_controller.js  |  4 +-
 .../app/controllers/wizard/step8_controller.js  |  2 +-
 .../app/controllers/wizard/step9_controller.js  |  4 +-
 .../app/mappers/service_metrics_mapper.js   |  2 +-
 .../app/mixins/common/configs/configs_saver.js  |  2 +-
 .../details/host_components/decommissionable.js |  2 +-
 .../main/service/configs/config_overridable.js  |  2 +-
 .../mixins/wizard/assign_master_components.js   |  2 +-
 .../wizard/wizardProgressPageController.js  |  2 +-
 .../app/models/alerts/alert_definition.js   |  2 +-
 .../models/configs/service_config_version.js|  2 +-
 ambari-web/app/models/root_service.js   |  4 +-
 ambari-web/app/models/service.js|  2 +-
 ambari-web/app/models/stack_service.js  |  2 +-
 .../app/utils/batch_scheduled_requests.js   |  4 +-
 ambari-web/app/utils/helper.js  | 53 +++-
 ambari-web/app/utils/host_progress_popup.js |  2 +-
 .../app/views/common/rolling_restart_view.js|  2 +-
 .../stack_upgrade/failed_hosts_modal_view.js|  4 +-
 .../admin/stack_upgrade/upgrade_wizard_view.js  |  2 +-
 .../views/main/charts/heatmap/heatmap_host.js   |  2 +-
 ambari-web/app/views/main/host.js   |  2 +-
 .../views/main/host/hosts_table_menu_view.js|  2 +-
 ambari-web/app/views/main/host/summary.js   |  2 +-
 .../app/views/main/service/info/configs.js  |  2 +-
 .../app/views/main/service/info/summary.js  |  2 +-
 ambari-web/app/views/main/service/item.js   |  8 +--
 .../views/main/service/reassign/step4_view.js   |  8 +--
 .../views/main/service/reassign/step6_view.js   |  6 +--
 ambari-web/app/views/wizard/step6_view.js   |  2 +-
 .../views/wizard/step9/hostLogPopupBody_view.js |  2 +-
 .../main/service/add_controller_test.js |  2 +-
 .../test/controllers/wizard/step4_test.js   |  2 +-
 ambari-web/test/utils/helper_test.js| 10 ++--
 53 files changed, 109 insertions(+), 100 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e5d143e9/ambari-web/app/controllers/global/background_operations_controller.js
--
diff --git 
a/ambari-web/app/controllers/global/background_operations_controller.js 
b/ambari-web/app/controllers/global/background_operations_controller.js
index 4156e46..518f5ba 100644
--- a/ambari-web/app/controllers/global/background_operations_controller.js
+++ b/ambari-web/app/controllers/global/background_operations_controller.js
@@ -338,11 +338,11 @@ App.BackgroundOperationsController = 
Em.Controller.extend({
   if (service === 'ALL_SERVICES') {
 parsedRequestContext = Em.I18n.t("requestInfo." + 
contextCommand.toLowerCase()).format(Em.I18n.t('common.allServices'));
   } else {
-parsedRequestContext = Em.I18n.t("requestInfo." + 
contextCommand.toLowerCase()).format(App.format.role(service));
+parsedRequestContext = Em.I18n.t("requestInfo." + 
context

ambari git commit: AMBARI-15340. Register Version: multiple UI tweaks .(xiwang)

2016-03-09 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk 6d3e2912d -> e5d261f84


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/trunk
Commit: e5d261f84c8f10d3276ece640659c7b53a6684d1
Parents: 6d3e291
Author: Xi Wang <xiw...@apache.org>
Authored: Tue Mar 8 14:16:52 2016 -0800
Committer: Xi Wang <xiw...@apache.org>
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 @@
   
 
 
-  
+  
 
   
-  
+  
 
   
  {{'versions.enterURL' | translate}}
@@ -55,7 +55,7 @@
   
 
 
-  {{'versions.readInfo' | 
translate}}
 
   
@@ -84,7 +84,7 @@
   
 
 
-
+
   
 
   {{'common.details' | translate}}
@@ -129,7 +129,7 @@
 
   {{'versions.repos' | translate}}
 
-
+
   {{'versions

ambari git commit: AMBARI-15306. Admin tab and left menu disappeared during Upgrade.(xiwang)

2016-03-04 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk 7ade22258 -> 2b1437c4c


AMBARI-15306. Admin tab and left menu disappeared during Upgrade.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2b1437c4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2b1437c4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2b1437c4

Branch: refs/heads/trunk
Commit: 2b1437c4cc5369db09774cb0ca3ec8c29e6e9db4
Parents: 7ade222
Author: Xi Wang <xiw...@apache.org>
Authored: Fri Mar 4 15:44:47 2016 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Fri Mar 4 15:44:54 2016 -0800

--
 ambari-web/app/routes/main.js  |  5 +++--
 ambari-web/app/views/main/admin.js |  8 
 ambari-web/app/views/main/menu.js  | 11 ++-
 3 files changed, 13 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2b1437c4/ambari-web/app/routes/main.js
--
diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js
index 419f845..a531845 100644
--- a/ambari-web/app/routes/main.js
+++ b/ambari-web/app/routes/main.js
@@ -346,7 +346,8 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
   admin: Em.Route.extend({
 route: '/admin',
 enter: function (router, transition) {
-  if (router.get('loggedIn') && 
!App.isAuthorized('CLUSTER.TOGGLE_KERBEROS, AMBARI.SET_SERVICE_USERS_GROUPS, 
CLUSTER.UPGRADE_DOWNGRADE_STACK, CLUSTER.VIEW_STACK_DETAILS')) {
+  if (router.get('loggedIn') && 
!App.isAuthorized('CLUSTER.TOGGLE_KERBEROS, AMBARI.SET_SERVICE_USERS_GROUPS, 
CLUSTER.UPGRADE_DOWNGRADE_STACK, CLUSTER.VIEW_STACK_DETAILS')
+&& !(App.get('upgradeInProgress') || App.get('upgradeHolding'))) {
 Em.run.next(function () {
   router.transitionTo('main.dashboard.index');
 });
@@ -354,7 +355,7 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
 },
 
 routePath: function (router, event) {
-  if (!App.isAuthorized('CLUSTER.UPGRADE_DOWNGRADE_STACK')) {
+  if (!App.isAuthorized('CLUSTER.UPGRADE_DOWNGRADE_STACK') && 
!(App.get('upgradeInProgress') || App.get('upgradeHolding'))) {
 Em.run.next(function () {
   App.router.transitionTo('main.dashboard.index');
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/2b1437c4/ambari-web/app/views/main/admin.js
--
diff --git a/ambari-web/app/views/main/admin.js 
b/ambari-web/app/views/main/admin.js
index fc186d8..2b111b6 100644
--- a/ambari-web/app/views/main/admin.js
+++ b/ambari-web/app/views/main/admin.js
@@ -23,28 +23,28 @@ App.MainAdminView = Em.View.extend({
   selectedBinding: 'controller.category',
   categories: function() {
 var items = [];
-if(App.isAuthorized('CLUSTER.VIEW_STACK_DETAILS, 
CLUSTER.UPGRADE_DOWNGRADE_STACK')) {
+if(App.isAuthorized('CLUSTER.VIEW_STACK_DETAILS, 
CLUSTER.UPGRADE_DOWNGRADE_STACK') || (App.get('upgradeInProgress') || 
App.get('upgradeHolding'))) {
   items.push({
 name: 'stackAndUpgrade',
 url: 'stackAndUpgrade.index',
 label: Em.I18n.t('admin.stackUpgrade.title')
   });
 }
-if(App.isAuthorized('AMBARI.SET_SERVICE_USERS_GROUPS')) {
+if(App.isAuthorized('AMBARI.SET_SERVICE_USERS_GROUPS') || 
(App.get('upgradeInProgress') || App.get('upgradeHolding'))) {
   items.push({
 name: 'adminServiceAccounts',
 url: 'adminServiceAccounts',
 label: Em.I18n.t('common.serviceAccounts')
   });
 }
-if (!App.get('isHadoopWindowsStack') && 
App.isAuthorized('CLUSTER.TOGGLE_KERBEROS')) {
+if (!App.get('isHadoopWindowsStack') && 
App.isAuthorized('CLUSTER.TOGGLE_KERBEROS') || (App.get('upgradeInProgress') || 
App.get('upgradeHolding')) ) {
   items.push({
 name: 'kerberos',
 url: 'adminKerberos.index',
 label: Em.I18n.t('common.kerberos')
   });
 }
-if (App.isAuthorized('SERVICE.START_STOP, CLUSTER.MODIFY_CONFIGS')) {
+if (App.isAuthorized('SERVICE.START_STOP, CLUSTER.MODIFY_CONFIGS') || 
(App.get('upgradeInProgress') || App.get('upgradeHolding'))) {
   if (App.supports.serviceAutoStart) {
 items.push({
   name: 'serviceAutoStart',

http://git-wip-us.apache.org/repos/asf/ambari/blob/2b1437c4/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 e79901b..8f6b14e 100644
--- a/ambari-web/app/views/main/menu.js
+++ b/ambari-web/app/views/main/menu.js
@@ -43,7 +43,8 @@ App.MainMenuView = Em.CollectionView.extend({

ambari git commit: AMBARI-15274. Stack and Versions: integrate newly registered versions to display in new look.(xiwang)

2016-03-03 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk f1c2b3da0 -> 8d4243c61


AMBARI-15274. Stack and Versions: integrate newly registered versions to 
display in new look.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8d4243c6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8d4243c6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8d4243c6

Branch: refs/heads/trunk
Commit: 8d4243c61b9dc1c5f29c2950d59b9ccdba4d6663
Parents: f1c2b3d
Author: Xi Wang <xiw...@apache.org>
Authored: Wed Mar 2 16:25:36 2016 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Thu Mar 3 13:45:35 2016 -0800

--
 .../stackVersions/StackVersionsCreateCtrl.js|  20 
 .../main/admin/stack_and_upgrade_controller.js  |   2 +-
 .../app/mappers/repository_version_mapper.js| 117 +--
 ambari-web/app/styles/stack_versions.less   |  12 +-
 .../main/admin/stack_upgrade/versions.hbs   |   1 -
 .../admin/stack_and_upgrade_controller_test.js  |   2 +-
 6 files changed, 10 insertions(+), 144 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8d4243c6/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 cf0ca2a..99464cf 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
@@ -238,26 +238,6 @@ angular.module('ambariAdminConsole')
 });
   };
 
-//
-//  $scope.save = function () {
-//return Stack.validateBaseUrls($scope.skipValidation, $scope.osList, 
$scope.upgradeStack).then(function (invalidUrls) {
-//  if (invalidUrls.length === 0) {
-//Stack.addRepo($scope.upgradeStack, $scope.actualVersion, 
$scope.osList)
-//  .success(function () {
-//var versionName = $scope.upgradeStack.selected.stack_version + 
'.' + $scope.repoSubversion;
-//var stackName = $scope.upgradeStack.selected.stack_name;
-//Alert.success($t('versions.alerts.versionCreated', {stackName: 
stackName, versionName: versionName}));
-//$location.path('/stackVersions');
-//  })
-//  .error(function (data) {
-//  Alert.error($t('versions.alerts.versionCreationError'), 
data.message);
-//  });
-//  } else {
-//Stack.highlightInvalidUrls(invalidUrls);
-//  }
-//});
-//  };
-
   $scope.cancel = function () {
 $scope.editVersionDisabled = true;
 $location.path('/stackVersions');

http://git-wip-us.apache.org/repos/asf/ambari/blob/8d4243c6/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js 
b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index 06f8ae1..847544f 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -205,7 +205,7 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
*/
   realRepoUrl: function () {
 return App.get('apiPrefix') + App.get('stackVersionURL') +
-  
'/compatible_repository_versions?fields=*,operating_systems/*,operating_systems/repositories/*';
+  
'/repository_versions?fields=*,RepositoryVersions/*,operating_systems/*,operating_systems/repositories/*';
   }.property('App.stackVersionURL'),
 
   /**

http://git-wip-us.apache.org/repos/asf/ambari/blob/8d4243c6/ambari-web/app/mappers/repository_version_mapper.js
--
diff --git a/ambari-web/app/mappers/repository_version_mapper.js 
b/ambari-web/app/mappers/repository_version_mapper.js
index be85cd2..f096976 100644
--- a/ambari-web/app/mappers/repository_version_mapper.js
+++ b/ambari-web/app/mappers/repository_version_mapper.js
@@ -24,7 +24,7 @@ App.repoVersionMapper = App.QuickDataMapper.create({
   modelServices: App.ServiceSimple,
 
   modelRepoVersion: function (isCurrentStackOnly) {
-var repoVersionsKey = isCurrentStackOnly ? 'RepositoryVersions' : 
'CompatibleRepositoryVersions';
+var repoVersionsKey = 'RepositoryVersions';
 return {
   id: repoVersionsKey + '.id',
   stack_version_id:

ambari git commit: AMBARI-15209. UI Displays Incorrect Information On Host Repos Installed.(xiwang)

2016-02-26 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk 1d7beb356 -> 3a5fc0261


AMBARI-15209. UI Displays Incorrect Information On Host Repos Installed.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3a5fc026
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3a5fc026
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3a5fc026

Branch: refs/heads/trunk
Commit: 3a5fc0261e94a67749ffd4df46cd0ea53a63c0b7
Parents: 1d7beb3
Author: Xi Wang <xiw...@apache.org>
Authored: Fri Feb 26 14:27:49 2016 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Fri Feb 26 15:04:40 2016 -0800

--
 ambari-web/app/mappers/stack_version_mapper.js | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3a5fc026/ambari-web/app/mappers/stack_version_mapper.js
--
diff --git a/ambari-web/app/mappers/stack_version_mapper.js 
b/ambari-web/app/mappers/stack_version_mapper.js
index 43eddc9..bd37288 100644
--- a/ambari-web/app/mappers/stack_version_mapper.js
+++ b/ambari-web/app/mappers/stack_version_mapper.js
@@ -58,8 +58,8 @@ App.stackVersionMapper = App.QuickDataMapper.create({
  * OUT_OF_SYNC
  */
 stack.host_states.NOT_INSTALLED = 
item.ClusterStackVersions.host_states.INSTALLING
-  .concat(item.ClusterStackVersions.host_states.INSTALL_FAILED)
-  .concat(item.ClusterStackVersions.host_states.OUT_OF_SYNC);
+  .concat(item.ClusterStackVersions.host_states.INSTALL_FAILED || [])
+  .concat(item.ClusterStackVersions.host_states.OUT_OF_SYNC || []);
 
 /**
  * this property contains array of hosts on which repoversion was 
installed
@@ -71,9 +71,9 @@ App.stackVersionMapper = App.QuickDataMapper.create({
  * UPGRADE_FAILED
  */
 stack.host_states.INSTALLED = 
item.ClusterStackVersions.host_states.INSTALLED
-  .concat(item.ClusterStackVersions.host_states.UPGRADING)
-  .concat(item.ClusterStackVersions.host_states.UPGRADED)
-  .concat(item.ClusterStackVersions.host_states.UPGRADE_FAILED);
+  .concat(item.ClusterStackVersions.host_states.UPGRADING || [])
+  .concat(item.ClusterStackVersions.host_states.UPGRADED || [])
+  .concat(item.ClusterStackVersions.host_states.UPGRADE_FAILED || []);
 
 if (item.repository_versions && item.repository_versions[0]) {
   item.repository_versions[0].RepositoryVersions.stackVersionId = 
item.ClusterStackVersions.id;

ambari git commit: AMBARI-15147. Patch Upgrade: integrate API to POST new repo version when registering new version.(xiwang)

2016-02-23 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/branch-dev-patch-upgrade e5d580f28 -> a5b673dd1


AMBARI-15147. Patch Upgrade: integrate API to  POST new repo version when 
registering new version.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a5b673dd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a5b673dd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a5b673dd

Branch: refs/heads/branch-dev-patch-upgrade
Commit: a5b673dd18b5849792aace38f8e377f57f45b610
Parents: e5d580f
Author: Xi Wang <xiw...@apache.org>
Authored: Thu Feb 18 11:27:10 2016 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Tue Feb 23 16:05:23 2016 -0800

--
 .../stackVersions/StackVersionsCreateCtrl.js| 175 +--
 .../ui/admin-web/app/scripts/i18n.config.js |   1 +
 .../ui/admin-web/app/scripts/services/Stack.js  | 167 +++---
 .../views/stackVersions/stackVersionPage.html   |   8 +-
 .../app/mappers/repository_version_mapper.js| 152 ++--
 ambari-web/app/styles/stack_versions.less   |  10 +-
 .../admin/stack_upgrade/upgrade_version_box.hbs |  10 +-
 .../stack_upgrade/upgrade_version_box_view.js   |   3 +
 .../upgrade_version_column_view.js  |   3 +
 9 files changed, 275 insertions(+), 254 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a5b673dd/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 190670a..cf0ca2a 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
@@ -36,7 +36,7 @@ angular.module('ambariAdminConsole')
   $scope.option1 = {
 index: 1,
 displayName: 'Upload Version Definition File',
-url: 'files://',
+file: null,
 hasError: false
   };
   $scope.option2 = {
@@ -45,7 +45,9 @@ angular.module('ambariAdminConsole')
 url: 'https://',
 hasError: false
   };
-  $scope.selectedOption = 1;
+  $scope.selectedOption = {
+index: 1
+  };
 
   /**
* User can select ONLY one option to upload version definition file
@@ -59,64 +61,78 @@ angular.module('ambariAdminConsole')
 $scope.option2.hasError = false;
   };
   $scope.readInfoButtonDisabled = function () {
-return $scope.option1.selected ? !$scope.option1.url : !$scope.option2.url;
+return $scope.option1.index == $scope.selectedOption.index ? 
!$scope.option1.file : !$scope.option2.url;
   };
 
-  $scope.onFileSelect = function(){
-return {
-  link: function($scope,el){
-el.bind("change", function(e){
-  $scope.file = (e.srcElement || e.target).files[0];
-  $scope.getFile();
-})
-  }
+  $scope.onFileSelect = function(e){
+if (e.files && e.files.length == 1) {
+  var file = e.files[0];
+  var reader = new FileReader();
+  reader.onload = (function () {
+return function (e) {
+  $scope.option1.file = e.target.result;
+};
+  })(file);
+  reader.readAsText(file);
 }
   };
 
-//  $scope.uploadFile = function(){
-//var file = $scope.myFile;
-//console.log('file is ' );
-//console.dir(file);
-//var uploadUrl = "/fileUpload";
-//fileUpload.uploadFileToUrl(file, uploadUrl);
-//  };
-
   /**
* Load selected file to current page content
*/
   $scope.readVersionInfo = function(){
-if ($scope.option2.selected) {
+var data = {};
+var isXMLdata = false;
+if ($scope.option2.index == $scope.selectedOption.index) {
   var url = $scope.option2.url;
-}
-/// POST url first then get the version definition info
-return Stack.getLatestRepo('HDP').then(function (response) {
-  $scope.id = response.id;
-  $scope.isPatch = response.type == 'PATCH';
-  $scope.stackNameVersion = response.stackNameVersion || 'n/a';
-  $scope.displayName = response.displayName || 'n/a';
-  $scope.version = response.version || 'n/a';
-  $scope.actualVersion = response.actualVersion || 'n/a';
-  $scope.upgradeStack = {
-stack_name: response.stackName,
-stack_version: response.stackVersion,
-display_name: response.displayName
+  data = {
+"VersionDefinition": {
+  "version_url": url
+}
   };
-  $scope.s

ambari git commit: AMBARI-14930. Admin Versions: display all existed stack versions in new format. (xiwang)

2016-02-11 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/branch-dev-patch-upgrade 03bc22607 -> 1e89d1d57


AMBARI-14930. Admin Versions: display all existed stack versions in new format. 
(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1e89d1d5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1e89d1d5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1e89d1d5

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 1e89d1d578d6ae38fe706e7e07eb0cde52429d92
Parents: 03bc226
Author: Xi Wang <xiw...@apache.org>
Authored: Thu Feb 4 12:00:30 2016 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Thu Feb 11 15:37:49 2016 -0800

--
 .../app/mappers/repository_version_mapper.js|  91 +++
 ambari-web/app/messages.js  |   5 +
 ambari-web/app/models.js|   1 +
 .../models/stack_version/repository_version.js  |   6 +-
 .../app/models/stack_version/service_simple.js  |  28 +
 ambari-web/app/styles/stack_versions.less   | 112 ++-
 .../admin/stack_upgrade/upgrade_version_box.hbs |   4 +
 .../stack_upgrade/upgrade_version_column.hbs|  86 ++
 .../main/admin/stack_upgrade/versions.hbs   |  61 ++
 ambari-web/app/utils/host_progress_popup.js |   4 +-
 ambari-web/app/views.js |   1 +
 .../stack_upgrade/upgrade_version_box_view.js   |  17 ++-
 .../upgrade_version_column_view.js  | 106 ++
 .../main/admin/stack_upgrade/versions_view.js   |   5 +
 14 files changed, 495 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1e89d1d5/ambari-web/app/mappers/repository_version_mapper.js
--
diff --git a/ambari-web/app/mappers/repository_version_mapper.js 
b/ambari-web/app/mappers/repository_version_mapper.js
index 0bb094f..c937678 100644
--- a/ambari-web/app/mappers/repository_version_mapper.js
+++ b/ambari-web/app/mappers/repository_version_mapper.js
@@ -21,6 +21,7 @@ App.repoVersionMapper = App.QuickDataMapper.create({
   modelRepoVersions: App.RepositoryVersion,
   modelOperatingSystems: App.OS,
   modelRepositories: App.Repository,
+  modelServices: App.ServiceSimple,
 
   modelRepoVersion: function (isCurrentStackOnly) {
 var repoVersionsKey = isCurrentStackOnly ? 'RepositoryVersions' : 
'CompatibleRepositoryVersions';
@@ -28,10 +29,16 @@ App.repoVersionMapper = App.QuickDataMapper.create({
   id: repoVersionsKey + '.id',
   stack_version_id: repoVersionsKey + '.stackVersionId',
   display_name: repoVersionsKey + '.display_name',
+  type: repoVersionsKey + '.type',
   repository_version: repoVersionsKey + '.repository_version',
   upgrade_pack: repoVersionsKey + '.upgrade_pack',
   stack_version_type: repoVersionsKey + '.stack_name',
   stack_version_number: repoVersionsKey + '.stack_version',
+  services_key: 'services',
+  services_type: 'array',
+  services: {
+item: 'id'
+  },
   operating_systems_key: 'operating_systems',
   operating_systems_type: 'array',
   operating_systems: {
@@ -53,6 +60,13 @@ App.repoVersionMapper = App.QuickDataMapper.create({
 }
   },
 
+  modelService: {
+id: 'id',
+name: 'name',
+display_name: 'display_name',
+latest_version: 'latest_version'
+  },
+
   modelRepository: {
 id: 'id',
 operating_system_id: 'Repositories.operating_system_id',
@@ -71,18 +85,81 @@ App.repoVersionMapper = App.QuickDataMapper.create({
 var modelRepoVersions = this.get('modelRepoVersions');
 var modelOperatingSystems = this.get('modelOperatingSystems');
 var modelRepositories = this.get('modelRepositories');
+var modelServices = this.get('modelServices');
 
 var resultRepoVersion = [];
 var resultOS = [];
 var resultRepo = [];
+var resultService = [];
 
 var repoVersionsKey = isCurrentStackOnly ? 'RepositoryVersions' : 
'CompatibleRepositoryVersions';
 
 if (json && json.items) {
   json.items.forEach(function (item) {
+// to test//
+item[repoVersionsKey].type = "PATCH";
+item[repoVersionsKey].release = {
+  "stack_id": "HDP-2.2",
+  "version": "2.2.4.1",
+  "build": "885",
+  "compatible_with": "", /* regex */
+  "release_notes": "http://someurl;
+};
+item[repoVersionsKey].services = [
+  {
+"name": "HDFS",
+"display_name": "HDFS

[2/4] ambari git commit: AMBARI-14797. Register Version: display loaded version definition info in different categories and Save them.(XIWANG)

2016-02-04 Thread xiwang

AMBARI-14797. Register Version: display loaded version definition info in 
different categories and Save them.(XIWANG)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0b475640
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0b475640
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0b475640

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 0b47564002b295efb6be1b41aa66381561dbe7e4
Parents: e4d03b5
Author: Xi Wang <xiw...@apache.org>
Authored: Wed Feb 3 15:58:18 2016 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Wed Feb 3 16:02:48 2016 -0800

--
 .../app/assets/data/version/version.json|   3 +
 .../stackVersions/StackVersionsCreateCtrl.js|  46 ++---
 .../ui/admin-web/app/scripts/i18n.config.js |  12 +-
 .../ui/admin-web/app/scripts/services/Stack.js  | 170 ++-
 .../resources/ui/admin-web/app/styles/main.css  |  15 ++
 .../views/stackVersions/stackVersionPage.html   |  87 +-
 6 files changed, 269 insertions(+), 64 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0b475640/ambari-admin/src/main/resources/ui/admin-web/app/assets/data/version/version.json
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/assets/data/version/version.json
 
b/ambari-admin/src/main/resources/ui/admin-web/app/assets/data/version/version.json
index b5b3601..d6530e2 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/app/assets/data/version/version.json
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/app/assets/data/version/version.json
@@ -26,6 +26,7 @@
 "services": [
   {
 "name": "HDFS",
+"display_name": "HDFS",
 "versions": [
   {
 "version": "2.1.1",
@@ -36,6 +37,7 @@
   },
   {
 "name": "HIVE",
+"display_name": "Hive",
 "versions": [
   {
 "version": "1.2.1"
@@ -44,6 +46,7 @@
   },
   {
 "name": "ZOOKEEPER",
+"display_name": "ZooKeeper",
 "versions": [
   {
 "version": "3.4.5"

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b475640/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 40aa103..81ad7f7 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
@@ -156,14 +156,14 @@ angular.module('ambariAdminConsole')
 index: 1,
 displayName: 'Upload Version Definition File',
 url: 'files://',
-selected: true,
-hasError: true
+//selected: true,
+hasError: false
   };
   $scope.option2 = {
 index: 2,
 displayName: 'Version Definition File URL',
 url: 'https://',
-selected: false,
+//selected: false,
 hasError: false
   };
   $scope.selectedOption = 1;
@@ -172,8 +172,8 @@ angular.module('ambariAdminConsole')
* User can select ONLY one option to upload version definition file
*/
   $scope.toggleOptionSelect = function () {
-$scope.option1.selected = $scope.selectedOption == $scope.option1.index;
-$scope.option2.selected = $scope.selectedOption == $scope.option2.index;
+//$scope.option1.selected = $scope.selectedOption == $scope.option1.index;
+//$scope.option2.selected = $scope.selectedOption == $scope.option2.index;
 $scope.option1.hasError = false;
 $scope.option2.hasError = false;
   };
@@ -215,11 +215,11 @@ angular.module('ambariAdminConsole')
 return Stack.getLatestRepo('HDP').then(function (response) {
   $scope.id = response.id;
   $scope.isPatch = response.type == 'PATCH';
-  $scope.stackNameVersion = response.stackNameVersion;
-  $scope.displayName = response.displayName;
-  $scope.version = response.version;
-  $scope.actualVersion = response.actualVersion;
-  $scope.services = response.services;
+  $scope.stackNameVersion =

[1/4] ambari git commit: AMBARI-14795. Register Version: add ability to load new version definition file.

2016-02-04 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/branch-dev-patch-upgrade c72dc41db -> 0f9da4282


AMBARI-14795. Register Version: add ability to load new version definition file.


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e4d03b5b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e4d03b5b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e4d03b5b

Branch: refs/heads/branch-dev-patch-upgrade
Commit: e4d03b5b5879aff474abdbb3a9d571215383a6c4
Parents: c72dc41
Author: Xi Wang 
Authored: Fri Jan 22 17:24:01 2016 -0800
Committer: Xi Wang 
Committed: Wed Feb 3 13:55:05 2016 -0800

--
 .../app/assets/data/version/version.json|  38 ++-
 .../stackVersions/StackVersionsCreateCtrl.js| 100 +++
 .../ui/admin-web/app/scripts/i18n.config.js |   4 +
 .../ui/admin-web/app/scripts/services/Stack.js  |  38 +++
 .../resources/ui/admin-web/app/styles/main.css  |  16 ++-
 .../views/stackVersions/stackVersionPage.html   |  31 ++
 6 files changed, 225 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e4d03b5b/ambari-admin/src/main/resources/ui/admin-web/app/assets/data/version/version.json
--
diff --git 
a/ambari-admin/src/main/resources/ui/admin-web/app/assets/data/version/version.json
 
b/ambari-admin/src/main/resources/ui/admin-web/app/assets/data/version/version.json
index 7c604f1..b5b3601 100644
--- 
a/ambari-admin/src/main/resources/ui/admin-web/app/assets/data/version/version.json
+++ 
b/ambari-admin/src/main/resources/ui/admin-web/app/assets/data/version/version.json
@@ -14,7 +14,43 @@
 "id" : 15,
 "repository_version" : "2.2.0.1-901",
 "stack_name" : "HDP",
-"stack_version" : "2.2"
+"stack_version" : "2.2",
+"release": {
+  "type": "PATCH",
+  "stack_id": "HDP-2.2",
+  "version": "2.2.0.1",
+  "build": "901",
+  "compatible_with": "2.2.0.1-[1-9]",
+  "release_notes": "http://someurl;
+},
+"services": [
+  {
+"name": "HDFS",
+"versions": [
+  {
+"version": "2.1.1",
+"version_id": "10",
+"components": [ "NAMENODE"]
+  }
+]
+  },
+  {
+"name": "HIVE",
+"versions": [
+  {
+"version": "1.2.1"
+  }
+]
+  },
+  {
+"name": "ZOOKEEPER",
+"versions": [
+  {
+"version": "3.4.5"
+  }
+]
+  }
+]
   },
   "operating_systems" : [
 {

http://git-wip-us.apache.org/repos/asf/ambari/blob/e4d03b5b/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 a817d88..40aa103 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
@@ -151,4 +151,104 @@ angular.module('ambariAdminConsole')
 $location.path('/stackVersions');
   };
 
+  // two options to upload version definition file
+  $scope.option1 = {
+index: 1,
+displayName: 'Upload Version Definition File',
+url: 'files://',
+selected: true,
+hasError: true
+  };
+  $scope.option2 = {
+index: 2,
+displayName: 'Version Definition File URL',
+url: 'https://',
+selected: false,
+hasError: false
+  };
+  $scope.selectedOption = 1;
+
+  /**
+   * User can select ONLY one option to upload version definition file
+   */
+  $scope.toggleOptionSelect = function () {
+$scope.option1.selected = $scope.selectedOption == $scope.option1.index;
+$scope.option2.selected = $scope.selectedOption == $scope.option2.index;
+$scope.option1.hasError = false;
+$scope.option2.hasError = false;
+  };
+  $scope.clearOptionsError = function () {
+$scope.option1.hasError = false;
+$scope.option2.hasError = false;
+  };
+  $scope.readInfoButtonDisabled = function () {
+return

[4/4] ambari git commit: AMBARI-14837. Versions: display all versions as tabs on left side, version details on selecting.(xiwang)

2016-02-04 Thread xiwang

AMBARI-14837. Versions: display all versions as tabs on left side, version 
details on selecting.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0f9da428
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0f9da428
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0f9da428

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 0f9da42829c5d7118284d09e98190403bfdce41e
Parents: efc3a07
Author: Xi Wang <xiw...@apache.org>
Authored: Wed Feb 3 16:15:24 2016 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Wed Feb 3 16:15:24 2016 -0800

--
 .../stackVersions/StackVersionsCreateCtrl.js|  35 +--
 .../stackVersions/StackVersionsEditCtrl.js  | 241 ---
 .../stackVersions/StackVersionsListCtrl.js  | 127 +++---
 .../ui/admin-web/app/scripts/i18n.config.js |   1 +
 .../ui/admin-web/app/scripts/services/Stack.js  |  30 ++-
 .../resources/ui/admin-web/app/styles/main.css  |  80 +-
 .../admin-web/app/views/stackVersions/list.html | 105 +++-
 .../views/stackVersions/stackVersionPage.html   |  50 +++-
 .../stackVersions/StackversionsListCtrl_test.js | 152 
 9 files changed, 357 insertions(+), 464 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0f9da428/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 37f9c34..df76c15 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
@@ -23,7 +23,6 @@ angular.module('ambariAdminConsole')
   $scope.createController = true;
   $scope.osList = [];
   $scope.skipValidation = false;
-  $scope.repoSubversion = "";
 
   $scope.clusterName = $routeParams.clusterName;
   $scope.subversionPattern = /^\d+\.\d+(-\d+)?$/;
@@ -111,10 +110,8 @@ angular.module('ambariAdminConsole')
 };
   });
   $scope.repoVersionFullName = response.repoVersionFullName;
-  $scope.selectedOS = [];
   angular.forEach(response.osList, function (os) {
 os.selected = true;
-$scope.selectedOS.push(os.OperatingSystems.os_type);
   });
   $scope.osList = response.osList;
   // load supported os type base on stack version
@@ -130,8 +127,12 @@ angular.module('ambariAdminConsole')
   .then(function (data) {
 var operatingSystems = data.operating_systems;
 operatingSystems.map(function (os) {
-  // os not in the list, mark as un-selected, add this to the osList
-  if ($scope.selectedOS.indexOf(os.OperatingSystems.os_type) < 0) {
+  var existingOSHash = {};
+  angular.forEach($scope.osList, function (os) {
+existingOSHash[os.OperatingSystems.os_type] = os;
+  });
+  // if os not in the list, mark as un-selected, add this to the osList
+  if (!existingOSHash[os.OperatingSystems.os_type]) {
 os.selected = false;
 os.repositories.forEach(function(repo) {
   repo.Repositories.base_url = '';
@@ -183,9 +184,10 @@ angular.module('ambariAdminConsole')
   if (invalidUrls.length === 0) {
 Stack.addRepo($scope.upgradeStack, $scope.actualVersion, $scope.osList)
   .success(function () {
-var versionName = $scope.actualVersion + '';
-var stackName = $scope.upgradeStack.stack_name;
-Alert.success($t('versions.alerts.versionCreated'), {stackName: 
stackName, versionName: versionName});
+Alert.success($t('versions.alerts.versionCreated', {
+  stackName: $scope.upgradeStack.stack_name,
+  versionName: $scope.actualVersion
+}));
 $location.path('/stackVersions');
   })
   .error(function (data) {
@@ -196,19 +198,12 @@ angular.module('ambariAdminConsole')
   }
 });
   };
-  /**
-   * TODO create parent controller for StackVersionsEditCtrl and 
StackVersionsCreateCtrl and
-   * move this method to it
-   */
+
   $scope.cancel = function () {
 $scope.editVersionDisabled = true;
 $location.path('/stackVersions');
   };
 
-  /**
-   * TODO create parent controller for StackVersionsEditCtrl and 
StackVersionsCreateCtrl and
-   * move this method to it
-   */
   $scope.clearErrors = function() {
 if ($scope.osList) {
   $scope.osList.forEach(

ambari git commit: AMBARI-14584. RU/EU - Fix calculation of hosts so that non-HDP component hosts will be excluded from 'Uninstalled', show more details on hover.(xiwang)

2016-01-13 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 595353166 -> 4230046d5


AMBARI-14584. RU/EU - Fix calculation of hosts so that non-HDP component hosts 
will be excluded from 'Uninstalled', show more details on hover.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4230046d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4230046d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4230046d

Branch: refs/heads/branch-2.2
Commit: 4230046d5a5f76a00e75e76dc1b341f3c70bfe53
Parents: 5953531
Author: Xi Wang <xiw...@apache.org>
Authored: Thu Jan 7 17:31:06 2016 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Wed Jan 13 13:28:25 2016 -0800

--
 ambari-web/app/app.js   |  4 ++
 ambari-web/app/messages.js  |  1 +
 ambari-web/app/models/host_component.js |  8 +++
 .../app/models/stack_service_component.js   |  5 ++
 .../admin/stack_upgrade/upgrade_version_box.hbs |  6 +-
 .../stack_upgrade/upgrade_version_box_view.js   | 74 +++-
 .../upgrade_version_box_view_test.js|  2 +
 7 files changed, 95 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4230046d/ambari-web/app/app.js
--
diff --git a/ambari-web/app/app.js b/ambari-web/app/app.js
index ccf7edb..ef1ddad 100644
--- a/ambari-web/app/app.js
+++ b/ambari-web/app/app.js
@@ -358,6 +358,10 @@ module.exports = Em.Application.create({
 
 clients: function () {
   return 
App.StackServiceComponent.find().filterProperty('isClient').mapProperty('componentName')
+}.property('App.router.clusterController.isLoaded'),
+
+nonHDP: function () {
+  return 
App.StackServiceComponent.find().filterProperty('isNonHDPComponent').mapProperty('componentName')
 }.property('App.router.clusterController.isLoaded')
   })
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/4230046d/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index bec978b..528a903 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1480,6 +1480,7 @@ Em.I18n.translations = {
   'admin.stackVersions.version.hostsTooltip': 'Click to List Hosts',
   'admin.stackVersions.version.emptyHostsTooltip': 'No Hosts to List',
   'admin.stackVersions.version.notInstalled': "Not Installed",
+  'admin.stackVersions.version.hostsInfoTooltip': "There are {0} hosts that do 
not need packages installed:{1} Maintenance Mode{2} Not 
Required",
   'admin.stackVersions.manageVersions': "Manage Versions",
   'admin.stackVersions.manageVersions.popup.body': 'You are about to leave the 
Cluster Management interface' +
 ' and go to the Ambari Administration interface. You can return to 
cluster management by using the' +

http://git-wip-us.apache.org/repos/asf/ambari/blob/4230046d/ambari-web/app/models/host_component.js
--
diff --git a/ambari-web/app/models/host_component.js 
b/ambari-web/app/models/host_component.js
index e61822a..1be5643 100644
--- a/ambari-web/app/models/host_component.js
+++ b/ambari-web/app/models/host_component.js
@@ -111,6 +111,14 @@ App.HostComponent = DS.Model.extend({
 return (this.get('passiveState') == 'OFF');
   }.property('passiveState'),
 
+  /**
+   * Determine if component is a HDP component
+   * @returns {bool}
+   */
+  isHDPComponent: function () {
+return !App.get('components.nonHDP').contains(this.get('componentName'));
+  }.property('componentName', 'App.components.nonHDP'),
+
   passiveTooltip: function () {
 if (!this.get('isActive')) {
   return Em.I18n.t('hosts.component.passive.mode');

http://git-wip-us.apache.org/repos/asf/ambari/blob/4230046d/ambari-web/app/models/stack_service_component.js
--
diff --git a/ambari-web/app/models/stack_service_component.js 
b/ambari-web/app/models/stack_service_component.js
index 0a03336..18e5932 100644
--- a/ambari-web/app/models/stack_service_component.js
+++ b/ambari-web/app/models/stack_service_component.js
@@ -80,6 +80,11 @@ App.StackServiceComponent = DS.Model.extend({
 return ['NAMENODE', 'SECONDARY_NAMENODE', 'JOBTRACKER', 'RESOURCEMANAGER', 
'APP_TIMELINE_SERVER', 'OOZIE_SERVER', 'WEBHCAT_SERVER', 'HIVE_SERVER', 
'HIVE_METASTORE', 'MYSQL_SERVER', 
'METRICS_COLLECTOR'].contains(this.get('componentName'));
   }.property('componentName'),
 
+  /** @property {Boolean} isNonHDPComponent - component not belongs to HDP 
services **/
+  isNonHDPComponent:

[1/2] ambari git commit: AMBARI-14406. Display A Dialog When Beginning An Upgrade.(xiwang)

2016-01-05 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk 3ffb97252 -> 4ec1f0e93


AMBARI-14406. Display A Dialog When Beginning An Upgrade.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6ad6d441
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6ad6d441
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6ad6d441

Branch: refs/heads/trunk
Commit: 6ad6d441b8f4beff6c5c97ef4b7d69eb71393ceb
Parents: 3ffb972
Author: Xi Wang <xiw...@apache.org>
Authored: Mon Jan 4 16:36:47 2016 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Tue Jan 5 11:22:14 2016 -0800

--
 .../main/admin/stack_and_upgrade_controller.js  | 46 
 .../app/controllers/wizard/step8_controller.js  |  1 +
 ambari-web/app/messages.js  |  1 +
 .../templates/wizard/step8/step8_log_popup.hbs  |  2 +-
 4 files changed, 49 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6ad6d441/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js 
b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index 06ddf24..d17776f 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -581,6 +581,7 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
* @param {object} version
*/
   upgrade: function (version) {
+var self = this;
 this.set('requestInProgress', true);
 App.ajax.send({
   name: 'admin.upgrade.start',
@@ -593,6 +594,51 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
   }
 });
 this.setDBProperty('currentVersion', this.get('currentVersion'));
+
+// Show a "preparing the upgrade..." dialog in case the api call returns 
too slow
+if (App.router.get('currentState.name') != 'stackUpgrade') {
+  self.showPreparingUpgradeIndicator();
+}
+  },
+
+  /**
+   * Should progress bar be displayed when preparing upgrade,
+   * should show after Upgrade Options window and before Upgrade Wizard
+   * @method showPreparingUpgradeIndicator
+   */
+  showPreparingUpgradeIndicator: function () {
+return App.ModalPopup.show({
+  header: '',
+  showFooter: false,
+  showCloseButton: false,
+  bodyClass: Em.View.extend({
+templateName: require('templates/wizard/step8/step8_log_popup'),
+controllerBinding: 'App.router.mainAdminStackAndUpgradeController',
+
+/**
+ * Css-property for progress-bar
+ * @type {string}
+ */
+barWidth: 'width: 100%;',
+progressBarClass: 'progress progress-striped active log_popup',
+
+/**
+ * Popup-message
+ * @type {string}
+ */
+message: Em.I18n.t('admin.stackUpgrade.dialog.prepareUpgrade.header'),
+
+/**
+ * Hide popup when upgrade wizard is open
+ * @method autoHide
+ */
+autoHide: function () {
+  if (!this.get('controller.requestInProgress')) {
+this.get('parentView').hide();
+  }
+}.observes('controller.requestInProgress')
+  })
+});
   },
 
   /**

http://git-wip-us.apache.org/repos/asf/ambari/blob/6ad6d441/ambari-web/app/controllers/wizard/step8_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js 
b/ambari-web/app/controllers/wizard/step8_controller.js
index 62ba32a..89fed3c 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -1767,6 +1767,7 @@ App.WizardStep8Controller = 
Em.Controller.extend(App.AddSecurityConfigs, App.wiz
  * @type {string}
  */
 barWidth: '',
+progressBarClass: 'progress log_popup',
 
 /**
  * Popup-message

http://git-wip-us.apache.org/repos/asf/ambari/blob/6ad6d441/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 8892cac..d36592f 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1573,6 +1573,7 @@ Em.I18n.translations = {
   'admin.stackUpgrade.dialog.details.open': "show details",
   'admin.stackUpgrade.dialog.details.hide': "hide details",
   'admin.stackUpgrade.dialog.notActive': "Waiting to execute the next task...",
+  'admin.stackUpgrade.dialog.prepareUpgrade.header': "Pr

[2/2] ambari git commit: AMBARI-14352. EU/RU: add error handler for 'Pause upgrade'.(xiwang)

2016-01-05 Thread xiwang

AMBARI-14352. EU/RU: add error handler for 'Pause upgrade'.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4ec1f0e9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4ec1f0e9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4ec1f0e9

Branch: refs/heads/trunk
Commit: 4ec1f0e93c332f3c5817a6c20fe1d8220d4e51f9
Parents: 6ad6d44
Author: Xi Wang <xiw...@apache.org>
Authored: Fri Dec 18 16:32:57 2015 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Tue Jan 5 11:22:22 2016 -0800

--
 .../main/admin/stack_and_upgrade_controller.js   | 19 ++-
 ambari-web/app/messages.js   |  2 ++
 2 files changed, 20 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4ec1f0e9/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js 
b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index d17776f..f80c5ea 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -558,10 +558,27 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
   sender: this,
   data: {
 upgradeId: this.get('upgradeId')
-  }
+  },
+  error: 'abortUpgradeErrorCallback'
 });
   },
 
+  /**
+   * error callback of abortUpgrade()
+   * @param {object} data
+   */
+  abortUpgradeErrorCallback: function (data) {
+var header = Em.I18n.t('admin.stackUpgrade.state.paused.fail.header');
+var body = Em.I18n.t('admin.stackUpgrade.state.paused.fail.body');
+if(data && data.responseText){
+  try {
+var json = $.parseJSON(data.responseText);
+body = body + ' ' + json.message;
+  } catch (err) {}
+}
+App.showAlertPopup(header, body);
+  },
+
   retryUpgrade: function () {
 this.setProperties({
   requestInProgress: true,

http://git-wip-us.apache.org/repos/asf/ambari/blob/4ec1f0e9/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index d36592f..f77901d 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1477,6 +1477,8 @@ Em.I18n.translations = {
   'admin.stackVersions.version.downgrade.running': "Downgrade: In Process",
   'admin.stackVersions.version.downgrade.aborted': "Downgrade: Aborted",
   'admin.stackVersions.version.downgrade.suspended': "Downgrade: Paused",
+  'admin.stackUpgrade.state.paused.fail.header': "Pause Upgrade failed",
+  'admin.stackUpgrade.state.paused.fail.body': "Upgrade could not be paused. 
Try again later.",
 
   'admin.stackVersions.version.upgrade.upgradeOptions.header': "Upgrade 
Options",
   'admin.stackVersions.version.upgrade.upgradeOptions.bodyMsg.version': "You 
are about to perform an upgrade to {0}.",

[1/2] ambari git commit: AMBARI-14406. Display A Dialog When Beginning An Upgrade.(xiwang)

2016-01-05 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 21a4ed434 -> 8c3d3d6a0


AMBARI-14406. Display A Dialog When Beginning An Upgrade.(xiwang)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/190e05e9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/190e05e9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/190e05e9

Branch: refs/heads/branch-2.2
Commit: 190e05e95ce45a459c88fc348262640eb9942690
Parents: 21a4ed4
Author: Xi Wang <xiw...@apache.org>
Authored: Mon Jan 4 16:36:47 2016 -0800
Committer: Xi Wang <xiw...@apache.org>
Committed: Tue Jan 5 11:12:09 2016 -0800

--
 .../main/admin/stack_and_upgrade_controller.js  | 46 
 .../app/controllers/wizard/step8_controller.js  |  1 +
 ambari-web/app/messages.js  |  1 +
 .../templates/wizard/step8/step8_log_popup.hbs  |  2 +-
 4 files changed, 49 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/190e05e9/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js 
b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index 483d90e..f58f384 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -588,6 +588,7 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
* @param {object} version
*/
   upgrade: function (version) {
+var self = this;
 this.set('requestInProgress', true);
 App.ajax.send({
   name: 'admin.upgrade.start',
@@ -600,6 +601,51 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
   }
 });
 this.setDBProperty('currentVersion', this.get('currentVersion'));
+
+// Show a "preparing the upgrade..." dialog in case the api call returns 
too slow
+if (App.router.get('currentState.name') != 'stackUpgrade') {
+  self.showPreparingUpgradeIndicator();
+}
+  },
+
+  /**
+   * Should progress bar be displayed when preparing upgrade,
+   * should show after Upgrade Options window and before Upgrade Wizard
+   * @method showPreparingUpgradeIndicator
+   */
+  showPreparingUpgradeIndicator: function () {
+return App.ModalPopup.show({
+  header: '',
+  showFooter: false,
+  showCloseButton: false,
+  bodyClass: Em.View.extend({
+templateName: require('templates/wizard/step8/step8_log_popup'),
+controllerBinding: 'App.router.mainAdminStackAndUpgradeController',
+
+/**
+ * Css-property for progress-bar
+ * @type {string}
+ */
+barWidth: 'width: 100%;',
+progressBarClass: 'progress progress-striped active log_popup',
+
+/**
+ * Popup-message
+ * @type {string}
+ */
+message: Em.I18n.t('admin.stackUpgrade.dialog.prepareUpgrade.header'),
+
+/**
+ * Hide popup when upgrade wizard is open
+ * @method autoHide
+ */
+autoHide: function () {
+  if (!this.get('controller.requestInProgress')) {
+this.get('parentView').hide();
+  }
+}.observes('controller.requestInProgress')
+  })
+});
   },
 
   /**

http://git-wip-us.apache.org/repos/asf/ambari/blob/190e05e9/ambari-web/app/controllers/wizard/step8_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js 
b/ambari-web/app/controllers/wizard/step8_controller.js
index c644328..a843f65 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -1705,6 +1705,7 @@ App.WizardStep8Controller = 
Em.Controller.extend(App.AddSecurityConfigs, App.wiz
  * @type {string}
  */
 barWidth: '',
+progressBarClass: 'progress log_popup',
 
 /**
  * Popup-message

http://git-wip-us.apache.org/repos/asf/ambari/blob/190e05e9/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 72db077..3a7f570 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1588,6 +1588,7 @@ Em.I18n.translations = {
   'admin.stackUpgrade.dialog.details.open': "show details",
   'admin.stackUpgrade.dialog.details.hide': "hide details",
   'admin.stackUpgrade.dialog.notActive': "Waiting to execute the next task...",
+  'admin.stackUpgrade.dialog.prepareUpgrade.header':

1 2 3 4 >

1 - 100 of 398 matches

Mail list logo