Skip to content
Snippets Groups Projects
Commit 28de4b66 authored by David Hoese's avatar David Hoese
Browse files

Merge branch 'bugfix-lobby-camera-url' into 'develop' 

Reorganize lobby display HTML files to avoid warnings

See merge request !9
parents f30ad1ef 0a5501d8
No related branches found
No related tags found
1 merge request!9Reorganize lobby display HTML files to avoid warnings
Show whitespace changes
Inline Side-by-side
.gitignore
+ 1
− 0
View file @ 28de4b66
...@@ -63,3 +63,4 @@ typings/ ...@@ -63,3 +63,4 @@ typings/
# dotenv environment variables file # dotenv environment variables file
.env .env
/.idea/
content/pages/lobby_meteorogram.html
+ 4
− 4
View file @ 28de4b66
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<meta name="url" content="aoss/tower/lobby/"> <meta name="url" content="aoss/tower/lobby/">
<meta name="save_as" content="aoss/tower/lobby/index.html"> <meta name="save_as" content="aoss/tower/lobby/index.html">
<meta name="category" content="data" /> <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" /> <meta name="template" content="lobby_base_meteorogram" />
</head> </head>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<div id="row3" style="height: calc(93%/3); width: 100%"> <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="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"> <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%;"> 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 id="dirText" style="position: absolute; bottom: 0%; right: 0%; font-size: .5vh; background-color: black; color: white">west</div>
</div> </div>
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
<div id="graph" style="z-index: 2; position: absolute; top: 0px; left: 0px; height: 100%; width: 100%;"></div> <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.--> <!--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> <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="{static}/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/site_configs_lobby.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var met = MeteorogramController('graph', 'control-container', siteConfigs); var met = MeteorogramController('graph', 'control-container', siteConfigs);
met.initMeteorogram(); met.initMeteorogram();
... ...
......
content/pages/instruments/lobby_meteorogram_24-7.html → content/pages/lobby_meteorogram_24-7.html
+ 5
− 5
View file @ 28de4b66
<html> <html>
<head> <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="url" content="aoss/tower/lobby24-7/">
<meta name="save_as" content="aoss/tower/lobby24-7/index.html"> <meta name="save_as" content="aoss/tower/lobby24-7/index.html">
<meta name="category" content="data" /> <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" /> <meta name="template" content="lobby_base_meteorogram" />
</head> </head>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<div id="row3" style="height: calc(93%/3); width: 100%"> <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="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"> <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%;"> 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 id="dirText" style="position: absolute; bottom: 0%; right: 0%; font-size: .5vh; background-color: black; color: white">west</div>
</div> </div>
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
<div id="graph" style="z-index: 2; position: absolute; top: 0px; left: 0px; height: 100%; width: 100%;"></div> <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.--> <!--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> <div id="overlay"></div>
<script type="text/javascript" src="/js/meteorogram/meteorogram.js"></script> <script type="text/javascript" src="{static}/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/site_configs_lobby.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var met = MeteorogramController('graph', 'control-container', siteConfigs); var met = MeteorogramController('graph', 'control-container', siteConfigs);
met.initMeteorogram(); met.initMeteorogram();
... ...
......
htdocs/aoss/tower/lobby/index.html
+ 3
− 3
View file @ 28de4b66
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
<div id="row3" style="height: calc(93%/3); width: 100%"> <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="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"> <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 id="dirText" style="position: absolute; bottom: 0%; right: 0%; font-size: .5vh; background-color: black; color: white">west</div>
</div> </div>
<div id="col3" style="float: left; height: 100%; width: calc(100%/3)"></div> <div id="col3" style="float: left; height: 100%; width: calc(100%/3)"></div>
...@@ -153,8 +153,8 @@ ...@@ -153,8 +153,8 @@
<div id="graph" style="z-index: 2; position: absolute; top: 0px; left: 0px; height: 100%; width: 100%;"></div> <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.--> <!--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> <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="https://metobs.ssec.wisc.edu/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/site_configs_lobby.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var met = MeteorogramController('graph', 'control-container', siteConfigs); var met = MeteorogramController('graph', 'control-container', siteConfigs);
met.initMeteorogram(); met.initMeteorogram();
... ...
......
htdocs/aoss/tower/lobby24-7/index.html
+ 4
− 4
View file @ 28de4b66
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<!--Page title--> <!--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 --> <!--Javascript includes -->
<meta charset="utf-8"> <meta charset="utf-8">
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
<div id="row3" style="height: calc(93%/3); width: 100%"> <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="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"> <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 id="dirText" style="position: absolute; bottom: 0%; right: 0%; font-size: .5vh; background-color: black; color: white">west</div>
</div> </div>
<div id="col3" style="float: left; height: 100%; width: calc(100%/3)"></div> <div id="col3" style="float: left; height: 100%; width: calc(100%/3)"></div>
...@@ -153,8 +153,8 @@ ...@@ -153,8 +153,8 @@
<div id="graph" style="z-index: 2; position: absolute; top: 0px; left: 0px; height: 100%; width: 100%;"></div> <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.--> <!--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> <div id="overlay"></div>
<script type="text/javascript" src="/js/meteorogram/meteorogram.js"></script> <script type="text/javascript" src="https://metobs.ssec.wisc.edu/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/site_configs_lobby.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var met = MeteorogramController('graph', 'control-container', siteConfigs); var met = MeteorogramController('graph', 'control-container', siteConfigs);
met.initMeteorogram(); met.initMeteorogram();
... ...
......
htdocs/feeds/all.atom.xml
+ 1
− 1
View file @ 28de4b66
<?xml version="1.0" encoding="utf-8"?> <?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> <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 \ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment