Repository: eagle Updated Branches: refs/heads/master 077e27b23 -> d9bb79952
[EAGLE-898][EAGLE-899] Improve user experience for HBase JMX Dashboard - EAGLE-898 Show jmx dashboard background first, then render the chart as that in JPM application - EAGLE-899 Show two charts in a line by default https://issues.apache.org/jira/browse/EAGLE-898 https://issues.apache.org/jira/browse/EAGLE-899 Author: r7raul1984 <[email protected]> Closes #810 from r7raul1984/EAGLE-898-AND-EAGLE-899. Project: http://git-wip-us.apache.org/repos/asf/eagle/repo Commit: http://git-wip-us.apache.org/repos/asf/eagle/commit/d9bb7995 Tree: http://git-wip-us.apache.org/repos/asf/eagle/tree/d9bb7995 Diff: http://git-wip-us.apache.org/repos/asf/eagle/diff/d9bb7995 Branch: refs/heads/master Commit: d9bb79952283c07f2682fd91f9f04ccbcfd4fd42 Parents: 077e27b Author: r7raul1984 <[email protected]> Authored: Fri Feb 17 03:00:49 2017 +0000 Committer: r7raul1984 <[email protected]> Committed: Fri Feb 17 03:00:49 2017 +0000 ---------------------------------------------------------------------- .../webapp/app/apps/hadoop_metric/partials/overview.html | 9 +++++++-- .../apps/hadoop_metric/partials/region/regionDetail.html | 9 +++++++-- .../src/main/webapp/app/apps/hadoop_metric/style/index.css | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/eagle/blob/d9bb7995/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/overview.html ---------------------------------------------------------------------- diff --git a/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/overview.html b/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/overview.html index 73912b8..3a864d3 100644 --- a/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/overview.html +++ b/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/overview.html @@ -85,10 +85,15 @@ </div> <div class="box-body no-padding"> <div class="row border-split"> - <div class="col-sm-6 col-md-4 col-lg-3" ng-repeat="chart in chartList track by $index"> + <div class="col-sm-6 col-md-4 col-lg-6" ng-repeat="chart in chartList track by $index"> <div class="hadoopMetric-chart"> <h3>{{metricList[chart.name].title}}</h3> - <div ng-show="metricList[chart.name].loading" class="fa fa-refresh fa-spin no-animate"></div> + <div ng-show="metricList[chart.name].loading" chart class="hadoopMetric-chart-container"></div> + <div ng-show="metricList[chart.name].loading" class="overlay-wrapper"> + <div class="overlay"> + <i class="fa fa-refresh fa-spin"></i> + </div> + </div> <div ng-show="metricList[chart.name].series.length" chart class="hadoopMetric-chart-container" series="metricList[chart.name].series" option="metricList[chart.name].option"></div> http://git-wip-us.apache.org/repos/asf/eagle/blob/d9bb7995/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/region/regionDetail.html ---------------------------------------------------------------------- diff --git a/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/region/regionDetail.html b/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/region/regionDetail.html index 2a5bff4..63a895f 100644 --- a/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/region/regionDetail.html +++ b/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/partials/region/regionDetail.html @@ -93,10 +93,15 @@ </div> <div class="box-body no-padding"> <div class="row border-split"> - <div class="col-sm-6 hadoopMetric-col-md-6 col-lg-3" ng-repeat="chart in chartList track by $index"> + <div class="col-sm-6 hadoopMetric-col-md-6 col-lg-6" ng-repeat="chart in chartList track by $index"> <div class="hadoopMetric-chart"> <h3>{{metricList[chart.name].title}}</h3> - <div ng-show="metricList[chart.name].loading" class="fa fa-refresh fa-spin no-animate"></div> + <div ng-show="metricList[chart.name].loading" class="hadoopMetric-chart-container"></div> + <div ng-show="metricList[chart.name].loading" class="overlay-wrapper"> + <div class="overlay"> + <i class="fa fa-refresh fa-spin"></i> + </div> + </div> <div ng-show="metricList[chart.name].series.length" chart class="hadoopMetric-chart-container" series="metricList[chart.name].series" option="metricList[chart.name].option"></div> http://git-wip-us.apache.org/repos/asf/eagle/blob/d9bb7995/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/style/index.css ---------------------------------------------------------------------- diff --git a/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/style/index.css b/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/style/index.css index b921d8f..aa215ab 100644 --- a/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/style/index.css +++ b/eagle-hadoop-metric/src/main/webapp/app/apps/hadoop_metric/style/index.css @@ -28,7 +28,7 @@ } .hadoopMetric-chart .hadoopMetric-chart-container { - height: 200px; + height: 300px; position: relative; }
