From 0a5501d8c0c7b7a3fa81f1178962fae224efefd5 Mon Sep 17 00:00:00 2001
From: David Hoese <david.hoese@ssec.wisc.edu>
Date: Mon, 24 Feb 2020 10:48:20 -0600
Subject: [PATCH] Reorganize lobby display HTML files to avoid warnings
---
.gitignore | 1 +
content/pages/lobby_meteorogram.html | 8 ++++----
.../{instruments => }/lobby_meteorogram_24-7.html | 10 +++++-----
htdocs/aoss/tower/lobby/index.html | 6 +++---
htdocs/aoss/tower/lobby24-7/index.html | 8 ++++----
htdocs/feeds/all.atom.xml | 2 +-
6 files changed, 18 insertions(+), 17 deletions(-)
rename content/pages/{instruments => }/lobby_meteorogram_24-7.html (81%)
diff --git a/.gitignore b/.gitignore
index 906788e8..7f4d1747 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,4 @@ typings/
# dotenv environment variables file
.env
+/.idea/
diff --git a/content/pages/lobby_meteorogram.html b/content/pages/lobby_meteorogram.html
index 04d718d4..0811571a 100644
--- a/content/pages/lobby_meteorogram.html
+++ b/content/pages/lobby_meteorogram.html
@@ -5,7 +5,7 @@
<meta name="url" content="aoss/tower/lobby/">
<meta name="save_as" content="aoss/tower/lobby/index.html">
<meta name="category" content="data" />
- <meta name="summary" content="Real-time Data Dashboard" />
+ <meta name="summary" content="Real-time Lobby Dashboard (includes display burn-in shutoff)" />
<meta name="template" content="lobby_base_meteorogram" />
</head>
@@ -19,7 +19,7 @@
<div id="row3" style="height: calc(93%/3); width: 100%">
<div id="col1" style="float: left; height: 100%; width: calc(100%/3)"></div>
<div id="col2" style="float: left; height: 100%; width: calc(100%/3); position: relative">
- <img id="roofCam" src="http://metobs.ssec.wisc.edu/pub/cache/aoss/cameras/west/latest_orig.jpg"
+ <img id="roofCam" src="/pub/cache/aoss/cameras/west/latest_orig.jpg"
alt="west" style="Cache-Control: no-store; height: 100%; width: 100%;">
<div id="dirText" style="position: absolute; bottom: 0%; right: 0%; font-size: .5vh; background-color: black; color: white">west</div>
</div>
@@ -29,8 +29,8 @@
<div id="graph" style="z-index: 2; position: absolute; top: 0px; left: 0px; height: 100%; width: 100%;"></div>
<!--opacity: 1 makes the screen black until graph loads, which only takes a fraction of a second. Also blacks out screen between 1 and 5 am.-->
<div id="overlay" style="z-index: 3; position: absolute; top: 0px; left: 0px; height: 100%; width: 100%; background-color: black; opacity: 1"></div>
-<script type="text/javascript" src="/js/meteorogram/meteorogram.js"></script>
-<script type="text/javascript" src="/js/meteorogram/site_configs_lobby.js"></script>
+<script type="text/javascript" src="{static}/js/meteorogram/meteorogram.js"></script>
+<script type="text/javascript" src="{static}/js/meteorogram/site_configs_lobby.js"></script>
<script type="text/javascript">
var met = MeteorogramController('graph', 'control-container', siteConfigs);
met.initMeteorogram();
diff --git a/content/pages/instruments/lobby_meteorogram_24-7.html b/content/pages/lobby_meteorogram_24-7.html
similarity index 81%
rename from content/pages/instruments/lobby_meteorogram_24-7.html
rename to content/pages/lobby_meteorogram_24-7.html
index 6043209d..daf7dba0 100644
--- a/content/pages/instruments/lobby_meteorogram_24-7.html
+++ b/content/pages/lobby_meteorogram_24-7.html
@@ -1,11 +1,11 @@
<html>
<head>
- <title>AOSS Tower Lobby Display</title>
+ <title>AOSS Tower Lobby Display - Always On</title>
<meta name="url" content="aoss/tower/lobby24-7/">
<meta name="save_as" content="aoss/tower/lobby24-7/index.html">
<meta name="category" content="data" />
- <meta name="summary" content="Real-time Data Dashboard" />
+ <meta name="summary" content="Real-time Lobby-style Dashboard (always on)" />
<meta name="template" content="lobby_base_meteorogram" />
</head>
@@ -19,7 +19,7 @@
<div id="row3" style="height: calc(93%/3); width: 100%">
<div id="col1" style="float: left; height: 100%; width: calc(100%/3)"></div>
<div id="col2" style="float: left; height: 100%; width: calc(100%/3); position: relative">
- <img id="roofCam" src="http://metobs.ssec.wisc.edu/pub/cache/aoss/cameras/west/latest_orig.jpg"
+ <img id="roofCam" src="/pub/cache/aoss/cameras/west/latest_orig.jpg"
alt="west" style="Cache-Control: no-store; height: 100%; width: 100%;">
<div id="dirText" style="position: absolute; bottom: 0%; right: 0%; font-size: .5vh; background-color: black; color: white">west</div>
</div>
@@ -29,8 +29,8 @@
<div id="graph" style="z-index: 2; position: absolute; top: 0px; left: 0px; height: 100%; width: 100%;"></div>
<!--Needs to exists for code to run, but does nothing. Used to make screen black between 1 and 5 am normally.-->
<div id="overlay"></div>
-<script type="text/javascript" src="/js/meteorogram/meteorogram.js"></script>
-<script type="text/javascript" src="/js/meteorogram/site_configs_lobby.js"></script>
+<script type="text/javascript" src="{static}/js/meteorogram/meteorogram.js"></script>
+<script type="text/javascript" src="{static}/js/meteorogram/site_configs_lobby.js"></script>
<script type="text/javascript">
var met = MeteorogramController('graph', 'control-container', siteConfigs);
met.initMeteorogram();
diff --git a/htdocs/aoss/tower/lobby/index.html b/htdocs/aoss/tower/lobby/index.html
index dd242353..676adb6d 100644
--- a/htdocs/aoss/tower/lobby/index.html
+++ b/htdocs/aoss/tower/lobby/index.html
@@ -144,7 +144,7 @@
<div id="row3" style="height: calc(93%/3); width: 100%">
<div id="col1" style="float: left; height: 100%; width: calc(100%/3)"></div>
<div id="col2" style="float: left; height: 100%; width: calc(100%/3); position: relative">
- <img id="roofCam" src="http://metobs.ssec.wisc.edu/pub/cache/aoss/cameras/west/latest_orig.jpg" alt="west" style="Cache-Control: no-store; height: 100%; width: 100%;">
+ <img id="roofCam" src="/pub/cache/aoss/cameras/west/latest_orig.jpg" alt="west" style="Cache-Control: no-store; height: 100%; width: 100%;">
<div id="dirText" style="position: absolute; bottom: 0%; right: 0%; font-size: .5vh; background-color: black; color: white">west</div>
</div>
<div id="col3" style="float: left; height: 100%; width: calc(100%/3)"></div>
@@ -153,8 +153,8 @@
<div id="graph" style="z-index: 2; position: absolute; top: 0px; left: 0px; height: 100%; width: 100%;"></div>
<!--opacity: 1 makes the screen black until graph loads, which only takes a fraction of a second. Also blacks out screen between 1 and 5 am.-->
<div id="overlay" style="z-index: 3; position: absolute; top: 0px; left: 0px; height: 100%; width: 100%; background-color: black; opacity: 1"></div>
-<script type="text/javascript" src="/js/meteorogram/meteorogram.js"></script>
-<script type="text/javascript" src="/js/meteorogram/site_configs_lobby.js"></script>
+<script type="text/javascript" src="https://metobs.ssec.wisc.edu/js/meteorogram/meteorogram.js"></script>
+<script type="text/javascript" src="https://metobs.ssec.wisc.edu/js/meteorogram/site_configs_lobby.js"></script>
<script type="text/javascript">
var met = MeteorogramController('graph', 'control-container', siteConfigs);
met.initMeteorogram();
diff --git a/htdocs/aoss/tower/lobby24-7/index.html b/htdocs/aoss/tower/lobby24-7/index.html
index cf278898..bfb6a723 100644
--- a/htdocs/aoss/tower/lobby24-7/index.html
+++ b/htdocs/aoss/tower/lobby24-7/index.html
@@ -6,7 +6,7 @@
<head>
<meta charset="utf-8">
<!--Page title-->
- <title>AOSS Tower Lobby Display - RAIN | SSEC @ UW-Madison</title>
+ <title>AOSS Tower Lobby Display - Always On - RAIN | SSEC @ UW-Madison</title>
<!--Javascript includes -->
<meta charset="utf-8">
@@ -144,7 +144,7 @@
<div id="row3" style="height: calc(93%/3); width: 100%">
<div id="col1" style="float: left; height: 100%; width: calc(100%/3)"></div>
<div id="col2" style="float: left; height: 100%; width: calc(100%/3); position: relative">
- <img id="roofCam" src="http://metobs.ssec.wisc.edu/pub/cache/aoss/cameras/west/latest_orig.jpg" alt="west" style="Cache-Control: no-store; height: 100%; width: 100%;">
+ <img id="roofCam" src="/pub/cache/aoss/cameras/west/latest_orig.jpg" alt="west" style="Cache-Control: no-store; height: 100%; width: 100%;">
<div id="dirText" style="position: absolute; bottom: 0%; right: 0%; font-size: .5vh; background-color: black; color: white">west</div>
</div>
<div id="col3" style="float: left; height: 100%; width: calc(100%/3)"></div>
@@ -153,8 +153,8 @@
<div id="graph" style="z-index: 2; position: absolute; top: 0px; left: 0px; height: 100%; width: 100%;"></div>
<!--Needs to exists for code to run, but does nothing. Used to make screen black between 1 and 5 am normally.-->
<div id="overlay"></div>
-<script type="text/javascript" src="/js/meteorogram/meteorogram.js"></script>
-<script type="text/javascript" src="/js/meteorogram/site_configs_lobby.js"></script>
+<script type="text/javascript" src="https://metobs.ssec.wisc.edu/js/meteorogram/meteorogram.js"></script>
+<script type="text/javascript" src="https://metobs.ssec.wisc.edu/js/meteorogram/site_configs_lobby.js"></script>
<script type="text/javascript">
var met = MeteorogramController('graph', 'control-container', siteConfigs);
met.initMeteorogram();
diff --git a/htdocs/feeds/all.atom.xml b/htdocs/feeds/all.atom.xml
index 5e735697..7b65d1ae 100644
--- a/htdocs/feeds/all.atom.xml
+++ b/htdocs/feeds/all.atom.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>RAIN | SSEC @ UW-Madison</title><link href="https://metobs.ssec.wisc.edu/" rel="alternate"></link><link href="https://metobs.ssec.wisc.edu/feeds/all.atom.xml" rel="self"></link><id>https://metobs.ssec.wisc.edu/</id><updated>2020-02-21T13:55:22Z</updated></feed>
\ No newline at end of file
+<feed xmlns="http://www.w3.org/2005/Atom"><title>RAIN | SSEC @ UW-Madison</title><link href="https://metobs.ssec.wisc.edu/" rel="alternate"></link><link href="https://metobs.ssec.wisc.edu/feeds/all.atom.xml" rel="self"></link><id>https://metobs.ssec.wisc.edu/</id><updated>2020-02-24T10:46:45Z</updated></feed>
\ No newline at end of file
--
GitLab