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/10/19 16:47:44 UTC
[33/50] [abbrv] ambari git commit: AMBARI-18607. Test and fix new
tables styles on Ambari (alexantonenko)
AMBARI-18607. Test and fix new tables styles on Ambari (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5c32fed7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5c32fed7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5c32fed7
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 5c32fed74cce667bacffbe7f0d549ceed709e3fc
Parents: 9eb64a5
Author: Alex Antonenko <hi...@gmail.com>
Authored: Mon Oct 17 15:24:55 2016 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Mon Oct 17 16:07:56 2016 +0300
----------------------------------------------------------------------
ambari-web/app/styles/alerts.less | 14 ------
ambari-web/app/styles/application.less | 40 ++-------------
ambari-web/app/styles/config_history_flow.less | 3 --
ambari-web/app/styles/modal_popups.less | 5 +-
.../app/styles/theme/bootstrap-ambari.css | 38 +++++++-------
.../templates/common/configs/overrideWindow.hbs | 34 +++++++------
.../common/configs/propertyDependence.hbs | 2 +-
.../config_recommendation_popup.hbs | 2 +-
.../modal_popups/dependent_configs_list.hbs | 4 +-
.../modal_popups/hosts_table_list_popup.hbs | 16 +++---
ambari-web/app/templates/common/settings.hbs | 2 +-
ambari-web/app/templates/experimental.hbs | 8 +--
.../templates/main/admin/serviceAccounts.hbs | 2 +-
.../main/admin/stack_upgrade/services.hbs | 2 +-
.../upgrade_configs_merge_table.hbs | 4 +-
.../admin/stack_upgrade/upgrade_history.hbs | 2 +-
ambari-web/app/templates/main/alerts.hbs | 2 +-
.../alerts/add_definition_to_group_popup.hbs | 52 ++++++++++----------
.../main/alerts/definition_details.hbs | 4 +-
.../templates/main/dashboard/config_history.hbs | 2 +-
ambari-web/app/templates/main/host.hbs | 2 +-
.../app/templates/main/host/addHost/step4.hbs | 2 +-
.../app/templates/main/host/host_alerts.hbs | 4 +-
ambari-web/app/templates/main/host/logs.hbs | 8 +--
.../app/templates/main/host/stack_versions.hbs | 2 +-
.../main/service/info/configs_save_popup.hbs | 20 +++++---
ambari-web/app/templates/main/views.hbs | 4 +-
ambari-web/app/templates/wizard/step1.hbs | 16 +++---
ambari-web/app/templates/wizard/step3.hbs | 2 +-
ambari-web/app/templates/wizard/step4.hbs | 4 +-
ambari-web/app/templates/wizard/step6.hbs | 2 +-
.../wizard/step9/step9_install_host_popup.hbs | 2 +-
.../app/views/main/alert_definitions_view.js | 4 +-
33 files changed, 136 insertions(+), 174 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/ambari-web/app/styles/alerts.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/alerts.less b/ambari-web/app/styles/alerts.less
index eb3f5a3..ceae728 100644
--- a/ambari-web/app/styles/alerts.less
+++ b/ambari-web/app/styles/alerts.less
@@ -67,24 +67,10 @@
margin-top: 10px;
margin-bottom: 10px;
- font-size: 13px \9;
.filter-input-width {
width: ~"calc(100% - 20px)";
}
-
- .filter-row {
- th {
- padding: 0;
- padding-left: 4px;
- }
- }
- thead {
- background: none repeat scroll 0 0 #F8F8F8;
- th {
- padding: 8px;
- }
- }
}
.alert-definition-review {
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index 3b2c10b..cd103eb 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -1577,15 +1577,6 @@ h1 {
}
}
-.running-host-components-table{
- width: 100%;
- margin-top: 10px;
- text-align: left;
- tbody {
- vertical-align: top;
- }
-}
-
a:focus {
outline: none;
}
@@ -3303,17 +3294,6 @@ table.graphs {
#hosts-table {
margin-top: 10px;
margin-bottom: 10px;
- font-size: 13px\9;
-
- .filter-row {
- th {
- padding: 0;
- padding-left: 4px;
- }
- }
- thead {
- background: none repeat scroll 0 0 #F8F8F8;
- }
.set-rack-id {
text-decoration: none;
@@ -3920,9 +3900,6 @@ table.graphs {
.host-tab-content,
.logs-tab-content {
margin-top: 20px;
- .table thead {
- background: none repeat scroll 0 0 #F8F8F8;
- }
}
.logs-tab-content {
a.external-link {
@@ -4709,19 +4686,7 @@ ul.list-inline li {
}
.advanced-header-table {
- th.first, td.first {
- border-left-width: 1px;
- }
table-layout: fixed;
- thead > tr > th {
- border-top: none;
- }
- thead > tr > th,
- tbody > tr > td {
- border-bottom: none;
- border-left: none;
- border-right: none;
- }
td {
&.rack-id {
@@ -5565,7 +5530,8 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox {
}
td.icon {
width: 6%;
- padding: 13px 5px 5px 20px;
+ padding-left: 20px;
+ padding-right: 5px;
.view-icon-image {
img {
height: 32px;
@@ -5666,7 +5632,7 @@ input[type="radio"].align-checkbox, input[type="checkbox"].align-checkbox {
}
.empty-label {
border-top: 1px solid #dddddd;
- text-align: center
+ text-align: center;
}
}
.wrapp-flume-status{
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/ambari-web/app/styles/config_history_flow.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/config_history_flow.less b/ambari-web/app/styles/config_history_flow.less
index a9d8a2d..e2806ea 100644
--- a/ambari-web/app/styles/config_history_flow.less
+++ b/ambari-web/app/styles/config_history_flow.less
@@ -349,9 +349,6 @@
#config_history {
.table {
- thead {
- background: none repeat scroll 0 0 #F8F8F8;
- }
.filter-input-width{
width: ~"calc(100% - 20px)";
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/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 49fda07..cf16e1b 100644
--- a/ambari-web/app/styles/modal_popups.less
+++ b/ambari-web/app/styles/modal_popups.less
@@ -232,9 +232,6 @@
overflow: auto;
}
table{
- th {
- background-color: #d9edf7;
- }
margin: 0 auto;
}
.message{
@@ -350,7 +347,7 @@
#infinite-scroll-append {
text-align: center;
- .glyphicon glyphicon-spinner {
+ .glyphicon.glyphicon-spinner {
font-size: 24px;
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/ambari-web/app/styles/theme/bootstrap-ambari.css
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/theme/bootstrap-ambari.css b/ambari-web/app/styles/theme/bootstrap-ambari.css
index dc57b22..4d1f249 100644
--- a/ambari-web/app/styles/theme/bootstrap-ambari.css
+++ b/ambari-web/app/styles/theme/bootstrap-ambari.css
@@ -408,25 +408,6 @@ h2.table-title {
.table.table-hover > tbody > tr > td:last-of-type {
border-right-width: 1px;
}
-.table.table-hover > tbody > tr:hover {
- background-color: #E7F6FC;
-}
-.table.table-hover > tbody > tr:hover > td {
- background-color: #E7F6FC;
- border-color: #A7DFF2 transparent;
-}
-.table.table-hover > tbody > tr:hover > td:first-of-type {
- border-left-color: #A7DFF2;
-}
-.table.table-hover > tbody > tr:hover > td:last-of-type {
- border-right-color: #A7DFF2;
-}
-.table.table-hover > tbody > tr:hover + tr > td {
- border-top-color: transparent;
-}
-.table.table-hover > tbody > tr:hover > td .action {
- visibility: visible;
-}
.table.table-hover > tbody > tr.active {
background-color: #EEE;
}
@@ -446,6 +427,25 @@ h2.table-title {
.table.table-hover > tbody > tr.active + tr:hover > td {
border-top-color: #A7DFF2;
}
+.table.table-hover > tbody > tr:hover {
+ background-color: #E7F6FC;
+}
+.table.table-hover > tbody > tr:hover > td {
+ background-color: #E7F6FC;
+ border-color: #A7DFF2 transparent;
+}
+.table.table-hover > tbody > tr:hover > td:first-of-type {
+ border-left-color: #A7DFF2;
+}
+.table.table-hover > tbody > tr:hover > td:last-of-type {
+ border-right-color: #A7DFF2;
+}
+.table.table-hover > tbody > tr:hover + tr > td {
+ border-top-color: transparent;
+}
+.table.table-hover > tbody > tr:hover > td .action {
+ visibility: visible;
+}
h1,
h2,
h3,
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/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 e618fb6..98213c3 100644
--- a/ambari-web/app/templates/common/configs/overrideWindow.hbs
+++ b/ambari-web/app/templates/common/configs/overrideWindow.hbs
@@ -89,9 +89,9 @@
</td>
</tr>
</table>
- <table class="table table-striped hosts-table">
+ <table class="table table-hover">
<thead>
- <tr class="success">
+ <tr>
<th width="10%">
{{view Ember.Checkbox checkedBinding="view.allHostsSelected" disabledBinding="view.isDisabled"}}
</th>
@@ -101,20 +101,22 @@
</thead>
</table>
<div class="hosts-table-container">
- <table class="table table-striped hosts-table">
- {{#each entry in view.pageContent}}
- <tr {{bindAttr class="entry.filtered::hidden"}}>
- <td width="10%">
- {{view Ember.Checkbox checkedBinding="entry.selected"}}
- </td>
- <td width="45%">
- {{entry.host.hostName}}
- </td>
- <td>
- {{entry.filterColumnValue}}
- </td>
- </tr>
- {{/each}}
+ <table class="table table-hover">
+ <tbody>
+ {{#each entry in view.pageContent}}
+ <tr {{bindAttr class="entry.filtered::hidden"}}>
+ <td width="10%">
+ {{view Ember.Checkbox checkedBinding="entry.selected"}}
+ </td>
+ <td width="45%">
+ {{entry.host.hostName}}
+ </td>
+ <td>
+ {{entry.filterColumnValue}}
+ </td>
+ </tr>
+ {{/each}}
+ </tbody>
</table>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/ambari-web/app/templates/common/configs/propertyDependence.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/propertyDependence.hbs b/ambari-web/app/templates/common/configs/propertyDependence.hbs
index bc04df4..b956d5e 100644
--- a/ambari-web/app/templates/common/configs/propertyDependence.hbs
+++ b/ambari-web/app/templates/common/configs/propertyDependence.hbs
@@ -16,7 +16,7 @@
* limitations under the License.
}}
-<table class="table table-bordered table-striped">
+<table class="table table-hover">
<thead>
<tr>
<th>{{t common.service}}</th>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/ambari-web/app/templates/common/modal_popups/config_recommendation_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/modal_popups/config_recommendation_popup.hbs b/ambari-web/app/templates/common/modal_popups/config_recommendation_popup.hbs
index 8100dff..1fe4d39 100644
--- a/ambari-web/app/templates/common/modal_popups/config_recommendation_popup.hbs
+++ b/ambari-web/app/templates/common/modal_popups/config_recommendation_popup.hbs
@@ -18,7 +18,7 @@
<p>{{view.messageBody}}</p>
<div id="config-validation-warnings" class="limited-height-2">
- <table class="table no-borders">
+ <table class="table table-hover">
<thead>
<tr>
<th>{{t common.type}}</th>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/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 fe78c2d..932d4a5 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
@@ -20,7 +20,7 @@
{{t popup.dependent.configs.title}}
</div>
<span id="config-dependencies" class="limited-height-2">
- <table class="table table-striped">
+ <table class="table table-hover">
<thead>
<tr>
<th class="check-box-col">{{view view.toggleAll}}</th>
@@ -28,7 +28,7 @@
<th>{{t common.service}}</th>
<th>{{t common.configGroup}}</th>
<th>{{t common.fileName}}</th>
- <th class="row-fliud">
+ <th class="row-fluid">
<div class="col-md-6">
{{t popup.dependent.configs.table.currentValue}}
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/ambari-web/app/templates/common/modal_popups/hosts_table_list_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/modal_popups/hosts_table_list_popup.hbs b/ambari-web/app/templates/common/modal_popups/hosts_table_list_popup.hbs
index 3ae2e3e..2c5d655 100644
--- a/ambari-web/app/templates/common/modal_popups/hosts_table_list_popup.hbs
+++ b/ambari-web/app/templates/common/modal_popups/hosts_table_list_popup.hbs
@@ -19,13 +19,15 @@
{{view.hostName}}
<div class="host-elements">
{{#if view.isObjectsList}}
- <table>
- {{#each view.items}}
- <tr>
- <td>{{name}}</td>
- <td>{{status}}</td>
- </tr>
- {{/each}}
+ <table class="table table-hover">
+ <tbody>
+ {{#each view.items}}
+ <tr>
+ <td>{{name}}</td>
+ <td>{{status}}</td>
+ </tr>
+ {{/each}}
+ </tbody>
</table>
{{else}}
<ul class="list-unstyled">
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/ambari-web/app/templates/common/settings.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/settings.hbs b/ambari-web/app/templates/common/settings.hbs
index 6c2a95c..31c20fa 100644
--- a/ambari-web/app/templates/common/settings.hbs
+++ b/ambari-web/app/templates/common/settings.hbs
@@ -43,7 +43,7 @@
</div>
<div>
{{#unless view.hidePrivileges}}
- <table class="table">
+ <table class="table table-hover">
<thead>
<tr>
<th>{{t common.cluster}}</th>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/ambari-web/app/templates/experimental.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/experimental.hbs b/ambari-web/app/templates/experimental.hbs
index 862fa16..2d05897 100644
--- a/ambari-web/app/templates/experimental.hbs
+++ b/ambari-web/app/templates/experimental.hbs
@@ -30,12 +30,12 @@
{{#if App}}
{{#if App.supports}}
- <table class="table table-bordered table-striped">
+ <table class="table table-hover">
<thead>
<tr>
- <td style="width: 20%; font-weight: bold;">Experimental Functionality</td>
- <td style="width: 20%; font-weight: bold;">Enabled?</td>
- <td style="width: 60%; font-weight: bold;">Description</td>
+ <th style="width: 20%;">Experimental Functionality</th>
+ <th style="width: 20%;">Enabled?</th>
+ <th style="width: 60%;">Description</th>
</tr>
</thead>
<tbody>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/ambari-web/app/templates/main/admin/serviceAccounts.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/serviceAccounts.hbs b/ambari-web/app/templates/main/admin/serviceAccounts.hbs
index 3e103dd..40421e0 100644
--- a/ambari-web/app/templates/main/admin/serviceAccounts.hbs
+++ b/ambari-web/app/templates/main/admin/serviceAccounts.hbs
@@ -22,7 +22,7 @@
{{#if controller.dataIsLoaded}}
{{#if controller.users}}
<div class="col-md-6">
- <table class="table table-bordered table-striped">
+ <table class="table table-hover">
<thead>
<tr>
<th>{{t common.name}}</th>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/ambari-web/app/templates/main/admin/stack_upgrade/services.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/services.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/services.hbs
index ed0dfce..5a4e64b 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/services.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/services.hbs
@@ -17,7 +17,7 @@
}}
-<table class="table table-striped">
+<table class="table table-hover">
<thead>
<tr>
<th>{{t common.service}}</th>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_configs_merge_table.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_configs_merge_table.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_configs_merge_table.hbs
index 71ddbbf..28dfbb6 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_configs_merge_table.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_configs_merge_table.hbs
@@ -24,7 +24,7 @@
{{t popup.clusterCheck.Upgrade.configsMerge.alert}}
</div>
<div class="configs-table-header">
- <table class="configs-table table table-striped">
+ <table class="configs-table table table-hover">
<thead>
<tr>
<th>{{t popup.clusterCheck.Upgrade.configsMerge.configType}}</th>
@@ -36,7 +36,7 @@
</table>
</div>
<div class="limited-height-2">
- <table class="configs-table table table-striped">
+ <table class="configs-table table table-hover">
<tbody>
{{#each view.configs}}
<tr>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs
index f37f69a..9244298 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs
@@ -41,7 +41,7 @@
</div>
<br/>
<br/>
- <table class="table advanced-header-table table-striped" id="upgrade-summary-table">
+ <table class="table advanced-header-table table-hover" id="upgrade-summary-table">
<thead>
<th>{{t common.direction}}</th>
<th>{{t common.type}}</th>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/ambari-web/app/templates/main/alerts.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/alerts.hbs b/ambari-web/app/templates/main/alerts.hbs
index 2c7f365..ed08943 100644
--- a/ambari-web/app/templates/main/alerts.hbs
+++ b/ambari-web/app/templates/main/alerts.hbs
@@ -31,7 +31,7 @@
<div id="alerts">
<div class="box-header row">
</div>
- <table class="table advanced-header-table table-bordered table-striped alerts-table" id="alert-definitions-table">
+ <table class="table advanced-header-table table-hover alerts-table" id="alert-definitions-table">
<thead>
{{#view view.sortView classNames="label-row" contentBinding="view.filteredContent"}}
{{view view.parentView.nameSort class="first name-sorting"}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/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 e5e9abd..91cfe47 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
@@ -83,9 +83,9 @@
</div>
</div>
</div>
- <table class="table table-striped hosts-table">
+ <table class="table table-hover">
<thead>
- <tr class="success">
+ <tr>
<th width="10%">
{{view Ember.Checkbox checkedBinding="view.allDefsSelected" disabledBinding="view.isDisabled"}}
</th>
@@ -96,30 +96,32 @@
</thead>
</table>
<div class="hosts-table-container">
- <table class="table table-striped hosts-table">
- {{#if view.pageContent}}
- {{#each entry in view.pageContent}}
- <tr {{bindAttr class="entry.filtered::hidden"}}>
- <td width="10%">
- {{view Ember.Checkbox checkedBinding="entry.selected"}}
- </td>
- <td width="35%">
- {{entry.label}}
- </td>
- <td>
- {{entry.serviceNameDisplay}}
- </td>
- <td>
- {{entry.componentNameDisplay}}
- </td>
+ <table class="table table-hover">
+ <tbody>
+ {{#if view.pageContent}}
+ {{#each entry in view.pageContent}}
+ <tr {{bindAttr class="entry.filtered::hidden"}}>
+ <td width="10%">
+ {{view Ember.Checkbox checkedBinding="entry.selected"}}
+ </td>
+ <td width="35%">
+ {{entry.label}}
+ </td>
+ <td>
+ {{entry.serviceNameDisplay}}
+ </td>
+ <td>
+ {{entry.componentNameDisplay}}
+ </td>
+ </tr>
+ {{/each}}
+ {{else}}
+ <tr>
+ <td width="30%"></td>
+ <td>{{t alerts.actions.manage_alert_groups_popup.addDefinition.noDefinitions}}</td>
</tr>
- {{/each}}
- {{else}}
- <tr>
- <td width="30%"></td>
- <td>{{t alerts.actions.manage_alert_groups_popup.addDefinition.noDefinitions}}</td>
- </tr>
- {{/if}}
+ {{/if}}
+ </tbody>
</table>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/ambari-web/app/templates/main/alerts/definition_details.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/alerts/definition_details.hbs b/ambari-web/app/templates/main/alerts/definition_details.hbs
index 0632ea5..558614a 100644
--- a/ambari-web/app/templates/main/alerts/definition_details.hbs
+++ b/ambari-web/app/templates/main/alerts/definition_details.hbs
@@ -201,9 +201,9 @@
{{#if App.router.mainAlertInstancesController.isLoaded}}
- <table class="table advanced-header-table table-bordered table-striped alerts-table" id="alert-instances-table">
+ <table class="table advanced-header-table table-hover alerts-table" id="alert-instances-table">
<thead>
- {{#view view.sortView classNames="label-row" contentBinding="view.filteredContent"}}
+ {{#view view.sortView contentBinding="view.filteredContent"}}
{{view view.parentView.serviceSort class="first service-sorting"}}
{{view view.parentView.hostNameSort class="host-sorting"}}
{{view view.parentView.stateSort class="state-sorting"}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/ambari-web/app/templates/main/dashboard/config_history.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/dashboard/config_history.hbs b/ambari-web/app/templates/main/dashboard/config_history.hbs
index ced85ac..56480dd 100644
--- a/ambari-web/app/templates/main/dashboard/config_history.hbs
+++ b/ambari-web/app/templates/main/dashboard/config_history.hbs
@@ -17,7 +17,7 @@
}}
<div id="config_history">
- <table class="table advanced-header-table table-bordered table-striped" >
+ <table class="table advanced-header-table table-hover">
<thead>
{{#view view.sortView classNames="label-row config-history-sort-row"}}
{{view view.parentView.versionSort}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/ambari-web/app/templates/main/host.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/host.hbs b/ambari-web/app/templates/main/host.hbs
index 94dcfe2..c5438e1 100644
--- a/ambari-web/app/templates/main/host.hbs
+++ b/ambari-web/app/templates/main/host.hbs
@@ -26,7 +26,7 @@
</div>
</div>
{{outlet}}
- <table class="table advanced-header-table table-bordered table-striped" id="hosts-table">
+ <table class="table advanced-header-table table-hover" id="hosts-table">
<thead>
{{#view view.sortView classNames="label-row" contentBinding="view.filteredContent"}}
<th class="first"><div class="ember-view view-wrapper">{{view Ember.Checkbox class="host-select-all" checkedBinding="view.parentView.selectAllHosts"}}</div></th>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/ambari-web/app/templates/main/host/addHost/step4.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/host/addHost/step4.hbs b/ambari-web/app/templates/main/host/addHost/step4.hbs
index 56b16d7..305b5f4 100644
--- a/ambari-web/app/templates/main/host/addHost/step4.hbs
+++ b/ambari-web/app/templates/main/host/addHost/step4.hbs
@@ -21,7 +21,7 @@
{{t addHost.step4.title}}
</div>
<div class="pre-scrollable">
- <table class="table" id="host-configurations-table">
+ <table class="table table-hover" id="host-configurations-table">
<thead>
<tr>
<th>{{t common.service}}</th>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/ambari-web/app/templates/main/host/host_alerts.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/host/host_alerts.hbs b/ambari-web/app/templates/main/host/host_alerts.hbs
index 8232efe..18eb387 100644
--- a/ambari-web/app/templates/main/host/host_alerts.hbs
+++ b/ambari-web/app/templates/main/host/host_alerts.hbs
@@ -22,9 +22,9 @@
{{#if App.router.mainAlertInstancesController.isLoaded}}
- <table class="table advanced-header-table table-bordered table-striped alerts-table" id="host-alerts-table">
+ <table class="table advanced-header-table table-hover alerts-table" id="host-alerts-table">
<thead>
- {{#view view.sortView classNames="label-row" contentBinding="view.filteredContent"}}
+ {{#view view.sortView contentBinding="view.filteredContent"}}
{{view view.parentView.serviceSort class="first service-sorting"}}
{{view view.parentView.nameSort class="name-sorting"}}
{{view view.parentView.statusSort class="status-sorting"}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/ambari-web/app/templates/main/host/logs.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/host/logs.hbs b/ambari-web/app/templates/main/host/logs.hbs
index 3489cee..2cdee44 100644
--- a/ambari-web/app/templates/main/host/logs.hbs
+++ b/ambari-web/app/templates/main/host/logs.hbs
@@ -16,9 +16,9 @@
* limitations under the License.
}}
-<table class="table advanced-header-table table-bordered table-striped">
+<table class="table advanced-header-table table-hover">
<thead>
- {{#view view.sortView classNames="label-row" contentBinding="view.filteredContent"}}
+ {{#view view.sortView contentBinding="view.filteredContent"}}
{{view view.parentView.serviceNameSort classNames="first"}}
{{view view.parentView.componentNameSort}}
{{view view.parentView.fileExtensionsSort}}
@@ -37,7 +37,7 @@
<td>{{row.componentDisplayName}}</td>
<td>
{{#each file in row.fileNamesObject}}
- <p>
+ <div>
<a {{action openLogFile row file.filePath target="view.parentView"}} href="#" rel="log-file-name-tooltip" {{bindAttr data-original-title="file.filePath"}}>{{file.fileName}}</a>
{{#view App.LogSearchUILinkView linkQueryParamsBinding="file.linkTail" tagName="span"}}
<a {{bindAttr href="view.formatedLink"}} target="_blank" rel="log-file-name-tooltip" {{translateAttr title="popup.logTail.openInLogSearch"}} class="pull-right external-link">
@@ -45,7 +45,7 @@
{{t popup.logTail.openInLogSearch}}
</a>
{{/view}}
- </p>
+ </div>
{{/each}}
</td>
{{/view}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/ambari-web/app/templates/main/host/stack_versions.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/host/stack_versions.hbs b/ambari-web/app/templates/main/host/stack_versions.hbs
index 1cf02fe..e1666cc 100644
--- a/ambari-web/app/templates/main/host/stack_versions.hbs
+++ b/ambari-web/app/templates/main/host/stack_versions.hbs
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
}}
-<table class="table advanced-header-table table-bordered table-striped">
+<table class="table advanced-header-table table-hover">
<thead>
{{#view view.sortView classNames="label-row" contentBinding="view.filteredContent"}}
{{view view.parentView.stackSort classNames="first"}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/ambari-web/app/templates/main/service/info/configs_save_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/info/configs_save_popup.hbs b/ambari-web/app/templates/main/service/info/configs_save_popup.hbs
index 7d786cd..2877a8c 100644
--- a/ambari-web/app/templates/main/service/info/configs_save_popup.hbs
+++ b/ambari-web/app/templates/main/service/info/configs_save_popup.hbs
@@ -31,20 +31,28 @@
{{#if view.isLoaded}}
{{#if view.runningHosts}}
<i class="glyphicon glyphicon-warning-sign"></i> {{view.runningHostsMessage}}
- <table class="table-striped running-host-components-table">
+ <table class="table table-hover">
+ <thead>
<tr><th>{{t common.host}}</th><th>{{t common.components}}</th></tr>
- {{#each host in view.runningHosts}}
+ </thead>
+ <tbody>
+ {{#each host in view.runningHosts}}
<tr><td>{{host.name}}</td><td>{{host.components}}</td></tr>
- {{/each}}
+ {{/each}}
+ </tbody>
</table>
{{/if}}
{{#if view.unknownHosts}}
<i class="glyphicon glyphicon-warning-sign"></i> {{view.unknownHostsMessage}}
- <table class="table-striped running-host-components-table">
+ <table class="table table-hover">
+ <thead>
<tr><th>{{t common.host}}</th><th>{{t common.components}}</th></tr>
- {{#each host in view.unknownHosts}}
+ </thead>
+ <tbody>
+ {{#each host in view.unknownHosts}}
<tr><td>{{host.name}}</td><td>{{host.components}}</td></tr>
- {{/each}}
+ {{/each}}
+ </tbody>
</table>
{{/if}}
{{else}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/ambari-web/app/templates/main/views.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/views.hbs b/ambari-web/app/templates/main/views.hbs
index cbbaa52..7fb3bf8 100644
--- a/ambari-web/app/templates/main/views.hbs
+++ b/ambari-web/app/templates/main/views.hbs
@@ -17,9 +17,9 @@
}}
<div id="views">
- <h4 class="background-text">{{t views.main.yourViews}}</h4>
+ <h2 class="table-title">{{t views.main.yourViews}}</h2>
{{#if view.views.length}}
- <table class="table views-table">
+ <table class="table table-hover views-table">
<tbody>
{{#each instance in view.views}}
{{#if instance.visible}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/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 f78f01c..01d74e8 100644
--- a/ambari-web/app/templates/wizard/step1.hbs
+++ b/ambari-web/app/templates/wizard/step1.hbs
@@ -53,13 +53,15 @@
{{#unless servicesForSelectedStack}}
<div class="alert alert-info" role="alert">{{t installer.step1.useLocalRepo.infoForm.content.empty}}</div>
{{/unless}}
- <table class="table table-striped table-condensed">
- {{#each service in servicesForSelectedStack}}
- <tr>
- <td class="col-md-4">{{service.displayName}}</td>
- <td class="col-md-8">{{service.latestVersion}}</td>
- </tr>
- {{/each}}
+ <table class="table table-hover">
+ <tbody>
+ {{#each service in servicesForSelectedStack}}
+ <tr>
+ <td class="col-md-4">{{service.displayName}}</td>
+ <td class="col-md-8">{{service.latestVersion}}</td>
+ </tr>
+ {{/each}}
+ </tbody>
</table>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/ambari-web/app/templates/wizard/step3.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step3.hbs b/ambari-web/app/templates/wizard/step3.hbs
index 7255528..9ef401c 100644
--- a/ambari-web/app/templates/wizard/step3.hbs
+++ b/ambari-web/app/templates/wizard/step3.hbs
@@ -56,7 +56,7 @@
</div>
<div class="pre-scrollable" style="max-height: 440px;">
- <table id="confirm-hosts-table" class="table table-bordered table-striped">
+ <table id="confirm-hosts-table" class="table table-hover">
<thead>
<tr>
<th class="tinyspan">
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/ambari-web/app/templates/wizard/step4.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step4.hbs b/ambari-web/app/templates/wizard/step4.hbs
index 97f4104..1083c7d 100644
--- a/ambari-web/app/templates/wizard/step4.hbs
+++ b/ambari-web/app/templates/wizard/step4.hbs
@@ -22,7 +22,7 @@
<div class="alert alert-info">
{{t installer.step4.body}}
</div>
- <table class="table table-striped">
+ <table class="table table-hover">
<thead>
<tr>
<th class="col-md-3" id="service-name">
@@ -35,7 +35,7 @@
<tbody>
{{#each controller}}
{{#unless isHiddenOnSelectServicePage}}
- <tr {{bindAttr class="isSelected:success isSelected:service-selected"}}>
+ <tr {{bindAttr class="isSelected:active isSelected:service-selected"}}>
<td>
<div class="checkbox">
<label>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/ambari-web/app/templates/wizard/step6.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step6.hbs b/ambari-web/app/templates/wizard/step6.hbs
index cb1e575..a53c0b3 100644
--- a/ambari-web/app/templates/wizard/step6.hbs
+++ b/ambari-web/app/templates/wizard/step6.hbs
@@ -29,7 +29,7 @@
{{/if}}
<div class="pre-scrollable">
- <table class="table" id="component_assign_table">
+ <table class="table table-hover" id="component_assign_table">
<thead>
<tr>
<th class="host-column">{{t common.host}}</th>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/ambari-web/app/templates/wizard/step9/step9_install_host_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step9/step9_install_host_popup.hbs b/ambari-web/app/templates/wizard/step9/step9_install_host_popup.hbs
index 9dd6344..c852137 100644
--- a/ambari-web/app/templates/wizard/step9/step9_install_host_popup.hbs
+++ b/ambari-web/app/templates/wizard/step9/step9_install_host_popup.hbs
@@ -17,7 +17,7 @@
}}
<div id="install-fail-popup" class="pre-scrollable">
- <table class="table table-striped">
+ <table class="table table-hover">
<thead>
<tr>
<th class="col-md-3">{{t common.host}}</th>
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c32fed7/ambari-web/app/views/main/alert_definitions_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/alert_definitions_view.js b/ambari-web/app/views/main/alert_definitions_view.js
index f2b5f56..a4a2ee8 100644
--- a/ambari-web/app/views/main/alert_definitions_view.js
+++ b/ambari-web/app/views/main/alert_definitions_view.js
@@ -350,10 +350,10 @@ App.MainAlertDefinitionsView = App.TableView.extend({
fieldType: 'filter-input-width',
template: Ember.Handlebars.compile(
'<div class="btn-group display-inline-block">' +
- '<a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#">' +
+ '<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">' +
'<span class="filters-label">{{t common.groups}}: </span>' +
'<span>{{view.selected.label}} <span class="caret"></span></span>' +
- '</a>' +
+ '</button>' +
'<ul class="dropdown-menu alert-groups-dropdown">' +
'{{#each category in view.content}}' +
'<li {{bindAttr class=":category-item category.selected:active"}}>' +