Commit 0a1e5f2b authored by Simon Daron's avatar Simon Daron
Browse files

fix bug with onAir /onair.json in place of onair.json

parent 1ef56b1d
......@@ -22,6 +22,10 @@ text-transform: uppercase;
.dateBloc .month {font-size: 0.8em;}
.dateBloc .time {font-size: 1.2em;margin: 0.2em 0;}
.dateBloc.small{
margin-left: 2em;
font-size: 50%;
}
.tabs .ui-tabs-nav {
font-family: "Reglo";
text-transform: uppercase;
......@@ -324,10 +328,6 @@ button.tag {
}
.episode.inline{
}
.episode.inline .date{
width: 3.5em;
font-size: 50%;
}
.episode.inline .content {
padding-left: 5em;
......
......@@ -14,9 +14,7 @@ $(function() {
*/
var bodyID = html.match(/<body id="(.*?)">/)[1].trim();
$('body').attr('id',bodyID);
$('html, body').animate({
scrollTop: $main.offset().top-$('#metaNav').height()
}, 500);
$('html, body').animate({scrollTop: $main.offset().top-$('#metaNav').height()+2}, 500);
init();
};
......
{% load url from future %}{% load i18n %}<!DOCTYPE html>
<html>
<head>
<title>{% block title %}Radio Panik{% endblock %}</title>
<title>Radio Panik {% block title %}{% endblock %}</title>
<meta charset="UTF-8" />
<script type="text/javascript" src="{{ STATIC_URL }}js/jquery.js"></script>
......@@ -26,7 +26,7 @@
{% block meta %}<div id="metaNav">{% include "includes/metaNav.html" %}</div>{% endblock %}
<div id="Commons">
<div id="Panik">
<div id="Panik" class="hidden">
{% block logo %}<img class="logo" src="{{ STATIC_URL }}/img/LogoPanik.jpg"/>{% endblock %}
</div>
<div id="Listen">
......
{% load thumbnails %}
<div class="episode episode-inline inline cf">
<div class="date dateBloc left">
<div class="date dateBloc left small">
<span class="day">
{{ episode.first_diffusion|date:"D"|slice:":2"}}
</span>
......
......@@ -22,7 +22,12 @@
<span class="icon-th-large" ></span>
<span class="iconLabel">Grid</span>
</a></li>
<!--<li><a href="#">Media</a></li>
<!--
<li><a href="{% url 'emissions' %}">
<span class="icon-group" ></span>
<span class="iconLabel">Emissions</span>
</a></li>
<li><a href="#">Media</a></li>
<li><a href="#">News</a></li>
<li><a href="#">Search</a></li>-->
<li><a href="#">
......
......@@ -5,7 +5,7 @@
<span class="control icon-volume-up resymbol huge"></span>
<span class="label">&nbsp;en direct</span>
</button>
<div id="WhatsOnAir"></div>
<div id="WhatsOnAir"><strong>Unknown (Probably Non-Stop)<strong></div>
<audio
id="DirectStreamPanik"
preload="none"
......@@ -36,8 +36,8 @@
interval = 5000;
$('#WhatsOnAir').on('load',function(){
var self = $(this);
self.fadeOut();
$.getJSON('onair.json', function(onair) {
$.getJSON('/onair.json', function(onair) {
self.fadeOut();
if(onair.data.episode || onair.data.emission){
var result = '';
result = result + ($.type(onair.data.emission) == 'object'?'<strong>'+onair.data.emission.title+'<strong>&nbsp;':'');
......@@ -46,7 +46,7 @@
}
else{self.html('<strong>Unknown (Probably Non-Stop)<strong>');}
self.fadeIn();
});
}).error(function(msg) { });
}).trigger('load');
$('#RefreshWhatsOnAir').on('activate',function(e){
$(this).addClass('spinning');
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment