This is an automated email from the ASF dual-hosted git repository.
ababiichuk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 26cd3cb AMBARI-23577 NN Federation Service Pages Changes. (ababiichuk)
26cd3cb is described below
commit 26cd3cba0880d070a329d9c87345ba160363acfa
Author: ababiichuk <ababiic...@hortonworks.com>
AuthorDate: Fri Apr 13 18:15:24 2018 +0300
AMBARI-23577 NN Federation Service Pages Changes. (ababiichuk)
---
ambari-web/app/styles/application.less | 10 +++++++++-
ambari-web/app/styles/dashboard.less | 4 ----
ambari-web/app/templates/common/widget/gauge_widget.hbs | 7 ++++++-
ambari-web/app/templates/common/widget/graph_widget.hbs | 7 ++++++-
ambari-web/app/templates/common/widget/number_widget.hbs | 7 ++++++-
ambari-web/app/templates/common/widget/template_widget.hbs | 7 ++++++-
ambari-web/app/templates/main/service/info/metrics.hbs | 1 +
.../app/templates/main/service/info/summary/hdfs/widgets.hbs | 8 ++++++--
ambari-web/app/views/main/service/info/summary/hdfs/widgets.js | 4 +++-
9 files changed, 43 insertions(+), 12 deletions(-)
diff --git a/ambari-web/app/styles/application.less
b/ambari-web/app/styles/application.less
index 312486a..6b38255 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -2535,7 +2535,10 @@ a.abort-icon:hover {
.summary-block {
flex: 1;
.metrics-summary {
- margin-top:40px;
+ margin-top: 40px;
+ &.multiple-master-groups {
+ margin-top: 0;
+ }
}
.component-summary, .metrics-summary {
.col-md-2 {
@@ -2941,3 +2944,8 @@ a.abort-icon:hover {
}
}
}
+
+.widgets-group-title {
+ display: inline-block;
+ text-transform: uppercase;
+}
diff --git a/ambari-web/app/styles/dashboard.less
b/ambari-web/app/styles/dashboard.less
index d4920f1..62aae1c 100644
--- a/ambari-web/app/styles/dashboard.less
+++ b/ambari-web/app/styles/dashboard.less
@@ -63,10 +63,6 @@
}
}
- .widgets-group-title {
- display: inline-block;
- text-transform: uppercase;
- }
}
@media (min-width: 1200px) {
diff --git a/ambari-web/app/templates/common/widget/gauge_widget.hbs
b/ambari-web/app/templates/common/widget/gauge_widget.hbs
index fee24ca..3524d15 100644
--- a/ambari-web/app/templates/common/widget/gauge_widget.hbs
+++ b/ambari-web/app/templates/common/widget/gauge_widget.hbs
@@ -18,7 +18,12 @@
<div class="gauge-widget img-thumbnail">
{{#if view.isLoaded}}
- <div class="caption title col-md-11">{{view.content.widgetName}}</div>
+ <div class="caption title col-md-11">
+ {{view.content.widgetName}}
+ {{#if view.content.tag}}
+ - {{view.content.tag}}
+ {{/if}}
+ </div>
<div {{bindAttr class="view.parentView.isMoving:hidden :corner-icon
:widget-icons view.isPreview:hidden"}}>
<button class="dropdown-toggle ellipsis-menu button-border"
data-toggle="dropdown" href="#"></button>
<ul class="dropdown-menu">
diff --git a/ambari-web/app/templates/common/widget/graph_widget.hbs
b/ambari-web/app/templates/common/widget/graph_widget.hbs
index 4978d9d..0f33694 100644
--- a/ambari-web/app/templates/common/widget/graph_widget.hbs
+++ b/ambari-web/app/templates/common/widget/graph_widget.hbs
@@ -18,7 +18,12 @@
<div class="graph-widget img-thumbnail">
{{#if view.isLoaded}}
- <div class="caption title col-md-11">{{view.content.widgetName}}</div>
+ <div class="caption title col-md-11">
+ {{view.content.widgetName}}
+ {{#if view.content.tag}}
+ - {{view.content.tag}}
+ {{/if}}
+ </div>
<div {{bindAttr class="view.parentView.isMoving:hidden :corner-icon
:widget-icons view.isPreview:hidden"}}>
<button class="dropdown-toggle ellipsis-menu button-border"
data-toggle="dropdown" href="#"></button>
<ul class="dropdown-menu">
diff --git a/ambari-web/app/templates/common/widget/number_widget.hbs
b/ambari-web/app/templates/common/widget/number_widget.hbs
index 6197ea6..3b7555d 100644
--- a/ambari-web/app/templates/common/widget/number_widget.hbs
+++ b/ambari-web/app/templates/common/widget/number_widget.hbs
@@ -18,7 +18,12 @@
<div class="number-widget img-thumbnail">
{{#if view.isLoaded}}
- <div class="caption title col-md-11">{{view.content.widgetName}}</div>
+ <div class="caption title col-md-11">
+ {{view.content.widgetName}}
+ {{#if view.content.tag}}
+ - {{view.content.tag}}
+ {{/if}}
+ </div>
<div {{bindAttr class="view.parentView.isMoving:hidden :corner-icon
:widget-icons view.isPreview:hidden"}}>
<button class="dropdown-toggle ellipsis-menu button-border"
data-toggle="dropdown" href="#"></button>
<ul class="dropdown-menu">
diff --git a/ambari-web/app/templates/common/widget/template_widget.hbs
b/ambari-web/app/templates/common/widget/template_widget.hbs
index 98b6f0d..500bde1 100644
--- a/ambari-web/app/templates/common/widget/template_widget.hbs
+++ b/ambari-web/app/templates/common/widget/template_widget.hbs
@@ -18,7 +18,12 @@
<div class="template-widget img-thumbnail">
{{#if view.isLoaded}}
- <div class="caption title col-md-11">{{view.content.widgetName}}</div>
+ <div class="caption title col-md-11">
+ {{view.content.widgetName}}
+ {{#if view.content.tag}}
+ - {{view.content.tag}}
+ {{/if}}
+ </div>
<div {{bindAttr class="view.parentView.isMoving:hidden :corner-icon
:widget-icons view.isPreview:hidden"}}>
<button class="dropdown-toggle ellipsis-menu button-border"
data-toggle="dropdown" href="#"></button>
<ul class="dropdown-menu">
diff --git a/ambari-web/app/templates/main/service/info/metrics.hbs
b/ambari-web/app/templates/main/service/info/metrics.hbs
index e6678d7..94139e2 100644
--- a/ambari-web/app/templates/main/service/info/metrics.hbs
+++ b/ambari-web/app/templates/main/service/info/metrics.hbs
@@ -99,6 +99,7 @@
{{#if controller.isHDFSFederatedSummary}}
{{#if controller.selectedNSWidgetLayout}}
<div style="margin-left: 21px; margin-top: 25px; position: relative">
+ <h5 class="widgets-group-title">{{t
dashboard.widgets.nameSpace}}</h5>
<button type="button" style="min-width: 200px; text-align: left;"
class="btn btn-default dropdown-toggle" data-toggle="dropdown">
{{controller.selectedNSWidgetLayout.displayName}} <span
class="caret pull-right" style="position: relative; top: 6px;"></span>
</button>
diff --git
a/ambari-web/app/templates/main/service/info/summary/hdfs/widgets.hbs
b/ambari-web/app/templates/main/service/info/summary/hdfs/widgets.hbs
index cd17840..0c59549 100644
--- a/ambari-web/app/templates/main/service/info/summary/hdfs/widgets.hbs
+++ b/ambari-web/app/templates/main/service/info/summary/hdfs/widgets.hbs
@@ -35,8 +35,12 @@
</div>
{{! Service Metrics Section }}
-<div class="col-md-12 metrics-summary">
- <div class="col-md-2">{{t
dashboard.services.hdfs.summary.service-metrics}}</div>
+<div {{bindAttr class=":col-md-12 :metrics-summary
view.isNonFederatedHDFS::multiple-master-groups"}}>
+ <div class="col-md-2">
+ {{#if view.isNonFederatedHDFS}}
+ {{t dashboard.services.hdfs.summary.service-metrics}}
+ {{/if}}
+ </div>
<div class="col-md-10">
{{! HDFS Capacity (Disk Usage)}}
<div class="row dfs-usage col-md-3">
diff --git a/ambari-web/app/views/main/service/info/summary/hdfs/widgets.js
b/ambari-web/app/views/main/service/info/summary/hdfs/widgets.js
index 1dd172a..ae6fbab 100644
--- a/ambari-web/app/views/main/service/info/summary/hdfs/widgets.js
+++ b/ambari-web/app/views/main/service/info/summary/hdfs/widgets.js
@@ -157,6 +157,8 @@ App.HDFSSummaryWidgetsView =
Em.View.extend(App.NameNodeWidgetMixin, {
} else {
return Em.I18n.t('services.service.summary.safeModeStatus.inSafeMode');
}
- }.property('safeModeStatusValue')
+ }.property('safeModeStatusValue'),
+
+ isNonFederatedHDFS: Em.computed.lt('model.masterComponentGroups.length', 2)
});
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
