source code beautification

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

diff --git a/web/templates/seepark_web.html b/web/templates/seepark_web.html
index 3eae1332e733d4d706b5302eac10226dc86cec61..09f17dc316e9e954476309f231803ffa5864de37 100644 (file)
--- a/web/templates/seepark_web.html
+++ b/web/templates/seepark_web.html
@@ -6,18 +6,21 @@
 
                <!-- don't cache; refresh -->
                <meta http-equiv="Pragma" content="no-cache" />
-               <meta http-equiv="Cache-Control" content="no-cache" />
-               <meta http-equiv="Refresh" content="300" />
+               <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
+               <meta http-equiv="Expires" content="0" />
 
                <!-- 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>
+               <!-- Load d3.js and c3.js, and strftime.js -->
+               <script src="{{url_for('static', filename='d3.min.js')}}" charset="utf-8"></script>
+               <script src="{{url_for('static', filename='c3.min.js')}}"></script>
+               <script src="{{url_for('static', filename='strftime-min.js')}}"></script>
+
+               <!-- here the owm script will be appended -->
 
                <title>Seepark Obsteig</title>
        </head>
@@ -29,13 +32,13 @@
                        {% 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>
+                       <strong>Luft: <span id="currentairvalue">{{ airvalue|round(1) }}</span>°C</strong><br />
+                       <small>(<span id="currentairtime">{{ airtime.strftime('%Y-%m-%d %H:%M') }}</span>)</small>
                        {% endif %}
                </p>
                <p id="currentwater">
-                       <strong>Wasser: {{ watervalue|round(1) }}°C</strong><br />
-                       <small>({{ watertime.strftime('%Y-%m-%d %H:%M') }})</small>
+                       <strong>Wasser: <span id="currentwatervalue">{{ watervalue|round(1) }}</span>°C</strong><br />
+                       <small>(<span id="currentwatertime">{{ watertime.strftime('%Y-%m-%d %H:%M') }}</span>)</small>
                </p>
                </div>
 
@@ -68,11 +71,19 @@
                        script.async = true;
                        script.charset = "utf-8";
                        script.src = "//openweathermap.org/themes/openweathermap/assets/vendor/owm/js/weather-widget-generator.js";
-                       var s = document.getElementsByTagName('script')[0];
+                       var s = document.getElementsByTagName('title')[0];
                        s.parentNode.insertBefore(script, s);
                })();
                </script>
 
+               <!-- windy widget -->
+               <div id="windy">
+               <iframe id="windyiframe" width="650" height="450" src="https://embed.windy.com/embed2.html?lat=47.297&amp;lon=10.927&amp;zoom=10&amp;level=surface&amp;overlay=rain&amp;menu=&amp;message=&amp;marker=&amp;calendar=&amp;pressure=&amp;type=map&amp;location=coordinates&amp;detail=&amp;detailLat=48.200&amp;detailLon=16.350&amp;metricWind=default&amp;metricTemp=default&amp;radarRange=-1" frameborder="0"></iframe> 
+               </div>
+
+               <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>