X-Git-Url: https://git.toastfreeware.priv.at/chrisu/seepark.git/blobdiff_plain/7089107ff2449e6d62cf0d16bca58a1823ffaf4b..d54f57a81207b2eb23eb8e5a39c1a055a6a51cc7:/web/templates/seepark_web.html?ds=sidebyside

diff --git a/web/templates/seepark_web.html b/web/templates/seepark_web.html
index 7715013..761ded9 100644
--- 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>
@@ -29,21 +30,27 @@
 			{% if airvalue is none %}
 			<strong>Luft: N/A</strong>
 			{% else %}
-			<strong>Luft: {{ airvalue }}°C</strong><br />
-			<small>({{ airtime }})</small>
+			<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>
@@ -67,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>