diff --git a/ambari-web/app/controllers/wizard/step3_controller.js b/ambari-web/app/controllers/wizard/step3_controller.js index 9a11e29c127..f4c90397140 100644 --- a/ambari-web/app/controllers/wizard/step3_controller.js +++ b/ambari-web/app/controllers/wizard/step3_controller.js @@ -330,16 +330,6 @@ App.WizardStep3Controller = App.WizardStepController.extend(App.ReloadPopupMixin this.removeHosts([hostInfo]); }, - /** - * Remove selected hosts (click-handler) - * @return App.ModalPopup - * @method removeSelectedHosts - */ - removeSelectedHosts: function () { - var selectedHosts = this.get('hosts').filterProperty('isChecked', true); - return this.removeHosts(selectedHosts); - }, - /** * Show popup with the list of hosts which are selected * @return App.ModalPopup diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index acf2a002eb3..b7f7cfa44c9 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -821,8 +821,7 @@ Em.I18n.translations = { 'installer.step2.refresh.table': 'REFRESH TABLE', 'installer.step3.header':'Confirm Hosts', - 'installer.step3.body':'Registering your hosts.
' + - 'Please confirm the host list and remove any hosts that you do not want to include in the cluster.', + 'installer.step3.body':'Registering your hosts. Please confirm the host list and remove any hosts that you do not want to include in the cluster.', 'installer.step3.hostLog.popup.header':'Registration log for {0}', 'installer.step3.hosts.remove.popup.header':'Remove Hosts', 'installer.step3.hosts.remove.popup.body':'Are you sure you want to remove the selected host(s)?', @@ -942,8 +941,6 @@ Em.I18n.translations = { 'installer.step3.warning.registeredHosts': '{0} Other Registered Hosts', 'installer.step3.warning.loading':'Please wait while the hosts are being checked for potential problems...', 'installer.step3.registeredHostsPopup': 'These are the hosts that have registered with the server, but do not appear in the list of hosts that you are adding.', - 'installer.step3.removeSelected':'Remove Selected', - 'installer.step3.retryFailed':'Retry Failed', 'installer.step3.hosts.status.registering':'Registering', 'installer.step3.hosts.status.installing':'Installing', 'installer.step3.hosts.bootLog.failed':'\nRegistration with the server failed.', @@ -3200,7 +3197,7 @@ Em.I18n.translations = { 'tableView.filters.all': 'All', 'tableView.filters.filtered': 'Filtered', 'tableView.filters.clearFilters': 'Clear filters', - 'tableView.filters.itemsPerPage': 'Items per page:', + 'tableView.filters.rowsPerPage': 'Rows per page:', 'tableView.filters.paginationInfo': '{0} - {1} of {2}', 'tableView.filters.clearAllFilters': 'clear filters', 'tableView.filters.showAll': 'Show All', diff --git a/ambari-web/app/styles/wizard.less b/ambari-web/app/styles/wizard.less index 0209589fccc..b18e95d17da 100644 --- a/ambari-web/app/styles/wizard.less +++ b/ambari-web/app/styles/wizard.less @@ -236,45 +236,18 @@ } #host-filter { - - ul { - margin: 3px; - font-size: 12px; - li.filter-status.active a { - text-decoration: none; - color: #fff; - } - li.filter-status.active, - li.filter-status.active:hover { - background-color: #666; - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - border-radius: 5px; - } - li.filter-status:hover { - background-color: #d8d8d8; - border-radius: 5px; - } - li.divider { - color: #666; - padding: 4px 2px; - } - li { - list-style: none; - display: block; - float: left; - padding: 4px; - a { - text-decoration: underline; - } - } - li.first { - font-weight: bold; - } + padding-top: 5px; + .nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus { + background-color: transparent; } } .progress { margin-bottom: 0; } + .pre-scrollable { + float: left; + max-height: 440px; + } #confirm-hosts-table { td.host { max-width: 290px; @@ -290,6 +263,19 @@ #display-action { visibility:visible; } + .step3-table-progress { + .progress { + height: 8px; + margin: 5px 5px 5px 0; + border-radius: 2px; + width: 80%; + } + } + .step3-table-action { + .icon { + color: #999; + } + } } #warningsSection { margin: 0px 10px; @@ -1027,4 +1013,4 @@ .filter-input { margin: 15px; -} \ No newline at end of file +} diff --git a/ambari-web/app/templates/common/pagination.hbs b/ambari-web/app/templates/common/pagination.hbs index f5b4fc2844b..2b30267ea03 100644 --- a/ambari-web/app/templates/common/pagination.hbs +++ b/ambari-web/app/templates/common/pagination.hbs @@ -17,7 +17,7 @@ }}
- {{t tableView.filters.itemsPerPage}} + {{t tableView.filters.rowsPerPage}} {{view view.rowsPerPageSelectView selectionBinding="view.dataView.displayLength" data-qa="pagination-select"}}
{{view.dataView.paginationInfo}}
diff --git a/ambari-web/app/templates/wizard/step3.hbs b/ambari-web/app/templates/wizard/step3.hbs index 0221d863d1e..cd200a58a34 100644 --- a/ambari-web/app/templates/wizard/step3.hbs +++ b/ambari-web/app/templates/wizard/step3.hbs @@ -19,137 +19,154 @@

{{t installer.step3.header}}

{{#if isSaved}} - + {{/if}}

{{t installer.step3.body}}

+
- {{#unless view.noHostsSelected}} - - {{/unless}} - {{#unless isRetryDisabled}} - - {{/unless}} - -
-
+
+
    {{#each category in view.categories}}
  • - + {{category.label}}
    • - {{#unless category.last}} -
  • |
    • - {{/unless}} +   {{/each}}
-
- - - - - - - - - - - - - - - - {{#if view.pageContent}} - {{#each host in view.pageContent}} - {{#view App.WizardHostView categoryBinding="controller.category" hostInfoBinding="host" data-qa="confirm-hosts-table-body-row"}} - -
{{t common.host}}{{t common.progress}}{{t common.status}}{{t common.action}} - {{view App.CheckboxView checkedBinding="view.pageChecked"}} -
- {{host.name}} - -
-
+
+
+
+ + + + + + + + + + + + + + + + {{#if view.pageContent}} + {{#each host in view.pageContent}} + {{#view App.WizardHostView categoryBinding="controller.category" hostInfoBinding="host" data-qa="confirm-hosts-table-body-row"}} + + + - - - + + + {{/view}} + {{/each}} + {{else}} + + - {{/view}} - {{/each}} - {{else}} - - - - {{/if}} - - + + {{/if}} + + - -
+ {{view App.CheckboxView checkedBinding="view.pageChecked"}} + {{t common.host}}{{t common.progress}}{{t common.status}}{{t common.action}}
+ {{view App.CheckboxView checkedBinding="host.isChecked" labelIdentifier="select-host-checkbox"}} + + {{host.name}} + +
+
+
- - 		- - {{host.bootStatusForDisplay}} - - - - - - - {{view App.CheckboxView checkedBinding="host.isChecked" labelIdentifier="select-host-checkbox"}} + + + {{host.bootStatusForDisplay}} + + + + + +
+ {{t hosts.table.noHosts}}
- {{t hosts.table.noHosts}} -
{{view App.PaginationView}}
-
- {{#if hasMoreRegisteredHosts}} -
- {{view.registeredHostsMessage}} -
- {{/if}} - {{#unless disableHostCheck}} -
- {{view.message}} - {{view.linkText}} - {{#unless isBootstrapFailed}} - {{#unless isWarningsLoaded}} - {{view App.SpinnerView data-qa="spinner"}} - {{/unless}} - {{/unless}} -
- {{/unless}} + +
+
+ {{#if hasMoreRegisteredHosts}} +
+ {{view.registeredHostsMessage}} +
+ {{/if}} + {{#unless disableHostCheck}} +
+ {{view.message}} + {{view.linkText}} + {{#unless isBootstrapFailed}} + {{#unless isWarningsLoaded}} + {{view App.SpinnerView data-qa="spinner"}} + {{/unless}} + {{/unless}} +
+ {{/unless}} +
+
-
- -