You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2014/09/30 20:11:35 UTC
git commit: AMBARI-7563 Slider View: Multiple issues which make
create Slider App wizard large. (Max Shepel via atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk 07e73ca2e -> 04688200d
AMBARI-7563 Slider View: Multiple issues which make create Slider App wizard large. (Max Shepel via atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/04688200
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/04688200
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/04688200
Branch: refs/heads/trunk
Commit: 04688200deb10a0425234b9956b4b2aa3630133d
Parents: 07e73ca
Author: atkach <at...@hortonworks.com>
Authored: Tue Sep 30 21:07:03 2014 +0300
Committer: atkach <at...@hortonworks.com>
Committed: Tue Sep 30 21:07:03 2014 +0300
----------------------------------------------------------------------
.../main/resources/ui/app/styles/common.less | 3 ++
.../main/resources/ui/app/styles/wizard.less | 44 +++++++++++---------
.../ui/app/templates/createAppWizard/step1.hbs | 8 ++--
.../ui/app/templates/createAppWizard/step2.hbs | 8 ++--
.../src/main/resources/ui/app/translations.js | 8 ++--
.../ui/app/views/create_app_wizard_view.js | 6 +--
6 files changed, 41 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/04688200/contrib/views/slider/src/main/resources/ui/app/styles/common.less
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/ui/app/styles/common.less b/contrib/views/slider/src/main/resources/ui/app/styles/common.less
index a61805d..a3cffbd 100644
--- a/contrib/views/slider/src/main/resources/ui/app/styles/common.less
+++ b/contrib/views/slider/src/main/resources/ui/app/styles/common.less
@@ -29,6 +29,9 @@ html {
}
.tooltip {
z-index: 1500;
+ .tooltip-inner {
+ text-align: left;
+ }
}
.popover {
max-width: 800px;
http://git-wip-us.apache.org/repos/asf/ambari/blob/04688200/contrib/views/slider/src/main/resources/ui/app/styles/wizard.less
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/ui/app/styles/wizard.less b/contrib/views/slider/src/main/resources/ui/app/styles/wizard.less
index c531865..d0eb4ae 100644
--- a/contrib/views/slider/src/main/resources/ui/app/styles/wizard.less
+++ b/contrib/views/slider/src/main/resources/ui/app/styles/wizard.less
@@ -29,23 +29,10 @@
font-weight: bold;
}
.slider-modal-body {
- height: 90%;
- max-height: 90%;
.wizard-content{
- min-height: 95%;
- padding-bottom: 49px;
background-color: #ffffff;
- }
- .container-fluid {
- height: 100%;
- .row {
- height: 100%;
- }
- .btn-area {
- position: absolute;
- right: 19px;
- bottom: 19px;
- left: 19px;
+ label {
+ font-weight: normal;
}
}
}
@@ -67,17 +54,28 @@
}
#step2 {
.table-container {
- max-height: 248px;
border: 1px solid #e3e3e3;
padding: 5px;
border-radius: 4px;
- overflow: hidden;
+ overflow: auto;
.components-table {
width: 100%;
border-spacing: 10px;
border-collapse: separate;
- input[type="text"]{
- width: 100px;
+ th {
+ padding-right: 1px;
+ }
+ .cell-narrow {
+ width: 4em;
+ }
+ .cell-wide {
+ width: 5em;
+ }
+ .cell-auto {
+ input {
+ width: 100%;
+ min-width: 7em;
+ }
}
}
margin-bottom: 30px;
@@ -87,9 +85,15 @@
select {
padding: 4px 0;
}
- .row {
+ hr {
.table-row();
}
+ label {
+ width: 100%;
+ }
+ .row {
+ margin: 5px 0;
+ }
.app-types-alert {
margin-top: 20px;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/04688200/contrib/views/slider/src/main/resources/ui/app/templates/createAppWizard/step1.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/ui/app/templates/createAppWizard/step1.hbs b/contrib/views/slider/src/main/resources/ui/app/templates/createAppWizard/step1.hbs
index feec2ea..500cbf3 100644
--- a/contrib/views/slider/src/main/resources/ui/app/templates/createAppWizard/step1.hbs
+++ b/contrib/views/slider/src/main/resources/ui/app/templates/createAppWizard/step1.hbs
@@ -18,7 +18,7 @@
<div id="step1">
<form role="form" class="form-horizontal">
<!-- Available Applications -->
- <h3>{{t wizard.step1.header}}</h3>
+ <strong>{{t wizard.step1.header}}</strong>
<div class="form-group row">
<div class="col-xs-3">
<label class="control-label">{{t wizard.step1.appTypes}}</label>
@@ -69,7 +69,7 @@
<!-- Scheduler Options -->
<hr />
<div class="row">
- <h3>{{t wizard.step1.schedulerOptions.label}}</h3>
+ <strong>{{t wizard.step1.schedulerOptions.label}}</strong>
</div>
<div class="row">
<div class="col-xs-3">
@@ -83,7 +83,7 @@
<!-- YARN Labels -->
<hr />
<div class="row">
- <h3>{{t wizard.step1.yarnLabels.label}}</h3>
+ <strong>{{t wizard.step1.yarnLabels.label}}</strong>
</div>
<div class="row">
<div class="col-xs-3">
@@ -116,7 +116,7 @@
<!-- Log Aggregation -->
<hr />
<div class="row">
- <h3>{{t wizard.step1.logAggregation.label}}</h3>
+ <strong>{{t wizard.step1.logAggregation.label}}</strong>
</div>
<div class="row">
<div class="col-xs-3">
http://git-wip-us.apache.org/repos/asf/ambari/blob/04688200/contrib/views/slider/src/main/resources/ui/app/templates/createAppWizard/step2.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/ui/app/templates/createAppWizard/step2.hbs b/contrib/views/slider/src/main/resources/ui/app/templates/createAppWizard/step2.hbs
index da82e12..bf18b16 100644
--- a/contrib/views/slider/src/main/resources/ui/app/templates/createAppWizard/step2.hbs
+++ b/contrib/views/slider/src/main/resources/ui/app/templates/createAppWizard/step2.hbs
@@ -34,15 +34,15 @@
{{#each}}
<tr>
<td>{{displayName}}</td>
- <td>{{input valueBinding="numInstances"}}</td>
- <td>{{input valueBinding="yarnMemory"}}</td>
- <td>{{input valueBinding="yarnCPU"}}</td>
+ <td>{{input class="cell-narrow" valueBinding="numInstances"}}</td>
+ <td>{{input class="cell-wide" valueBinding="yarnMemory"}}</td>
+ <td>{{input class="cell-narrow" valueBinding="yarnCPU"}}</td>
<td>
<div {{bs-bind-tooltip content=view.checkBoxPopover}}>
{{input type="checkbox" checkedBinding="yarnLabelChecked" class="checkbox-inline"}}
</div>
</td>
- <td>
+ <td class="cell-auto">
<div {{bs-bind-tooltip content=view.yarnLabelPopover}}>
{{input valueBinding="yarnLabel" disabledBinding="yarnLabelNotChecked"}}
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/04688200/contrib/views/slider/src/main/resources/ui/app/translations.js
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/ui/app/translations.js b/contrib/views/slider/src/main/resources/ui/app/translations.js
index acc1c9c..5141a84 100644
--- a/contrib/views/slider/src/main/resources/ui/app/translations.js
+++ b/contrib/views/slider/src/main/resources/ui/app/translations.js
@@ -130,10 +130,10 @@ Em.I18n.translations = {
'wizard.step1.noAppTypesError': 'No Slider Application packages have been installed on this server. Please contact your Ambari server administrator to install Slider Application packages into /var/lib/ambari-server/resources/apps/ folder.',
'wizard.step2.name': 'Allocate Resources',
'wizard.step2.header': ' application requires resources to be allocated on the cluster. Provide resource allocation requests for each component of the application below.',
- 'wizard.step2.table.instances': 'Number of Instances',
- 'wizard.step2.table.memory': 'YARN Memory (MB)',
- 'wizard.step2.table.cpu': 'YARN CPU Cores',
- 'wizard.step2.table.yarnLabels': 'YARN Lables',
+ 'wizard.step2.table.instances': 'Instances',
+ 'wizard.step2.table.memory': 'Memory (MB)',
+ 'wizard.step2.table.cpu': 'CPU Cores',
+ 'wizard.step2.table.yarnLabels': 'YARN Labels',
'wizard.step2.table.popoverCheckbox': 'Check box to enable YARN labels on component',
'wizard.step2.table.popoverLabel': 'Provide YARN label to make component run on labeled hosts. Empty value would make component run on non-labeled hosts.',
'wizard.step2.error.numbers': 'All fields should be filled. Only integer numbers allowed.',
http://git-wip-us.apache.org/repos/asf/ambari/blob/04688200/contrib/views/slider/src/main/resources/ui/app/views/create_app_wizard_view.js
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/ui/app/views/create_app_wizard_view.js b/contrib/views/slider/src/main/resources/ui/app/views/create_app_wizard_view.js
index e57b1ea..d99d2e7 100644
--- a/contrib/views/slider/src/main/resources/ui/app/views/create_app_wizard_view.js
+++ b/contrib/views/slider/src/main/resources/ui/app/views/create_app_wizard_view.js
@@ -72,9 +72,7 @@ App.CreateAppWizardView = Ember.View.extend({
setHeight: function () {
var height = $(window).height() * 0.8;
- $('#createAppWizard').css({
- height: height + 'px',
- marginTop: -(height / 2) + 'px'
- });
+ $('.slider-modal-body').css('max-height', height + 'px');
+ $('#createAppWizard').css('margin-top', -(height / 2) + 'px');
}
});