Skip to content

[AMBARI-22712] Update install Wizard layout. Fourth patch. #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aleksandrkovalenko merged 2 commits into from
Feb 1, 2018
Merged

[AMBARI-22712] Update install Wizard layout. Fourth patch. #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d94cfe3
AMBARI-22712. Update install Wizard layout. Fourth patch. (akovalenko)
aleksandrkovalenko Feb 1, 2018
d3bac35
AMBARI-22712. Update install Wizard layout. Fourth patch. (akovalenko)
aleksandrkovalenko Feb 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions ambari-web/app/styles/wizard.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,12 @@
.glyphicon-asterisks {
color: #00688B;
}
.checkbox-cell {
padding-top: 4px;
}
.checkbox-row {
width: 47px;
}
}
#step6 {
.pre-scrollable {
Expand All @@ -250,6 +256,7 @@
margin: 0;
}
.host-component-checkbox {
line-height: 17px;
font-size: 12px;
top: 0px;
}
Expand Down Expand Up @@ -770,6 +777,3 @@
}
}

.checkbox-row {
width: 47px;
}
4 changes: 2 additions & 2 deletions ambari-web/app/templates/wizard/step4.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
{{#each service in controller.fileSystems}}
{{#unless service.isHiddenOnSelectServicePage}}
<tr {{QAAttr "service-row"}} {{bindAttr class="service.isSelected:active service.isSelected:service-selected"}} {{action toggleCheckBox service target="view"}} >
<td>
<td class="checkbox-cell">
<div class="checkbox">
{{view App.CheckboxView checkboxClassNamesBinding="service.serviceName" data-qa="toggle-service"
disabledBinding="service.isDisabled"
Expand Down Expand Up @@ -74,7 +74,7 @@
{{#unless service.isHiddenOnSelectServicePage}}
{{#unless service.isDFS}}
<tr {{QAAttr "service-row"}} {{bindAttr class="service.isSelected:active service.isSelected:service-selected"}} {{action toggleCheckBox service target="view"}}>
<td>
<td class="checkbox-cell">
<div class="checkbox">
{{view App.CheckboxView checkboxClassNamesBinding="service.serviceName" data-qa="toggle-service"
disabledBinding="service.isDisabled"
Expand Down
4 changes: 2 additions & 2 deletions ambari-web/app/templates/wizard/step8.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,10 @@
{{/if}}
{{t common.deploy}} &rarr;
</button>
<button type="button" class="btn btn-info pull-right" {{action printReview target="view"}}>{{t common.print}}</button>
<button type="button" class="btn btn-secondary pull-right" {{action printReview target="view"}}>{{t common.print}}</button>
<button type="button" {{bindAttr class=":btn :btn-primary :pull-right :mrm controller.showDownloadCsv::hide"}} {{action downloadCSV target="controller"}}>{{t admin.kerberos.wizard.step5.downloadCSV}}</button>
{{#unless App.router.clusterInstallCompleted}}
<button type="button" class="btn btn-success pull-right" {{action generateBlueprintConfirmation target="controller"}}><i class="glyphicon glyphicon-download-alt"></i>&nbsp;
<button type="button" class="btn btn-secondary pull-right" {{action generateBlueprintConfirmation target="controller"}}><i class="glyphicon glyphicon-download-alt"></i>&nbsp;
{{t common.generate.blueprint}}
</button>
{{/unless}}
Expand Down