You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2016/11/28 19:23:28 UTC
[34/50] [abbrv] ambari git commit: AMBARI-18984 Test and fix new
tables styles on Ambari (part 5). (ababiichuk)
AMBARI-18984 Test and fix new tables styles on Ambari (part 5). (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/14d63dd9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/14d63dd9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/14d63dd9
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 14d63dd9b4241ef5cf6624c3ca3d5a1f303bc68c
Parents: 3081aec
Author: ababiichuk <ab...@hortonworks.com>
Authored: Thu Nov 24 13:20:26 2016 +0200
Committer: ababiichuk <ab...@hortonworks.com>
Committed: Thu Nov 24 13:20:26 2016 +0200
----------------------------------------------------------------------
ambari-web/app/messages.js | 2 +-
ambari-web/app/styles/alerts.less | 75 +----
ambari-web/app/styles/application.less | 123 ++------
ambari-web/app/styles/modal_popups.less | 67 +---
ambari-web/app/styles/stack_versions.less | 6 +-
ambari-web/app/styles/wizard.less | 4 -
.../templates/common/configs/overrideWindow.hbs | 2 +-
.../templates/common/host_progress_popup.hbs | 316 +++++++++++--------
.../common/modal_popups/alerts_popup.hbs | 80 +++--
.../modal_popups/dependent_configs_list.hbs | 2 +-
ambari-web/app/templates/experimental.hbs | 2 +-
.../templates/main/admin/service_auto_start.hbs | 70 ++--
.../admin/stack_upgrade/edit_repositories.hbs | 52 +--
.../stack_upgrade/stack_upgrade_wizard.hbs | 4 +-
.../stack_upgrade/upgrade_history_details.hbs | 4 +-
.../main/admin/stack_upgrade/upgrade_task.hbs | 4 +-
.../alerts/add_definition_to_group_popup.hbs | 2 +-
.../main/host/bulk_operation_confirm_popup.hbs | 2 +-
ambari-web/app/templates/wizard/step1.hbs | 2 +-
.../wizard/step9/step9HostTasksLogPopup.hbs | 88 +++---
ambari-web/app/utils/host_progress_popup.js | 5 +-
ambari-web/app/views/main/host.js | 5 +-
ambari-web/app/views/wizard/step3_view.js | 2 +-
.../views/wizard/step9/hostLogPopupBody_view.js | 2 +
24 files changed, 414 insertions(+), 507 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/14d63dd9/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index aa4e2aa..a1d84a3 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1700,7 +1700,7 @@ Em.I18n.translations = {
'admin.stackVersions.upgrade.installPackage.fail.title':'Packages could not be installed',
'admin.stackVersions.upgrade.installPackage.fail.timeout':'Request timed out.',
- 'admin.stackVersions.editRepositories.info': 'Provide Base URLs for the Operating Systems you are configuring. Uncheck all other Operating Systems.',
+ 'admin.stackVersions.editRepositories.info': 'Provide Base URLs for the Operating Systems you are configuring.',
'admin.stackVersions.editRepositories.validation.warning': 'Some of the repositories failed validation. Make changes to the base url or skip validation if you are sure that urls are correct',
'admin.stackVersions.version.install.confirm': 'You are about to install packages for version <strong>{0}</strong> on all hosts.',
'admin.stackVersions.version.linkTooltip': 'Click to Edit Repositories',
http://git-wip-us.apache.org/repos/asf/ambari/blob/14d63dd9/ambari-web/app/styles/alerts.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/alerts.less b/ambari-web/app/styles/alerts.less
index bf3eaf3..77cc13c 100644
--- a/ambari-web/app/styles/alerts.less
+++ b/ambari-web/app/styles/alerts.less
@@ -416,11 +416,6 @@
.modal-body, .modal-footer, .modal-header {
min-width: 600px;
}
- #alert-info {
- .alert-list-wrap:hover {
- background-color: #e6e6e6;
- }
- }
}
.service-alerts {
@@ -444,76 +439,16 @@
}
.alerts-popup-wrap {
- .trim_hostname{
- display: block;
- overflow: hidden;
- text-overflow: ellipsis;
- }
- .top-wrap {
- width: 100%;
- border-bottom: 1px solid #CCC;
- text-align: center;
- font-size: 15px;
- padding: 0 0 20px 0;
- height: 20px;
- .name-top {
- width: 32%;
- padding-left: 10px;
- }
- .service-top {
- width: 31%;
- padding-left: 10px;
- }
- .status-top,.name-top,.service-top,.last-triggered-top {
- float: left;
- text-align: left;
- }
- }
- #alert-info{
+ #alert-info {
overflow: auto;
max-height: 340px;
- width: 100%;
.alert-list-wrap {
padding: 10px 5px;
- border-top: 1px solid #CCC;
- border-bottom: 1px solid #CCC;
- }
- .alert-list-line-cursor{
- width: 100%;
- min-height: 20px;
- .status-icon {
- padding-right: 5px;
- min-width: 20px;
- }
- .name-text {
- float: left;
- width: 33%;
- }
- .service-text {
- padding-left: 5px;
- width: 33%;
- float: left;
- .na-text {
- color: #808080;
- }
- }
}
- .alert-list-line-cursor:before,.alert-list-line-cursor:after {
- display: table;
- line-height: 0;
- content: "";
- }
- .alert-list-line-cursor:after {
- clear: both;
- }
- .show-more {
- width: 98.8%;
- min-height: 20px;
- cursor: pointer;
- border-top: 1px solid #CCC;
- text-align: center;
- padding: 10px 10px 10px 0;
- font-size: 16px;
+ .trim_hostname {
+ display: block;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/14d63dd9/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index aab3287..7d93778 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -868,11 +868,7 @@ a:focus {
}
/*****start styles for install tasks logs*****/
-.task-list-main-warp, .task-detail-info {
- i {
- font-size: 20px;
- vertical-align: middle;
- }
+.task-list-main-wrap, .task-detail-info {
.pending, .queued {
color: #999;
}
@@ -890,11 +886,7 @@ a:focus {
}
}
-.task-list-main-warp {
-
- .task-list-line-cursor {
- cursor: pointer;
- }
+.task-list-main-wrap {
.request-schedule-abort {
margin-top: 7px;
@@ -904,95 +896,16 @@ a:focus {
}
.task-top-wrap {
-
width: 100%;
border-bottom: 1px solid #CCC;
- text-align: center;
font-size: 15px;
height: 40px;
-
- .task-detail-back-to-hosts {
- float: left;
- }
-
- .select-wrap {
- float: right;
- margin-top: -8px;
- select {
- width: 140px;
- }
- }
-
- .tasks-list-select{
- //margin-top: -28px;
- }
-
- .task-name-top {
- width: 23%;
- padding-left: 20px;
- }
- .start-time-top {
- width: 20%;
- padding-left: 5px;
- }
- .duration-top {
- width: 10%;
- padding-left: 5px;
- }
- .task-name-top,.start-time-top,.duration-top {
- float: left;
- text-align: left;
- }
-
-
}
#host-log {
max-height: 340px;
overflow: auto;
width: 100%;
- .log-list-wrap {
- padding: 10px 10px 10px 20px;
- border-top: 1px solid #CCC;
- border-bottom: 1px solid #CCC;
- .show-details {
- float: right;
- cursor: pointer;
- font-size: 16px;
-
- i {
- color: #333;
- }
- }
-
- .task-list-line-cursor:before,.task-list-line-cursor:after {
- display: table;
- line-height: 0;
- content: "";
- }
- .task-list-line-cursor:after {
- clear: both;
- }
- .operation-name-icon-wrap {
- float: left;
- width: 35%;
- }
- .start-time-text {
- margin-left: 5px;
- width: 20%;
- float: left;
- }
- .duration-text {
- margin-left: 5px;
- width: 10%;
- float: left;
- }
- .time-summary {
- padding-left: 0;
- color: #808080;
- font-size: 12px;
- }
- }
}
}
@@ -1026,19 +939,9 @@ a:focus {
.task-top-wrap {
width: 100%;
border-bottom: 1px solid #CCC;
- text-align: center;
font-size: 15px;
padding: 0 0 10px 0;
- .task-detail-back {
- float: left;
- }
-
- .task-detail-log-rolename {
- position: relative;
- left: 0;
- top: 0;
- }
.task-detail-status-ico {
content: "";
margin-top: -4px;
@@ -1559,6 +1462,12 @@ table.graphs {
margin-top: 0;
color: @green;
}
+ .services-heading {
+ padding: 8px;
+ color: #999;
+ font-size: 13px;
+ font-weight: bold;
+ }
}
.admin-user-settings {
@@ -2683,4 +2592,20 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox {
.side-menu-well {
padding: 8px 0;
+}
+
+.table-body-wrap {
+ table {
+ table-layout: fixed;
+ margin-bottom: 0;
+ }
+}
+
+table.table.inner-table {
+ margin-bottom: 0;
+ background-color: transparent;
+}
+
+a.abort-icon:hover {
+ text-decoration: none;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/14d63dd9/ambari-web/app/styles/modal_popups.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/modal_popups.less b/ambari-web/app/styles/modal_popups.less
index 1125c2a..0c87e63 100644
--- a/ambari-web/app/styles/modal_popups.less
+++ b/ambari-web/app/styles/modal_popups.less
@@ -35,7 +35,6 @@
width: 98.8%;
min-height: 20px;
cursor: pointer;
- border-top: 1px solid #CCC;
text-align: center;
padding: 10px 10px 10px 0;
font-size: 16px;
@@ -49,71 +48,16 @@
&.scheduled{
max-height: 255px;
}
- .col-md-2{
- width:20%;
- float: left;
- }
- .host-progress-num{
- float: left;
- padding-left: 8px;
- }
- .host-name-icon-wrap{
- float: left;
- width: 50%;
- white-space: nowrap;
- }
}
#host-info, #service-info, #host-log {
.log-list-wrap {
- cursor: pointer;
padding: 10px 10px 10px 20px;
- border-top: 1px solid #CCC;
- border-bottom: 1px solid #CCC;
}
- .task-list-line-cursor{
- width: 100%;
- min-height: 20px;
- .progress-wrapper{
- .progress{
- margin-bottom: 0;
- }
- }
- .show-details {
- float: right;
- cursor: pointer;
- font-size: 16px;
- i {
- color: #333;
- }
- }
- .operation-name-icon-wrap {
- float: left;
- width: 35%;
- }
- .start-time-text {
- margin-left: 5px;
- width: 20%;
- float: left;
- }
- .duration-text {
- margin-left: 5px;
- width: 10%;
- float: left;
- }
- .time-summary {
- padding-left: 0;
- color: #808080;
- font-size: 12px;
+ .progress-wrapper {
+ .progress {
+ margin-bottom: 0;
}
}
- .task-list-line-cursor:before,.task-list-line-cursor:after {
- display: table;
- line-height: 0;
- content: "";
- }
- .task-list-line-cursor:after {
- clear: both;
- }
}
}
@@ -355,11 +299,6 @@
}
.host-progress-popup {
- #service-info, #host-info, #host-log {
- .log-list-wrap:hover {
- background-color: #e6e6e6;
- }
- }
.task-detail-info {
.task-detail-log-info {
http://git-wip-us.apache.org/repos/asf/ambari/blob/14d63dd9/ambari-web/app/styles/stack_versions.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/stack_versions.less b/ambari-web/app/styles/stack_versions.less
index aca9c65..f67e03e 100644
--- a/ambari-web/app/styles/stack_versions.less
+++ b/ambari-web/app/styles/stack_versions.less
@@ -399,7 +399,7 @@
margin-right: 5px;
}
}
- .task-list-main-warp i {
+ .task-list-main-wrap i {
font-size: 16px;
}
ul.failed-info-list {
@@ -432,10 +432,6 @@
}
.repository-list {
- .os-block {
- border-top: 1px solid #ddd;
- padding-top: 10px;
- }
input[type="text"] {
width: 80%;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/14d63dd9/ambari-web/app/styles/wizard.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/wizard.less b/ambari-web/app/styles/wizard.less
index 747c7eb..a4dac8c 100644
--- a/ambari-web/app/styles/wizard.less
+++ b/ambari-web/app/styles/wizard.less
@@ -565,10 +565,6 @@
color: grey;
}
}
- .repos-inner-table {
- margin-bottom: 0;
- background-color: transparent;
- }
.repo-url input {
width: 90%;
height: 24px;
http://git-wip-us.apache.org/repos/asf/ambari/blob/14d63dd9/ambari-web/app/templates/common/configs/overrideWindow.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/overrideWindow.hbs b/ambari-web/app/templates/common/configs/overrideWindow.hbs
index 1154bea..6784f28 100644
--- a/ambari-web/app/templates/common/configs/overrideWindow.hbs
+++ b/ambari-web/app/templates/common/configs/overrideWindow.hbs
@@ -104,7 +104,7 @@
<table class="table table-hover">
<tbody>
{{#each entry in view.pageContent}}
- <tr {{bindAttr class="entry.filtered::hidden"}}>
+ <tr {{bindAttr class="entry.filtered::hidden entry.selected:active"}}>
<td width="45%">
{{entry.host.hostName}}
</td>
http://git-wip-us.apache.org/repos/asf/ambari/blob/14d63dd9/ambari-web/app/templates/common/host_progress_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/host_progress_popup.hbs b/ambari-web/app/templates/common/host_progress_popup.hbs
index c6c8bf8..f0a8c17 100644
--- a/ambari-web/app/templates/common/host_progress_popup.hbs
+++ b/ambari-web/app/templates/common/host_progress_popup.hbs
@@ -16,55 +16,81 @@
* limitations under the License.
}}
-<div class="host-component-popup-wrap">
+<div class="host-component-popup-wrap col-sm-12">
{{#if view.parentView.isLoaded}}
{{!-- SERVICES --}}
- <div {{bindAttr class="view.parentView.isServiceListHidden:hidden :task-list-main-warp"}}>
- <div class="task-top-wrap">
- <div class="operation-name-top">{{t common.operations}}</div>
- <div class="start-time-top">{{t common.startTime}}</div>
- <div class="duration-top">{{t common.duration}}</div>
- <div class="select-wrap">
- {{t common.show}}:
- {{view Ember.Select
- contentBinding="view.categories"
- optionValuePath="content.value"
- optionLabelPath="content.label"
- selectionBinding="view.serviceCategory"
- classNames="form-control"
- }}
+ <div {{bindAttr class="view.parentView.isServiceListHidden:hidden :task-list-main-wrap :table-body-wrap"}}>
+ <div class="row">
+ <div class="table-controls row col-sm-12 pull-right">
+ <div class="col-sm-12">
+ <div class="btn-group pull-right">
+ {{view Ember.Select
+ contentBinding="view.categories"
+ optionValuePath="content.value"
+ optionLabelPath="content.label"
+ selectionBinding="view.serviceCategory"
+ classNames="form-control"
+ }}
+ </div>
+ </div>
</div>
</div>
+ <table class="table table-hover">
+ <thead>
+ <tr>
+ <th class="col-sm-3">{{t common.operations}}</th>
+ <th class="col-sm-3">{{t common.startTime}}</th>
+ <th colspan="3" class="col-sm-6">{{t common.duration}}</th>
+ </tr>
+ </thead>
+ </table>
<div id="service-info">
{{#if view.isServiceEmptyList}}
<div class="log-list-wrap">{{t hostPopup.noServicesToShow}}</div>
{{else}}
- {{#each servicesInfo in view.services}}
- <div {{action gotoHosts servicesInfo}} {{bindAttr class="servicesInfo.isVisible::hidden :log-list-wrap"}}>
- <div class="task-list-line-cursor">
- <div class="operation-name-icon-wrap">
- {{view statusIcon servicesInfoBinding="servicesInfo"}}
- <a href="#">
- {{servicesInfo.name}}
- </a>
- {{#if servicesInfo.isAbortable}}
- {{view abortIcon servicesInfoBinding="servicesInfo"}}
- {{/if}}
- </div>
- <div class="time-summary start-time-text">{{servicesInfo.startTime}}</div>
- <div class="time-summary duration-text">{{servicesInfo.duration}}</div>
- <div class="progress-wrapper col-md-2">
- <div class="progress">
- <div {{bindAttr class="servicesInfo.isInProgress:active servicesInfo.isInProgress:progress-bar-striped servicesInfo.barColor :progress-bar" style="servicesInfo.barWidth"}}></div>
- </div>
- </div>
- <div class="host-progress-num">{{servicesInfo.progress}}%</div>
- <div class="show-details"><i class="glyphicon glyphicon-caret-right"></i></div>
- </div>
- </div>
- {{/each}}
+ <table class="table table-hover">
+ <tbody>
+ {{#each servicesInfo in view.services}}
+ <tr {{action gotoHosts servicesInfo}} {{bindAttr class="servicesInfo.isVisible::hidden :pointer"}}>
+ <td class="col-sm-3">
+ {{view statusIcon servicesInfoBinding="servicesInfo"}}
+ <a href="#">
+ {{servicesInfo.name}}
+ </a>
+ </td>
+ <td class="col-sm-3">{{servicesInfo.startTime}}</td>
+ <td class="col-sm-2">{{servicesInfo.duration}}</td>
+ <td class="col-sm-3">
+ <div class="progress-wrapper col-sm-10">
+ <div class="progress">
+ <div {{bindAttr class="servicesInfo.isInProgress:active servicesInfo.isInProgress:progress-bar-striped servicesInfo.barColor :progress-bar" style="servicesInfo.barWidth"}}></div>
+ </div>
+ </div>
+ <div class="col-sm-2">{{servicesInfo.progress}}%</div>
+ </td>
+ <td class="col-sm-1 text-right">
+ {{#if servicesInfo.isAbortable}}
+ {{view abortIcon servicesInfoBinding="servicesInfo"}}
+ {{/if}}
+ <a class="action" href="#">
+ <span class="icon icon-caret-right"></span>
+ </a>
+ </td>
+ </tr>
+ {{/each}}
+ </tbody>
+ {{#if view.isPaginate}}
+ <tfoot>
+ <tr>
+ <td colspan="5">
+ {{view App.PaginationView}}
+ </td>
+ </tr>
+ </tfoot>
+ {{/if}}
+ </table>
{{/if}}
{{#if view.isShowMore}}
<div class="show-more" {{action requestMoreOperations}}><a href="#">{{t hostPopup.serviceInfo.showMore}}</a>
@@ -76,24 +102,26 @@
{{!-- HOSTS ---}}
- <div {{bindAttr class="view.parentView.isHostListHidden:hidden :task-list-main-warp"}}>
- <div class="task-top-wrap">
- {{#if controller.isBackgroundOperations}}
- <a class="task-detail-back-to-hosts" href="javascript:void(null)" {{action backToServiceList}} >
- <i class="glyphicon glyphicon-arrow-left"></i> {{t common.operations}}
- </a>
- {{/if}}
- <span class="task-detail-log-rolename">{{t common.hosts}}</span>
-
- <div class="select-wrap">
- {{t common.show}}:
- {{view Ember.Select
- contentBinding="view.categories"
- optionValuePath="content.value"
- optionLabelPath="content.label"
- selectionBinding="view.hostCategory"
- classNames="form-control"
- }}
+ <div {{bindAttr class="view.parentView.isHostListHidden:hidden :task-list-main-wrap :table-body-wrap"}}>
+ <div class="row">
+ <h2 class="table-title col-sm-2">{{t common.hosts}}</h2>
+ <div class="table-controls row col-sm-10 pull-right">
+ <div class="col-sm-12">
+ <div class="btn-group pull-right">
+ {{view Ember.Select
+ contentBinding="view.categories"
+ optionValuePath="content.value"
+ optionLabelPath="content.label"
+ selectionBinding="view.hostCategory"
+ classNames="form-control"
+ }}
+ </div>
+ {{#if controller.isBackgroundOperations}}
+ <button type="button" class="btn btn-link pull-right" {{action backToServiceList}}>
+ <i class="glyphicon glyphicon-arrow-left"></i> {{t common.operations}}
+ </button>
+ {{/if}}
+ </div>
</div>
</div>
{{#if view.isRequestSchedule}}
@@ -117,25 +145,42 @@
{{#if view.isHostEmptyList}}
<div class="log-list-wrap">{{t hostPopup.noHostsToShow}}</div>
{{else}}
- {{#each hostInfo in view.pageContent}}
- <div {{action gotoTasks hostInfo}} {{bindAttr class="hostInfo.isVisible::hidden :log-list-wrap"}}>
- <div class="task-list-line-cursor">
- <div class="host-name-icon-wrap">
- {{view statusIcon servicesInfoBinding="hostInfo"}}
- <a href="#">
- {{hostInfo.displayName}}
- </a>
- </div>
- <div class="progress-wrapper col-md-2">
- <div class="progress">
- <div {{bindAttr class="hostInfo.isInProgress:progress-bar-striped :active hostInfo.barColor :progress-bar" style="hostInfo.barWidth"}}></div>
- </div>
- </div>
- <div class="host-progress-num">{{hostInfo.progress}}%</div>
- <div class="show-details"><i class="glyphicon glyphicon-caret-right"></i></div>
- </div>
- </div>
- {{/each}}
+ <table class="table table-hover">
+ <tbody>
+ {{#each hostInfo in view.pageContent}}
+ <tr {{action gotoTasks hostInfo}} {{bindAttr class="hostInfo.isVisible::hidden :pointer"}}>
+ <td class="col-sm-6 text-nowrap">
+ {{view statusIcon servicesInfoBinding="hostInfo"}}
+ <a href="#">
+ {{hostInfo.displayName}}
+ </a>
+ </td>
+ <td class="col-sm-5">
+ <div class="progress-wrapper col-md-6">
+ <div class="progress">
+ <div {{bindAttr class="hostInfo.isInProgress:progress-bar-striped :active hostInfo.barColor :progress-bar" style="hostInfo.barWidth"}}></div>
+ </div>
+ </div>
+ <div class="col-sm-2">{{hostInfo.progress}}%</div>
+ </td>
+ <td class="col-sm-1 text-right">
+ <a class="action" href="#">
+ <span class="icon icon-caret-right"></span>
+ </a>
+ </td>
+ </tr>
+ {{/each}}
+ </tbody>
+ {{#if view.isPaginate}}
+ <tfoot>
+ <tr>
+ <td colspan="3">
+ {{view App.PaginationView}}
+ </td>
+ </tr>
+ </tfoot>
+ {{/if}}
+ </table>
{{/if}}
</div>
{{else}}
@@ -146,21 +191,25 @@
{{!-- TASKS ---}}
- <div {{bindAttr class="view.parentView.isTaskListHidden:hidden :task-list-main-warp"}}>
- <div class="task-top-wrap">
- <a class="task-detail-back-to-hosts" href="javascript:void(null)" {{action backToHostList}} ><i
- class="glyphicon glyphicon-arrow-left"></i> {{t common.hosts}}</a>
-
- <div class="task-name-top task-detail-log-rolename">{{t common.tasks}}</div>
- <div class="select-wrap tasks-list-select">
- {{t common.show}}:
- {{view Ember.Select
- contentBinding="view.categories"
- optionValuePath="content.value"
- optionLabelPath="content.label"
- selectionBinding="view.taskCategory"
- classNames="form-control"
- }}
+ <div {{bindAttr class="view.parentView.isTaskListHidden:hidden :task-list-main-wrap :table-body-wrap"}}>
+ <div class="row">
+ <h2 class="table-title col-sm-2">{{t common.tasks}}</h2>
+ <div class="table-controls row col-sm-10 pull-right">
+ <div class="col-sm-12">
+ <div class="btn-group pull-right">
+ {{view Ember.Select
+ class="form-control"
+ contentBinding="view.categories"
+ optionValuePath="content.value"
+ optionLabelPath="content.label"
+ selectionBinding="view.taskCategory"
+ classNames="form-control"
+ }}
+ </div>
+ <button type="button" class="btn btn-link pull-right" {{action backToHostList}}>
+ <i class="glyphicon glyphicon-arrow-left"></i> {{t common.hosts}}
+ </button>
+ </div>
</div>
</div>
<div id="host-log">
@@ -168,19 +217,34 @@
{{#if view.isTasksEmptyList}}
<div class="log-list-wrap">{{t hostPopup.noTasksToShow}}</div>
{{else}}
- {{#each taskInfo in view.tasks}}
- <div {{action toggleTaskLog taskInfo}} {{bindAttr class="taskInfo.isVisible::hidden :log-list-wrap"}}>
- <div class="task-list-line-cursor">
- <div class="operation-name-icon-wrap">
- {{view statusIcon servicesInfoBinding="taskInfo"}}
- <a href="#">
- {{taskInfo.commandDetail}}
- </a>
- </div>
- <div class="show-details"><i class="glyphicon glyphicon-caret-right"></i></div>
- </div>
- </div>
- {{/each}}
+ <table class="table table-hover">
+ <tbody>
+ {{#each taskInfo in view.tasks}}
+ <tr {{action toggleTaskLog taskInfo}} {{bindAttr class="taskInfo.isVisible::hidden :pointer"}}>
+ <td class="col-sm-3">
+ {{view statusIcon servicesInfoBinding="taskInfo"}}
+ <a href="#">
+ {{taskInfo.commandDetail}}
+ </a>
+ </td>
+ <td class="col-sm-9 text-right">
+ <a class="action" href="#">
+ <span class="icon icon-caret-right"></span>
+ </a>
+ </td>
+ </tr>
+ {{/each}}
+ </tbody>
+ {{#if view.isPaginate}}
+ <tfoot>
+ <tr>
+ <td colspan="2">
+ {{view App.PaginationView}}
+ </td>
+ </tr>
+ </tfoot>
+ {{/if}}
+ </table>
{{/if}}
{{else}}
{{view App.SpinnerView}}
@@ -193,26 +257,31 @@
<div {{bindAttr class="view.parentView.isLogWrapHidden:hidden :task-detail-info view.hostComponentLogsExists:task-detail-info-tabbed"}}>
<div class="task-top-wrap">
- <a class="task-detail-back" href="javascript:void(null)" {{action backToTaskList}} ><i
- class="glyphicon glyphicon-arrow-left"></i> {{t common.tasks}}</a>
-
- <div {{bindAttr class="view.hostComponentLogsExists:task-detail-log-nav-actions"}}>
- <i {{bindAttr class="view.openedTask.status :task-detail-status-ico view.openedTask.icon"}}></i>
-
- <div class="task-detail-ico-wrap">
- <a {{translateAttr title="common.fullLogPopup.clickToCopy"}} {{action "textTrigger" taskInfo target="view"}} class="task-detail-copy"><i
- class="glyphicon glyphicon-copy"></i> {{t common.copy}}</a>
- <a {{translateAttr title="common.openNewWindow"}} {{action openTaskLogInDialog}} class="task-detail-open-dialog"><i
- class="glyphicon icon-external-link"></i> {{t common.open}}</a>
- {{#if App.supports.logSearch}}
- {{#if view.isLogSearchInstalled}}
- <a {{action navigateToHostLogs target="view"}} {{bindAttr class="view.isLogsLinkVisible::hidden"}} href="#">
- <i class="glyphicon glyphicon-file"></i> {{t common.host}} {{t common.logs}}
- </a>
+ <div {{bindAttr class="view.hostComponentLogsExists:task-detail-log-nav-actions :row"}}>
+ <h2 class="table-title col-sm-5">
+ <i {{bindAttr class="view.openedTask.status :task-detail-status-ico view.openedTask.icon"}}></i>
+ {{view.openedTask.commandDetail}}
+ </h2>
+ <div class="table-controls row col-sm-7 pull-right">
+ <div class="col-sm-12">
+ {{#if App.supports.logSearch}}
+ {{#if view.isLogSearchInstalled}}
+ <button type="button" class="btn btn-link pull-right" {{action navigateToHostLogs target="view"}} {{bindAttr class="view.isLogsLinkVisible::hidden"}}>
+ <i class="glyphicon glyphicon-file"></i> {{t common.host}} {{t common.logs}}
+ </button>
+ {{/if}}
{{/if}}
- {{/if}}
+ <button type="button" class="btn btn-link pull-right" {{translateAttr title="common.openNewWindow"}} {{action openTaskLogInDialog}}>
+ <i class="icon icon-external-link"></i> {{t common.open}}
+ </button>
+ <button type="button" class="btn btn-link pull-right" {{translateAttr title="common.fullLogPopup.clickToCopy"}} {{action "textTrigger" taskInfo target="view"}}>
+ <i class="glyphicon glyphicon-copy"></i> {{t common.copy}}
+ </button>
+ <button type="button" class="btn btn-link pull-right" {{action backToTaskList}}>
+ <i class="glyphicon glyphicon-arrow-left"></i> {{t common.tasks}}
+ </button>
+ </div>
</div>
- <span class="task-detail-log-rolename">{{view.openedTask.commandDetail}}</span>
</div>
<ul {{bindAttr class="view.hostComponentLogsExists::hide :nav :nav-tabs :task-detail-nav"}}>
<li {{bindAttr class="view.isLevelLoaded:active"}}>
@@ -289,6 +358,3 @@
{{view App.SpinnerView}}
{{/if}}
</div>
-{{#if view.isPaginate}}
- {{view App.PaginationView}}
-{{/if}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/14d63dd9/ambari-web/app/templates/common/modal_popups/alerts_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/modal_popups/alerts_popup.hbs b/ambari-web/app/templates/common/modal_popups/alerts_popup.hbs
index 7ace34c..179490a 100644
--- a/ambari-web/app/templates/common/modal_popups/alerts_popup.hbs
+++ b/ambari-web/app/templates/common/modal_popups/alerts_popup.hbs
@@ -16,49 +16,59 @@
* limitations under the License.
}}
-<div class="alerts-popup-wrap">
+<div class="alerts-popup-wrap table-body-wrap">
{{#if view.isLoaded}}
- <div class="alert-list-main-warp">
- <div class="top-wrap">
- <div class="service-top">{{t alerts.definition.details.serviceHost}}</div>
- <div class="name-top">{{t alerts.fastAccess.popup.body.name}}</div>
- <div class="last-triggered-top">{{t common.status}}</div>
- </div>
- <div id="alert-info">
- {{#if view.isAlertEmptyList}}
- <div class="alert-list-wrap">{{t alerts.fastAccess.popup.body.noalerts}}</div>
- {{else}}
+ <table class="table table-hover">
+ <thead>
+ <tr>
+ <th class="col-sm-4">{{t alerts.definition.details.serviceHost}}</th>
+ <th class="col-sm-4">{{t alerts.fastAccess.popup.body.name}}</th>
+ <th class="col-sm-4">{{t common.status}}</th>
+ </tr>
+ </thead>
+ </table>
+ <div id="alert-info">
+ {{#if view.isAlertEmptyList}}
+ <div class="alert-list-wrap">{{t alerts.fastAccess.popup.body.noalerts}}</div>
+ {{else}}
+ <table class="table table-hover">
+ <tbody>
{{#each instance in view.pageContent}}
- <div class="alert-list-wrap">
- <div class="alert-list-line-cursor">
- <div class="service-text">
- {{view App.AlertInstanceServiceHostView instanceBinding="instance"}}
- </div>
- <div class="name-text">
- <div>
- <a href="#" {{action "gotoAlertDetails" instance target="view"}}>{{instance.label}}</a>
- </div>
- <div class="instance-text">
- {{instance.text}}
- </div>
- </div>
- <div class="status-col" {{bindAttr title="instance.lastTriggered"}}>
- {{view App.AlertInstanceStateView instanceBinding="instance"}}
- </div>
- </div>
- </div>
- {{/each}}
- {{/if}}
- </div>
+ <tr>
+ <td class="col-sm-4">
+ {{view App.AlertInstanceServiceHostView instanceBinding="instance"}}
+ </td>
+ <td class="col-sm-4">
+ <a href="#" {{action "gotoAlertDetails" instance target="view"}}>{{instance.label}}</a>
+ <div class="instance-text">
+ {{instance.text}}
+ </div>task-detail-log-info
+ </td>
+ <td class="col-sm-4" {{bindAttr title="instance.lastTriggered"}}>
+ {{view App.AlertInstanceStateView instanceBinding="instance"}}
+ </td>
+ </tr>
+ {{/each}}
+ </tbody>
+ </table>
+ {{/if}}
</div>
+ {{#if view.isPaginate}}
+ <table class="table table-hover">
+ <tfoot>
+ <tr>
+ <td colspan="3">
+ {{view App.PaginationView}}
+ </td>
+ </tr>
+ </tfoot>
+ </table>
+ {{/if}}
<div {{bindAttr class="view.filteringComplete:hidden :table-overlay"}}>
{{view App.SpinnerView}}
</div>
- {{#if view.isPaginate}}
- {{view App.PaginationView}}
- {{/if}}
{{else}}
{{view App.SpinnerView}}
{{/if}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/14d63dd9/ambari-web/app/templates/common/modal_popups/dependent_configs_list.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/modal_popups/dependent_configs_list.hbs b/ambari-web/app/templates/common/modal_popups/dependent_configs_list.hbs
index a717341..d117dd1 100644
--- a/ambari-web/app/templates/common/modal_popups/dependent_configs_list.hbs
+++ b/ambari-web/app/templates/common/modal_popups/dependent_configs_list.hbs
@@ -40,7 +40,7 @@
</thead>
<tbody>
{{#each recommendation in view.parentView.recommendations}}
- <tr>
+ <tr {{bindAttr class="recommendation.saveRecommended:active"}}>
<td class="config-dependency-name">{{recommendation.propertyName}}</td>
<td class="config-dependency-service">{{recommendation.serviceDisplayName}}</td>
<td class="config-dependency-group">
http://git-wip-us.apache.org/repos/asf/ambari/blob/14d63dd9/ambari-web/app/templates/experimental.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/experimental.hbs b/ambari-web/app/templates/experimental.hbs
index 640393b..c3d9eba 100644
--- a/ambari-web/app/templates/experimental.hbs
+++ b/ambari-web/app/templates/experimental.hbs
@@ -40,7 +40,7 @@
</thead>
<tbody>
{{#each support in controller.supports}}
- <tr>
+ <tr {{bindAttr class="support.selected:active"}}>
<td>{{support.name}}</td>
<td></td>
<td>{{view App.CheckboxView checkedBinding="support.selected"}}</td>
http://git-wip-us.apache.org/repos/asf/ambari/blob/14d63dd9/ambari-web/app/templates/main/admin/service_auto_start.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/service_auto_start.hbs b/ambari-web/app/templates/main/admin/service_auto_start.hbs
index be101e7..29ec3b3 100644
--- a/ambari-web/app/templates/main/admin/service_auto_start.hbs
+++ b/ambari-web/app/templates/main/admin/service_auto_start.hbs
@@ -33,17 +33,13 @@
</div>
</div>
</div>
- {{#if view.isLoaded}}
- <hr>
+ {{#if view.isLoaded}}
+ <hr>
+ <div class="row">
+ <div class="col-md-4 col-lg-3">
+ <div class="services-heading">{{t common.service}}</div>
<div class="row">
- <div class="col-md-4 col-lg-3"><h5>{{t common.service}}</h5></div>
- <div class="col-md-8 col-lg-9 row">
- <div class="col-md-4"><h5>{{t common.component}}</h5></div>
- <div class="col-md-8"><h5>{{t common.status}}</h5></div>
- </div>
- </div>
- <div class="row">
- <div class="col-md-4 col-lg-3">
+ <div class="col-md-12">
<ul class="nav nav-tabs nav-stacked nav-tabs-left">
{{#each tab in controller.tabs}}
<li {{bindAttr class="tab.isActive:active"}}>
@@ -55,33 +51,51 @@
{{/each}}
</ul>
</div>
- <div class="tab-content col-md-8 col-lg-9">
- {{#each tab in controller.tabs}}
- <div {{bindAttr class=":tab-pane tab.isActive:active tab.service_name"}}>
- <table class="table">
- {{#each component in tab.components}}
+ </div>
+ </div>
+ <div class="col-md-8 col-lg-9 row">
+ <div class="tab-content col-md-12">
+ {{#each tab in controller.tabs}}
+ <div {{bindAttr class=":tab-pane tab.isActive:active tab.service_name"}}>
+ <table class="table table-hover">
+ <thead>
<tr>
- <td class="col-md-4">
- {{component.display_name}}
- </td>
- <td class="col-md-8">
- {{view App.MainAdminServiceAutoStartComponentView componentBinding="component" tabBinding="tab"}}
- </td>
+ <th class="col-md-4">
+ {{t common.component}}
+ </th>
+ <th class="col-md-8">
+ {{t common.status}}
+ </th>
</tr>
- {{/each}}
+ </thead>
+ <tbody>
+ {{#each component in tab.components}}
+ <tr>
+ <td class="col-md-4">
+ {{component.display_name}}
+ </td>
+ <td class="col-md-8">
+ {{view App.MainAdminServiceAutoStartComponentView componentBinding="component" tabBinding="tab"}}
+ </td>
+ </tr>
+ {{/each}}
+ </tbody>
+ <tfoot>
<tr>
<td class="col-md-4"></td>
<td class="col-md-8">
<a href="#" class="enable-all-link" {{action enableAll tab target="controller"}}>
- {{t common.enableAll}}
+ {{t common.enableAll}}
</a> |
<a href="#" {{action disableAll tab target="controller"}}>{{t common.disableAll}}</a>
</td>
</tr>
- </table>
- </div>
- {{/each}}
- </div>
+ </tfoot>
+ </table>
+ </div>
+ {{/each}}
</div>
- {{/if}}
+ </div>
+ </div>
+ {{/if}}
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/14d63dd9/ambari-web/app/templates/main/admin/stack_upgrade/edit_repositories.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/edit_repositories.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/edit_repositories.hbs
index 18760ec..263b902 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/edit_repositories.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/edit_repositories.hbs
@@ -22,28 +22,36 @@
<div {{bindAttr class="view.parentView.serverValidationFailed::hidden :alert :alert-warning"}}>
{{t admin.stackVersions.editRepositories.validation.warning}}
</div>
-<div class="row">
- <div class="col-md-2"><strong>{{t common.os}}</strong></div>
- <div class="col-md-10 row">
- <div class="col-md-3"><strong>{{t common.name}}</strong></div>
- <div class="col-md-9"><strong>{{t admin.cluster.repositories.baseUrl}}</strong></div>
- </div>
-</div>
-{{#each os in view.content.operatingSystems}}
- <div class="row os-block" {{bindAttr id="os.osType"}}>
- <div class="col-md-2">
- {{os.osType}}
- </div>
- <div class="col-md-10">
- {{#each repository in os.repositories}}
- <div {{bindAttr class="repository.repoName :row"}}>
- <div class="col-md-3">{{repository.repoName}}</div>
- <div {{bindAttr class="repository.hasError:error :form-group :col-md-9"}}>{{view App.BaseUrlTextField repositoryBinding="repository" disabledBinding="view.content.useRedhatSatellite"}}</div>
- </div>
- {{/each}}
- </div>
- </div>
-{{/each}}
+<table class="table table-hover">
+ <thead>
+ <tr>
+ <th class="col-md-2">{{t common.os}}</th>
+ <th class="col-md-2">{{t common.name}}</th>
+ <th class="col-md-8">{{t admin.cluster.repositories.baseUrl}}</th>
+ </tr>
+ </thead>
+ <tbody>
+ {{#each os in view.content.operatingSystems}}
+ <tr {{bindAttr id="os.osType"}}>
+ <td class="col-md-2">{{os.osType}}</td>
+ <td class="col-md-10" colspan="2">
+ <table class="table table-condensed no-borders inner-table">
+ <tbody>
+ {{#each repository in os.repositories}}
+ <tr {{bindAttr class="repository.repoName"}}>
+ <td class="col-md-2">{{repository.repoName}}</td>
+ <td class="col-md-8">
+ <div {{bindAttr class="repository.hasError:error :form-group"}}>{{view App.BaseUrlTextField repositoryBinding="repository" disabledBinding="view.content.useRedhatSatellite"}}</div>
+ </td>
+ </tr>
+ {{/each}}
+ </tbody>
+ </table>
+ </td>
+ </tr>
+ {{/each}}
+ </tbody>
+</table>
<div id="skip-validation">
{{#view view.skipCheckBox labelTranslate="installer.step1.advancedRepo.skipValidation.message"
http://git-wip-us.apache.org/repos/asf/ambari/blob/14d63dd9/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
index 84666a3..8bb0904 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
@@ -22,7 +22,7 @@
</div>
<div {{bindAttr class="view.isLoaded::hidden :row"}}>
- <div class="col-md-3 task-list-main-warp">{{statusIcon controller.requestStatus}}
+ <div class="col-md-3 task-list-main-wrap">{{statusIcon controller.requestStatus}}
{{view.upgradeStatusLabel}}</div>
<div class="col-md-8">
{{view App.ProgressBarView
@@ -35,7 +35,7 @@
</div>
</div>
- <div class="task-list scrollable-block task-list-main-warp">
+ <div class="task-list scrollable-block task-list-main-wrap">
{{#if view.isLoaded}}
<div>
{{#if view.runningItem}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/14d63dd9/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history_details.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history_details.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history_details.hbs
index f9d0a2a..2e85b54 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history_details.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history_details.hbs
@@ -18,7 +18,7 @@
<div id="stack-upgrade-record-dialog">
<div {{bindAttr class="view.isLoaded::hidden :row"}}>
- <div class="col-md-3 task-list-main-warp">{{statusIcon controller.requestStatus}}
+ <div class="col-md-3 task-list-main-wrap">{{statusIcon controller.requestStatus}}
{{view.upgradeStatusLabel}}</div>
<div class="col-md-8">
{{view App.ProgressBarView
@@ -31,7 +31,7 @@
</div>
</div>
- <div class="task-list scrollable-block task-list-main-warp">
+ <div class="task-list scrollable-block task-list-main-wrap">
{{#if view.isReady}}
{{#each group in controller.upgradeData.upgradeGroups}}
{{#if group.isVisible}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/14d63dd9/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_task.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_task.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_task.hbs
index 488fe39..36450a2 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_task.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_task.hbs
@@ -40,7 +40,7 @@
<a {{translateAttr title="common.openNewWindow"}} {{action openOutLog target="view"}} class="task-detail-open-dialog pull-right">
<i class="icon-external-link"></i> {{t common.open}}
</a>
- <a title="Click to Copy" {{action copyOutLog view.content target="view"}} class="task-detail-copy pull-right">
+ <a {{translateAttr title="common.fullLogPopup.clickToCopy"}} {{action copyOutLog view.content target="view"}} class="task-detail-copy pull-right">
<i class="glyphicon glyphicon-copy"></i> {{t common.copy}}
</a>
</div>
@@ -56,7 +56,7 @@
<a {{translateAttr title="common.openNewWindow"}} {{action openErrorLog target="view"}} class="task-detail-open-dialog pull-right">
<i class="icon-external-link"></i> {{t common.open}}
</a>
- <a title="Click to Copy" {{action copyErrLog view.content target="view"}} class="task-detail-copy pull-right">
+ <a {{translateAttr title="common.fullLogPopup.clickToCopy"}} {{action copyErrLog view.content target="view"}} class="task-detail-copy pull-right">
<i class="glyphicon glyphicon-copy"></i> {{t common.copy}}
</a>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/14d63dd9/ambari-web/app/templates/main/alerts/add_definition_to_group_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/alerts/add_definition_to_group_popup.hbs b/ambari-web/app/templates/main/alerts/add_definition_to_group_popup.hbs
index 445cfd4..ed5cfa8 100644
--- a/ambari-web/app/templates/main/alerts/add_definition_to_group_popup.hbs
+++ b/ambari-web/app/templates/main/alerts/add_definition_to_group_popup.hbs
@@ -100,7 +100,7 @@
<tbody>
{{#if view.pageContent}}
{{#each entry in view.pageContent}}
- <tr {{bindAttr class="entry.filtered::hidden"}}>
+ <tr {{bindAttr class="entry.filtered::hidden entry.selected:active"}}>
<td width="35%">
{{entry.label}}
</td>
http://git-wip-us.apache.org/repos/asf/ambari/blob/14d63dd9/ambari-web/app/templates/main/host/bulk_operation_confirm_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/host/bulk_operation_confirm_popup.hbs b/ambari-web/app/templates/main/host/bulk_operation_confirm_popup.hbs
index e9f55a9..217aa4f 100644
--- a/ambari-web/app/templates/main/host/bulk_operation_confirm_popup.hbs
+++ b/ambari-web/app/templates/main/host/bulk_operation_confirm_popup.hbs
@@ -19,7 +19,7 @@
<p>{{{view.message}}}</p>
<div class="task-top-wrap">
<div class="task-detail-ico-wrap">
- <a href="#" title="Click to Copy" {{action "textTrigger"}} class="task-detail-copy"><i class="glyphicon glyphicon-copy"></i> {{t common.copy}}</a>
+ <a href="#" {{translateAttr title="common.fullLogPopup.clickToCopy"}} {{action "textTrigger"}} class="task-detail-copy"><i class="glyphicon glyphicon-copy"></i> {{t common.copy}}</a>
</div>
</div>
<div class="task-detail-log-info">
http://git-wip-us.apache.org/repos/asf/ambari/blob/14d63dd9/ambari-web/app/templates/wizard/step1.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step1.hbs b/ambari-web/app/templates/wizard/step1.hbs
index dce6b27..312898c 100644
--- a/ambari-web/app/templates/wizard/step1.hbs
+++ b/ambari-web/app/templates/wizard/step1.hbs
@@ -135,7 +135,7 @@
<tr>
<td class="col-sm-2">{{operatingSystem.osType}}</td>
<td class="col-sm-9" colspan="2">
- <table class="table table-condensed no-borders repos-inner-table">
+ <table class="table table-condensed no-borders inner-table">
<tbody>
{{#each repository in operatingSystem.repositories}}
<tr>
http://git-wip-us.apache.org/repos/asf/ambari/blob/14d63dd9/ambari-web/app/templates/wizard/step9/step9HostTasksLogPopup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step9/step9HostTasksLogPopup.hbs b/ambari-web/app/templates/wizard/step9/step9HostTasksLogPopup.hbs
index 9640e32..6145730 100644
--- a/ambari-web/app/templates/wizard/step9/step9HostTasksLogPopup.hbs
+++ b/ambari-web/app/templates/wizard/step9/step9HostTasksLogPopup.hbs
@@ -24,34 +24,43 @@
{{#if view.isNoTasksScheduled}}
{{t installer.step9.host.status.noTasks}}
{{else}}
- <div {{bindAttr class="view.isLogWrapHidden::hidden :task-list-main-warp"}}>
- <div class="task-top-wrap">
- <div class="task-name-top task-detail-log-rolename">{{t common.tasks}}</div>
- <div class="select-wrap">
- {{t common.show}}:
- {{view Ember.Select
- classNames="form-control"
- contentBinding="view.categories"
- optionValuePath="content.value"
- optionLabelPath="content.label"
- selectionBinding="view.category"
- }}
+ <div {{bindAttr class="view.isLogWrapHidden::hidden :task-list-main-wrap :table-body-wrap"}}>
+ <div class="row">
+ <h2 class="table-title col-sm-2">{{t common.tasks}}</h2>
+ <div class="table-controls row col-sm-10 pull-right">
+ <div class="col-sm-12">
+ <div class="btn-group pull-right">
+ {{view Ember.Select
+ classNames="form-control"
+ contentBinding="view.categories"
+ optionValuePath="content.value"
+ optionLabelPath="content.label"
+ selectionBinding="view.category"
+ }}
+ </div>
+ </div>
</div>
</div>
<div id="host-log">
- {{#each taskInfo in view.tasks}}
- <div {{bindAttr class="taskInfo.isVisible::hidden :log-list-wrap"}}>
- <div {{action toggleTaskLog taskInfo}} class="task-list-line-cursor">
- <div class="operation-name-icon-wrap">
- <i {{bindAttr class="taskInfo.status taskInfo.icon"}}></i>
- <a href="#">
- {{taskInfo.commandDetail}}
- </a>
- </div>
- <div class="show-details"><i class="glyphicon glyphicon-caret-right"></i></div>
- </div>
- </div>
- {{/each}}
+ <table class="table table-hover">
+ <tbody>
+ {{#each taskInfo in view.tasks}}
+ <tr {{action toggleTaskLog taskInfo}} {{bindAttr class="taskInfo.isVisible::hidden :pointer"}}>
+ <td class="col-sm-3">
+ <i {{bindAttr class="taskInfo.status taskInfo.icon"}}></i>
+ <a href="#">
+ {{taskInfo.commandDetail}}
+ </a>
+ </td>
+ <td class="col-sm-9 text-right">
+ <a class="action" href="#">
+ <span class="icon icon-caret-right"></span>
+ </a>
+ </td>
+ </tr>
+ {{/each}}
+ </tbody>
+ </table>
{{#if view.isEmptyList}}
<div class="log-list-wrap">{{t installer.step9.hostLog.popup.noTasksToShow}}</div>
{{/if}}
@@ -60,20 +69,25 @@
<div {{bindAttr class="view.isLogWrapHidden:hidden :task-detail-info"}}>
<div class="task-top-wrap">
- <a class="task-detail-back" href="javascript:void(null)" {{action backToTaskList}} ><i
- class="glyphicon glyphicon-arrow-left"></i> {{t common.tasks}}</a>
-
- <div>
- <i {{bindAttr class="view.openedTask.status :task-detail-status-ico view.openedTask.icon"}}></i>
- <div class="task-detail-ico-wrap">
- <a title="Click to Copy" {{action "textTrigger" taskInfo target="view"}} class="task-detail-copy"><i class="glyphicon glyphicon-copy"></i> {{t common.copy}}</a>
- <a {{translateAttr title="common.openNewWindow"}} {{action openTaskLogInDialog}} class="task-detail-open-dialog"><i class="glyphicon icon-external-link"></i> {{t common.open}}</a>
- </div>
- <span class="task-detail-log-rolename">
+ <div class="row">
+ <h2 class="table-title col-sm-5">
+ <i {{bindAttr class="view.openedTask.status :task-detail-status-ico view.openedTask.icon"}}></i>
{{view.openedTask.commandDetail}}
- </span>
+ </h2>
+ <div class="table-controls row col-sm-7 pull-right">
+ <div class="col-sm-12">
+ <button type="button" class="btn btn-link pull-right" {{translateAttr title="common.openNewWindow"}} {{action openTaskLogInDialog}}>
+ <i class="icon icon-external-link"></i> {{t common.open}}
+ </button>
+ <button type="button" class="btn btn-link pull-right" {{translateAttr title="common.fullLogPopup.clickToCopy"}} {{action "textTrigger" taskInfo target="view"}}>
+ <i class="glyphicon glyphicon-copy"></i> {{t common.copy}}
+ </button>
+ <button type="button" class="btn btn-link pull-right" {{action backToTaskList}}>
+ <i class="glyphicon glyphicon-arrow-left"></i> {{t common.tasks}}
+ </button>
+ </div>
+ </div>
</div>
-
</div>
{{#if view.isTaskLoaded}}
<div class="task-detail-log-info">
http://git-wip-us.apache.org/repos/asf/ambari/blob/14d63dd9/ambari-web/app/utils/host_progress_popup.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/host_progress_popup.js b/ambari-web/app/utils/host_progress_popup.js
index 5bd0ceb..c615cae 100644
--- a/ambari-web/app/utils/host_progress_popup.js
+++ b/ambari-web/app/utils/host_progress_popup.js
@@ -182,8 +182,9 @@ App.HostPopup = Em.Object.create({
* @type {Em.View}
*/
abortIcon: Em.View.extend({
- tagName: 'i',
- classNames: ['abort-icon', 'icon-remove-circle', 'pointer'],
+ tagName: 'a',
+ classNames: ['action', 'abort-icon'],
+ template: Em.Handlebars.compile('<span class="icon icon-remove-circle"></span>'),
click: function () {
this.get('controller').abortRequest(this.get('servicesInfo'));
return false;
http://git-wip-us.apache.org/repos/asf/ambari/blob/14d63dd9/ambari-web/app/views/main/host.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/host.js b/ambari-web/app/views/main/host.js
index 6043d63..9183f6b 100644
--- a/ambari-web/app/views/main/host.js
+++ b/ambari-web/app/views/main/host.js
@@ -346,9 +346,10 @@ App.MainHostView = App.TableView.extend(App.TableServerViewMixin, {
type: 'number'
}),
- HostView:Em.View.extend({
- content:null,
+ HostView: Em.View.extend({
+ content: null,
tagName: 'tr',
+ classNameBindings: ['content.selected:active'],
didInsertElement: function(){
App.tooltip(this.$("[rel='HealthTooltip'], [rel='UsageTooltip'], [rel='ComponentsTooltip']"));
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/14d63dd9/ambari-web/app/views/wizard/step3_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/wizard/step3_view.js b/ambari-web/app/views/wizard/step3_view.js
index 2f57b9e..3249b24 100644
--- a/ambari-web/app/views/wizard/step3_view.js
+++ b/ambari-web/app/views/wizard/step3_view.js
@@ -311,7 +311,7 @@ App.WizardHostView = Em.View.extend({
tagName: 'tr',
- classNameBindings: ['hostInfo.bootStatus'],
+ classNameBindings: ['hostInfo.bootStatus', 'hostInfo.isChecked:active'],
/**
* Host from parent view
http://git-wip-us.apache.org/repos/asf/ambari/blob/14d63dd9/ambari-web/app/views/wizard/step9/hostLogPopupBody_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/wizard/step9/hostLogPopupBody_view.js b/ambari-web/app/views/wizard/step9/hostLogPopupBody_view.js
index 3dad7d8..d983252 100644
--- a/ambari-web/app/views/wizard/step9/hostLogPopupBody_view.js
+++ b/ambari-web/app/views/wizard/step9/hostLogPopupBody_view.js
@@ -21,6 +21,8 @@ var date = require('utils/date/date');
App.WizardStep9HostLogPopupBodyView = Em.View.extend({
+ classNames: ['col-sm-12'],
+
templateName: require('templates/wizard/step9/step9HostTasksLogPopup'),
/**