html template: use minified js/css for c3 and d3

[chrisu/seepark.git] / web / templates / seepark_web.html

diff --git a/web/templates/seepark_web.html b/web/templates/seepark_web.html
index fd75b467b877d5f5904620bf62cda83024a6b21c..761ded99bde43919823e76c3baae870b4751cf5f 100644 (file)
--- a/web/templates/seepark_web.html
+++ b/web/templates/seepark_web.html
@@ -6,18 +6,19 @@
 
                <!-- don't cache; refresh -->
                <meta http-equiv="Pragma" content="no-cache" />
-               <meta http-equiv="Cache-Control" content="no-cache" />
+               <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
+               <meta http-equiv="Expires" content="0" />
                <meta http-equiv="Refresh" content="300" />
 
                <!-- Load c3.css -->
-               <link href="{{url_for('static', filename='c3.css')}}" rel="stylesheet">
+               <link href="{{url_for('static', filename='c3.min.css')}}" rel="stylesheet">
 
                <!-- Load own css -->
                <link href="{{url_for('static', filename='seepark_web.css')}}" rel="stylesheet">
 
                <!-- Load d3.js and c3.js -->
-               <script src="{{url_for('static', filename='d3.js')}}" charset="utf-8"></script>
-               <script src="{{url_for('static', filename='c3.js')}}"></script>
+               <script src="{{url_for('static', filename='d3.min.js')}}" charset="utf-8"></script>
+               <script src="{{url_for('static', filename='c3.min.js')}}"></script>
 
                <title>Seepark Obsteig</title>
        </head>
@@ -26,20 +27,30 @@
                <h2>Aktuelle Werte</h2>
                <div id="current">
                <p id="currentair">
-                       <strong>Luft: {{ airvalue }}°C</strong><br />
-                       <small>({{ airtime }})</small>
+                       {% if airvalue is none %}
+                       <strong>Luft: N/A</strong>
+                       {% else %}
+                       <strong>Luft: {{ airvalue|round(1) }}°C</strong><br />
+                       <small>({{ airtime.strftime('%Y-%m-%d %H:%M') }})</small>
+                       {% endif %}
                </p>
                <p id="currentwater">
-                       <strong>Wasser: {{ watervalue }}°C</strong><br />
-                       <small>({{ watertime }})</small>
+                       <strong>Wasser: {{ watervalue|round(1) }}°C</strong><br />
+                       <small>({{ watertime.strftime('%Y-%m-%d %H:%M') }})</small>
                </p>
                </div>
 
                <h2>Der See</h2>
-               <div id="chart1"></div>
-               <div id="chart7"></div>
-               <div id="chart31"></div>
-               <div id="chart365"></div>
+               <div id="chart_water_1"></div>
+               <div id="chart_water_7"></div>
+               <div id="chart_water_31"></div>
+               <div id="chart_water_365"></div>
+
+               <h2>Die Luft</h2>
+               <div id="chart_air_1"></div>
+               <div id="chart_air_7"></div>
+               <div id="chart_air_31"></div>
+               <div id="chart_air_365"></div>
 
                <!-- openweathermap widget -->
                <div id="openweathermap-widget-15"></div>
@@ -63,6 +74,9 @@
                })();
                </script>
 
+               <hr />
+               <p><small><a href="https://git.toastfreeware.priv.at/chrisu/seepark.git">Source code</a></small></p>
+               
                <!-- Load own javascript code -->
                <script src="{{url_for('static', filename='seepark_web.js')}}"></script>