This is an automated email from the ASF dual-hosted git repository.
akovalenko pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 9916dcd AMBARI-22712. Update install Wizard layout. Third patch.
(akovalenko)
9916dcd is described below
commit 9916dcdda3a8707f3310b95811c348be05fbdccb
Author: Aleksandr Kovalenko <[email protected]>
AuthorDate: Mon Jan 29 19:07:08 2018 +0200
AMBARI-22712. Update install Wizard layout. Third patch. (akovalenko)
---
ambari-web/app/styles/wizard.less | 8 ++++++++
ambari-web/app/templates/wizard/step3.hbs | 2 +-
ambari-web/app/templates/wizard/step4.hbs | 27 ++++++++++++++-------------
3 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/ambari-web/app/styles/wizard.less
b/ambari-web/app/styles/wizard.less
index 316b623..1d0bf3c 100644
--- a/ambari-web/app/styles/wizard.less
+++ b/ambari-web/app/styles/wizard.less
@@ -113,6 +113,10 @@
.compact-panel-heading {
padding: 10px;
}
+ .hosts-panel {
+ padding-left: 0;
+ padding-right: 0;
+ }
.page-bar {
border: none;
}
@@ -764,4 +768,8 @@
}
}
}
+}
+
+.checkbox-row {
+ width: 47px;
}
\ No newline at end of file
diff --git a/ambari-web/app/templates/wizard/step3.hbs
b/ambari-web/app/templates/wizard/step3.hbs
index e140b0b..547df11 100644
--- a/ambari-web/app/templates/wizard/step3.hbs
+++ b/ambari-web/app/templates/wizard/step3.hbs
@@ -57,7 +57,7 @@
</div>
<div class="clearfix"></div>
</div>
- <div class="panel-body">
+ <div class="panel-body hosts-panel">
<div class="pre-scrollable col-sm-12" style="max-height: 440px;">
<table style="table-layout: fixed" id="confirm-hosts-table"
class="table table-hover" {{QAAttr "confirm-hosts-table"}}>
<thead>
diff --git a/ambari-web/app/templates/wizard/step4.hbs
b/ambari-web/app/templates/wizard/step4.hbs
index b738f69..f3d9c58 100644
--- a/ambari-web/app/templates/wizard/step4.hbs
+++ b/ambari-web/app/templates/wizard/step4.hbs
@@ -24,6 +24,7 @@
<table class="table table-hover">
<thead>
<tr>
+ <th class="checkbox-row"></th>
<th {{QAAttr "service-name-header"}} class="col-md-3">{{t
common.service}}</th>
<th {{QAAttr "service-version-header"}} id="service-version">{{t
common.version}}</th>
<th {{QAAttr "service-description-header"}}
id="service-description">{{t common.description}}</th>
@@ -33,17 +34,17 @@
{{#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 {{QAAttr
"service-name"}}>{{service.displayNameOnSelectServicePage}}</td>
- <td {{QAAttr
"service-version"}}>{{service.serviceVersionDisplay}}</td>
- <td {{QAAttr "service-description"}}>{{{service.comments}}}</td>
<td>
<div class="checkbox">
{{view App.CheckboxView
checkboxClassNamesBinding="service.serviceName" data-qa="toggle-service"
- disabledBinding="service.isDisabled"
- checkedBinding="service.isSelected"
+ disabledBinding="service.isDisabled"
+ checkedBinding="service.isSelected"
}}
</div>
</td>
+ <td {{QAAttr
"service-name"}}>{{service.displayNameOnSelectServicePage}}</td>
+ <td {{QAAttr
"service-version"}}>{{service.serviceVersionDisplay}}</td>
+ <td {{QAAttr "service-description"}}>{{{service.comments}}}</td>
</tr>
{{/unless}}
{{/each}}
@@ -60,12 +61,12 @@
<table class="table table-hover">
<thead>
<tr>
- <th {{QAAttr "service-name-header"}} class="col-md-3">{{t
common.service}}</th>
- <th {{QAAttr "service-version-header"}} id="service-version">{{t
common.version}}</th>
- <th {{QAAttr "service-description-header"}}
id="service-description">{{t common.description}}</th>
<th>
{{view App.CheckboxView data-qa="toggle-all"
disabledBinding="isInstalled" checkedBinding="isAllChecked"}}
</th>
+ <th {{QAAttr "service-name-header"}} class="col-md-3">{{t
common.service}}</th>
+ <th {{QAAttr "service-version-header"}} id="service-version">{{t
common.version}}</th>
+ <th {{QAAttr "service-description-header"}}
id="service-description">{{t common.description}}</th>
</tr>
</thead>
<tbody>
@@ -73,16 +74,16 @@
{{#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 {{QAAttr
"service-name"}}>{{service.displayNameOnSelectServicePage}}</td>
- <td {{QAAttr
"service-version"}}>{{service.serviceVersionDisplay}}</td>
- <td {{QAAttr
"service-description"}}>{{{service.comments}}}</td>
<td>
<div class="checkbox">
{{view App.CheckboxView
checkboxClassNamesBinding="service.serviceName" data-qa="toggle-service"
- disabledBinding="service.isDisabled"
- checkedBinding="service.isSelected" }}
+ disabledBinding="service.isDisabled"
+ checkedBinding="service.isSelected" }}
</div>
</td>
+ <td {{QAAttr
"service-name"}}>{{service.displayNameOnSelectServicePage}}</td>
+ <td {{QAAttr
"service-version"}}>{{service.serviceVersionDisplay}}</td>
+ <td {{QAAttr
"service-description"}}>{{{service.comments}}}</td>
</tr>
{{/unless}}
{{/unless}}
--
To stop receiving notification emails like this one, please contact
[email protected].
