You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2013/11/21 14:55:33 UTC
git commit: AMBARI-3835. Manage Configuration Group needs various UI
tweaks(alexantonenko)
Updated Branches:
refs/heads/trunk efe97301a -> 6a709e238
AMBARI-3835. Manage Configuration Group needs various UI tweaks(alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/6a709e23
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/6a709e23
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/6a709e23
Branch: refs/heads/trunk
Commit: 6a709e238699f6e397d5f761f5bab4f4f28d489d
Parents: efe9730
Author: Alex Antonenko <hi...@gmail.com>
Authored: Thu Nov 21 15:55:31 2013 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu Nov 21 15:55:31 2013 +0200
----------------------------------------------------------------------
.../service/manage_config_groups_controller.js | 10 +++++++++
ambari-web/app/messages.js | 6 +++++
.../manage_configuration_groups_popup.hbs | 17 +++++++++------
.../main/service/manage_config_groups_view.js | 23 +++++++++++++++++++-
4 files changed, 48 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/6a709e23/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/manage_config_groups_controller.js b/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
index 7c7138c..97b7f10 100644
--- a/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
+++ b/ambari-web/app/controllers/main/service/manage_config_groups_controller.js
@@ -191,6 +191,16 @@ App.ManageConfigGroupsController = Em.Controller.extend({
},
/**
+ * confirm delete config group
+ */
+ confirmDelete : function () {
+ var self = this;
+ App.showConfirmationPopup(function() {
+ self.deleteConfigGroup();
+ });
+ },
+
+ /**
* delete selected config group
*/
deleteConfigGroup: function () {
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/6a709e23/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index be515df..1c5dffc 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1129,6 +1129,12 @@ Em.I18n.translations = {
'services.service.config_groups_popup.group_name_lable':'Name',
'services.service.config_groups_popup.group_desc_lable':'Description',
'services.service.config_groups_popup.properties':'Properties',
+ 'services.service.config_groups_popup.addButton':'Create new Configuration Group',
+ 'services.service.config_groups_popup.removeButton':'Delete Configuration Group',
+ 'services.service.config_groups_popup.renameButton':'Rename Configuration Group',
+ 'services.service.config_groups_popup.addHost':'Add hosts to selected Configuration Group',
+ 'services.service.config_groups_popup.removeHost':'Remove hosts from selected Configuration Group',
+ 'services.service.config_groups_popup.duplicateButton':'Duplicate Configuration Group',
'services.service.config_groups.add_config_group_popup.header':'Create New Configuration Group',
'services.service.config_groups.duplicate_config_group_popup.header':'Duplicate Configuration Group',
'services.service.config_groups.rename_config_group_popup.header':'Rename Configuration Group',
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/6a709e23/ambari-web/app/templates/main/service/manage_configuration_groups_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/manage_configuration_groups_popup.hbs b/ambari-web/app/templates/main/service/manage_configuration_groups_popup.hbs
index 9ee572e..19098fa 100644
--- a/ambari-web/app/templates/main/service/manage_configuration_groups_popup.hbs
+++ b/ambari-web/app/templates/main/service/manage_configuration_groups_popup.hbs
@@ -29,8 +29,10 @@
class="group-select"
}}
<div class="btn-toolbar pull-right">
- <button class="btn" {{bindAttr disabled="isHostsModified"}} {{action addConfigGroup target="controller"}}><i class="icon-plus"></i></button>
- <button class="btn" {{bindAttr disabled="isDeleteGroupDisabled"}} {{action deleteConfigGroup target="controller"}}><i class="icon-minus"></i></button>
+ <button rel="button-info" class="btn" {{bindAttr data-original-title="view.addButtonTooltip" disabled="isHostsModified"}}
+ {{action addConfigGroup target="controller"}}><i class="icon-plus"></i></button>
+ <button rel="button-info" class="btn" {{bindAttr data-original-title="view.removeButtonTooltip" disabled="view.isRemoveButtonDisabled"}}
+ {{action confirmDelete target="controller"}}><i class="icon-minus"></i></button>
<div class="btn-group">
<button class="btn" {{bindAttr disabled="isHostsModified"}}><i class="icon-cog"></i></button>
<button class="btn dropdown-toggle" data-toggle="dropdown" {{bindAttr disabled="isHostsModified"}}>
@@ -38,10 +40,10 @@
</button>
<ul class="dropdown-menu">
<li {{bindAttr class="view.isRenameButtonDisabled:disabled"}}>
- <a {{action renameConfigGroup target="controller"}}>{{t services.service.config_groups_popup.rename}}</a>
+ <a rel="button-info" {{bindAttr data-original-title="view.renameButtonTooltip"}} {{action renameConfigGroup target="controller"}}>{{t services.service.config_groups_popup.rename}}</a>
</li>
<li>
- <a {{action duplicateConfigGroup target="controller"}}>{{t services.service.config_groups_popup.duplicate}}</a>
+ <a rel="button-info" {{bindAttr data-original-title="view.duplicateButtonTooltip"}} {{action duplicateConfigGroup target="controller"}}>{{t services.service.config_groups_popup.duplicate}}</a>
</li>
</ul>
</div>
@@ -59,18 +61,19 @@
}}
</div>
<div class="button-group pull-right">
- <button class="btn" {{bindAttr disabled="selectedConfigGroup.isAddHostsDisabled"}} {{action addHosts target="controller"}} ><i class="icon-plus"></i></button>
- <button class="btn" {{bindAttr disabled="selectedConfigGroup.isDeleteHostsDisabled"}} {{action deleteHosts target="controller"}} ><i class="icon-minus"></i></button>
+ <button rel="button-info" class="btn" {{bindAttr data-original-title="view.addHostTooltip" disabled="selectedConfigGroup.isAddHostsDisabled"}} {{action addHosts target="controller"}} ><i class="icon-plus"></i></button>
+ <button rel="button-info" class="btn" {{bindAttr data-original-title="view.removeHostTooltip" disabled="selectedConfigGroup.isDeleteHostsDisabled"}} {{action deleteHosts target="controller"}} ><i class="icon-minus"></i></button>
</div>
</div>
<div class="row-fluid">
<div class="span2">{{t common.overrides}}</div>
<div class="span10">
<a href="" class="properties-link" {{action showProperties target="controller"}}
- rel="HealthTooltip" {{bindAttr data-original-title="selectedConfigGroup.propertiesList" }}>{{selectedConfigGroup.properties.length}} {{t common.properties}}</a>
+ {{bindAttr data-original-title="selectedConfigGroup.propertiesList" }}>{{selectedConfigGroup.properties.length}} {{t common.properties}}</a>
</div>
</div>
</div>
+ <div class="span12">{{selectedConfigGroup.description}}</div>
<div class="span12 text-error" id="manage-config-group-error-div">
{{#if errorMessage}}
{{errorMessage}}
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/6a709e23/ambari-web/app/views/main/service/manage_config_groups_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/manage_config_groups_view.js b/ambari-web/app/views/main/service/manage_config_groups_view.js
index 0d8ef93..d1a1d5b 100644
--- a/ambari-web/app/views/main/service/manage_config_groups_view.js
+++ b/ambari-web/app/views/main/service/manage_config_groups_view.js
@@ -61,5 +61,26 @@ App.MainServiceManageConfigGroupView = Em.View.extend({
didInsertElement: function () {
this.get('controller').loadConfigGroups(this.get('serviceName'));
$('.properties-link').tooltip();
- }
+ $("[rel='button-info']").tooltip();
+ },
+
+ addButtonTooltip: function () {
+ return Em.I18n.t('services.service.config_groups_popup.addButton');
+ }.property(),
+ removeButtonTooltip: function () {
+ return Em.I18n.t('services.service.config_groups_popup.removeButton');
+ }.property(),
+ renameButtonTooltip: function () {
+ return Em.I18n.t('services.service.config_groups_popup.renameButton');
+ }.property(),
+ duplicateButtonTooltip: function () {
+ return Em.I18n.t('services.service.config_groups_popup.duplicateButton');
+ }.property(),
+ addHostTooltip: function () {
+ return Em.I18n.t('services.service.config_groups_popup.addHost');
+ }.property(),
+ removeHostTooltip: function () {
+ return Em.I18n.t('services.service.config_groups_popup.removeHost');
+ }.property()
+
});