You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2017/09/18 15:03:21 UTC
ambari git commit: AMBARI-21980. Change MAINT repo icon from the
existing Maintenance Mode icon (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk e87da0862 -> 10a960f70
AMBARI-21980. Change MAINT repo icon from the existing Maintenance Mode icon (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/10a960f7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/10a960f7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/10a960f7
Branch: refs/heads/trunk
Commit: 10a960f7041f662bbc50733cca60c8f8731ccca8
Parents: e87da08
Author: Alex Antonenko <aa...@hortonworks.com>
Authored: Mon Sep 18 18:03:03 2017 +0300
Committer: Alex Antonenko <aa...@hortonworks.com>
Committed: Mon Sep 18 18:03:03 2017 +0300
----------------------------------------------------------------------
ambari-web/app/styles/stack_versions.less | 8 +++++++-
.../main/admin/stack_upgrade/upgrade_version_box.hbs | 6 +++---
.../main/admin/stack_upgrade/upgrade_version_column.hbs | 12 ++++++++++++
3 files changed, 22 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/10a960f7/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 804bb4d..245dbff 100644
--- a/ambari-web/app/styles/stack_versions.less
+++ b/ambari-web/app/styles/stack_versions.less
@@ -156,7 +156,7 @@
}
.left-menu-table {
padding: 10px 0;
- margin-top: 122px;
+ margin-top: 142px;
.border-extended-table {
width: 100%;
position: relative;
@@ -291,6 +291,12 @@
padding: 5px;
margin-bottom: 0;
}
+ .version-column-display-type{
+ text-align: center;
+ height: 20px;
+ margin-bottom: 0;
+ color: #ff4500;
+ }
.version-column-show-details {
text-align: center;
font-size: 13px;
http://git-wip-us.apache.org/repos/asf/ambari/blob/10a960f7/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_box.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_box.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_box.hbs
index 8ce441d..d40483d 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_box.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_box.hbs
@@ -30,13 +30,13 @@
<p class="patch-icon">
{{#if view.content.isMaint}}
- <i class="glyphicon glyphicon-umbrella"></i> {{t common.maint}}
+ <i class="icon-wrench"></i> {{t common.maint}}
{{/if}}
{{#if view.content.isPatch}}
- <i class="glyphicon glyphicon-umbrella"></i> {{t common.patch}}
+ <i class="icon-bug"></i> {{t common.patch}}
{{/if}}
{{#if view.content.isService}}
- <i class="glyphicon glyphicon-umbrella"></i> {{t common.service}}
+ <i class="icon-umbrella"></i> {{t common.service}}
{{/if}}
</p>
http://git-wip-us.apache.org/repos/asf/ambari/blob/10a960f7/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 41c8cdb..bfeae65 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
@@ -28,6 +28,18 @@
{{/if}}
</p>
+<p class="version-column-display-type">
+ {{#if view.content.isMaint}}
+ <i class="icon-wrench"></i> {{t common.maint}}
+ {{/if}}
+ {{#if view.content.isPatch}}
+ <i class="icon-bug"></i> {{t common.patch}}
+ {{/if}}
+ {{#if view.content.isService}}
+ <i class="icon-umbrella"></i> {{t common.service}}
+ {{/if}}
+</p>
+
<p class="version-column-show-details">
<a {{action openVersionBoxPopup target="view"}}>{{t admin.stackVersions.version.column.showDetails}}</a>
</p>