]> git.0d.be Git - panikweb.git/commitdiff
projects / panikweb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1ef56b1)
fix bug with onAir /onair.json in place of onair.json
authorlaron <simon@surlaterre.org>
Fri, 23 Aug 2013 15:03:30 +0000 (17:03 +0200)
committerlaron <simon@surlaterre.org>
Fri, 23 Aug 2013 15:03:30 +0000 (17:03 +0200)
panikweb_templates/static/css/specifics.css patch | blob | history
panikweb_templates/static/js/specifics.js patch | blob | history
panikweb_templates/templates/base.html patch | blob | history
panikweb_templates/templates/episodes/inline.html patch | blob | history
panikweb_templates/templates/includes/metaNav.html patch | blob | history
panikweb_templates/templates/includes/player.html patch | blob | history

diff --git a/panikweb_templates/static/css/specifics.css b/panikweb_templates/static/css/specifics.css
index 7a53611297ff913ae28af49da7acab006ee41b42..f8e13a78811ac33771e3544e89cc63fa6980e333 100644 (file)
--- a/panikweb_templates/static/css/specifics.css
+++ b/panikweb_templates/static/css/specifics.css
@@ -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;
diff --git a/panikweb_templates/static/js/specifics.js b/panikweb_templates/static/js/specifics.js
index 27807fcb122a1eba293cef5ae62b9e97e1ea3eac..5811e801f36e0045c1be88a1fe9ea455eed0c458 100644 (file)
--- a/panikweb_templates/static/js/specifics.js
+++ b/panikweb_templates/static/js/specifics.js
@@ -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();
        };
 
diff --git a/panikweb_templates/templates/base.html b/panikweb_templates/templates/base.html
index e0411c6dbaf6bebf05b2e6ccddbc7e02e97d78a1..dfbc62df989c0fee7a6b9ebc6b3b07ef8147dce3 100644 (file)
--- a/panikweb_templates/templates/base.html
+++ b/panikweb_templates/templates/base.html
@@ -1,7 +1,7 @@
 {% 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">
diff --git a/panikweb_templates/templates/episodes/inline.html b/panikweb_templates/templates/episodes/inline.html
index 320edfe87867c7e5f346efee23bf31a1d59c3287..f4aa7e969fb903236427fd9fa2f7e5ff72caf765 100644 (file)
--- a/panikweb_templates/templates/episodes/inline.html
+++ b/panikweb_templates/templates/episodes/inline.html
@@ -1,6 +1,6 @@
 {% 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>
diff --git a/panikweb_templates/templates/includes/metaNav.html b/panikweb_templates/templates/includes/metaNav.html
index 2c9c8de905e50fe6090c9d687bc10e71c970deae..488176dd9e28231fcb12c61551e8d27bb11a8514 100644 (file)
--- a/panikweb_templates/templates/includes/metaNav.html
+++ b/panikweb_templates/templates/includes/metaNav.html
@@ -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="#">
diff --git a/panikweb_templates/templates/includes/player.html b/panikweb_templates/templates/includes/player.html
index 58a8768862579a8f88e74f2f923bb1ba444eca85..111120210bcbd7d7d00121deeb88362dd7dfc6ad 100644 (file)
--- a/panikweb_templates/templates/includes/player.html
+++ b/panikweb_templates/templates/includes/player.html
@@ -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');
Site web de Radio Panik (base commune)