This is an automated email from the ASF dual-hosted git repository.
atkach pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by
this push:
new 44d303c AMBARI-24025 Display Mpack Info on Service Summary Page
44d303c is described below
commit 44d303cb106afd554f7902144da90437d37698d1
Author: Andrii Tkach <[email protected]>
AuthorDate: Mon Jun 4 21:30:53 2018 +0300
AMBARI-24025 Display Mpack Info on Service Summary Page
* AMBARI-24025 Display Mpack Info on Service Summary Page
---
ambari-web/app/messages.js | 1 +
ambari-web/app/styles/application.less | 10 +++++++++-
ambari-web/app/templates/main/service/service.hbs | 6 ++++++
ambari-web/app/views/main/service/service.js | 7 ++++++-
4 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 99034e5..ded6c4c 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -377,6 +377,7 @@ Em.I18n.translations = {
'common.with': 'with',
'common.zookeeper':'ZooKeeper',
'common.critical.error': 'Critical',
+ 'common.mpack': 'Mpack',
'models.alert_instance.tiggered.verbose': "Occurred on {0} <br> Checked on
{1}",
'models.alert_definition.triggered.verbose': "Occurred on {0}",
diff --git a/ambari-web/app/styles/application.less
b/ambari-web/app/styles/application.less
index 5048c9a..ef7fe9b 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -2544,7 +2544,7 @@ a.abort-icon:hover {
.metrics-summary {
margin-top:40px;
}
- .component-summary, .metrics-summary {
+ .component-summary, .metrics-summary, .mpack-summary {
.col-md-2 {
float: left;
padding-left: 0;
@@ -2563,6 +2563,14 @@ a.abort-icon:hover {
text-transform: capitalize;
}
}
+ .mpack-summary {
+ .col-md-2 {
+ top: 0;
+ }
+ .main-info {
+ padding: 0 30px;
+ }
+ }
}
.quick-links-block {
diff --git a/ambari-web/app/templates/main/service/service.hbs
b/ambari-web/app/templates/main/service/service.hbs
index 9724095..3a03fa4 100644
--- a/ambari-web/app/templates/main/service/service.hbs
+++ b/ambari-web/app/templates/main/service/service.hbs
@@ -18,6 +18,12 @@
<div class="service-content">
<div class="summary-info">
+ <div class="row mpack-summary">
+ <div class="col-md-12">
+ <div class="col-md-2">{{t common.mpack}}:</div>
+ <div class="col-md-10 main-info
summary-value">{{view.mpackVersion}}</div>
+ </div>
+ </div>
{{yield}}
</div>
</div>
\ No newline at end of file
diff --git a/ambari-web/app/views/main/service/service.js
b/ambari-web/app/views/main/service/service.js
index 1e2d57c..6032333 100644
--- a/ambari-web/app/views/main/service/service.js
+++ b/ambari-web/app/views/main/service/service.js
@@ -121,7 +121,12 @@ App.ComponentLiveTextView = Em.View.extend({
});
App.MainDashboardServiceViewWrapper = Em.Mixin.create({
- layoutName: require('templates/main/service/service')
+ layoutName: require('templates/main/service/service'),
+
+ mpackVersion: function() {
+ const stackService =
App.StackService.find(this.get('controller.content.serviceName'));
+ return `${stackService.get('stackName')}
(${stackService.get('stackVersion')})`;
+ }.property('controller.content.serviceName'),
});
App.MainDashboardServiceView =
Em.View.extend(App.MainDashboardServiceViewWrapper, {
--
To stop receiving notification emails like this one, please contact
[email protected].
