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

Merge branch 'develop' into wroberts_develop 

# Conflicts:
#	content/js/meteorogram/meteorogram.js
#	content/js/meteorogram/plot/update.js
parents 0a4d8444 8d9eb4b7
No related branches found
No related tags found
1 merge request!14Make roofcam update every 5 minutes and have no html default
Show whitespace changes
Inline Side-by-side
aeri_quicklooks.html
+ 15
− 15
View file @ e2ba8e59
......@@ -217,11 +217,11 @@ nav {
<div class="row">
<div class="col-lg-6 text-center">
<h4 class="hidden-lg">6 Hours</h4>
<img class="ql-refresh" width="100%" src="http://metobs.ssec.wisc.edu/pub/cache/sparc/current/aeri/level_c1/version_00/aerioe.temp_xsec.last_06_hours.png">
<img class="ql-refresh" width="100%" src="/pub/cache/sparc/current/aeri/level_c1/version_00/aerioe.temp_xsec.last_06_hours.png">
</div>
<div class="col-lg-6 text-center">
<h4 class="hidden-lg">24 Hours</h4>
<img class="ql-refresh" width="100%" src="http://metobs.ssec.wisc.edu/pub/cache/sparc/current/aeri/level_c1/version_00/aerioe.temp_xsec.last_24_hours.png">
<img class="ql-refresh" width="100%" src="/pub/cache/sparc/current/aeri/level_c1/version_00/aerioe.temp_xsec.last_24_hours.png">
</div>
</div>
</div>
......@@ -238,11 +238,11 @@ nav {
<div class="row">
<div class="col-lg-6 text-center">
<h4 class="hidden-lg">6 Hours</h4>
<img class="ql-refresh" width="100%" src="http://metobs.ssec.wisc.edu/pub/cache/sparc/current/aeri/level_c1/version_00/aerioe.wvmr_xsec.last_06_hours.png">
<img class="ql-refresh" width="100%" src="/pub/cache/sparc/current/aeri/level_c1/version_00/aerioe.wvmr_xsec.last_06_hours.png">
</div>
<div class="col-lg-6 text-center">
<h4 class="hidden-lg">24 Hours</h4>
<img class="ql-refresh" width="100%" src="http://metobs.ssec.wisc.edu/pub/cache/sparc/current/aeri/level_c1/version_00/aerioe.wvmr_xsec.last_24_hours.png">
<img class="ql-refresh" width="100%" src="/pub/cache/sparc/current/aeri/level_c1/version_00/aerioe.wvmr_xsec.last_24_hours.png">
</div>
</div>
</div>
......@@ -259,11 +259,11 @@ nav {
<div class="row">
<div class="col-lg-6 text-center">
<h4 class="hidden-lg">6 Hours</h4>
<img class="ql-refresh" width="100%" src="http://metobs.ssec.wisc.edu/pub/cache/sparc/current/aeri/level_c1/version_00/aerioe.rh_xsec.last_06_hours.png">
<img class="ql-refresh" width="100%" src="/pub/cache/sparc/current/aeri/level_c1/version_00/aerioe.rh_xsec.last_06_hours.png">
</div>
<div class="col-lg-6 text-center">
<h4 class="hidden-lg">24 Hours</h4>
<img class="ql-refresh" width="100%" src="http://metobs.ssec.wisc.edu/pub/cache/sparc/current/aeri/level_c1/version_00/aerioe.rh_xsec.last_24_hours.png">
<img class="ql-refresh" width="100%" src="/pub/cache/sparc/current/aeri/level_c1/version_00/aerioe.rh_xsec.last_24_hours.png">
</div>
</div>
</div>
......@@ -280,11 +280,11 @@ nav {
<div class="row">
<div class="col-lg-6 text-center">
<h4 class="hidden-lg">6 Hours</h4>
<img class="ql-refresh" width="100%" src="http://metobs.ssec.wisc.edu/pub/cache/sparc/current/aeri/level_c1/version_00/aerioe.theta_xsec.last_06_hours.png">
<img class="ql-refresh" width="100%" src="/pub/cache/sparc/current/aeri/level_c1/version_00/aerioe.theta_xsec.last_06_hours.png">
</div>
<div class="col-lg-6 text-center">
<h4 class="hidden-lg">24 Hours</h4>
<img class="ql-refresh" width="100%" src="http://metobs.ssec.wisc.edu/pub/cache/sparc/current/aeri/level_c1/version_00/aerioe.theta_xsec.last_24_hours.png">
<img class="ql-refresh" width="100%" src="/pub/cache/sparc/current/aeri/level_c1/version_00/aerioe.theta_xsec.last_24_hours.png">
</div>
</div>
</div>
......@@ -303,11 +303,11 @@ nav {
<div class="row">
<div class="col-lg-6 text-center">
<h4>6 Hours</h4>
<img class="ql-refresh" width="100%" src="http://metobs.ssec.wisc.edu/pub/cache/sparc/current/aeri/level_c1/version_00/aerioe.lwp_itau.last_06_hours.png">
<img class="ql-refresh" width="100%" src="/pub/cache/sparc/current/aeri/level_c1/version_00/aerioe.lwp_itau.last_06_hours.png">
</div>
<div class="col-lg-6 text-center">
<h4>24 Hours</h4>
<img class="ql-refresh" width="100%" src="http://metobs.ssec.wisc.edu/pub/cache/sparc/current/aeri/level_c1/version_00/aerioe.lwp_itau.last_24_hours.png">
<img class="ql-refresh" width="100%" src="/pub/cache/sparc/current/aeri/level_c1/version_00/aerioe.lwp_itau.last_24_hours.png">
</div>
</div>
</div>
......@@ -326,11 +326,11 @@ nav {
<div class="row">
<div class="col-lg-6 text-center">
<h4>6 Hours</h4>
<img class="ql-refresh" width="100%" src="http://metobs.ssec.wisc.edu/pub/cache/sparc/current/windpro/level_a1/version_00/wind_speed_last_6_hrs.png">
<img class="ql-refresh" width="100%" src="/pub/cache/sparc/current/windpro/level_a1/version_00/wind_speed_last_6_hrs.png">
</div>
<div class="col-lg-6 text-center">
<h4>24 Hours</h4>
<img class="ql-refresh" width="100%" src="http://metobs.ssec.wisc.edu/pub/cache/sparc/current/windpro/level_a1/version_00/wind_speed_last_24_hrs.png">
<img class="ql-refresh" width="100%" src="/pub/cache/sparc/current/windpro/level_a1/version_00/wind_speed_last_24_hrs.png">
</div>
</div>
</div>
......@@ -349,17 +349,17 @@ nav {
<div class="row">
<div class="col-lg-6 text-center">
<h4>6 Hours</h4>
<img class="ql-refresh" width="100%" src="http://metobs.ssec.wisc.edu/pub/cache/sparc/current/windpro/level_a1/version_00/wind_dir_last_6_hrs.png">
<img class="ql-refresh" width="100%" src="/pub/cache/sparc/current/windpro/level_a1/version_00/wind_dir_last_6_hrs.png">
</div>
<div class="col-lg-6 text-center">
<h4>24 Hours</h4>
<img class="ql-refresh" width="100%" src="http://metobs.ssec.wisc.edu/pub/cache/sparc/current/windpro/level_a1/version_00/wind_dir_last_24_hrs.png">
<img class="ql-refresh" width="100%" src="/pub/cache/sparc/current/windpro/level_a1/version_00/wind_dir_last_24_hrs.png">
</div>
</div>
</div>
</div>
</div>
<script src="metobs.ssec.wisc.edu/js/moment.min.js"></script>
<script src="{static}/js/moment.min.js"></script>
<script>
setInterval(function(){
//cache-break the images with a new url every 10 minutes
......
......
ci/build.sh
+ 2
− 2
View file @ e2ba8e59
......@@ -13,9 +13,9 @@ fi
if [[ -z "$METOBS_SITE_DEST" ]]; then
if [[ "$CI_COMMIT_BRANCH" == "develop" ]]; then
METOBS_SITE_DEST="metobs-test"
export METOBS_SITE_DEST="metobs-test"
else
METOBS_SITE_DEST="metobs"
export METOBS_SITE_DEST="metobs"
fi
fi
......
......
content/pages/instruments/aoss/ceilo.html
+ 1
− 3
View file @ e2ba8e59
......@@ -25,9 +25,7 @@
</p>
<h3>View / Download Data</h3>
<ul>
<li><a href="http://metobs.ssec.wisc.edu/pub/cache/aoss/ceilo/">Browse raw data in NetCDF and ASCII</a></li>
<li><a href="http://metobs.ssec.wisc.edu/download/index.php?site=rig">Download data form</a></li>
<li><a href="/quicklooks/">Quicklooks</a></li>
<li><a href="/pub/cache/aoss/ceilo/">Browse raw data in NetCDF and ASCII</a></li>
</ul>
<strong>More information:</strong>
<strong style="color: #333;">Model / manufacturer:</strong> <a href="http://www.esrl.noaa.gov/psd/psd3/cruises/CT25K.pdf">Vaisala CT25K Ceilometer</a>
......
......
pelicanconf.py
+ 1
− 1
View file @ e2ba8e59
......@@ -11,7 +11,7 @@ JS_CONF_VARS = {
PATH = 'content'
THEME = 'themes/rain-theme'
STATIC_PATHS = ['images', 'css', 'js', 'camera_feeds', 'cgi-bin~']
STATIC_PATHS = ['images', 'css', 'js', 'camera_feeds']
TIMEZONE = 'America/Chicago'
DEFAULT_LANG = 'en'
......
......
themes/rain-theme/static/css/stylish-portfolio.css
+ 1
− 1
View file @ e2ba8e59
......@@ -167,7 +167,7 @@ nav{
position: relative;
width: 100%;
height: 55%;
background: url(http://metobs.ssec.wisc.edu/pub/cache/aoss/cameras/north/latest_orig.jpg) no-repeat center 75% scroll;
background: url(/pub/cache/aoss/cameras/north/latest_orig.jpg) no-repeat center 75% scroll;
-webkit-background-size: cover;
-moz-background-size: cover;
background-size: cover;
......
......
themes/rain-theme/templates/home.html
+ 0
− 18
View file @ e2ba8e59
{% extends "base.html" %}
{% block title %}{{ page.title }}{% endblock %}
{% block header %}
<script language="javascript" type="text/javascript">
var updateFreq = (60*2 + 15) * 1000
setInterval(function() {
var cameraElement = document.getElementById("cameraImage");
cameraElement.src = "http://metobs.ssec.wisc.edu/aoss/cameras/images/west/small/latest.jpg?" + new Date().getTime;
var aossMeteorogramElement = document.getElementById("aossMeteorogram");
aossMeteorogramElement.src = "http://metobs.ssec.wisc.edu/pub/cache/aoss/tower/latest_quicklook_met.png?" + new Date().getTime;
var buoyMeteorogramElement = document.getElementById("buoyMeteorogram");
buoyMeteorogramElement.src = "http://metobs.ssec.wisc.edu/pub/cache/mendota/buoy/latest_quicklook_met.png?" + new Date().getTime;
}, updateFreq);
</script>
{% endblock %}
{% block content %}
{{ page.content }}
......
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment