ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [17/50] [abbrv] ambari git commit: AMBARI-19590 Add/delete host component: visual changes for configuration popup. (ababiichuk)
Date Wed, 18 Jan 2017 15:57:50 GMT
AMBARI-19590 Add/delete host component: visual changes for configuration popup. (ababiichuk)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 83716672e99cbf012f9db1561c7d1d044459ae4f
Parents: 71c5b1f
Author: ababiichuk <ababiichuk@hortonworks.com>
Authored: Tue Jan 17 18:35:37 2017 +0200
Committer: ababiichuk <ababiichuk@hortonworks.com>
Committed: Tue Jan 17 18:35:37 2017 +0200

----------------------------------------------------------------------
 ambari-web/app/messages.js                         |  1 +
 .../common/modal_popups/dependent_configs_list.hbs | 17 +++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/83716672/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index cacb798..961af55 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -467,6 +467,7 @@ Em.I18n.translations = {
   'popup.dependent.configs.header': 'Dependent Configurations',
   'popup.dependent.configs.title.recommendation': 'Based on your configuration changes, Ambari
is recommending the following dependent configuration changes.',
   'popup.dependent.configs.title.values': 'Ambari will update all checked configuration changes
to the <b>Recommended Value</b>. Uncheck any configuration to retain the <b>Current
Value</b>.',
+  'popup.dependent.configs.title.required': 'The following configuration changes are required
and will be applied automatically.',
   'popup.dependent.configs.table.recommended': 'Recommended Changes',
   'popup.dependent.configs.table.required': 'Required Changes',
   'popup.dependent.configs.table.saveProperty': 'Save property',

http://git-wip-us.apache.org/repos/asf/ambari/blob/83716672/ambari-web/app/templates/common/modal_popups/dependent_configs_list.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/modal_popups/dependent_configs_list.hbs b/ambari-web/app/templates/common/modal_popups/dependent_configs_list.hbs
index af84306..c53e29d 100644
--- a/ambari-web/app/templates/common/modal_popups/dependent_configs_list.hbs
+++ b/ambari-web/app/templates/common/modal_popups/dependent_configs_list.hbs
@@ -16,17 +16,15 @@
 * limitations under the License.
 }}
 
-{{#if view.recommendations.length}}
-  <div class="alert alert-warning">
-    {{#if view.isAfterRecommendation}}
-      <div>{{t popup.dependent.configs.title.recommendation}}</div>
-    {{/if}}
-    <div>{{t popup.dependent.configs.title.values}}</div>
-  </div>
-{{/if}}
 <span id="config-dependencies" class="limited-height-2">
   {{#if view.recommendations.length}}
     <h4>{{t popup.dependent.configs.table.recommended}}</h4>
+    <div class="alert alert-warning">
+      {{#if view.isAfterRecommendation}}
+        <div>{{t popup.dependent.configs.title.recommendation}}</div>
+      {{/if}}
+      <div>{{t popup.dependent.configs.title.values}}</div>
+    </div>
     <table class="table table-hover">
       <thead>
         <tr>
@@ -70,6 +68,9 @@
   {{/if}}
   {{#if view.requiredChanges.length}}
     <h4>{{t popup.dependent.configs.table.required}}</h4>
+    <div class="alert alert-warning">
+      {{t popup.dependent.configs.title.required}}
+    </div>
     <table class="table table-hover">
       <thead>
         <tr>


Mime
View raw message