Просмотр исходного кода

Cleaned up formating in `summary.html.tmpl`

No changes other than whitespace
Kurt Jacobson 7 лет назад
Родитель
Сommit
6507c89623
1 измененных файлов с 287 добавлено и 202 удалено
  1. 287 202
      summary.html.tmpl

+ 287 - 202
summary.html.tmpl

@@ -2,214 +2,299 @@
 <html lang="en">
   <head itemscope itemtype="http://schema.org/Website">
     <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-	<meta http-equiv="Refresh" Content="180">
-	#if $Extras.has_key('cwop')
-        <meta name="description" content="$station.location Weather Station ($Extras.cwop) - weather web site powered by WeeWX">
-        #else
-        <meta name="description" content="$station.location Weather Station - weather web site powered by WeeWX">
-	#end if
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <link rel="profile" href="http://gmpg.org/xfn/11" />
-	#if $Extras.has_key('web_url')
-	<link href="$Extras.web_url/summary.html" itemprop="url"/>
-	#end if
-        
-	<title itemprop="name">$station.location Weather Summaries</title>
-        
-        <!-- Open Graph -->
-	<meta property="og:site_name" content="$station.location Summaries and Records" />
-	<meta property="og:title" content="Summaries and Records"/>
-	#if $Extras.has_key('web_url')
-	<meta property="og:url" content="$Extras.web_url/summary.html"/>
-	#end if
-	<meta property="og:description" content="Summaries and Records for $station.location - weather web site powered by WeeWX" />
-	<meta property="og:type" content="website" /> 
-
-        <!-- Icons -->
-        <link rel="icon" href="favicon.ico" type="image/png">
-	<link rel="apple-touch-icon" href="touch-icon.png"/>
-        
-        <!-- Styles -->
-        <link href='http://fonts.googleapis.com/css?family=Lato:300,400,700' rel='stylesheet' type='text/css'>
-	<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
-        <link rel="stylesheet" href="css/main.css">
-        
-        <!-- Skripte -->
-        <script src="js/modernizr-2.6.2.min.js"></script>
-	<script src="js/checkdiff.js"></script>
-        
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta http-equiv="Refresh" Content="180">
+    #if $Extras.has_key('cwop')
+    <meta name="description" content="$station.location Weather Station ($Extras.cwop) - weather web site powered by WeeWX">
+    #else
+    <meta name="description" content="$station.location Weather Station - weather web site powered by WeeWX">
+    #end if
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="profile" href="http://gmpg.org/xfn/11" />
+    #if $Extras.has_key('web_url')
+    <link href="$Extras.web_url/summary.html" itemprop="url"/>
+    #end if
+    <title itemprop="name">$station.location Weather Summaries</title>
+    <!-- Open Graph -->
+    <meta property="og:site_name" content="$station.location Summaries and Records" />
+    <meta property="og:title" content="Summaries and Records"/>
+    #if $Extras.has_key('web_url')
+    <meta property="og:url" content="$Extras.web_url/summary.html"/>
+    #end if
+    <meta property="og:description" content="Summaries and Records for $station.location - weather web site powered by WeeWX" />
+    <meta property="og:type" content="website" />
+    <!-- Icons -->
+    <link rel="icon" href="favicon.ico" type="image/png">
+    <link rel="apple-touch-icon" href="touch-icon.png"/>
+    <!-- Styles -->
+    <link href='http://fonts.googleapis.com/css?family=Lato:300,400,700' rel='stylesheet' type='text/css'>
+    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
+    <link rel="stylesheet" href="css/main.css">
+    <!-- Skripte -->
+    <script src="js/modernizr-2.6.2.min.js"></script>
+    <script src="js/checkdiff.js"></script>
   </head>
-
   <body>
     <!-- Menu navbar -->
     <header>
-            <div class="container-fix" >
-                <div class="h-left" >
-                <h1><i class="fa fa-cloud" ></i> $station.location </h1>
-                <p>$station.latitude[0]&deg; $station.latitude[1]' $station.latitude[2] | $station.longitude[0]&deg; $station.longitude[1]' $station.longitude[2] | $station.altitude | <a href="https://www.google.com/maps/?q=$station.latitude[0]&deg;%20$station.latitude[1]%20$station.latitude[2],$station.longitude[0]&deg;%20$station.longitude[1]%20$station.longitude[2]" target="_blank" ><i class="fa fa-map-marker" ></i> Show on map</a></p>
-                <h2>Summaries and Records</h2>
-                <p><i class="fa fa-clock-o" ></i> $current.dateTime $current.dateTime.format("%Z")</p>
-		<p id="freshweather" class="m-orange"></p>
-		<script>
-                      window.onload = checkDiff("$current.dateTime ($current.dateTime.format('%Z'))");
-                </script>
-                </div>
-                
-                <div class="h-right" >
-                    <table>
-                        <tr><td><b>Station:</b></td><td>$station.hardware</td></tr>
-                        <tr><td><b>Software:</b></td><td><a href="http://weewx.com/" target="_blank" >WeeWX v$station.version</a></td></tr>
-                        <tr><td><b>Weewx uptime:</b></td><td>$station.uptime</td></tr>
-                        <tr><td><b>Server uptime:</b></td><td>$station.os_uptime</td></tr>
-			#if $Extras.has_key('cwop') and $Extras.has_key('crahs')
-			<tr><td><b>Station IDs:</b></td><td><a href="$Extras.cwop_url" target="_blank">$Extras.cwop</a> | <a href="$Extras.crahs_url" target="_blank">$Extras.crahs</a></td></tr>
-			#end if
-                    </table>
-                </div>
-
-                <nav>
-                    <ul class="topnav" id="myTopnav">
-			<li class="icon"><a href="javascript:void(0);" onclick="myFunction()"><i class="fa fa-bars" ></i></a></li>
-                        <li><a href="/" >Current</a></li>
-                        <li><a href="week.html" >Week</a></li>
-                        <li><a href="month.html" >Month</a></li>
-                        <li><a href="year.html" >Year</a></li>
-			<li class="active" ><a href="summary.html" >Summaries</a></li>
-			<li><a href="station.html" >Station</a></li>
-                        <li><a href="RSS/weewx_rss.xml" ><i class="fa fa-rss" ></i></a></li>
-                    </ul>
-                </nav>
+      <div class="container-fix" >
+        <div class="h-left" >
+          <h1><i class="fa fa-cloud" ></i> $station.location </h1>
+          <p>$station.latitude[0]&deg; $station.latitude[1]' $station.latitude[2] | $station.longitude[0]&deg; $station.longitude[1]' $station.longitude[2] | $station.altitude | <a href="https://www.google.com/maps/?q=$station.latitude[0]&deg;%20$station.latitude[1]%20$station.latitude[2],$station.longitude[0]&deg;%20$station.longitude[1]%20$station.longitude[2]" target="_blank" ><i class="fa fa-map-marker" ></i> Show on map</a></p>
+          <h2>Summaries and Records</h2>
+          <p><i class="fa fa-clock-o" ></i> $current.dateTime $current.dateTime.format("%Z")</p>
+          <p id="freshweather" class="m-orange"></p>
+          <script>
+            window.onload = checkDiff("$current.dateTime ($current.dateTime.format('%Z'))");
+          </script>
+        </div>
+        <div class="h-right" >
+          <table>
+            <tr>
+              <td><b>Station:</b></td>
+              <td>$station.hardware</td>
+            </tr>
+            <tr>
+              <td><b>Software:</b></td>
+              <td><a href="http://weewx.com/" target="_blank" >WeeWX v$station.version</a></td>
+            </tr>
+            <tr>
+              <td><b>Weewx uptime:</b></td>
+              <td>$station.uptime</td>
+            </tr>
+            <tr>
+              <td><b>Server uptime:</b></td>
+              <td>$station.os_uptime</td>
+            </tr>
+            #if $Extras.has_key('cwop') and $Extras.has_key('crahs')
+            <tr>
+              <td><b>Station IDs:</b></td>
+              <td><a href="$Extras.cwop_url" target="_blank">$Extras.cwop</a> | <a href="$Extras.crahs_url" target="_blank">$Extras.crahs</a></td>
+            </tr>
+            #end if
+          </table>
+        </div>
+        <nav>
+          <ul class="topnav" id="myTopnav">
+            <li class="icon"><a href="javascript:void(0);" onclick="myFunction()"><i class="fa fa-bars" ></i></a></li>
+            <li><a href="/" >Current</a></li>
+            <li><a href="week.html" >Week</a></li>
+            <li><a href="month.html" >Month</a></li>
+            <li><a href="year.html" >Year</a></li>
+            <li class="active" ><a href="summary.html" >Summaries</a></li>
+            <li><a href="station.html" >Station</a></li>
+            <li><a href="RSS/weewx_rss.xml" ><i class="fa fa-rss" ></i></a></li>
+          </ul>
+        </nav>
+      </div>
+    </header>
+    <!-- Main container -->
+    <div class="main" >
+      <div class="container" >
+        <div class="left" >
+          <div class="card" >
+            <h1><i class="fa fa-bolt m-orange" ></i> All Time Records (Since Nov. 2007)</h1>
+            <table class="tablespacer">
+              <tr>
+                <td colspan="3"><b>Outside Temperatures</b></td>
+              </tr>
+              <tr>
+                <td>Highest</td>
+                <td>$alltime.outTemp.max</td>
+                <td>$alltime.outTemp.maxtime</td>
+              </tr>
+              <tr>
+                <td>Lowest</td>
+                <td>$alltime.outTemp.min</td>
+                <td>$alltime.outTemp.mintime</td>
+              </tr>
+              <tr>
+                <td>Min Max</td>
+                <td>$alltime.outTemp.minmax</td>
+                <td>$alltime.outTemp.minmaxtime</td>
+              </tr>
+              <tr>
+                <td>Max Min</td>
+                <td>$alltime.outTemp.maxmin</td>
+                <td>$alltime.outTemp.maxmintime</td>
+              </tr>
+              <tr>
+                <td colspan="3"><br><b>Dewpoint</b></td>
+              </tr>
+              <tr>
+                <td>Highest</td>
+                <td>$alltime.dewpoint.max</td>
+                <td>$alltime.dewpoint.maxtime</td>
+              </tr>
+              <tr>
+                <td>Lowest</td>
+                <td>$alltime.dewpoint.min</td>
+                <td>$alltime.dewpoint.mintime</td>
+              </tr>
+              <tr>
+                <td colspan="3"><br><b>Precipitation</b></td>
+              </tr>
+              <tr>
+                <td>Highest Daily Rainfall</td>
+                <td>$alltime.rain.maxsum</td>
+                <td>$alltime.rain.maxsumtime.format("%m/%d/%Y")</td>
+              </tr>
+              <tr>
+                <td>Highest Rain Rate</td>
+                <td>$alltime.rainRate.max</td>
+                <td>$alltime.rainRate.maxtime</td>
+              </tr>
+              <tr>
+                <td colspan="3"><br><b>Heat Index</b></td>
+              </tr>
+              <tr>
+                <td>Highest</td>
+                <td>$alltime.heatindex.max</td>
+                <td>$alltime.heatindex.maxtime</td>
+              </tr>
+              <tr>
+                <td colspan="3"><br><b>Barometer</b></td>
+              </tr>
+              <tr>
+                <td>Highest</td>
+                <td>$alltime.barometer.max</td>
+                <td>$alltime.barometer.maxtime</td>
+              </tr>
+              <tr>
+                <td>Lowest</td>
+                <td>$alltime.barometer.min</td>
+                <td>$alltime.barometer.mintime</td>
+              </tr>
+              <tr>
+                <td colspan="3"><br><b>Wind</b></td>
+              </tr>
+              <tr>
+                <td>Highest Sustained</td>
+                <td>$alltime.windSpeed.max</td>
+                <td>$alltime.windSpeed.maxtime</td>
+              </tr>
+              <tr>
+                <td>Highest Gust</td>
+                <td>$alltime.windGust.max</td>
+                <td>$alltime.windGust.maxtime</td>
+              </tr>
+              <tr>
+                <td colspan="3"><br><b>Wind Chill</b></td>
+              </tr>
+              <tr>
+                <td>Lowest</td>
+                <td>$alltime.windchill.min</td>
+                <td>$alltime.windchill.mintime</td>
+              </tr>
+              <tr>
+                <td colspan="3"><br><b>House Temperatures</b></td>
+              </tr>
+              <tr>
+                <td>Highest</td>
+                <td>$alltime.inTemp.max</td>
+                <td>$alltime.inTemp.maxtime</td>
+              </tr>
+              <tr>
+                <td>Lowest</td>
+                <td>$alltime.inTemp.min</td>
+                <td>$alltime.inTemp.mintime</td>
+              </tr>
+              <tr>
+                <td colspan="3"><br><b>House Humidity</b></td>
+              </tr>
+              <tr>
+                <td>Highest</td>
+                <td>$alltime.inHumidity.max</td>
+                <td>$alltime.inHumidity.maxtime</td>
+              </tr>
+              <tr>
+                <td>Lowest</td>
+                <td>$alltime.inHumidity.min</td>
+                <td>$alltime.inHumidity.mintime</td>
+              </tr>
+            </table>
+          </div>
+          <div class="card">
+            <h1><i class="fa fa-table m-grau" ></i> Number of Days with Observations</h1>
+            <div class="tablefix">
+              $temp_count_table
             </div>
-     </header>
-    <!-- Main container -->  
-     <div class="main" >
-        <div class="container" >
-	    <div class="left" >
-
-		<div class="card" >
-                    <h1><i class="fa fa-bolt m-orange" ></i> All Time Records (Since Nov. 2007)</h1>
-                    <table class="tablespacer">
-			<tr><td colspan="3"><b>Outside Temperatures</b></td></tr>
-			<tr><td>Highest</td><td>$alltime.outTemp.max</td><td>$alltime.outTemp.maxtime</td></tr>
-			<tr><td>Lowest</td><td>$alltime.outTemp.min</td><td>$alltime.outTemp.mintime</td></tr>
-		    	<tr><td>Min Max</td><td>$alltime.outTemp.minmax</td><td>$alltime.outTemp.minmaxtime</td></tr>
-			<tr><td>Max Min</td><td>$alltime.outTemp.maxmin</td><td>$alltime.outTemp.maxmintime</td></tr>
-			<tr><td colspan="3"><br><b>Dewpoint</b></td></tr>
-			<tr><td>Highest</td><td>$alltime.dewpoint.max</td><td>$alltime.dewpoint.maxtime</td></tr>
-			<tr><td>Lowest</td><td>$alltime.dewpoint.min</td><td>$alltime.dewpoint.mintime</td></tr>
-			<tr><td colspan="3"><br><b>Precipitation</b></td></tr>
-			<tr><td>Highest Daily Rainfall</td><td>$alltime.rain.maxsum</td><td>$alltime.rain.maxsumtime.format("%m/%d/%Y")</td></tr>
-			<tr><td>Highest Rain Rate</td><td>$alltime.rainRate.max</td><td>$alltime.rainRate.maxtime</td></tr>
-			<tr><td colspan="3"><br><b>Heat Index</b></td></tr>
-			<tr><td>Highest</td><td>$alltime.heatindex.max</td><td>$alltime.heatindex.maxtime</td></tr>
-			<tr><td colspan="3"><br><b>Barometer</b></td></tr>
-			<tr><td>Highest</td><td>$alltime.barometer.max</td><td>$alltime.barometer.maxtime</td></tr>
-			<tr><td>Lowest</td><td>$alltime.barometer.min</td><td>$alltime.barometer.mintime</td></tr>
-			<tr><td colspan="3"><br><b>Wind</b></td></tr>
-			<tr><td>Highest Sustained</td><td>$alltime.windSpeed.max</td><td>$alltime.windSpeed.maxtime</td></tr>
-			<tr><td>Highest Gust</td><td>$alltime.windGust.max</td><td>$alltime.windGust.maxtime</td></tr>
-			<tr><td colspan="3"><br><b>Wind Chill</b></td></tr>
-			<tr><td>Lowest</td><td>$alltime.windchill.min</td><td>$alltime.windchill.mintime</td></tr>
-            		<tr><td colspan="3"><br><b>House Temperatures</b></td></tr>
-			<tr><td>Highest</td><td>$alltime.inTemp.max</td><td>$alltime.inTemp.maxtime</td></tr>
-			<tr><td>Lowest</td><td>$alltime.inTemp.min</td><td>$alltime.inTemp.mintime</td></tr>
-			<tr><td colspan="3"><br><b>House Humidity</b></td></tr>
-			<tr><td>Highest</td><td>$alltime.inHumidity.max</td><td>$alltime.inHumidity.maxtime</td></tr>
-			<tr><td>Lowest</td><td>$alltime.inHumidity.min</td><td>$alltime.inHumidity.mintime</td></tr>
-                    </table>
-                </div>
-
-		<div class="card">
-                    <h1><i class="fa fa-table m-grau" ></i> Number of Days with Observations</h1>
-			<div class="tablefix">
-                    	$temp_count_table
-			</div>
-                </div>
-
-	   </div>
-
-	   <div class="right" >
-		<div class="card">
-                    <h1><i class="fa fa-archive"></i> Monthly Reports</h1>
-			<div class="noaatable">
-                   	$NOAA_table
-			</div>
-                </div>
-
-		<div class="card">
-                    <h1><i class="fa fa-thermometer-half" ></i> Average Temperature by Month</h1>
-			<div class="tablefix">
-                    	$avg_temp_table
-			</div>
-                </div>
-		
-		<div class="card">
-                    <h1><i class="fa fa-umbrella m-blau" ></i> Total Monthly Rainfall </h1>
-			<div class="tablefix">
-                    	$rain_table
-			</div>
-                </div>
-
-		<div class="card">
-                    <h1><i class="fa fa-umbrella m-blau" ></i> Number of Days it Rained (>=0.02")</h1>
-			<div class="tablefix">
-                    	$rain_count_table
-			</div>
-                </div>
-
-		<div class="card">
-                    <h1><i class="fa fa-thermometer-half m-rot" ></i> Average House Temperature by Month</h1>
-			<div class="tablefix">
-                    	$avg_htemp_table
-			</div>
-                </div>
-	   </div>
+          </div>
+        </div>
+        <div class="right" >
+          <div class="card">
+            <h1><i class="fa fa-archive"></i> Monthly Reports</h1>
+            <div class="noaatable">
+              $NOAA_table
+            </div>
+          </div>
+          <div class="card">
+            <h1><i class="fa fa-thermometer-half" ></i> Average Temperature by Month</h1>
+            <div class="tablefix">
+              $avg_temp_table
+            </div>
+          </div>
+          <div class="card">
+            <h1><i class="fa fa-umbrella m-blau" ></i> Total Monthly Rainfall </h1>
+            <div class="tablefix">
+              $rain_table
+            </div>
+          </div>
+          <div class="card">
+            <h1><i class="fa fa-umbrella m-blau" ></i> Number of Days it Rained (>=0.02")</h1>
+            <div class="tablefix">
+              $rain_count_table
+            </div>
+          </div>
+          <div class="card">
+            <h1><i class="fa fa-thermometer-half m-rot" ></i> Average House Temperature by Month</h1>
+            <div class="tablefix">
+              $avg_htemp_table
+            </div>
+          </div>
         </div>
+      </div>
+    </div>
+    <footer>
+      <div class="container-fix">
+        <div style="text-align:center">
+          #if $Extras.has_key('you')
+          <i class="fa fa-pied-piper-pp"> </i><a href=mailto:$Extras.email> $Extras.you</a> 
+          #end if
+          &sdot;
+          Copyright <i class="fa fa-copyright"></i> $latest.dateTime.format("%Y") 
+          <br>
+          Sofaskin by <a href="http://blauesledersofa.de">Blaues Ledersofa</a>
+          &sdot;
+          CW9009 Version by <a href="http://cw9009.x10host.com">JDS</a>
+          <br>
+          Powered by<i class="fa fa-cog fa-spin fa-fw" aria-hidden="true"></i><a href="http://weewx.com/" target="_blank">WeeWX</a> 
         </div>
-        
-        <footer>
-            <div class="container-fix">
-	      <div style="text-align:center">
-		#if $Extras.has_key('you')
-            	<i class="fa fa-pied-piper-pp"> </i><a href=mailto:$Extras.email> $Extras.you</a> 
-            	#end if
-		&sdot;
-	    	Copyright <i class="fa fa-copyright"></i> $latest.dateTime.format("%Y") 
-	   	<br>
-	    	Sofaskin by <a href="http://blauesledersofa.de">Blaues Ledersofa</a>
-                &sdot;
-		CW9009 Version by <a href="http://cw9009.x10host.com">JDS</a>
- 		<br>
-            	Powered by<i class="fa fa-cog fa-spin fa-fw" aria-hidden="true"></i><a href="http://weewx.com/" target="_blank">WeeWX</a> 
-	      </div>
-	    </div>
-        </footer>
-
-        #if $Extras.has_key('googleAnalyticsId')
-        <!-- Google Analytics -->
-        <script>
-            (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-            (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-            })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-            
-            ga('create', '$Extras.googleAnalyticsId', 'auto');
-            ga('send', 'pageview');
-        </script>
-        #end if
-
-	<!-- Toggle between adding and removing the "responsive" class to topnav when the user clicks on the icon -->
-	<script>
-		function myFunction() {
-    			var x = document.getElementById("myTopnav");
-    			if (x.className === "topnav") {
-    			    x.className += " responsive";
-    			} else {
-    			    x.className = "topnav";
-    			}
-		}	
-	</script>
-    </body>
+      </div>
+    </footer>
+    #if $Extras.has_key('googleAnalyticsId')
+    <!-- Google Analytics -->
+    <script>
+      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+      
+      ga('create', '$Extras.googleAnalyticsId', 'auto');
+      ga('send', 'pageview');
+    </script>
+    #end if
+    <!-- Toggle between adding and removing the "responsive" class to topnav when the user clicks on the icon -->
+    <script>
+      function myFunction() {
+          var x = document.getElementById("myTopnav");
+          if (x.className === "topnav") {
+              x.className += " responsive";
+          } else {
+              x.className = "topnav";
+          }
+      }
+    </script>
+  </body>
 </html>