Merge pull request #110 from flask-dashboard/development

Development
flask-dashboard · May 4, 2018 · 1ad0da7 · 1ad0da7
2 parents 96bb49c + fe3a090
commit 1ad0da7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,4 +15,8 @@ deploy:
   provider: pypi
   user: flyingbird95
   password:
-    secure: P3BqSjdTww+I9tnpurGTPSTEQUvl9ki3BxvV3ndpLqvd+4rE5njjuaWuinSSjNqNDUmWhV9PfxfzMoXuRJZHPUCEfF5PrJ3aH4tQcuP/83PAdjGAokzHeByLJsYhbcPKWqon/j1syynAQtOpM//ow8qK4c/tE3I1mP1YQujp3R0SAA4KMHtZ+ZhMcyXFwMprX6dfcdv7w/H0zxcQhVJn5vZmiPMmkwRXhNEQ7jif8PVpGdGYBtX/hySaV2WTEZNaKyUvrvK6vxzPjoaT7JBrHrCcasefUy3/9oVX+bZHoUTd1OgrwCYehAWr59l5Mk+LJMgcMb6DaVu6KXDJSQ5NNFonpIJLl+HIGyz+EXsdb3ZgPwq395RNDYX1VrKA1JOKBN/a6mlWPpV4JyNeTyYFIGJdbZYbaLgc080pA/IN8K3EdAO1Ulze9gVFcOdLYbUWWEy4JHcKoaL9+FIPw+02HI980r8X9XdYdeMBll+hGiyIoV4OGisacjdb3CNbOCc9MmsKCieJJe6ee1VjUYgFEFcqr6cFXDH5rFgLwjNL2ofcrItic30kdmf/Pk31cj8aPMmR/hFYPiOGx+mpMI94vdRhfU89JQqAvvFWFJp5+fA+TBRnP+4APrCEcvgr95Wp0S+GLP6t0MGcQp7EaloedKbWi0qvVRaaLU6X2NwenpM=
+    secure: PnHFJ+b7pqspmlS3sP5+3RW0gYBhoYza/yM78CYTP5n4gB/30wsMNlwBkGQ6EibK292tz7xSJ6BP537U9LqEyMafpUabfYJ3LqUgkVQOzzIXh7Z9pWWkxTmLD3MgX/yS0l3GOEx9RLh9tRPKWR8tc/zzzh+MV1LyCSty3GmlnIQ0bOddauXkYJdK8cSmOIbgoBg604yHzZihkP5bGGOJB2keuf6Ty1whliuJw17lz7992YTJYhqurND6V5iNTZxr6W7CzEnoyivW09lrDeAQNdpQcb3gfgvfMMJxEgd6Qri/ILm/dF9y8tvR/BEOo+xN6yF4QK1CthW+usPpaE+6LzQRjbz1fVIp5f5kuEAqpgYjKl5GeUGDrx0XQIABpmXqJ2oIXUIHMnTbDN2CgXdzD7ez+mM2rMEXupBgPnZKEViSPxMyynDQLW0HMvXsX83wGqgTRaj1dStpJPtORsW4bDJ0+8Gni3g/zZC4pzwJMZGkSzcFvqGnyD9RK6KwlixO2A4Z2AB/l3Y4oizXlvLShNryDxA31gwaGRFfBLjBEu78wIzkiVarrZezWl6ecEJG6UjlnTPNWqyjhAj9Hsw+0Yn9fvC841tasqoF49R4SZfjGyqbx7x3fTrbZxVNNdOEboBgy7gU4aXzMLCARbPGJzuqpbIBlbcaR+FnNcMX+7Y=
+  on:
+    distributions: sdist bdist_wheel
+    repo: flask-dashboard/Flask-MonitoringDashboard
+    branch: master
diff --git a/README.md b/README.md
@@ -4,6 +4,7 @@
 [![codecov](https://codecov.io/gh/flask-dashboard/Flask-MonitoringDashboard/branch/master/graph/badge.svg)](https://codecov.io/gh/flask-dashboard/Flask-MonitoringDashboard)
 [![PyPI version](https://badge.fury.io/py/Flask-MonitoringDashboard.svg)](https://badge.fury.io/py/Flask-MonitoringDashboard)
 [![Py-version](https://img.shields.io/pypi/pyversions/flask_monitoringdashboard.svg)](https://img.shields.io/pypi/pyversions/flask_monitoringdashboard.svg)
+[![Downloads](http://pepy.tech/badge/flask-monitoringdashboard)](http://pepy.tech/count/flask-monitoringdashboard)
 
 Dashboard for automatic monitoring of Flask web-services.
 

diff --git a/flask_monitoringdashboard/templates/fmd_dashboard/graph.html b/flask_monitoringdashboard/templates/fmd_dashboard/graph.html
@@ -8,6 +8,15 @@ <h4>{{ title }}</h4>
     {% endblock %}
   </div>
   <div class="card-body">
+    {% block graph_content %}
+      {% if graph %}
+        <div class="col-sm-12">
+          {{ graph|safe }}
+        </div>
+      {% else %}
+        <p>No data available.</p>
+      {% endif %}
+    {% endblock %}
 
     {% block form_content %}
     {% if form %}
@@ -82,16 +91,6 @@ <h4>{{ title }}</h4>
         </div>
       </div>
     </div>
-
-    {% block graph_content %}
-      {% if graph %}
-        <div class="col-sm-12">
-          {{ graph|safe }}
-        </div>
-      {% else %}
-        <p>No data available.</p>
-      {% endif %}
-    {% endblock %}
   </div>
 </div>
 {% block summary %}