You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by xi...@apache.org on 2016/12/30 04:14:23 UTC
ambari git commit: AMBARI-19322. Improve and Fix 'Admin page' after
new guidelines.(xiwang)
Repository: ambari
Updated Branches:
refs/heads/trunk 96f7f5f6f -> 3ab08abe4
AMBARI-19322. Improve and Fix 'Admin page' after new guidelines.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3ab08abe
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3ab08abe
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3ab08abe
Branch: refs/heads/trunk
Commit: 3ab08abe4d84bb5dd9fb0a0966b582102510c0b8
Parents: 96f7f5f
Author: Xi Wang <xi...@apache.org>
Authored: Thu Dec 29 17:51:20 2016 -0800
Committer: Xi Wang <xi...@apache.org>
Committed: Thu Dec 29 17:51:30 2016 -0800
----------------------------------------------------------------------
ambari-web/app/styles/stack_versions.less | 34 ++++++++------------
.../stack_upgrade/upgrade_version_column.hbs | 2 --
.../main/admin/stack_upgrade/versions.hbs | 2 +-
.../upgrade_version_column_view.js | 10 +++---
4 files changed, 20 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/3ab08abe/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 6698dfa..0e1d2d0 100644
--- a/ambari-web/app/styles/stack_versions.less
+++ b/ambari-web/app/styles/stack_versions.less
@@ -135,9 +135,6 @@
padding: 0;
margin: 0;
border: none;
- .hosts-section {
- padding-bottom: 16px;
- }
.out-of-sync-badge {
top: 0;
left: 0;
@@ -160,9 +157,15 @@
.left-menu-table {
padding: 10px 0;
margin-top: 122px;
- td.service-display-name {
- border-top: 2px solid #e4e4e4;
- border-bottom: 2px solid #e4e4e4;
+ .border-extended-table {
+ width: 100%;
+ position: relative;
+ z-index: 999;
+ background: transparent;
+ td.service-display-name {
+ border-top: 1px solid #d2d9dd;
+ border-bottom: 1px solid #d2d9dd;
+ }
}
}
div.current-version-box {
@@ -258,15 +261,16 @@
}
.hosts-section {
margin-top: 16px;
+ padding-bottom: 8px;
width: 100%;
text-align: center;
background: #f8f8f8;
border-top: 1px solid #e4e4e4;
- padding-bottom: 4px;
}
.hosts-section .hosts-bar {
font-size: 14px;
font-weight: 500;
+ padding: 8px;
}
.hosts-section .host-link {
margin: 0;
@@ -318,9 +322,11 @@
width: 100%;
text-align: center;
padding-bottom: 4px;
+ margin-top: -5px;
.service-version-info {
line-height: 20px;
- margin-bottom: 12px;
+ margin-bottom: 9px;
+ padding-top: 6px;
text-align: center;
span.label {
padding: 5px 15px;
@@ -329,18 +335,6 @@
position: relative;
}
}
- .line-separator, .line-separator-bottom{
- height: 2px;
- background: #e4e4e4;
- position: relative;
- margin: 0 0 0 -15px;
- }
- .line-separator {
- top: -7px;
- }
- .line-separator-bottom {
- top: -5px;
- }
}
}
div.current-version-box.version-column {
http://git-wip-us.apache.org/repos/asf/ambari/blob/3ab08abe/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
index 7cd9ffb..185b4f3 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
@@ -79,10 +79,8 @@
<div class="services-section">
{{#each service in view.services}}
- <div class="line-separator"></div>
<p class="service-version-info">
<span {{bindAttr class="service.isVersionInvisible:invisible :label"}}>{{service.latestVersion}}</span>
</p>
- <div class="line-separator-bottom"></div>
{{/each}}
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3ab08abe/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs
index a82aad6..acb6e78 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/versions.hbs
@@ -43,7 +43,7 @@
</div>
<div id="versions-section" class="row col-md-12">
<div class="col-md-3 left-menu-table">
- <table class="table">
+ <table class="table border-extended-table">
<thead>
</thead>
<tbody>
http://git-wip-us.apache.org/repos/asf/ambari/blob/3ab08abe/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js
index 15d9701..4ce07f2 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js
@@ -37,11 +37,11 @@ App.UpgradeVersionColumnView = App.UpgradeVersionBoxView.extend({
var height = App.Service.find().get('length') > 10 ? ((App.Service.find().get('length') - 10) * 40 + 500) : 500;
$('.version-column').height(height);
- // fix the line up minor diff issue in FireFox
- if ($.browser.mozilla) {
- $('.line-separator').css('top', '-6px');
- $('.line-separator-bottom').css('top', '-4px');
- }
+ // set the lines width of the table, line up the labels
+ var account = App.RepositoryVersion.find().get('length');
+ $('.border-extended-table').width(account * 100 + 100 + "%");
+ $('.border-extended-table').css("max-width", account * 100 + 100 + "%");
+ $('.services-section .service-version-info').css('margin-bottom', $(".border-extended-table tr").height() - 25 + "px");
},
services: function() {