Fix sort Listen

diff --git a/panikweb/views.py b/panikweb/views.py
index 551ff7f73dd2e798ac35813644d682ad03e76835..ee5dbf26913826f10734e7bd85bfe5a403504cd4 100644 (file)
--- a/panikweb/views.py
+++ b/panikweb/views.py
@@ -438,10 +438,10 @@ class Listen(TemplateView):
                                                 FROM emissions_diffusion
                                                WHERE episode_id = emissions_episode.id)'''],
                         tables=['emissions_diffusion'],
-                    ).order_by('-first_diffusion').reverse():
-            if x >= 24:
+                    ).order_by('-first_diffusion'):
+            if x >= 60:
                break
-            elif episode.has_sound is None:
+            elif episode.main_sound is None:
                continue
             else:
                 x+=1

diff --git a/panikweb_templates/templates/base.html b/panikweb_templates/templates/base.html
index 68af8a65d6a2553293ec331c419cf83b879c26c3..07fc747b78c85f13ea33ee54fde5d4136985e1b9 100644 (file)
--- a/panikweb_templates/templates/base.html
+++ b/panikweb_templates/templates/base.html
@@ -33,10 +33,10 @@
        <div id="All">
                {% block meta %}<div id="metaNav">{% metanav %}</div>{% endblock %}
                <div id="Commons">
-                       <div id="mainHeader" class="center">
-                               <a href="{% url 'home' %}"><h1><span id="radioPanik" class="inBlock">Radio Panik</span> <span id="frequence" class="inBlock">105.4 FM</span></h1></a>
+                       <a href="{% url 'home' %}" id="mainHeader" class="block center">
+                               <h1><span id="radioPanik" class="inBlock">Radio Panik</span> <span id="frequence" class="inBlock">105.4 FM</span></h1>
                                <!--{% block logo %}<img class="logo" src="{{ STATIC_URL }}/img/LogoPanik.jpg"/>{% endblock %}-->
-                       </div>
+                       </a>
                        <div id="Listen" class="{% block player-class %}{% endblock %}">
                                {% block listen %}{% player %}{% endblock %}
                        </div>

diff --git a/panikweb_templates/templates/episodes/resume.html b/panikweb_templates/templates/episodes/resume.html
index ab3ca1094bf163cda4d1c97bc4fd2e60958a386c..597ecd520507032db3c48c8c55788791f1bd2b81 100644 (file)
--- a/panikweb_templates/templates/episodes/resume.html
+++ b/panikweb_templates/templates/episodes/resume.html
@@ -38,7 +38,7 @@
                                <a href="{% url 'emission-view' slug=episode.emission.slug %}">{{ episode.emission.title }}</a>
                        </h5>
                {% endif %}
-               <h5 class="title">
+               <h5 class="title {% if model = "inline" %}ellipsis{% endif %}">
                        <a href="{% url 'episode-view' emission_slug=episode.emission.slug slug=episode.slug %}">{{ episode.title }}</a>
                </h5>
                {% if model = "inline" %}