updated images and html

markyharris · Mar 26, 2022 · 7a0ec02 · 7a0ec02
1 parent 349deb9
commit 7a0ec02
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 11 deletions.
diff --git a/data.txt b/data.txt
@@ -1,4 +1,4 @@
-kflg
-6
+KCMH
+7
 3600
 0
diff --git a/metar_settings.py b/metar_settings.py
@@ -14,7 +14,7 @@
 # For the same airports in the same locations on screen, place 12 airports in list. The 13th will be the default airport
 # For randomly selected airports, put more than 12 in list. 12 will randomly be displayed, 13th will be default
 # If you put less than 12 airports in list, it will pad the missing spots with the default airport above.
-random_airports = ["KEYW","KDFW","KSEA","KORD", "KLAS","KCMR","KABQ","KDEN", \
-                   "KPHX","KNBC","KBKV","KTTS"] #, "KTPA", "KLAS","KGEU","KOLS", \
+random_airports = ["KEYW","KFVE","KSEA","KCVG", "KLAS","KCMR","KGRR","KMSN", \
+                   "KLAX","KNBC","KFVE","KBUF"] #, "KTPA", "KLAS","KGEU","KOLS", \
                   # "KSAN", "KPDX", "KBOI", "KMSP", "KSTL", "KBNA", "KTYS"] 
 
diff --git a/static/layout0.jpg b/static/layout0.jpg
diff --git a/static/layout1.jpg b/static/layout1.jpg
diff --git a/static/layout2.jpg b/static/layout2.jpg
diff --git a/static/layout3.jpg b/static/layout3.jpg
diff --git a/static/layout4.jpg b/static/layout4.jpg
diff --git a/static/layout5.jpg b/static/layout5.jpg
diff --git a/static/layout6.jpg b/static/layout6.jpg
diff --git a/static/layout7.jpg b/static/layout7.jpg
diff --git a/static/metar_cmdline.jpg b/static/metar_cmdline.jpg
diff --git a/static/metar_collage.jpg b/static/metar_collage.jpg
diff --git a/static/metar_html.jpg b/static/metar_html.jpg
diff --git a/templates/metar.html b/templates/metar.html
@@ -24,7 +24,7 @@
 .myDiv span{
 	text-align: center;
     background: #b1cafc;
-    padding: 6px 10px;
+    padding: 6px 6px;
     display: block;
     width: 400px;
     border: 1px solid blue;
@@ -146,27 +146,42 @@ <h2>METAR E-Paper Display Selector</h2>
 	<div id="show0" class="myDiv">
      <span><p>
 	       <img src="./static/layout0.jpg" width="300"><p><p>
-		   Basic Display with Large Flight Category Letters and METAR String</span>
+		   </span>
 	 </div>
 	<div id="show1" class="myDiv">
      <span><p>
 	       <img src="./static/layout1.jpg" width="300"><p><p>
-		   METAR String with individual weather items with dynamic icons.</span>
+		   </span>
 	 </div>
 	<div id="show2" class="myDiv">
      <span><p>
 	       <img src="./static/layout2.jpg" width="300"><p><p>
-		   Formatted Weather Data with dynamic icons.</span>
+		   </span>
 	 </div>
 	<div id="show3" class="myDiv">
      <span><p>
 	       <img src="./static/layout3.jpg" width="300"><p><p>
-		   Basic Large Letter Flight Category.</span>
+		   </span>
 	 </div>
 	<div id="show4" class="myDiv">
      <span><p>
 	       <img src="./static/layout4.jpg" width="300"><p><p>
-		   3-Area Display with Large Flight Category Letters and weather data.</span>
+		   </span>
+	 </div>
+	<div id="show5" class="myDiv">
+     <span><p>
+	       <img src="./static/layout5.jpg" width="300"><p><p>
+		   </span>
+	 </div>
+	<div id="show6" class="myDiv">
+     <span><p>
+	       <img src="./static/layout6.jpg" width="300"><p><p>
+		   </span>
+	 </div>
+	<div id="show7" class="myDiv">
+     <span><p>
+	       <img src="./static/layout7.jpg" width="300"><p><p>
+		   </span>
 	 </div>
 
 

diff --git a/webapp.py b/webapp.py
@@ -5,7 +5,7 @@
 from flask import Flask, render_template, request, flash, redirect, url_for, send_file, Response
 import os
 import sys
-from shutdown import *
+from metar_poweroff import *
 from metar_settings import *
 
 app = Flask(__name__)