ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject ambari git commit: AMBARI-21797. Patch / Maint UI Minor Style Adjustments (alexantonenko)
Date Thu, 24 Aug 2017 16:48:56 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 4b047c37a -> 8e68463dc


AMBARI-21797. Patch / Maint UI Minor Style Adjustments (alexantonenko)


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

Branch: refs/heads/branch-2.6
Commit: 8e68463dc6ce2660c71b83846cd38ac4f16ffbdb
Parents: 4b047c3
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Wed Aug 23 22:28:53 2017 +0300
Committer: Jonathan Hurley <jhurley@hortonworks.com>
Committed: Thu Aug 24 12:46:22 2017 -0400

----------------------------------------------------------------------
 ambari-web/app/messages.js                      |  7 +++---
 ambari-web/app/styles/stack_versions.less       | 26 +++++++++++++-------
 .../stack_upgrade/upgrade_version_column.hbs    |  5 +++-
 .../stack_upgrade/upgrade_version_box_view.js   |  6 +++--
 .../upgrade_version_column_view.js              |  1 +
 5 files changed, 30 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/8e68463d/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index e08647f..d5cb9eb 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -218,6 +218,7 @@ Em.I18n.translations = {
   'common.duration': 'Duration',
   'common.reinstall': 'Re-Install',
   'common.revert': 'Revert',
+  'common.revert.patch': 'Revert Patch',
   'common.errorPopup.header': 'An error has been encountered',
   'common.use': 'Use',
   'common.stacks': 'Stacks',
@@ -1696,7 +1697,7 @@ Em.I18n.translations = {
   'admin.stackVersions.filter.upgradeReady': "Upgrade Ready ({0})",
   'admin.stackVersions.filter.installed': "Installed ({0})",
   'admin.stackVersions.filter.current': "Current ({0})",
-  'admin.stackVersions.filter.upgrading': "Upgrade/Downgrade In Process ({0})",
+  'admin.stackVersions.filter.upgrading': "Upgrade/Downgrade In Progress ({0})",
   'admin.stackVersions.filter.upgraded': "Ready to Finalize ({0})",
   'admin.stackVersions.upgrade.start.fail.title':'Upgrade could not be started',
   'admin.stackVersions.upgrade.installPackage.fail.title':'Packages could not be installed',
@@ -1726,11 +1727,11 @@ Em.I18n.translations = {
   'admin.stackVersions.version.performUpgrade': "Perform Upgrade",
   'admin.stackVersions.version.upgrade.pause': "Upgrade: Action Required",
   'admin.stackVersions.version.upgrade.notFinalized.warning': "The upgrade has not been finalized
yet. After the cluster is verified to be functional, do not forget to finalize the upgrade
as soon as possible (within a couple of days is highly recommended) as running the cluster
in unfinalized state causes extra resource requirements on HDFS.",
-  'admin.stackVersions.version.upgrade.running': "Upgrade: In Process",
+  'admin.stackVersions.version.upgrade.running': "Upgrade: In Progress",
   'admin.stackVersions.version.upgrade.aborted': "Upgrade: Aborted",
   'admin.stackVersions.version.upgrade.suspended': "Upgrade: Paused",
   'admin.stackVersions.version.downgrade.pause': "Downgrade: Action Required",
-  'admin.stackVersions.version.downgrade.running': "Downgrade: In Process",
+  'admin.stackVersions.version.downgrade.running': "Downgrade: In Progress",
   'admin.stackVersions.version.downgrade.aborted': "Downgrade: Aborted",
   'admin.stackVersions.version.downgrade.suspended': "Downgrade: Paused",
   'admin.stackUpgrade.state.paused.fail.header': "Pause Upgrade failed",

http://git-wip-us.apache.org/repos/asf/ambari/blob/8e68463d/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 381cd20..9d21a07 100644
--- a/ambari-web/app/styles/stack_versions.less
+++ b/ambari-web/app/styles/stack_versions.less
@@ -269,7 +269,7 @@
   }
   .version-column {
     min-height: 500px;
-    min-width: 175px;
+    min-width: 190px;
     margin: 15px 7px 0 7px;
     padding-top: 0;
     background-color: #efefef;
@@ -295,17 +295,15 @@
       margin: 0 0 -5px 0;
     }
     .icon-trash {
-      padding: 3px 5px;
+      padding: 2px 4px;
       border-radius: 15px;
-      border: 1px solid black;
+      border: 1px solid #000;
       font-size: 12px;
       cursor: pointer;
       background: white;
     }
     .state {
-      margin: 0 0 25px 0;
-      line-height: 20px;
-      padding-top: 0;
+      margin: 10px 0;
       .top-label {
         font-size: inherit;
         border-radius: 0;
@@ -322,8 +320,8 @@
         top: 100%;
         width: 0;
         height: 0;
-        border-left: 86px solid transparent;
-        border-right: 86px solid transparent;
+        border-left: 95px solid transparent;
+        border-right: 95px solid transparent;
         border-top: 10px solid @current-green;
         clear: both;
       }
@@ -342,6 +340,11 @@
           padding: 9px 5px;
         }
       }
+      .btn {
+        width: 100%;
+        border-radius: 0;
+        padding: 9px 5px;
+      }
       .open .dropdown-menu {
         min-width: 100px;
         right: 0;
@@ -349,7 +352,12 @@
     }
     .state.installing {
       padding-bottom: 5px;
-      margin: 10px 0px;
+      margin: 5px 0 15px 0;
+    }
+    .state.attach-top {
+      margin: 0 0 25px 0;
+      line-height: 20px;
+      padding-top: 0;
     }
     .services-section {
       width: 100%;

http://git-wip-us.apache.org/repos/asf/ambari/blob/8e68463d/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 96c22d5..91a39a4 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
@@ -20,7 +20,10 @@
   <i class="icon-exclamation-sign out-of-sync-badge"></i>
 {{/if}}
 
-<div {{bindAttr class="view.stateElement.isInstalling:installing :align-center :state
:repo-version-tooltip"}}>
+<div {{bindAttr class="view.stateElement.isInstalling:installing
+                       view.stateElement.isButton:attach-top
+                       view.stateElement.isCurrent:attach-top
+                       view.stateElement.isButtonGroup:attach-top :align-center :state :repo-version-tooltip"}}>
     {{#if view.stateElement.isButton}}
       <button class="btn btn-primary"
           {{action runAction target="view"}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/8e68463d/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 216d34e..83243a5 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
@@ -114,7 +114,8 @@ App.UpgradeVersionBoxView = Em.View.extend({
     'CURRENT': {
       isLabel: true,
       text: Em.I18n.t('common.current'),
-      class: 'label top-label label-success'
+      class: 'label top-label label-success',
+      isCurrent: true
     },
     'NOT_REQUIRED': {
       isButton: true,
@@ -146,7 +147,8 @@ App.UpgradeVersionBoxView = Em.View.extend({
       isLabel: true,
       text: Em.I18n.t('common.current'),
       class: 'label top-label label-success',
-      canBeReverted: true
+      canBeReverted: true,
+      isCurrent: true
     }
   },
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/8e68463d/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js
b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js
index 746873f..2c3e6ea 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js
@@ -27,6 +27,7 @@ App.UpgradeVersionColumnView = App.UpgradeVersionBoxView.extend({
   didInsertElement: function () {
     App.tooltip($('.out-of-sync-badge'), {title: Em.I18n.t('hosts.host.stackVersions.status.out_of_sync')});
     App.tooltip($('.not-upgradable'), {title: Em.I18n.t('admin.stackVersions.version.service.notUpgradable')});
+    App.tooltip($('.icon-trash'), {title: Em.I18n.t('common.revert.patch')});
     if (!this.get('content.isCompatible')) {
       App.tooltip(this.$(".repo-version-tooltip"), {
         title: Em.I18n.t('admin.stackVersions.version.noCompatible.tooltip')


Mime
View raw message