diff --git a/.gitignore b/.gitignore index 906788e82c34e0a50a5770a39a91d65baff9fae2..7f4d174702afe8d6272345c2e0fc10b5da770837 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 04d718d46ee39d917a87767675e7ebd37edda691..0811571a8672fbc378285724df0795d9a696cd0b 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 6043209d1d157ff81bc1855f7dfa31725ad67f33..daf7dba0f438c4c156cd73c7e32cb558bdb1f73c 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 dd242353f724480a63422a7c2abe8a9e23ca6d76..676adb6da94418e52ca8847bfe8204139f2ab2f4 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 cf278898dfdb2c67ae52f31a9c82db485f91502b..bfb6a723e3318287b3196c7eb0bca86ce2bb41bb 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 5e73569753f6262f2ba6530ff219c14e1ff1039f..7b65d1ae1e9da3ca61fe726a4d9a7714a7eac0fb 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