[01/29] git commit: AMBARI-7069. Configs: make comparision bar info more clear.(xiwang)
Repository: ambari
Updated Branches:
refs/heads/branch-alerts-dev 2f5c78e7f - c13730a06
AMBARI-7069. Configs: make comparision bar info more clear.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/663e0d6f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/663e0d6f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/663e0d6f
Branch: refs/heads/branch-alerts-dev
Commit: 663e0d6f087b5a8ed912712d642d1b8fdd04c50a
Parents: 869b00c
Author: Xi Wang xiw...@apache.org
Authored: Thu Aug 28 17:19:06 2014 -0700
Committer: Xi Wang xiw...@apache.org
Committed: Thu Aug 28 18:04:29 2014 -0700
--
ambari-web/app/messages.js | 3 +++
ambari-web/app/models/service_config.js | 3 +++
ambari-web/app/models/service_config_version.js | 3 +++
ambari-web/app/styles/application.less | 9 +
.../templates/common/configs/compare_property.hbs | 2 +-
.../common/configs/config_history_flow.hbs | 10 +++---
.../templates/common/configs/overriddenProperty.hbs | 2 +-
.../common/configs/service_config_category.hbs | 2 +-
.../app/views/common/configs/config_history_flow.js | 16
9 files changed, 44 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/663e0d6f/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 4c9abd9..bc8736e 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1412,7 +1412,9 @@ Em.I18n.translations = {
'services.service.config.configHistory.configGroup': 'Config Group',
'services.service.config.configHistory.leftArrow.tooltip': 'Show earlier
versions',
'services.service.config.configHistory.rightArrow.tooltip': 'Show later
versions',
+ 'services.service.config.configHistory.dismissIcon.tooltip': 'Dismiss',
'services.service.config.configHistory.makeCurrent.message': 'Created from
service config version {0}',
+ 'services.service.config.configHistory.comparing': 'Comparing',
'services.add.header':'Add Service Wizard',
'services.reassign.header':'Move Master Wizard',
@@ -2007,6 +2009,7 @@ Em.I18n.translations = {
'dashboard.configHistory.info-bar.makeCurrent.popup.title': 'Make Current
Confirmation',
'dashboard.configHistory.info-bar.save.popup.placeholder': 'What did you
change?',
'dashboard.configHistory.info-bar.revert.button': 'Make Current',
+ 'dashboard.configHistory.info-bar.revert.versionButton': 'Make {0} Current',
'dashboard.configHistory.info-bar.view.button.disabled': 'You are currently
viewing this version.',
'dashboard.configHistory.info-bar.compare.button.disabled': 'You cannot
compare against the same version.',
'dashboard.configHistory.info-bar.revert.button.disabled': 'This is the
current version.',
http://git-wip-us.apache.org/repos/asf/ambari/blob/663e0d6f/ambari-web/app/models/service_config.js
--
diff --git a/ambari-web/app/models/service_config.js
b/ambari-web/app/models/service_config.js
index 8326dd4..891b54f 100644
--- a/ambari-web/app/models/service_config.js
+++ b/ambari-web/app/models/service_config.js
@@ -151,6 +151,9 @@ App.ServiceConfigProperty = Ember.Object.extend({
isEditable: true, // by default a config property is editable
isNotEditable: Ember.computed.not('isEditable'),
isFinal: false,
+ hideFinalIcon: function () {
+return (!this.get('isFinal')) this.get('isNotEditable');
+ }.property('isFinal', 'isNotEditable'),
defaultIsFinal: false,
supportsFinal: false,
isVisible: true,
http://git-wip-us.apache.org/repos/asf/ambari/blob/663e0d6f/ambari-web/app/models/service_config_version.js
--
diff --git a/ambari-web/app/models/service_config_version.js
b/ambari-web/app/models/service_config_version.js
index 93da4aa..1f34261 100644
--- a/ambari-web/app/models/service_config_version.js
+++ b/ambari-web/app/models/service_config_version.js
@@ -44,6 +44,9 @@ App.ServiceConfigVersion = DS.Model.extend({
versionText: function () {
return
Em.I18n.t('dashboard.configHistory.table.version.versionText').format(this.get('version'));
}.property('version'),
+ makeCurrentButtonText: function() {
+return
Em.I18n.t('dashboard.configHistory.info-bar.revert.versionButton').format(this.get('versionText'));
+ }.property('versionText'),
modifiedDate: function () {
return dateUtil.dateFormat(this.get('createTime'));
}.property('createTime'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/663e0d6f/ambari-web/app/styles/application.less
git commit: AMBARI-7069. Configs: make comparision bar info more clear.(xiwang)
Repository: ambari
Updated Branches:
refs/heads/trunk 869b00c61 - 663e0d6f0
AMBARI-7069. Configs: make comparision bar info more clear.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/663e0d6f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/663e0d6f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/663e0d6f
Branch: refs/heads/trunk
Commit: 663e0d6f087b5a8ed912712d642d1b8fdd04c50a
Parents: 869b00c
Author: Xi Wang xiw...@apache.org
Authored: Thu Aug 28 17:19:06 2014 -0700
Committer: Xi Wang xiw...@apache.org
Committed: Thu Aug 28 18:04:29 2014 -0700
--
ambari-web/app/messages.js | 3 +++
ambari-web/app/models/service_config.js | 3 +++
ambari-web/app/models/service_config_version.js | 3 +++
ambari-web/app/styles/application.less | 9 +
.../templates/common/configs/compare_property.hbs | 2 +-
.../common/configs/config_history_flow.hbs | 10 +++---
.../templates/common/configs/overriddenProperty.hbs | 2 +-
.../common/configs/service_config_category.hbs | 2 +-
.../app/views/common/configs/config_history_flow.js | 16
9 files changed, 44 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/663e0d6f/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 4c9abd9..bc8736e 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1412,7 +1412,9 @@ Em.I18n.translations = {
'services.service.config.configHistory.configGroup': 'Config Group',
'services.service.config.configHistory.leftArrow.tooltip': 'Show earlier
versions',
'services.service.config.configHistory.rightArrow.tooltip': 'Show later
versions',
+ 'services.service.config.configHistory.dismissIcon.tooltip': 'Dismiss',
'services.service.config.configHistory.makeCurrent.message': 'Created from
service config version {0}',
+ 'services.service.config.configHistory.comparing': 'Comparing',
'services.add.header':'Add Service Wizard',
'services.reassign.header':'Move Master Wizard',
@@ -2007,6 +2009,7 @@ Em.I18n.translations = {
'dashboard.configHistory.info-bar.makeCurrent.popup.title': 'Make Current
Confirmation',
'dashboard.configHistory.info-bar.save.popup.placeholder': 'What did you
change?',
'dashboard.configHistory.info-bar.revert.button': 'Make Current',
+ 'dashboard.configHistory.info-bar.revert.versionButton': 'Make {0} Current',
'dashboard.configHistory.info-bar.view.button.disabled': 'You are currently
viewing this version.',
'dashboard.configHistory.info-bar.compare.button.disabled': 'You cannot
compare against the same version.',
'dashboard.configHistory.info-bar.revert.button.disabled': 'This is the
current version.',
http://git-wip-us.apache.org/repos/asf/ambari/blob/663e0d6f/ambari-web/app/models/service_config.js
--
diff --git a/ambari-web/app/models/service_config.js
b/ambari-web/app/models/service_config.js
index 8326dd4..891b54f 100644
--- a/ambari-web/app/models/service_config.js
+++ b/ambari-web/app/models/service_config.js
@@ -151,6 +151,9 @@ App.ServiceConfigProperty = Ember.Object.extend({
isEditable: true, // by default a config property is editable
isNotEditable: Ember.computed.not('isEditable'),
isFinal: false,
+ hideFinalIcon: function () {
+return (!this.get('isFinal')) this.get('isNotEditable');
+ }.property('isFinal', 'isNotEditable'),
defaultIsFinal: false,
supportsFinal: false,
isVisible: true,
http://git-wip-us.apache.org/repos/asf/ambari/blob/663e0d6f/ambari-web/app/models/service_config_version.js
--
diff --git a/ambari-web/app/models/service_config_version.js
b/ambari-web/app/models/service_config_version.js
index 93da4aa..1f34261 100644
--- a/ambari-web/app/models/service_config_version.js
+++ b/ambari-web/app/models/service_config_version.js
@@ -44,6 +44,9 @@ App.ServiceConfigVersion = DS.Model.extend({
versionText: function () {
return
Em.I18n.t('dashboard.configHistory.table.version.versionText').format(this.get('version'));
}.property('version'),
+ makeCurrentButtonText: function() {
+return
Em.I18n.t('dashboard.configHistory.info-bar.revert.versionButton').format(this.get('versionText'));
+ }.property('versionText'),
modifiedDate: function () {
return dateUtil.dateFormat(this.get('createTime'));
}.property('createTime'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/663e0d6f/ambari-web/app/styles/application.less
