You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2014/01/27 14:49:13 UTC
git commit: AMBARI-4423. Add Services > Assign Masters: distinguish
new masters vs existing masters. (Mikhail Bayuk via akovalenko)
Updated Branches:
refs/heads/trunk 78559508e -> 12f610d09
AMBARI-4423. Add Services > Assign Masters: distinguish new masters vs existing masters. (Mikhail Bayuk via akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/12f610d0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/12f610d0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/12f610d0
Branch: refs/heads/trunk
Commit: 12f610d096b991b0c67f161fcb118e4e43b845ba
Parents: 7855950
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Mon Jan 27 15:48:51 2014 +0200
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Mon Jan 27 15:48:51 2014 +0200
----------------------------------------------------------------------
ambari-web/app/styles/application.less | 17 ++++++++++++++++-
ambari-web/app/templates/wizard/step5.hbs | 3 ++-
2 files changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/12f610d0/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index fca4a0e..a11e846 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -3335,12 +3335,22 @@ background: url( data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByU
padding: 2px 8px;
border: solid 1px #cccccc;
margin: 2px;
- background-color: @green;
+ background-color: #969696;
color: white;
white-space: nowrap;
font-size: 0.9em;
display: inline-block;
}
+ .host-assignments .newService {
+ padding: 2px 8px;
+ border: solid 1px #cccccc;
+ margin: 2px;
+ background-color: @green;
+ color: white;
+ white-space: nowrap;
+ font-size: 0.9em;
+ display: inline-block;
+ }
.host-assignments .grey {
background-color: #808080;
@@ -5217,3 +5227,8 @@ i.icon-asterisks {
}
}
}
+
+.host-select[disabled] {
+ background-color: #848484;
+ color: #FFF;
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/12f610d0/ambari-web/app/templates/wizard/step5.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step5.hbs b/ambari-web/app/templates/wizard/step5.hbs
index 41e90fa..b66d268 100644
--- a/ambari-web/app/templates/wizard/step5.hbs
+++ b/ambari-web/app/templates/wizard/step5.hbs
@@ -63,6 +63,7 @@
optionLabelPath="content.host_info"
selectedHostBinding="selectedHost"
componentNameBinding="component_name"
+ class="host-select"
zIdBinding="zId"
disabledBinding="isInstalled"
}}
@@ -87,7 +88,7 @@
<div class="mapping-box round-corners well">
<div class="hostString"><span>{{hostInfo}}</span></div>
{{#each masterServices}}
- <span {{bindAttr class="color :assignedService :round-corners"}}>{{display_name}}</span>
+ <span {{bindAttr class="isInstalled:assignedService:newService :round-corners"}}>{{display_name}}</span>
{{/each}}
</div>
{{/each}}