ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [25/50] ambari git commit: AMBARI-20118 Test and fix new modals styles on Ambari. (ababiichuk)
Date Fri, 24 Feb 2017 14:19:32 GMT
AMBARI-20118 Test and fix new modals styles on Ambari. (ababiichuk)


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

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 0b6d1cd3b311389e8d385ab782ae78a65b14ef8b
Parents: a6f3420
Author: ababiichuk <ababiichuk@hortonworks.com>
Authored: Wed Feb 22 20:19:25 2017 +0200
Committer: ababiichuk <ababiichuk@hortonworks.com>
Committed: Wed Feb 22 20:19:25 2017 +0200

----------------------------------------------------------------------
 .../main/admin/stack_and_upgrade_controller.js  |  1 -
 .../wizard/step7/assign_master_controller.js    | 13 +++-----
 .../app/controllers/wizard/step9_controller.js  |  7 ++---
 ambari-web/app/routes/main.js                   |  4 +--
 .../app/styles/enhanced_service_dashboard.less  |  1 -
 ambari-web/app/styles/modal_popups.less         | 11 ++-----
 ambari-web/app/styles/stack_versions.less       |  2 +-
 .../app/styles/theme/bootstrap-ambari.css       |  6 ++--
 .../common/assign_master_components.hbs         | 33 ++++++++++----------
 .../configs/propertyDependence_footer.hbs       | 25 ---------------
 ambari-web/app/templates/common/modal_popup.hbs | 26 +++++++++------
 ambari-web/app/templates/common/progress.hbs    | 16 +++++-----
 .../main/service/info/save_popup_footer.hbs     | 13 ++++++--
 .../step3/step3_host_warning_popup_footer.hbs   | 14 +++++----
 .../common/assign_master_components_view.js     |  6 ++--
 .../configs/service_configs_by_category_view.js | 15 +++++----
 .../views/main/admin/kerberos/disable_view.js   |  2 +-
 .../views/wizard/step7/assign_master_view.js    |  6 +---
 18 files changed, 86 insertions(+), 115 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/0b6d1cd3/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 cb02665..35b2ecc 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
@@ -1022,7 +1022,6 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
       secondary: function() {
         return this.get('controller.getSupportedUpgradeError') ? null : Em.I18n.t('common.cancel');
       }.property('controller.getSupportedUpgradeError'),
-      primaryClass: 'btn-success',
       classNames: ['upgrade-options-popup'],
       header: Em.I18n.t('admin.stackVersions.version.upgrade.upgradeOptions.header'),
       controller: this,

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b6d1cd3/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step7/assign_master_controller.js b/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
index 81c80e1..e635f41 100644
--- a/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
+++ b/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
@@ -117,8 +117,10 @@ App.AssignMasterOnStep7Controller = Em.Controller.extend(App.BlueprintMixin,
App
       bodyClass: App.AssignMasterOnStep7View.extend({
         controller: self
       }),
-      primary: Em.I18n.t('form.cancel'),
-      showFooter: false,
+      primary: Em.I18n.t('common.select'),
+      onSecondary: function() {
+        this.showWarningPopup();
+      },
       onClose: function () {
         this.showWarningPopup();
       },
@@ -402,12 +404,5 @@ App.AssignMasterOnStep7Controller = Em.Controller.extend(App.BlueprintMixin,
App
       configActionComponent.hostName = componentHostName;
       self.get('configWidgetContext.config').set('configActionComponent', configActionComponent);
     });
-  },
-
-  /**
-   * function called for onclcik event on cancel button for the popup
-   */
-  onCancel: function() {
-    this.get('popup').showWarningPopup();
   }
 });
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b6d1cd3/ambari-web/app/controllers/wizard/step9_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step9_controller.js b/ambari-web/app/controllers/wizard/step9_controller.js
index f63bd79..a009334 100644
--- a/ambari-web/app/controllers/wizard/step9_controller.js
+++ b/ambari-web/app/controllers/wizard/step9_controller.js
@@ -606,11 +606,8 @@ App.WizardStep9Controller = Em.Controller.extend(App.ReloadPopupMixin,
{
       encodeBody: false,
       primary: Em.I18n.t('ok'),
       header: Em.I18n.t('installer.step9.service.start.header'),
-      secondaryClass: "hide",
-      body: Em.I18n.t('installer.step9.service.start.failed'),
-      primaryClass: 'btn-success',
-      onPrimary: function() { this.hide(); },
-      onClose: function() { this.hide(); }
+      secondary: false,
+      body: Em.I18n.t('installer.step9.service.start.failed')
     });
   },
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b6d1cd3/ambari-web/app/routes/main.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js
index 14435e8..9730de2 100644
--- a/ambari-web/app/routes/main.js
+++ b/ambari-web/app/routes/main.js
@@ -429,9 +429,9 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
               bodyClass: App.KerberosDisableView.extend({
                 controllerBinding: 'App.router.kerberosDisableController'
               }),
-              primary: Em.I18n.t('form.cancel'),
+              primary: Em.I18n.t('common.complete'),
               secondary: null,
-              showFooter: false,
+              disablePrimary: Em.computed.alias('App.router.kerberosDisableController.isSubmitDisabled'),
 
               onClose: function () {
                 var self = this;

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b6d1cd3/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 dfbe042..1dd645b 100644
--- a/ambari-web/app/styles/enhanced_service_dashboard.less
+++ b/ambari-web/app/styles/enhanced_service_dashboard.less
@@ -522,7 +522,6 @@
 
 .widgets-browser-popup {
   .modal {
-    position: fixed;
     .modal-body {
       padding-top: 0;
       min-height: 290px;

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b6d1cd3/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 a6a0196..e269791 100644
--- a/ambari-web/app/styles/modal_popups.less
+++ b/ambari-web/app/styles/modal_popups.less
@@ -77,10 +77,6 @@
   overflow-y: auto;
 }
 
-.modal-header h4 {
-  margin: 0;
-}
-
 /*90% width wizard modal window start*/
 .wizard-modal-wrapper {
   .modal {
@@ -202,7 +198,6 @@
   .modal-footer {
     .footer-checkbox {
       text-align: left;
-      padding-top: 11px;
       margin-left: 22px;
     }
   }
@@ -395,14 +390,14 @@
 
 .modal-graph-line {
   .modal-dialog {
-    width: 810px;
+    width: 820px;
   }
   .modal-body {
     min-height: 450px !important;
     overflow: hidden;
     .corner-icon {
       position: absolute;
-      right: 15px;
+      right: 20px;
       text-decoration: none;
       .glyphicon-save {
         color: #555;
@@ -410,7 +405,7 @@
     }
     .export-graph-list {
       top: auto;
-      right: 15px;
+      right: 20px;
     }
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b6d1cd3/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 0e1d2d0..2d5c2b4 100644
--- a/ambari-web/app/styles/stack_versions.less
+++ b/ambari-web/app/styles/stack_versions.less
@@ -404,7 +404,7 @@
     position: absolute;
     cursor: pointer;
     right: 10%;
-    top: 13px;
+    top: 22px;
     width: 100px;
     a {
       font-size: 13px;

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b6d1cd3/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 2c84f88..d88a1ed 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -1323,11 +1323,13 @@ input.radio:checked + label:after {
 .modal .modal-content .modal-header {
   border-bottom: none;
   padding-top: 20px;
+  color: #666;
+  font-size: 20px;
 }
 .modal .modal-content .modal-header h4 {
   margin: 0;
-  color: #666;
-  font-size: 20px;
+  color: inherit;
+  font-size: inherit;
 }
 .modal .modal-content .modal-body {
   color: #666;

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b6d1cd3/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 d5eaf75..72568a4 100644
--- a/ambari-web/app/templates/common/assign_master_components.hbs
+++ b/ambari-web/app/templates/common/assign_master_components.hbs
@@ -160,24 +160,23 @@
   </div>
 </div>
 
-<div class="wizard-footer col-md-12">
-  <div class="btn-area">
-    {{#if view.isBackButtonVisible}}
-      <button type="button" class="btn btn-default pull-left installer-back-btn" {{bindAttr
disabled="App.router.btnClickInProgress"}} {{action back}}>
-        &larr; {{t common.back}}
-        {{#if App.router.backBtnClickInProgress}}
+{{#if view.isWizardStep}}
+  <div class="wizard-footer col-md-12">
+    <div class="btn-area">
+      {{#if view.isBackButtonVisible}}
+        <button type="button" class="btn btn-default pull-left installer-back-btn" {{bindAttr
disabled="App.router.btnClickInProgress"}} {{action back}}>
+          &larr; {{t common.back}}
+          {{#if App.router.backBtnClickInProgress}}
+            {{view App.SpinnerView tagName="span" classNames="service-button-spinner"}}
+          {{/if}}
+        </button>
+      {{/if}}
+      <button type="button" class="btn btn-success pull-right" {{bindAttr disabled="nextButtonDisabled"}}
{{action submit target="controller"}}>
+        {{#if App.router.nextBtnClickInProgress}}
           {{view App.SpinnerView tagName="span" classNames="service-button-spinner"}}
         {{/if}}
+        {{t common.next}} &rarr;
       </button>
-    {{/if}}
-    <button type="button" class="btn btn-success pull-right" {{bindAttr disabled="nextButtonDisabled"}}
{{action submit target="controller"}}>
-      {{#if App.router.nextBtnClickInProgress}}
-        {{view App.SpinnerView tagName="span" classNames="service-button-spinner"}}
-      {{/if}}
-      {{view.acceptButtonText}}
-    </button>
-    {{#if view.isCancelButtonVisible}}
-      <button class="btn btn-default pull-right mrm" {{action onCancel target="controller"}}>{{t
common.cancel}}</button>
-    {{/if}}
+    </div>
   </div>
-</div>
+{{/if}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b6d1cd3/ambari-web/app/templates/common/configs/propertyDependence_footer.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/propertyDependence_footer.hbs b/ambari-web/app/templates/common/configs/propertyDependence_footer.hbs
deleted file mode 100644
index ee03ad4..0000000
--- a/ambari-web/app/templates/common/configs/propertyDependence_footer.hbs
+++ /dev/null
@@ -1,25 +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.
-}}
-
-<div class="pull-right">
-  <button class="btn btn-default" {{action onUndo target="view.parentView"}}>{{t common.cancel}}</button>
-  {{#if view.canIgnore}}
-    <button class="btn btn-warning" {{action onIgnore target="view.parentView"}}>{{t
common.ignore}}</button>
-  {{/if}}
-  <button class="btn btn-success" {{action onApply target="view.parentView"}}>{{t common.apply}}</button>
-</div>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b6d1cd3/ambari-web/app/templates/common/modal_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/modal_popup.hbs b/ambari-web/app/templates/common/modal_popup.hbs
index 59e9c0b..f805ec6 100644
--- a/ambari-web/app/templates/common/modal_popup.hbs
+++ b/ambari-web/app/templates/common/modal_popup.hbs
@@ -24,7 +24,7 @@
       {{! Modal header }}
       <div class="modal-header">
         {{#if view.showCloseButton}}
-          <a class="close" {{action onClose target="view"}}>x</a>
+          <a class="close" {{action onClose target="view"}}>&times;</a>
         {{/if}}
         <h4 id="modal-label">
           {{#if view.headerClass}}
@@ -54,17 +54,23 @@
         {{else}}
           <div class="modal-footer">
             {{#if view.third}}
-              <button {{bindAttr disabled="view.disableThird" class=":btn view.thirdClass"
id="view.thirdId"}} {{action onThird target="view"}}>{{view.third}}</button>
-            {{/if}}
-            {{#if view.secondary}}
-              <button {{bindAttr disabled="view.disableSecondary" class=":btn view.secondaryClass"
id="view.secondaryId"}} {{action onSecondary target="view"}}>{{view.secondary}}</button>
-            {{/if}}
-            {{#if view.primary}}
-              <button {{bindAttr disabled="view.disablePrimary" class=":btn view.primaryClass"
id="view.primaryId"}} {{action onPrimary target="view"}}>{{view.primary}}</button>
+              <button
+                {{bindAttr disabled="view.disableThird" class=":btn view.thirdClass" id="view.thirdId"}}
+                {{action onThird target="view"}}>
+                  {{view.third}}
+              </button>{{/if}}{{#if view.secondary}}<button
+                {{bindAttr disabled="view.disableSecondary" class=":btn view.secondaryClass"
id="view.secondaryId"}}
+                {{action onSecondary target="view"}}>
+                  {{view.secondary}}
+              </button>{{/if}}{{#if view.primary}}<button
+                {{bindAttr disabled="view.disablePrimary" class=":btn view.primaryClass"
id="view.primaryId"}}
+                {{action onPrimary target="view"}}>
+                  {{view.primary}}
+              </button>
             {{/if}}
           </div>
-            {{/if}}
-          {{/if}}
+        {{/if}}
+      {{/if}}
     </div>
   </div>
 </div>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b6d1cd3/ambari-web/app/templates/common/progress.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/progress.hbs b/ambari-web/app/templates/common/progress.hbs
index 8485698..fce5641 100644
--- a/ambari-web/app/templates/common/progress.hbs
+++ b/ambari-web/app/templates/common/progress.hbs
@@ -75,11 +75,13 @@
     </div>
   </div>
 </div>
-<div class="wizard-footer col-md-12">
-  <div class="btn-area">
-    {{#if view.showBackButton}}
-      <button class="btn btn-default pull-left" {{bindAttr disabled="controller.isBackButtonDisabled"}}
{{action back target="controller"}}>&larr; {{t common.back}}</button>
-    {{/if}}
-    <button class="btn btn-success pull-right" {{bindAttr disabled="controller.isSubmitDisabled"}}
{{action done target="controller"}}>{{{view.submitButtonText}}}</button>
+{{#unless view.isSimpleModal}}
+  <div class="wizard-footer col-md-12">
+    <div class="btn-area">
+      {{#if view.showBackButton}}
+        <button class="btn btn-default pull-left" {{bindAttr disabled="controller.isBackButtonDisabled"}}
{{action back target="controller"}}>&larr; {{t common.back}}</button>
+      {{/if}}
+      <button class="btn btn-success pull-right" {{bindAttr disabled="controller.isSubmitDisabled"}}
{{action done target="controller"}}>{{{view.submitButtonText}}}</button>
+    </div>
   </div>
-</div>
+{{/unless}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b6d1cd3/ambari-web/app/templates/main/service/info/save_popup_footer.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/info/save_popup_footer.hbs b/ambari-web/app/templates/main/service/info/save_popup_footer.hbs
index 4907b3a..4f9a52f 100644
--- a/ambari-web/app/templates/main/service/info/save_popup_footer.hbs
+++ b/ambari-web/app/templates/main/service/info/save_popup_footer.hbs
@@ -17,7 +17,14 @@
 }}
 
 <div class="modal-footer">
-  <button type="button" class="btn btn-default" {{action onCancel target="view.parentView"}}>{{t
common.cancel}}</button>
-  <button type="button" class="btn btn-default" {{action onDiscard target="view.parentView"}}>{{t
common.discard}}</button>
-  <button type="button" class="btn btn-success" {{bindAttr disabled="view.isSaveDisabled"}}
{{action onSave target="view.parentView"}}>{{t common.save}}</button>
+  <button type="button" class="btn btn-default"
+    {{action onCancel target="view.parentView"}}>
+      {{t common.cancel}}
+  </button><button type="button" class="btn btn-default"
+    {{action onDiscard target="view.parentView"}}>
+      {{t common.discard}}
+  </button><button type="button" class="btn btn-success"
+    {{bindAttr disabled="view.isSaveDisabled"}}
+    {{action onSave target="view.parentView"}}>
+      {{t common.save}}</button>
 </div>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b6d1cd3/ambari-web/app/templates/wizard/step3/step3_host_warning_popup_footer.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step3/step3_host_warning_popup_footer.hbs b/ambari-web/app/templates/wizard/step3/step3_host_warning_popup_footer.hbs
index d906b75..10c7e32 100644
--- a/ambari-web/app/templates/wizard/step3/step3_host_warning_popup_footer.hbs
+++ b/ambari-web/app/templates/wizard/step3/step3_host_warning_popup_footer.hbs
@@ -26,10 +26,12 @@
   {{/if}}
 </div>
 {{#if view.parentView.secondary}}
-  <button type="button"
-          class="btn btn-info" {{bindAttr disabled="view.isUpdateInProgress"}} {{action onSecondary
target="view.parentView"}}>
-    <i class="glyphicon glyphicon-repeat"></i>&nbsp;{{view.parentView.secondary}}</button>
-{{/if}}
-{{#if view.parentView.primary}}
-  <button type="button" class="btn btn-default" {{action onPrimary target="view.parentView"}}>{{view.parentView.primary}}</button>
+  <button type="button" class="btn btn-info"
+    {{bindAttr disabled="view.isUpdateInProgress"}}
+    {{action onSecondary target="view.parentView"}}>
+      <i class="glyphicon glyphicon-repeat"></i>&nbsp;{{view.parentView.secondary}}
+  </button>{{/if}}{{#if view.parentView.primary}}<button type="button" class="btn
btn-default"
+    {{action onPrimary target="view.parentView"}}>
+      {{view.parentView.primary}}
+  </button>
 {{/if}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b6d1cd3/ambari-web/app/views/common/assign_master_components_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/assign_master_components_view.js b/ambari-web/app/views/common/assign_master_components_view.js
index 73654c7..8ad1991 100644
--- a/ambari-web/app/views/common/assign_master_components_view.js
+++ b/ambari-web/app/views/common/assign_master_components_view.js
@@ -43,11 +43,9 @@ App.AssignMasterComponentsView = Em.View.extend({
    */
   shouldUseInputs: Em.computed.gt('controller.hosts.length', 25),
 
-  isBackButtonVisible: true,
-
-  isCancelButtonVisible: false,
+  isWizardStep: true,
 
-  acceptButtonText: Em.I18n.t('common.next') + '&rarr;',
+  isBackButtonVisible: true,
 
   didInsertElement: function () {
     this.get('controller').loadStep();

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b6d1cd3/ambari-web/app/views/common/configs/service_configs_by_category_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/configs/service_configs_by_category_view.js b/ambari-web/app/views/common/configs/service_configs_by_category_view.js
index 25f7dfb..68bf22c 100644
--- a/ambari-web/app/views/common/configs/service_configs_by_category_view.js
+++ b/ambari-web/app/views/common/configs/service_configs_by_category_view.js
@@ -254,8 +254,12 @@ App.ServiceConfigsByCategoryView = Em.View.extend(App.UserPref, App.ConfigOverri
         classNames: ['modal-690px-width'],
         modalDialogClasses: ['modal-lg'],
         showCloseButton: false,
+        primary: Em.I18n.t('common.apply'),
+        secondary: serviceId == 'MISC' ? Em.I18n.t('common.ignore') : null,
+        third: Em.I18n.t('common.cancel'),
+        secondaryClass: 'btn-warning',
         header: "Warning: you must also change these Service properties",
-        onApply: function () {
+        onPrimary: function () {
           self.get("newAffectedProperties").forEach(function(item) {
             if (item.isNewProperty) {
               self.createProperty({
@@ -275,11 +279,11 @@ App.ServiceConfigsByCategoryView = Em.View.extend(App.UserPref, App.ConfigOverri
           self.get("controller").set("miscModalVisible", false);
           this.hide();
         },
-        onIgnore: function () {
+        onSecondary: function () {
           self.get("controller").set("miscModalVisible", false);
           this.hide();
         },
-        onUndo: function () {
+        onThird: function () {
           var affected = self.get("newAffectedProperties").objectAt(0),
             changedProperty = self.get("controller.stepConfigs").findProperty("serviceName",
affected.sourceServiceName)
               .get("configs").findProperty("name", affected.changedPropertyName);
@@ -287,11 +291,6 @@ App.ServiceConfigsByCategoryView = Em.View.extend(App.UserPref, App.ConfigOverri
           self.get("controller").set("miscModalVisible", false);
           this.hide();
         },
-        footerClass: Em.View.extend({
-          classNames: ['modal-footer'],
-          templateName: require('templates/common/configs/propertyDependence_footer'),
-          canIgnore: serviceId == 'MISC'
-        }),
         bodyClass: Em.View.extend({
           templateName: require('templates/common/configs/propertyDependence'),
           controller: this,

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b6d1cd3/ambari-web/app/views/main/admin/kerberos/disable_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/admin/kerberos/disable_view.js b/ambari-web/app/views/main/admin/kerberos/disable_view.js
index 64657e8..f7b3527 100644
--- a/ambari-web/app/views/main/admin/kerberos/disable_view.js
+++ b/ambari-web/app/views/main/admin/kerberos/disable_view.js
@@ -37,6 +37,6 @@ App.KerberosDisableView = App.KerberosProgressPageView.extend({
 
   msgColor: 'alert-info',
 
-  submitButtonText: Em.I18n.t('common.complete')
+  isSimpleModal: true
 
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b6d1cd3/ambari-web/app/views/wizard/step7/assign_master_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/wizard/step7/assign_master_view.js b/ambari-web/app/views/wizard/step7/assign_master_view.js
index b795647..0407afe 100644
--- a/ambari-web/app/views/wizard/step7/assign_master_view.js
+++ b/ambari-web/app/views/wizard/step7/assign_master_view.js
@@ -26,13 +26,9 @@ App.AssignMasterOnStep7View = App.AssignMasterComponentsView.extend({
 
   showTitle: false,
 
-  acceptButtonText: Em.I18n.t('common.select'),
-
   alertMessage: '',
 
-  isBackButtonVisible: false,
-
-  isCancelButtonVisible: true,
+  isWizardStep: false,
 
   willInsertElement: function() {
     this._super();


Mime
View raw message