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 2015/04/23 20:33:07 UTC
[2/2] ambari git commit: AMBARI-10678. Graphs in service dashboards
are too small (smaller than cluster dashboard graphs)(xiwang)
AMBARI-10678. Graphs in service dashboards are too small (smaller than cluster dashboard graphs)(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d3f08c97
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d3f08c97
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d3f08c97
Branch: refs/heads/trunk
Commit: d3f08c97e8de468e4405621d88d5e76fea169cab
Parents: 2f25e3b
Author: Xi Wang <xi...@apache.org>
Authored: Wed Apr 22 18:52:10 2015 -0700
Committer: Xi Wang <xi...@apache.org>
Committed: Thu Apr 23 11:23:31 2015 -0700
----------------------------------------------------------------------
.../app/styles/enhanced_service_dashboard.less | 38 ++++++++++++++------
.../views/common/widget/graph_widget_view.js | 1 +
2 files changed, 28 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d3f08c97/ambari-web/app/styles/enhanced_service_dashboard.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/enhanced_service_dashboard.less b/ambari-web/app/styles/enhanced_service_dashboard.less
index b4acfa9..184a493 100644
--- a/ambari-web/app/styles/enhanced_service_dashboard.less
+++ b/ambari-web/app/styles/enhanced_service_dashboard.less
@@ -52,7 +52,7 @@
#widget-preview {
.frame {
height: 150px;
- width: 90%;
+ width: 93%;
}
.span2p4 {
width: 19.3%;
@@ -67,10 +67,12 @@
margin: 55px auto;
}
.title {
- padding: 5px 0 0 1px;
+ padding: 4px 0 0 1px;
font-weight: bold;
+ font-size: 13px;
+ line-height: 17px;
text-align: left;
- height: 45px;
+ height: 40px;
overflow: hidden;
text-overflow: ellipsis;
}
@@ -95,14 +97,28 @@
.graph-widget {
.frame;
.content {
- padding-top: 30px;
- }
- .chart-legend {
- min-width: 100%;
- padding: 5px;
- text-align: left;
- top: 95px;
- left: -15px;
+ padding-top: 45px;
+ width: 99%;
+ }
+ .screensaver{ // graph onload wait
+ width: 90%;
+ height: 100px;
+ border: 1px solid #eee;
+ background: url(/img/spinner.gif) no-repeat center center;
+ }
+ .chart-container{
+ margin: -4px 8px 0px 8px;
+ .chart-y-axis{
+ margin-top: 10px;
+ }
+ .chart-legend {
+ top: 110px;
+ left: 0px;
+ padding: 3px;
+ min-width: 100%;
+ text-align: left;
+ z-index: 3;
+ }
}
}
.gauge-widget {
http://git-wip-us.apache.org/repos/asf/ambari/blob/d3f08c97/ambari-web/app/views/common/widget/graph_widget_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/widget/graph_widget_view.js b/ambari-web/app/views/common/widget/graph_widget_view.js
index d800a73..1f705fa 100644
--- a/ambari-web/app/views/common/widget/graph_widget_view.js
+++ b/ambari-web/app/views/common/widget/graph_widget_view.js
@@ -189,6 +189,7 @@ App.GraphWidgetView = Em.View.extend(App.WidgetMixin, {
graphView: App.ChartLinearTimeView.extend({
noTitleUnderGraph: true,
+ inWidget: true,
/**
* graph height