You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2017/10/19 12:55:20 UTC
[34/50] [abbrv] ambari git commit: AMBARI-22255. Make the install
modal full screen (alexantonenko)
AMBARI-22255. Make the install modal full screen (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/448d6a8b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/448d6a8b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/448d6a8b
Branch: refs/heads/branch-3.0-perf
Commit: 448d6a8b235583a20206b790bee8170de32f27b7
Parents: ce29f8c
Author: Alex Antonenko <aa...@hortonworks.com>
Authored: Tue Oct 17 20:26:49 2017 +0300
Committer: Alex Antonenko <aa...@hortonworks.com>
Committed: Tue Oct 17 20:26:49 2017 +0300
----------------------------------------------------------------------
ambari-web/app/messages.js | 1 +
ambari-web/app/routes/installer.js | 3 +--
ambari-web/app/routes/main.js | 1 +
ambari-web/app/styles/application.less | 3 +--
ambari-web/app/styles/common.less | 2 +-
ambari-web/app/styles/wizard.less | 24 +++++++++++++++++++++++-
ambari-web/app/templates/installer.hbs | 2 +-
7 files changed, 29 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/448d6a8b/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 3c4f038..0123356 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -21,6 +21,7 @@ Em.I18n.translations = {
'app.name':'Ambari',
'app.name.subtitle':'Ambari - {0}',
'app.name.subtitle.experimental':'Ambari Experimental',
+ 'app.name.subtitle.installer':'Cluster Install Wizard',
'app.reloadPopup.link': 'Reload Page',
'app.reloadPopup.text': 'Trying to connect to server...',
'app.reloadPopup.noClusterName.text': 'Failed to retrieve cluster name, trying to reload...',
http://git-wip-us.apache.org/repos/asf/ambari/blob/448d6a8b/ambari-web/app/routes/installer.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/installer.js b/ambari-web/app/routes/installer.js
index ec8f1b9..f1f6659 100644
--- a/ambari-web/app/routes/installer.js
+++ b/ambari-web/app/routes/installer.js
@@ -35,8 +35,7 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
// check server/web client versions match
App.router.get('installerController').checkServerClientVersion().done(function () {
- var name = 'Cluster Install Wizard';
- $('title').text('Ambari - ' + name);
+ $('title').text(Em.I18n.t('app.name.subtitle').format(Em.I18n.t('app.name.subtitle.installer')));
$('#main').addClass('install-wizard-content');
App.router.get('mainViewsController').loadAmbariViews();
http://git-wip-us.apache.org/repos/asf/ambari/blob/448d6a8b/ambari-web/app/routes/main.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js
index 7ed18de..d1f9012 100644
--- a/ambari-web/app/routes/main.js
+++ b/ambari-web/app/routes/main.js
@@ -40,6 +40,7 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
clusterController.loadAmbariProperties().complete(function () {
App.router.get('mainViewsController').loadAmbariViews();
clusterController.loadClusterName(false).done(function () {
+ $('#main').removeClass('install-wizard-content');
if (App.get('testMode')) {
router.get('mainController').initialize();
} else {
http://git-wip-us.apache.org/repos/asf/ambari/blob/448d6a8b/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index 099f3cf..d40ab8e 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -80,7 +80,6 @@ footer {
color: #666;
margin-top: -1 * @footer-height - 1;
height: @footer-height - 60px;
- margin-left: @side-navigation-width;
}
.editable-list-container {
@@ -2807,4 +2806,4 @@ a.abort-icon:hover {
.container-wrap-table {
padding: 0 10px;
background-color: @diff-background-equal;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/448d6a8b/ambari-web/app/styles/common.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/common.less b/ambari-web/app/styles/common.less
index 7753a59..7202342 100644
--- a/ambari-web/app/styles/common.less
+++ b/ambari-web/app/styles/common.less
@@ -186,7 +186,7 @@
}
@footer-height: 100px;
-@side-navigation-width: 190px;
+@side-navigation-width: 230px;
@default-font-size: 14px;
@smaller-font-size: 12px;
http://git-wip-us.apache.org/repos/asf/ambari/blob/448d6a8b/ambari-web/app/styles/wizard.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/wizard.less b/ambari-web/app/styles/wizard.less
index 5f60378..cb9eb92 100644
--- a/ambari-web/app/styles/wizard.less
+++ b/ambari-web/app/styles/wizard.less
@@ -659,6 +659,28 @@
}
}
+.install-wizard-content {
+ #top-nav .navbar.navbar-static-top {
+ margin-bottom: 0;
+ }
+ .navbar-static-top > .main-container,
+ >.main-container {
+ width: 100%;
+ }
+ >.main-container {
+ padding: 0;
+ .wizard {
+ border: none;
+ .wizard-nav {
+ width: 250px;
+ }
+ .wizard-content.col-md-9 {
+ width: calc(~"100% - 250px");
+ }
+ }
+ }
+}
+
@media all and (max-width: 2560px) {
.wizard-content {
#serviceConfig {
@@ -675,4 +697,4 @@
}
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/448d6a8b/ambari-web/app/templates/installer.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/installer.hbs b/ambari-web/app/templates/installer.hbs
index f63664a..73ecff4 100644
--- a/ambari-web/app/templates/installer.hbs
+++ b/ambari-web/app/templates/installer.hbs
@@ -23,7 +23,7 @@
{{else}}
<div class="wizard">
<div class="wizard-body row">
- <div class="wizard-nav col-md-3">
+ <div class="wizard-nav">
<ul class="nav nav-pills nav-stacked" {{QAAttr "wizard-nav"}}>
<li {{QAAttr "wizard-nav-step"}} {{bindAttr class="isStep0:active view.isStep0Disabled:disabled view.isStep0Completed:completed"}}><a href="javascript:void(null);" {{action gotoStep0 target="controller"}}><i class="step-marker"><span class="step-index">0</span></i><p class="step-name">{{t installer.step0.header}}</p></a></li>
<li {{QAAttr "wizard-nav-step"}} {{bindAttr class="isStep1:active view.isStep1Disabled:disabled view.isStep1Completed:completed"}}><a href="javascript:void(null);" {{action gotoStep1 target="controller"}}><i class="step-marker"><span class="step-index">1</span></i><p class="step-name">{{t installer.step1.header}}</p></a></li>