ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [49/50] [abbrv] ambari git commit: AMBARI-18787 Correct service Configs page styling. (atkach)
Date Fri, 04 Nov 2016 16:55:30 GMT
AMBARI-18787 Correct service Configs page styling. (atkach)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 2c9f0625718ad40361693bc377683af52c93feb0
Parents: e644473
Author: Andrii Tkach <atkach@apache.org>
Authored: Thu Nov 3 17:45:09 2016 +0200
Committer: Andrii Tkach <atkach@apache.org>
Committed: Fri Nov 4 18:31:15 2016 +0200

----------------------------------------------------------------------
 .../mixins/common/configs/config_recommendation_parser.js |  2 +-
 ambari-web/app/styles/application.less                    |  1 +
 ambari-web/app/styles/config_history_flow.less            | 10 ++++++----
 .../app/templates/common/configs/compare_property.hbs     |  4 ++--
 .../app/templates/common/configs/config_history_flow.hbs  |  2 +-
 .../templates/common/configs/service_config_category.hbs  |  6 +++---
 .../common/configs/config_recommendation_parser_test.js   |  4 ++--
 7 files changed, 16 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/2c9f0625/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
index d07d108..b88cf62 100644
--- a/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
+++ b/ambari-web/app/mixins/common/configs/config_recommendation_parser.js
@@ -82,7 +82,7 @@ App.ConfigRecommendationParser = Em.Mixin.create(App.ConfigRecommendations,
{
                 propertiesToDelete.push(config);
               } else if (attr === 'visible' || stackProperty) {
                 /** update config boundaries **/
-                updateBoundariesCallback(stackProperty, attr, propertyAttributes[attr], configGroup);
+                updateBoundariesCallback(stackProperty, attr, propertyAttributes[attr], name,
fileName, configGroup);
               }
             }
           }

http://git-wip-us.apache.org/repos/asf/ambari/blob/2c9f0625/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index ae7f1f9..dc98ce1 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -118,6 +118,7 @@ footer {
 }
 .form-control {
   height: 30px;
+  float: none;
 }
 table.diff {
   white-space: normal;

http://git-wip-us.apache.org/repos/asf/ambari/blob/2c9f0625/ambari-web/app/styles/config_history_flow.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/config_history_flow.less b/ambari-web/app/styles/config_history_flow.less
index e4bb599..3613949 100644
--- a/ambari-web/app/styles/config_history_flow.less
+++ b/ambari-web/app/styles/config_history_flow.less
@@ -70,7 +70,7 @@
         font-size: 11px;
         .top-label {
           min-width: 20px;
-          padding: 3px 2px;
+          padding: 6px 2px;
         }
         .author,
         .content {
@@ -105,7 +105,7 @@
         left: -45px;
         z-index: 1000;
         float: left;
-        width: 370px;
+        width: 380px;
         padding: 8px;
         list-style: none;
         background-color: #ffffff;
@@ -125,7 +125,8 @@
             word-wrap: break-word;
             white-space: pre-wrap;
           }
-          .date{
+          .date {
+            padding: 5px 0;
             color: #808080;
             font-size: 11px;
             white-space: nowrap;
@@ -209,12 +210,13 @@
     -moz-border-radius: 4px;
     border-radius: 4px;
     padding: 5px;
+    margin-bottom: 5px;
 
     .glyphicon-remove-circle {
       color: #ffffff;
       font-size: 1.5em;
       padding-top: 4px;
-      margin-top: 0px;
+      margin-top: 0;
       display: inline-block;
       cursor: pointer;
     }

http://git-wip-us.apache.org/repos/asf/ambari/blob/2c9f0625/ambari-web/app/templates/common/configs/compare_property.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/compare_property.hbs b/ambari-web/app/templates/common/configs/compare_property.hbs
index df35e9e..6d84913 100644
--- a/ambari-web/app/templates/common/configs/compare_property.hbs
+++ b/ambari-web/app/templates/common/configs/compare_property.hbs
@@ -21,9 +21,9 @@
     <div class="row">
       <div class="col-md-9">
         {{view compareConfig.viewClass serviceConfigBinding="compareConfig" versionBinding="compareConfig.serviceVersion.version"
categoryConfigsAllBinding="view.parentView.categoryConfigsAll"}}
-        <span class="label label-info">{{compareConfig.serviceVersion.versionText}}</span>
+        <span class="label label-info config-controls">{{compareConfig.serviceVersion.versionText}}</span>
         {{#if compareConfig.serviceVersion.isCurrent}}
-          <span class="label label-success">{{t common.current}}</span>
+          <span class="label label-success config-controls">{{t common.current}}</span>
         {{/if}}
         {{#unless compareConfig.isMock}}
           {{#if compareConfig.supportsFinal}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/2c9f0625/ambari-web/app/templates/common/configs/config_history_flow.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/config_history_flow.hbs b/ambari-web/app/templates/common/configs/config_history_flow.hbs
index 99a65a2..84f319f 100644
--- a/ambari-web/app/templates/common/configs/config_history_flow.hbs
+++ b/ambari-web/app/templates/common/configs/config_history_flow.hbs
@@ -31,7 +31,7 @@
   <div class="version-info-bar-wrapper row">
     {{#isAuthorized "SERVICE.COMPARE_CONFIGS"}}
       <div {{bindAttr class="view.showCompareVersionBar::hidden :version-info-bar :col-md-12"}}>
-        <div class="version-info-bar">
+        <div>
           <div class="col-md-1 remove-compare-bar" {{action removeCompareVersionBar target="view"}}
data-toggle="arrow-tooltip" {{translateAttr data-original-title="services.service.config.configHistory.dismissIcon.tooltip"}}>
             <i class="glyphicon-remove-circle glyphicon glyphicon-large"></i>
           </div>

http://git-wip-us.apache.org/repos/asf/ambari/blob/2c9f0625/ambari-web/app/templates/common/configs/service_config_category.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/service_config_category.hbs b/ambari-web/app/templates/common/configs/service_config_category.hbs
index 8539e4e..fbcb828 100644
--- a/ambari-web/app/templates/common/configs/service_config_category.hbs
+++ b/ambari-web/app/templates/common/configs/service_config_category.hbs
@@ -64,12 +64,12 @@
                   {{#if this.isComparison}}
                     {{#if controller.selectedConfigGroup.isDefault}}
                       <span
-                          class="label label-info">{{t dashboard.configHistory.table.version.prefix}}{{controller.selectedVersion}}</span>
+                          class="label label-info config-controls">{{t dashboard.configHistory.table.version.prefix}}{{controller.selectedVersion}}</span>
                       {{#if controller.isCurrentSelected}}
-                        <span class="label label-success">{{t common.current}}</span>
+                        <span class="label label-success config-controls">{{t common.current}}</span>
                       {{/if}}
                     {{else}}
-                      <span class="label label-info">{{t common.default}}
+                      <span class="label label-info config-controls">{{t common.default}}
                         &nbsp;{{t services.service.config.configHistory.configGroup}}</span>
                     {{/if}}
                   {{/if}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/2c9f0625/ambari-web/test/mixins/common/configs/config_recommendation_parser_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/mixins/common/configs/config_recommendation_parser_test.js b/ambari-web/test/mixins/common/configs/config_recommendation_parser_test.js
index c7c24d4..f08bbad 100644
--- a/ambari-web/test/mixins/common/configs/config_recommendation_parser_test.js
+++ b/ambari-web/test/mixins/common/configs/config_recommendation_parser_test.js
@@ -102,12 +102,12 @@ describe('App.ConfigRecommendationParser', function() {
 
       it('updateBoundariesCallback maximum', function() {
         expect(instanceObject.updateBoundariesCallback.calledWith({ name: 'p3', filename:
'fileName1' },
-          'maximum', 100, null)).to.be.true;
+          'maximum', 100, 'p3', 'fileName1', null)).to.be.true;
       });
 
       it('updateBoundariesCallback minimum', function() {
         expect(instanceObject.updateBoundariesCallback.calledWith({ name: 'p3', filename:
'fileName1' },
-          'minimum', 1, null)).to.be.true;
+          'minimum', 1, 'p3', 'fileName1', null)).to.be.true;
       });
     });
 


Mime
View raw message