You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2014/02/13 15:04:17 UTC
git commit: AMBARI-4652 Hosts table hostname and alignment is off.
(ababiichuk)
Updated Branches:
refs/heads/trunk a6224cfb4 -> 812092497
AMBARI-4652 Hosts table hostname and alignment is off. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/81209249
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/81209249
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/81209249
Branch: refs/heads/trunk
Commit: 812092497d2ac64cb8e6f3f523d0c5275f994f72
Parents: a6224cf
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Thu Feb 13 15:59:16 2014 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Thu Feb 13 15:59:34 2014 +0200
----------------------------------------------------------------------
ambari-web/app/styles/application.less | 80 +++++++++++++++++++++++------
ambari-web/app/views/main/host.js | 10 ++--
2 files changed, 68 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/81209249/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index 8329310..ae4b91f 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -2669,10 +2669,11 @@ table.graphs {
#hosts-table {
margin-top: 10px;
margin-bottom: 10px;
+ font-size: 13px\9;
.label-row {
font-size: 0.9em;
th {
- padding: 4px 4px 4px 8px;
+ padding: 4px;
}
.active-sort {
color: #555555;
@@ -2687,7 +2688,7 @@ table.graphs {
#filter-row {
th {
padding: 0px;
- padding-left: 8px;
+ padding-left: 4px;
}
.active-filter {
color: #555555;
@@ -2871,8 +2872,8 @@ table.graphs {
.progress {
margin-bottom: 0;
}
- .width70{
- width:70%;
+ .filter-input-width{
+ width:68%;
}
.table {
table-layout: fixed;
@@ -2880,33 +2881,47 @@ table.graphs {
border-top: none;
}
th, td {
+ padding-left: 4px;
+ padding-right: 4px;
border-left-width: 0;
}
-
+ input[type="checkbox"] {
+ margin: 0px;
+ }
.col0,.col1,
td:first-child,
th:first-child,
td:first-child + td,
th:first-child + th{
- width: 3%;
+ padding-left: 2px!important;
+ padding-right: 1px!important;
+ padding-right: 10px\9!important;
+ width: 1.6%;
width: 13px\9!important;
}
.col2,
td:first-child + td + td,
th:first-child + th + th{
- width: 22%;
+ width: 40%;
+ padding-left: 6px;
+ padding-right: 1px;
}
.col3, .col4,
td:first-child + td + td + td,
th:first-child + th + th + th,
td:first-child + td + td + td + td,
th:first-child + th + th + th + th{
- width: 3%;
+ padding-left: 1px!important;
+ padding-right: 1px!important;
+ width: 1.6%;
width: 13px\9!important;
}
- .col5,.col6,.col7,.col8,.col9,
+ .col5,
td:first-child + td + td + td + td + td,
- th:first-child + th + th + th + th + th,
+ th:first-child + th + th + th + th + th {
+ width: 12%!important;
+ }
+ .col6,.col7,.col8,.col9,
td:first-child + td + td + td + td + td + td,
th:first-child + th + th + th + th + th + th,
td:first-child + td + td + td + td + td + td + td,
@@ -2915,15 +2930,13 @@ table.graphs {
th:first-child + th + th + th + th + th + th + th + th,
td:first-child + td + td + td + td + td + td + td + td + td,
th:first-child + th + th + th + th + th + th + th + th + th{
- width: 12%;
- max-width: 12% !important;
+ width: 9%!important;
}
.col10,
td:first-child + td + td + td + td + td + td + td + td + td + td,
th:first-child + th + th + th + th + th + th + th + th + th + th{
- width: 16%;
- max-width: 16% !important;
+ width: 16%!important;
}
td.name {
@@ -2934,7 +2947,7 @@ table.graphs {
td.name .trim_hostname{
display: block;
float: left;
- width: 90%!important;
+ width: 93%!important;
overflow: hidden;
text-overflow: ellipsis;
}
@@ -2950,6 +2963,9 @@ table.graphs {
margin: 5px 0 0 0;
width: 13px;
}
+ td.health .icon-medkit {
+ margin: 3px 0 0 0;
+ }
ul.filter-components {
padding: 5px 0;
background: #777777;
@@ -3327,12 +3343,20 @@ background: url( data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByU
}
}
-#host-details, #hosts, .services-menu, #serviceConfig{
+.services-menu {
.icon-refresh {
color: @restart-indicator-color;
margin-left: 4px;
}
}
+#hosts, #host-details, #serviceConfig {
+ .icon-refresh {
+ color: @restart-indicator-color;
+ }
+ .alerts-count {
+ margin-left: 0;
+ }
+}
.background-operations {
.progress {
margin-bottom: 5px;
@@ -4504,7 +4528,29 @@ ul.inline li {
width: 120px;
}
}
-
+ #hosts {
+ .table {
+ .col2,
+ td:first-child + td + td,
+ th:first-child + th + th {
+ width: 27%!important;
+ }
+ .col6,.col7,.col8,.col9,
+ td:first-child + td + td + td + td + td + td,
+ th:first-child + th + th + th + th + th + th,
+ td:first-child + td + td + td + td + td + td + td,
+ th:first-child + th + th + th + th + th + th + th,
+ td:first-child + td + td + td + td + td + td + td + td,
+ th:first-child + th + th + th + th + th + th + th + th,
+ td:first-child + td + td + td + td + td + td + td + td + td,
+ th:first-child + th + th + th + th + th + th + th + th + th{
+ width: 10%!important;
+ }
+ td.name .trim_hostname{
+ width: 90%!important;
+ }
+ }
+ }
// when the scree is narrow, the popup modal width is adjustable
.full-width-modal {
.modal{
http://git-wip-us.apache.org/repos/asf/ambari/blob/81209249/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 edaa4d5..a0671dd 100644
--- a/ambari-web/app/views/main/host.js
+++ b/ambari-web/app/views/main/host.js
@@ -542,7 +542,7 @@ App.MainHostView = App.TableView.extend({
*/
nameFilterView: filters.createTextView({
column: 1,
- fieldType: 'width70',
+ fieldType: 'filter-input-width',
onChangeValue: function(){
this.get('parentView').updateFilter(this.get('column'), this.get('value'), 'string');
}
@@ -554,7 +554,7 @@ App.MainHostView = App.TableView.extend({
*/
ipFilterView: filters.createTextView({
column: 2,
- fieldType: 'width70',
+ fieldType: 'filter-input-width',
onChangeValue: function(){
this.get('parentView').updateFilter(this.get('column'), this.get('value'), 'string');
}
@@ -565,7 +565,7 @@ App.MainHostView = App.TableView.extend({
* Based on <code>filters</code> library
*/
cpuFilterView: filters.createTextView({
- fieldType: 'width70',
+ fieldType: 'filter-input-width',
fieldId: 'cpu_filter',
column: 3,
onChangeValue: function(){
@@ -578,7 +578,7 @@ App.MainHostView = App.TableView.extend({
* Based on <code>filters</code> library
*/
loadAvgFilterView: filters.createTextView({
- fieldType: 'width70',
+ fieldType: 'filter-input-width',
fieldId: 'load_avg_filter',
column: 5,
onChangeValue: function(){
@@ -591,7 +591,7 @@ App.MainHostView = App.TableView.extend({
* Based on <code>filters</code> library
*/
ramFilterView: filters.createTextView({
- fieldType: 'width70',
+ fieldType: 'filter-input-width',
fieldId: 'ram_filter',
column: 4,
onChangeValue: function(){