Merge branch 'web'

[chrisu/seepark.git] / web / templates / seepark_web.html
diff --git a/web/templates/seepark_web.html b/web/templates/seepark_web.html

index 6997f7a50450b35b7e231614250a4738120ea90f..c6d34d3ae8876fb3235c7bb8e67feb5c1c2c022c 100644 (file)
--- a/web/templates/seepark_web.html
+++ b/web/templates/seepark_web.html
@@ -1,26 +1,59 @@
  <!DOCTYPE html>
  <html lang="de">
         <head>
  <!DOCTYPE html>
  <html lang="de">
         <head>
+               <title>Seepark Obsteig</title>
+
+               <!-- mobile first, yeah -->
                 <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
                 <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
+               <!-- don't cache; refresh -->
+               <meta http-equiv="Pragma" content="no-cache" />
+               <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
+               <meta http-equiv="Expires" content="0" />
+
                 <!-- Load c3.css -->
                 <!-- 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 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>
  
  
-               <title>Seepark Obsteig</title>
+               <!-- Load owm script -->
+               <script async="true" charset="utf-8" src="//openweathermap.org/themes/openweathermap/assets/vendor/owm/js/weather-widget-generator.js"></script>
         </head>
         <body>
                 <h1>Daten zum Seepark Obsteig</h1>
         </head>
         <body>
                 <h1>Daten zum Seepark Obsteig</h1>
-               <div id="chart1"></div>
-               <div id="chart7"></div>
-               <div id="chart31"></div>
-               <div id="chart365"></div>
+               <h2>Aktuelle Werte</h2>
+               <div id="current">
+               <p id="currentair">
+                       {% if airvalue is none %}
+                       <strong>Luft: N/A</strong>
+                       {% else %}
+                       <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: <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>
+
+               <h2>Der See</h2>
+               <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>
  
                 <!-- openweathermap widget -->
                 <div id="openweathermap-widget-15"></div>
@@ -34,16 +67,16 @@
                         containerid: 'openweathermap-widget-15',
                         lang: 'de',
                 });
                         containerid: 'openweathermap-widget-15',
                         lang: 'de',
                 });
-               (function() {
-                       var script = document.createElement('script');
-                       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];
-                       s.parentNode.insertBefore(script, s);
-               })();
                 </script>
  
                 </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>
  
                 <!-- Load own javascript code -->
                 <script src="{{url_for('static', filename='seepark_web.js')}}"></script>