projects / kiosk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fe07743)
Bringing git version into sync with what's really running.
authorScott Gasch <scott@gasch.org>
Wed, 8 Feb 2023 17:59:04 +0000 (09:59 -0800)
committerScott Gasch <scott@gasch.org>
Wed, 8 Feb 2023 17:59:04 +0000 (09:59 -0800)
PUSH.sh [new file with mode: 0755] patch | blob
pages/cabin_2_none.html [deleted file] patch | blob | history
pages/clock_10_none.html patch | blob | history
pages/radar_2_none.html [deleted file] patch | blob | history
pages/stevens_cams_1_none.html [deleted file] patch | blob | history
pages/style.css patch | blob | history
pages/wenatchee-cams_3_none.html patch | blob | history
pages/wsdot-bridges_3_none.html [deleted file] patch | blob | history

diff --git a/PUSH.sh b/PUSH.sh
new file mode 100755 (executable)
index 0000000..a00aba6
--- /dev/null
+++ b/PUSH.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+GIT=/var/www/kiosk.git
+PROD=/var/www/kiosk
+
+rsync -aP --verbose -r --exclude=kiosk_secrets.py --exclude=pages/hidden/* ${GIT}/* ${PROD}/
diff --git a/pages/cabin_2_none.html b/pages/cabin_2_none.html
deleted file mode 100644 (file)
index fb1de4d..0000000
--- a/pages/cabin_2_none.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<html>
-<head>
-<meta http-equiv="cache-control" content="max-age=0" />
-<meta http-equiv="cache-control" content="no-cache" />
-<meta http-equiv="expires" content="0" />
-<meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT" />
-<meta http-equiv="pragma" content="no-cache" />
-<link rel="icon" 
-      type="image/jpeg"
-      href="http://ski.dyn.guru.org/favicon.jpg">
-</head>
-<body><h1>Ski Critter Cabin</h1><hr><P>
-<center>
-<table border=0>
-<tr>
-<td>
-<center>
-<img src="http://ski.dyn.guru.org/webcam/videostream.cgi"
-     height="384">
-<br>
-</center>
-</td>
-<td>
-<center>
-<img src="http://ski.dyn.guru.org/rpi/~pi/one_day.png"
-     height="384">
-<br>
-</center>
-</td>
-</tr>
-<tr>
-<td>
-<center>
-<img src="http://ski.dyn.guru.org/rpi/~pi/one_week.png"
-     height="384">
-<br>
-</center>
-</td>
-<td>
-<center>
-<img src="http://ski.dyn.guru.org/rpi/~pi/one_month.png"
-     height="384">
-<br>
-</center>
-</td>
-</tr>
-</table>
-</center>
-</body>
-</html>
diff --git a/pages/clock_10_none.html b/pages/clock_10_none.html
index 737ba6b49da2896c1f16b18467f45296762aae0d..cac7de52f2554488ac3675e537dc60c91d402a7f 100755 (executable)
--- a/pages/clock_10_none.html
+++ b/pages/clock_10_none.html
@@ -1,11 +1,9 @@
-<head>
 <!-- Thank you to Toby Pitman for posting this really cool article (and
      javascript / css / image) explaining how to make a running analog
      clock webpage.  See: http://css-tricks.com/css3-clock for more info. -->
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>Analog Clock</title>
-  <script type="text/javascript" src="jquery-1.2.6.min.js"></script>
-  <style type="text/css">
+<head>
+<script type="text/javascript" src="jquery-1.2.6.min.js"></script>
+<style type="text/css">
     * {
       margin: 0px;
       padding: 0px;
@@ -36,15 +34,26 @@
       line-height:0.5;
     }
     #clock {
-      position: relative;
+      position: absolute;
+      top: 100px;
+      left: 120px;
       width: 600px;
       height: 600px;
       margin: 20px auto 0 auto;
+      float: none;
+      // background-image: url("clockimg/smallface.gif");
       list-style: none;
     }
     #analog {
-      position: relative;
+      position: absolute;
+      top: 200px;
+      left: 750px;
       width: 100%;
+      float: none;
+    }
+    #bottom {
+      position: absolute;
+      top: 750px;
     }
     #txt {
       position: absolute;
@@ -77,8 +86,8 @@
     .digit {
       display: block;
     }
-  </style>
-  <script type="text/javascript">
+</style>
+<script type="text/javascript">
     $(document).ready(
       function() {
         $.fn.preload = function() {
@@ -147,7 +156,7 @@
             var s2 = seconds % 10;
             $("#s1").css({"content" : "url(" + digit_images[s1] + ")"});
             $("#s2").css({"content" : "url(" + digit_images[s2] + ")"});
-          }, 75);
+          }, 125);
 
         // Rotate minute hand and set minutes.
         function updateMinutes() {
@@ -164,7 +173,7 @@
           $("#m2").css({"content" : "url(" + digit_images[m2] + ")"});
         }
         updateMinutes();
-        setInterval(function(){updateMinutes();}, 1000);
+        setInterval(function(){updateMinutes();}, 3000);
 
         // Rotate hour hand and set hours.
         function updateHours() {
@@ -187,7 +196,7 @@
           $("#h2").css({"content" : "url(" + digit_images[h2] + ")"});
         }
         updateHours();
-        setInterval(function(){updateHours();}, 1000);
+        setInterval(function(){updateHours();}, 10000);
 
         function updateDate() {
           var date = new Date();
@@ -204,58 +213,48 @@
           $("#mm").css({"content" : "url(" + month_images[month] + ")"});
         }
         updateDate();
-        setInterval(function(){updateDate();}, 1000);
+        setInterval(function(){updateDate();}, 10000);
       });
   </script>
 </head>
 <body>
-  <table border=0 width=100%>
-    <tr>
-      <td width=50%>
-        <ul id="clock">
-          <div id="txt">
-            <table style="background-color:#999999" border>
-              <td><img src="0.png" height=26 id="d1" class="digit"></td>
-              <td><img src="1.png" height=26 id="d2" class="digit"></td>
-            </table>
-          </div>
-          <li id="sec"></li>
-          <li id="hour"></li>
-          <li id="min"></li>
-        </ul>
-      </td>
-      <td STYLE="vertical-align:middle">
-          <li><div id="analog">
-            <center>
-              <table style="background-color:#999999;height:80px;" border>
-                <tr>
-                <td><img src="clockimg/2.png" id="h1" class="digit"></td>
-                <td><img src="clockimg/3.png" id="h2" class="digit"></td>
-                <td style="border: none">&nbsp;&nbsp;</td>
-                <td><img src="clockimg/4.png" id="m1" class="digit"></td>
-                <td><img src="clockimg/5.png" id="m2" class="digit"></td>
-                <td style="border: none">&nbsp;&nbsp;</td>
-                <td><img src="clockimg/6.png" id="s1" class="digit"></td>
-                <td><img src="clockimg/7.png" id="s2" class="digit"></td>
-                </tr>
-              </table>
-              <br>
-              <table style="background-color:#999999;height:80px;" border>
-                <tr>
-                <td><img src="clockimg/sun.png" id="dow" class="digit"></td>
-                <td style="border: none">&nbsp;&nbsp;</td>
-                <td><img src="clockimg/8.png" id="dd1" class="digit"></td>
-                <td><img src="clockimg/9.png" id="dd2" class="digit"></td>
-                <td style="border: none">&nbsp;&nbsp;</td>
-                <td><img src="clockimg/jan.png" id="mm" class="digit"></td>
-                </tr>
-              </table>
-            </center>
-            </div>
-          </li>
-        </ul>
-      </td>
-    </tr>
-  </table>
-</body>
-</html>
+  <div style="height:775px; float:none">
+  <ul id="clock">
+     <div id="txt">
+       <table style="background-color:#999999" border>
+         <td><img src="0.png" height=26 id="d1" class="digit"></td>
+         <td><img src="1.png" height=26 id="d2" class="digit"></td>
+       </table>
+     </div>
+     <li id="sec"></li>
+     <li id="hour"></li>
+     <li id="min"></li>
+     <li><div id="analog">
+         <center>
+         <table style="background-color:#999999;height:80px;" border>
+           <tr>
+           <td><img src="clockimg/2.png" id="h1" class="digit"></td>
+           <td><img src="clockimg/3.png" id="h2" class="digit"></td>
+           <td style="border: none">&nbsp;&nbsp;</td>
+           <td><img src="clockimg/4.png" id="m1" class="digit"></td>
+           <td><img src="clockimg/5.png" id="m2" class="digit"></td>
+           <td style="border: none">&nbsp;&nbsp;</td>
+           <td><img src="clockimg/6.png" id="s1" class="digit"></td>
+           <td><img src="clockimg/7.png" id="s2" class="digit"></td>
+           </tr>
+         </table>
+         <br>
+         <table style="background-color:#999999;height:80px;" border>
+           <tr>
+           <td><img src="clockimg/sun.png" id="dow" class="digit"></td>
+           <td style="border: none">&nbsp;&nbsp;</td>
+           <td><img src="clockimg/8.png" id="dd1" class="digit"></td>
+           <td><img src="clockimg/9.png" id="dd2" class="digit"></td>
+           <td style="border: none">&nbsp;&nbsp;</td>
+           <td><img src="clockimg/jan.png" id="mm" class="digit"></td>
+           </tr>
+         </table>
+         </center>
+         </div></li>
+  </ul>
+  </div>
diff --git a/pages/radar_2_none.html b/pages/radar_2_none.html
deleted file mode 100644 (file)
index c3b2e91..0000000
--- a/pages/radar_2_none.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<H1>Current Radar / Satellite:</H1><HR>
-<CENTER>
-<TABLE WIDTH=99%>
-<TR>
-<TD WIDTH=50%>
-<CENTER>
-  <IMG SRC="http://fin.bimedia.net/KOMO/komo_radar_seattle_metro_640.gif">
-</CENTER>
-</TD>
-<TD>
-<CENTER>
-  <IMG SRC="http://fin.bimedia.net/KOMO/komo_radar_westwa_640.gif">
-</CENTER>
-</TD>
-</TR>
-<TR>
-<TD>
-<CENTER>
-  <IMG SRC="http://fin.bimedia.net/KOMO/komo_sat_regional_640.gif">
-</CENTER>
-</TD>
-<TD>
-<CENTER>
-  <IMG SRC="http://fin.bimedia.net/KOMO/komo_sat_wide_640.gif">
-</CENTER>
-</TD>
-</TR>
-</TABLE>
-</CENTER>
diff --git a/pages/stevens_cams_1_none.html b/pages/stevens_cams_1_none.html
deleted file mode 100644 (file)
index 4f408c6..0000000
--- a/pages/stevens_cams_1_none.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<h1>Stevens Pass Webcams:</h1>
-<hr>
-<center>
-<table border=0>
-<tr>
-<td>
-<img alt="Web Cam Image" height="384" src="http://www.stevenspass.com/cams/base1/" style="BORDER-BOTTOM: #5270a3 1px solid; BORDER-LEFT: #5270a3 1px solid; BORDER-TOP: #5270a3 1px solid; BORDER-RIGHT: #5270a3 1px solid" width="512" />
-</td>
-<td>
-<img height="384" name="webCam2" src="http://www.stevenspass.com/cams/mountain/" style="BORDER-BOTTOM: #5270a3 1px solid; BORDER-LEFT: #5270a3 1px solid; BORDER-TOP: #5270a3 1px solid; BORDER-RIGHT: #5270a3 1px solid" width="512" />
-</td>
-</tr>
-<tr>
-<td>
-<img alt="Stevens Pass Summit" border="0" height="392" src="http://www.stevenspass.com/cams/summit-east/" width="512" />
-<br />
-</td>
-<td>
-<img alt="Stevens Pass Summit" border="0" height="392" src="http://www.stevenspass.com/cams/summit-west/" width="512" />
-</td>
-</tr>
-</table>
-</center>
diff --git a/pages/style.css b/pages/style.css
index ccebbf5ddfbd382cab405f6c836c452930bf40b2..9e8c9742fe2ea54f07404ca527b949307974f444 100644 (file)
Binary files a/pages/style.css and b/pages/style.css differ
diff --git a/pages/wenatchee-cams_3_none.html b/pages/wenatchee-cams_3_none.html
index 92eb9b2117372c40061aedc70ce3d3f871e3d1ee..19ba8264e6b1bdbd299a91180bdc82bac18931a2 100644 (file)
--- a/pages/wenatchee-cams_3_none.html
+++ b/pages/wenatchee-cams_3_none.html
@@ -1,22 +1,42 @@
+<HEAD>
+  <META HTTP-EQUIV="Pragma" CONTENT="no-cache">
+  <META HTTP-EQUIV="Expires" CONTENT="-1">
+</HEAD>
 <h1>Lake Wenatchee Webcams:</h1>
 <hr>
 <center>
 <table border=0>
 <tr>
 <td>
-<img alt="Fish Lake" width="512" height="384" src="http://lakewenatcheeinfo.com/images/cam2/Fishlake.jpg" />
+<img alt="Dirty Face"
+     border="0"
+     width="512"
+     height="384"
+     src="https://lakewenatcheeinfo.com/wp-content/images/dirtyfacecam/Dface.jpg" />
 </td>
 <td>
-<img alt="Lake Wenatchee" width="512" height="384" src="http://home.comcast.net/~rmakela/jpeg/lake.jpg" />
+<img alt="State Park"
+     border="0"
+     width="512"
+     height="384"
+     src="https://biz.parks.wa.gov/webcams/LakeWen1.jpg" />
 </td>
 </tr>
 <tr>
 <td>
-<img alt="Cabin Driveway" border="0" height="392" width="512" src="http://webcam:asdfghjkl@ski.dyn.guru.org/webcam/videostream.cgi"/>
+<img alt="Cabin Driveway"
+     border="0"
+     height="392"
+     width="512"
+     src="http://10.0.0.233:8080/rirF9tp7MdjNFl2atzoEvU2BFDyWin/jpeg/WHyDnbh4sv/c3XfOJfFDn/s.jpg"
 <br />
 </td>
 <td>
-<img alt="Midway" border="0" height="392" width="512" src="http://lakewenatcheeinfo.com/images/cam2/midwaylatest.jpg" />
+<img alt="Midway"
+     border="0"
+     height="392"
+     width="512"
+     src="https://lakewenatcheeinfo.com/wp-content/images/midwaycam/Cam4.jpg" />
 </td>
 </tr>
 </table>
diff --git a/pages/wsdot-bridges_3_none.html b/pages/wsdot-bridges_3_none.html
deleted file mode 100644 (file)
index 8c254f0..0000000
--- a/pages/wsdot-bridges_3_none.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<BODY>
-  <h1>WSDOT Traffic</h1>
-  <HR>
-  <CENTER>
-    <TABLE BORDER=0 WIDTH=96%>
-      <TR>
-        <TD ALIGN=CENTER>
-          <IMG SRC="http://images.wsdot.wa.gov/nwflow/flowmaps/bridges.gif" HEIGHT=850>
-        </TD>
-      </TR>
-    </TABLE>
-  </CENTER>
-</BODY>
Local rpi-based kiosk driver program.