AMBARI-4196. Install Wizard: Service Config Group popup text does not show the service name prefix. (onechiporenko)

ambari-web/app/messages.js

@@ -1734,14 +1734,14 @@ Em.I18n.translations = {
   'contact.administrator': 'Contact System Administrator for more information!',
 
   'config.group.selection.dialog.title': '{0} Configuration Group',
-  'config.group.selection.dialog.subtitle': 'Select or create a {{serviceName}} Configuration Group where the configuration value will be overridden.',
-  'config.group.selection.dialog.option.select': 'Select an existing {{serviceName}} Configuration Group',
+  'config.group.selection.dialog.subtitle': 'Select or create a {0} Configuration Group where the configuration value will be overridden.',
+  'config.group.selection.dialog.option.select': 'Select an existing {0} Configuration Group',
   'config.group.selection.dialog.option.select.msg': 'Overridden property will be changed for hosts belonging to the selected group.',
-  'config.group.selection.dialog.option.create': 'Create a new {{serviceName}} Configuration Group',
-  'config.group.selection.dialog.option.create.msg': 'A new {{serviceName}} Configuration Group will be created with the given name. Initially there will be no hosts in the group, with only the selected property overridden.',
+  'config.group.selection.dialog.option.create': 'Create a new {0} Configuration Group',
+  'config.group.selection.dialog.option.create.msg': 'A new {0} Configuration Group will be created with the given name. Initially there will be no hosts in the group, with only the selected property overridden.',
   'config.group.selection.dialog.err.name.exists': 'Configuration Group with given name already exists',
   'config.group.selection.dialog.err.create': 'Error creating new Configuration Group [{0}]',
-  'config.group.selection.dialog.no.groups': 'There are no existing {{serviceName}} Configuration Groups.',
+  'config.group.selection.dialog.no.groups': 'There are no existing {0} Configuration Groups.',
   'config.group.host.switch.dialog.title': 'Change Group',
 
   'config.group.save.confirmation.header': 'Save Configuration Group',

ambari-web/app/templates/common/configs/selectCreateConfigGroup.hbs

@@ -17,20 +17,16 @@
 }}
 <div id="config-group-select-create-dialog">
   <div class="alert alert-info">
-    {{t config.group.selection.dialog.subtitle serviceNameBinding="selectedService.displayName"}}
+    {{view.parentView.subTitle}}
   </div>
   <div class="text-warning">
-  {{#if view.parentView.warningMessage}}
     {{view.parentView.warningMessage}}
-  {{else}}
-    &nbsp;
-  {{/if}}
-    </div>
-    <label class="radio">
-      {{view view.selectConfigGroupRadioButton}}
-      <span {{bindAttr class="view.parentView.hasExistedGroups::message"}}>{{t config.group.selection.dialog.option.select serviceNameBinding="selectedService.displayName"}}</span>
-    </label>
-    {{#if view.parentView.availableConfigGroups.length}}
+  </div>
+  <label class="radio">
+    {{view view.selectConfigGroupRadioButton}}
+    <span {{bindAttr class="view.parentView.hasExistedGroups::message"}}>{{view.parentView.selectExistingGroupLabel}}</span>
+  </label>
+  {{#if view.parentView.availableConfigGroups.length}}
     <div class="select-create-config-group-div">
       <span class="btn-group">
         <button class="btn" {{bindAttr disabled="view.parentView.optionCreateConfigGroup"}}>{{view.parentView.selectedConfigGroup.name}}</button>
@@ -52,16 +48,16 @@
     </div>
   {{else}}
     <div class="select-create-config-group-div">
-      <div class="alert alert-block">{{t config.group.selection.dialog.no.groups serviceNameBinding="selectedService.displayName"}}</div>
+      <div class="alert alert-block">{{view.parentView.noGroups}}</div>
     </div>
   {{/if}}
   <label class="radio">
     {{view view.createConfigGroupRadioButton}}
-    {{t config.group.selection.dialog.option.create serviceNameBinding="selectedService.displayName"}}
+    {{view.parentView.createNewGroupLabel}}
   </label>
   <div class="select-create-config-group-div">
     {{view Ember.TextField valueBinding="view.parentView.newConfigGroupName"
       disabledBinding="view.parentView.optionSelectConfigGroup" maxlength="255" class="span5"}}
-    <div class="message">{{t config.group.selection.dialog.option.create.msg serviceNameBinding="selectedService.displayName"}}</div>
+    <div class="message">{{view.parentView.createNewGroupDescription}}</div>
   </div>
 </div>

ambari-web/app/utils/config.js

@@ -1062,12 +1062,17 @@ App.config = Em.Object.create({
     availableConfigGroups = result;
     var selectedConfigGroup = availableConfigGroups && availableConfigGroups.length > 0 ?
         availableConfigGroups[0] : null;
+    var serviceName = App.Service.DisplayNames[serviceId];
     App.ModalPopup.show({
       classNames: [ 'sixty-percent-width-modal' ],
-      header: Em.I18n.t('config.group.selection.dialog.title').format(App.Service.DisplayNames[serviceId]),
-      primary: Em.I18n.t('ok'),
-      secondary: Em.I18n.t('common.cancel'),
-      warningMessage: null,
+      header: Em.I18n.t('config.group.selection.dialog.title').format(serviceName),
+      subTitle: Em.I18n.t('config.group.selection.dialog.subtitle').format(serviceName),
+      selectExistingGroupLabel: Em.I18n.t('config.group.selection.dialog.option.select').format(serviceName),
+      noGroups: Em.I18n.t('config.group.selection.dialog.no.groups').format(serviceName),
+      createNewGroupLabel: Em.I18n.t('config.group.selection.dialog.option.create').format(serviceName),
+      createNewGroupDescription: Em.I18n.t('config.group.selection.dialog.option.create.msg').format(serviceName),
+      warningMessage: ' ',
+      isWarning: false,
       optionSelectConfigGroup: true,
       optionCreateConfigGroup: function(){
         return !this.get('optionSelectConfigGroup');
@@ -1079,7 +1084,7 @@ App.config = Em.Object.create({
       selectedConfigGroup: selectedConfigGroup,
       newConfigGroupName: '',
       enablePrimary: function () {
-        return this.get('optionSelectConfigGroup') || (this.get('newConfigGroupName').trim().length > 0 && !this.get('warningMessage'));
+        return this.get('optionSelectConfigGroup') || (this.get('newConfigGroupName').trim().length > 0 && !this.get('isWarning'));
       }.property('newConfigGroupName', 'optionSelectConfigGroup', 'warningMessage'),
       onPrimary: function () {
         if (!this.get('enablePrimary')) {
@@ -1115,15 +1120,18 @@ App.config = Em.Object.create({
         this.set('selectedConfigGroup', configGroup);
       },
       validate: function () {
-        var msg = null;
+        var msg = ' ';
+        var isWarning = false;
         var optionSelect = this.get('optionSelectConfigGroup');
         if (!optionSelect) {
           var nn = this.get('newConfigGroupName');
           if (nn && configGroups.mapProperty('name').contains(nn)) {
             msg = Em.I18n.t("config.group.selection.dialog.err.name.exists");
+            isWarning = true;
           }
         }
         this.set('warningMessage', msg);
+        this.set('isWarning', isWarning);
       }.observes('newConfigGroupName', 'optionSelectConfigGroup'),
       bodyClass: Ember.View.extend({
         templateName: require('templates/common/configs/selectCreateConfigGroup'),
@@ -1171,8 +1179,6 @@ App.config = Em.Object.create({
     var self = this;
     App.ModalPopup.show({
       header: Em.I18n.t('config.group.host.switch.dialog.title'),
-      primary: Em.I18n.t('ok'),
-      secondary: Em.I18n.t('common.cancel'),
       configGroups: configGroups,
       selectedConfigGroup: selectedGroup,
       enablePrimary: function () {