Repository: ambari Updated Branches: refs/heads/trunk cda44fe2f -> 24d64fc9b
AMBARI-18849 Stack Versions page: fix styles. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/24d64fc9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/24d64fc9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/24d64fc9 Branch: refs/heads/trunk Commit: 24d64fc9b24099ba74630c20f7cf8a4414542786 Parents: cda44fe Author: Andrii Tkach <[email protected]> Authored: Thu Nov 10 18:16:28 2016 +0200 Committer: Andrii Tkach <[email protected]> Committed: Thu Nov 10 19:18:26 2016 +0200 ---------------------------------------------------------------------- .../main/admin/stack_and_upgrade_controller.js | 4 ++-- .../add_alert_definition/step1_controller.js | 2 +- ambari-web/app/routes/stack_upgrade_routes.js | 4 ++-- ambari-web/app/styles/application.less | 5 +++-- ambari-web/app/styles/stack_versions.less | 12 ++++++++--- .../stack_upgrade/stack_upgrade_wizard.hbs | 16 +++++++-------- .../main/admin/stack_upgrade/versions.hbs | 4 ++-- .../admin/stack_upgrade/upgrade_history_view.js | 21 ++++++++++---------- 8 files changed, 38 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/24d64fc9/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 4429bf4..35756cd 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 @@ -148,7 +148,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage, Em.Object.create({ displayName: Em.I18n.t('admin.stackVersions.version.upgrade.upgradeOptions.EU.title'), type: 'NON_ROLLING', - icon: "glyphicon glyphicon-bolt", + icon: "icon-bolt", description: Em.I18n.t('admin.stackVersions.version.upgrade.upgradeOptions.EU.description'), selected: false, allowed: true, @@ -162,7 +162,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage, Em.Object.create({ displayName: Em.I18n.t('admin.stackVersions.version.upgrade.upgradeOptions.HOU.title'), type: 'HOST_ORDERED', - icon: "glyphicon glyphicon-bolt", + icon: "icon-bolt", description: '', selected: false, allowed: false, http://git-wip-us.apache.org/repos/asf/ambari/blob/24d64fc9/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js b/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js index ae9471c..2d4f338 100644 --- a/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js +++ b/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js @@ -28,7 +28,7 @@ App.AddAlertDefinitionStep1Controller = Em.Controller.extend({ */ alertDefinitionsTypes: [ Em.Object.create({value: 'PORT', isActive: false, icon: 'glyphicon glyphicon-signal'}), - Em.Object.create({value: 'METRIC', isActive: false, icon: 'glyphicon glyphicon-bolt'}), + Em.Object.create({value: 'METRIC', isActive: false, icon: 'icon-bolt'}), Em.Object.create({value: 'WEB', isActive: false, icon: 'glyphicon glyphicon-globe'}), Em.Object.create({value: 'AGGREGATE', isActive: false, icon: 'glyphicon glyphicon-plus-sign-alt'}), Em.Object.create({value: 'SCRIPT', isActive: false, icon: 'glyphicon glyphicon-code'}), http://git-wip-us.apache.org/repos/asf/ambari/blob/24d64fc9/ambari-web/app/routes/stack_upgrade_routes.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/stack_upgrade_routes.js b/ambari-web/app/routes/stack_upgrade_routes.js index 7cf83b6..f95dd6e 100644 --- a/ambari-web/app/routes/stack_upgrade_routes.js +++ b/ambari-web/app/routes/stack_upgrade_routes.js @@ -57,8 +57,8 @@ module.exports = App.WizardRoute.extend({ * fit height of scrollable block inside of modal body */ fitInnerHeight: function () { - var block = this.$().find('#modal > .modal-body'); - var scrollable = this.$().find('#modal .scrollable-block'); + var block = this.$().find('.modal .modal-body'); + var scrollable = this.$().find('.modal .scrollable-block'); scrollable.css('max-height', Number(block.css('max-height').slice(0, -2)) - block.height()); block.css('max-height', 'none'); http://git-wip-us.apache.org/repos/asf/ambari/blob/24d64fc9/ambari-web/app/styles/application.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index df2d054..9d7d949 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -566,6 +566,7 @@ table.diff { } .nav-list.nav-services { + margin-bottom: 5px; .glyphicon-caption { .alerts-count { position: relative; @@ -2589,7 +2590,7 @@ a.services-menu-blocks{ } .quick-links-wrapper { - margin-top: -40px; + margin-top: -60px; position: relative; left: 280px; .nav-pills.move { @@ -2623,7 +2624,7 @@ a.services-menu-blocks{ .service-button { text-align: right; margin-bottom: 5px; - margin-top: -40px; + margin-top: -60px; margin-left: 10px; min-height: 30px; .btn-group { http://git-wip-us.apache.org/repos/asf/ambari/blob/24d64fc9/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 b183303..ce6a595 100644 --- a/ambari-web/app/styles/stack_versions.less +++ b/ambari-web/app/styles/stack_versions.less @@ -140,6 +140,10 @@ .hosts-section { padding-bottom: 16px; } + .out-of-sync-badge { + top: 0; + left: 0; + } } } @@ -187,7 +191,7 @@ margin: 15px 0; line-height: 30px; padding-top: 5px; - height: 30px; + height: 35px; i { color: #0088cc; font-size: 16px; @@ -294,8 +298,9 @@ } } .state { - margin: 5px 0px 15px 0px; + margin: 5px 0 15px 0; line-height: 20px; + height: 35px; .label-success { line-height: 30px; } @@ -315,7 +320,8 @@ text-align: center; padding-bottom: 4px; .service-version-info { - margin-bottom: 14px; + line-height: 20px; + margin-bottom: 12px; text-align: center; span.label { padding: 5px 15px; http://git-wip-us.apache.org/repos/asf/ambari/blob/24d64fc9/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs index 6548ea0..b8a38e0 100644 --- a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs +++ b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs @@ -39,7 +39,7 @@ {{#if view.isLoaded}} <div> {{#if view.runningItem}} - <div class="box details-box row"> + <div class="panel panel-default details-box row"> <div class="row col-md-12"> <div class="pull-left col-md-6">{{t admin.stackUpgrade.dialog.inProgress}} {{view.runningItem.text}}</div> {{#if view.isDetailsOpened}} @@ -59,7 +59,7 @@ {{/if}} {{#if view.failedItem}} {{#unless view.isSlaveComponentFailuresItem}} - <div class="box details-box row"> + <div class="panel panel-default details-box row"> <div class="row col-md-12"> <div class="pull-left col-md-6">{{t admin.stackUpgrade.dialog.failed}} {{view.failedItem.text}}</div> {{#if view.isDetailsOpened}} @@ -95,7 +95,7 @@ {{/unless}} {{/if}} {{#if view.plainManualItem}} - <div class="box details-box"> + <div class="panel panel-default details-box"> <p class="manual-steps-title"><strong>{{t admin.stackUpgrade.dialog.manual}}</strong></p> {{#each message in view.manualItem.messages}} <p class="manual-steps-content">{{message}}</p> @@ -119,7 +119,7 @@ </div> {{/if}} {{#if view.isFinalizeItem}} - <div class="box details-box"> + <div class="panel panel-default details-box"> <p class="manual-steps-title"><strong>{{t admin.stackUpgrade.dialog.manual}}</strong></p> {{#if isDowngrade}} <p class="manual-steps-content">{{t admin.stackUpgrade.finalize.message.downgrade}}</p> @@ -156,7 +156,7 @@ </div> {{/if}} {{#if view.isSlaveComponentFailuresItem}} - <div class="box details-box"> + <div class="panel panel-default details-box"> <p class="manual-steps-title"><strong>{{t admin.stackUpgrade.dialog.manual}}</strong></p> <div class="slave-failures-info"> <p> @@ -202,7 +202,7 @@ </div> {{/if}} {{#if view.isServiceCheckFailuresItem}} - <div class="box details-box"> + <div class="panel panel-default details-box"> <p class="manual-steps-title"><strong>{{t admin.stackUpgrade.dialog.manual}}</strong></p> {{#if areServiceCheckFailuresServicenamesLoaded}} @@ -260,14 +260,14 @@ </div> {{/if}} {{#if view.noActiveItem}} - <div class="box details-box"> + <div class="panel panel-default details-box"> <div> {{t admin.stackUpgrade.dialog.notActive}} </div> </div> {{/if}} {{#if App.upgradeSuspended}} - <div class="box details-box"> + <div class="panel panel-default details-box"> <label class="message"> {{#if isDowngrade}} {{t admin.stackUpgrade.dialog.suspended.downgrade}} http://git-wip-us.apache.org/repos/asf/ambari/blob/24d64fc9/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs index 6e45868..a82aad6 100644 --- a/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs +++ b/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs @@ -42,7 +42,7 @@ </div> </div> <div id="versions-section" class="row col-md-12"> - <div class="col-md-2 left-menu-table"> + <div class="col-md-3 left-menu-table"> <table class="table"> <thead> </thead> @@ -55,7 +55,7 @@ </tbody> </table> </div> - <div class="col-md-10 versions-slides"> + <div class="col-md-9 versions-slides"> {{#if isLoaded}} <div class="versions-slides-bar"> {{#each version in view.repoVersionsDisplay}} http://git-wip-us.apache.org/repos/asf/ambari/blob/24d64fc9/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js index fda0c7e..31e1478 100644 --- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js +++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js @@ -277,19 +277,20 @@ App.MainAdminStackUpgradeHistoryView = App.TableView.extend(App.TableServerViewM this.set('isReady', true); }, - showUpgradeHistoryRecord: function(event) { - var record = event.context + showUpgradeHistoryRecord: function (event) { + var record = event.context; var title = ''; var direction = App.format.normalizeName(record.get('direction')); - var type = record.get('upgradeType') - if ('ROLLING' == type) + var type = record.get('upgradeType'); + if ('ROLLING' === type) { type = App.format.normalizeName(type); - else if ('NON_ROLLING' == type) + } else if ('NON_ROLLING' === type) { type = 'Express' + } title = Em.I18n.t('admin.stackVersions.upgradeHistory.record.title').format(type, direction, record.get('fromVersion')); - this.get('controller').set('currentUpgradeRecord', record) + this.get('controller').set('currentUpgradeRecord', record); App.ModalPopup.show({ classNames: ['wizard-modal-wrapper'], @@ -304,11 +305,11 @@ App.MainAdminStackUpgradeHistoryView = App.TableView.extend(App.TableServerViewM this.fitInnerHeight(); }, fitInnerHeight: function () { - var block = this.$().find('#modal > .modal-body'); - var scrollable = this.$().find('#modal .scrollable-block'); + var block = this.$().find('.modal .modal-body'); + var scrollable = this.$().find('.modal .scrollable-block'); scrollable.css('max-height', Number(block.css('max-height').slice(0, -2)) - block.height()); block.css('max-height', 'none'); - }, + } }); - }, + } });
