ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject ambari git commit: AMBARI-22024. Stack and versions view style issues (alexantonenko)
Date Thu, 21 Sep 2017 15:44:19 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 34aa2fc1d -> 47461e1e7


AMBARI-22024. Stack and versions view style issues (alexantonenko)


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

Branch: refs/heads/branch-2.6
Commit: 47461e1e76d02585d6f823bf5b242f3f844d706f
Parents: 34aa2fc
Author: Alex Antonenko <aantonenko@hortonworks.com>
Authored: Thu Sep 21 18:44:04 2017 +0300
Committer: Alex Antonenko <aantonenko@hortonworks.com>
Committed: Thu Sep 21 18:44:04 2017 +0300

----------------------------------------------------------------------
 ambari-web/app/styles/stack_versions.less       | 38 ++++++++++++++------
 .../stack_upgrade/upgrade_version_column.hbs    |  1 +
 .../stack_upgrade/upgrade_version_box_view.js   |  4 +--
 .../upgrade_version_box_view_test.js            | 12 +++----
 4 files changed, 36 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/47461e1e/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 ad477d8..505ce8e 100644
--- a/ambari-web/app/styles/stack_versions.less
+++ b/ambari-web/app/styles/stack_versions.less
@@ -184,7 +184,7 @@
       padding-top: 5px;
       height: 30px;
       i {
-        color: #0088cc;
+        color: #fff;
         font-size: 16px;
       }
       i[disabled='disabled'] {
@@ -199,16 +199,16 @@
       }
       .dropdown-menu {
         cursor: pointer;
+        text-align: left;
       }
     }
-    .installing {
+    .installing, .upgrading {
       margin-top: 10px;
-      padding-top: 0;
-      padding-bottom: 10px;
+      padding: 0;
       .progress {
         height: 15px;
         width: 60%;
-        margin: 0 20%;
+        margin: 5px 20%;
       }
     }
     .host-link a {
@@ -360,28 +360,44 @@
         .btn:not(.dropdown-toggle) {
           width: 81%;
           border-radius: 0;
-          padding: 9px 5px;
+          padding: 5px 5px;
           min-width: 70px;
         }
         .dropdown-toggle {
           width: 20%;
           border-radius: 0;
-          padding: 9px 5px;
+          padding: 5px 5px;
+          height: 32px;
         }
       }
       .btn {
         width: 100%;
         border-radius: 0;
-        padding: 9px 5px;
+        padding: 5px 5px;
+        height: 32px;
+        &:focus{
+          background-color: #0044cc;
+        }
       }
       .open .dropdown-menu {
         min-width: 100px;
         right: 0;
       }
     }
-    .state.installing {
-      padding-bottom: 5px;
-      margin: 5px 0 15px 0;
+    .state.installing, .state.upgrading {
+      margin-top: 0;
+      margin-bottom: 23px;
+      background-color: #006dcc;
+      height: 32px;
+      line-height: 32px;
+      font-size: 13px;
+      a{
+        color: #fff;
+      }
+      &.attach-top{
+        background-color: transparent;
+        font-size: 14px;
+      }
     }
     .state.attach-top {
       margin: 0;

http://git-wip-us.apache.org/repos/asf/ambari/blob/47461e1e/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
index 1ea8de4..6dddfde 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
@@ -24,6 +24,7 @@
                        view.stateElement.isButton:attach-top
                        view.stateElement.isCurrent:attach-top
                        view.stateElement.isLabel:overflow
+                       view.isUpgrading:upgrading
                        view.stateElement.isButtonGroup:attach-top :align-center :state :repo-version-tooltip"}}>
     {{#if view.stateElement.isButton}}
       <button class="btn btn-primary"

http://git-wip-us.apache.org/repos/asf/ambari/blob/47461e1e/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
index b07beb3..28d61ec 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
@@ -291,7 +291,7 @@ App.UpgradeVersionBoxView = Em.View.extend({
 
           if (this.get('content.isPatch')) {
             element.get('buttons').pushObject({
-              text: Em.I18n.t('common.discard'),
+              text: Em.I18n.t('common.hide'),
               action: 'confirmDiscardRepoVersion',
               isDisabled: isDisabled
             });
@@ -322,7 +322,7 @@ App.UpgradeVersionBoxView = Em.View.extend({
     element.set('isButtonGroup', true);
     element.set('isButton', false);
     element.get('buttons').pushObject({
-      text: Em.I18n.t('common.discard'),
+      text: Em.I18n.t('common.hide'),
       action: 'confirmDiscardRepoVersion',
       isDisabled: isDisabledOnInit
     });

http://git-wip-us.apache.org/repos/asf/ambari/blob/47461e1e/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
index d84e6cb..3e9fa73 100644
--- a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
+++ b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
@@ -421,7 +421,7 @@ describe('App.UpgradeVersionBoxView', function () {
             {
               "action": "confirmDiscardRepoVersion",
               "isDisabled": false,
-              "text": "Discard"
+              "text": Em.I18n.t('common.hide')
             }
           ],
           isDisabled: false
@@ -450,7 +450,7 @@ describe('App.UpgradeVersionBoxView', function () {
             {
               "action": "confirmDiscardRepoVersion",
               "isDisabled": true,
-              "text": "Discard"
+              "text": Em.I18n.t('common.hide')
             }
           ],
           isDisabled: true
@@ -647,7 +647,7 @@ describe('App.UpgradeVersionBoxView', function () {
             {
               "action": "confirmDiscardRepoVersion",
               "isDisabled": true,
-              "text": "Discard"
+              "text": Em.I18n.t('common.hide')
             }
           ],
           isDisabled: true
@@ -1406,7 +1406,7 @@ describe('App.UpgradeVersionBoxView', function () {
             isDisabled: false
           },
           {
-            "text": Em.I18n.t('common.discard'),
+            "text": Em.I18n.t('common.hide'),
             "action": "confirmDiscardRepoVersion",
             "isDisabled": false
           }
@@ -1443,7 +1443,7 @@ describe('App.UpgradeVersionBoxView', function () {
       expect(JSON.stringify(element)).to.be.equal(JSON.stringify(Em.Object.create({
         "buttons": [
           {
-            "text": Em.I18n.t('common.discard'),
+            "text": Em.I18n.t('common.hide'),
             "action": "confirmDiscardRepoVersion",
             "isDisabled": false
           }
@@ -1471,7 +1471,7 @@ describe('App.UpgradeVersionBoxView', function () {
       expect(JSON.stringify(element)).to.be.equal(JSON.stringify(Em.Object.create({
         "buttons": [
           {
-            "text": Em.I18n.t('common.discard'),
+            "text": Em.I18n.t('common.hide'),
             "action": "confirmDiscardRepoVersion",
             "isDisabled": false
           }


Mime
View raw message