list future and recent episodes

diff --git a/panikweb/views.py b/panikweb/views.py
index 2870ed4b107610e61a760dfe121c068e77bc846f..53a7ef3712988da9a2e4f988dc442a728fed66d8 100644 (file)
--- a/panikweb/views.py
+++ b/panikweb/views.py
@@ -51,10 +51,24 @@ class EmissionMixin:
                         select_params=(False, True),
                         where=['''datetime = (SELECT MIN(datetime)
                                                 FROM emissions_diffusion
-                                               WHERE episode_id = emissions_episode.id)'''],
+                                               WHERE episode_id = emissions_episode.id
+                                                 AND datetime <= CURRENT_TIMESTAMP)'''],
                         tables=['emissions_diffusion'],
                     ).order_by('-first_diffusion').distinct()
 
+        context['futurEpisodes'] = \
+                episodes_queryset.extra(select={
+                        'first_diffusion': 'emissions_diffusion.datetime',
+                        },
+                        select_params=(False, True),
+                        where=['''datetime = (SELECT MIN(datetime)
+                                                FROM emissions_diffusion
+                                               WHERE episode_id = emissions_episode.id
+                                                 AND datetime > CURRENT_TIMESTAMP)'''],
+                        tables=['emissions_diffusion'],
+                    ).order_by('first_diffusion').distinct()
+
+
         # get all related soundfiles in a single query
         soundfiles = {}
         if episode_ids is not None:

diff --git a/panikweb_templates/static/css/specifics.css b/panikweb_templates/static/css/specifics.css
index b95dc9c7f98c969d06e0aaa70f55ca0b55139cdb..049db8fca0d0b58fd0c1ad6a9801bd3ed0c80b18 100644 (file)
--- a/panikweb_templates/static/css/specifics.css
+++ b/panikweb_templates/static/css/specifics.css
@@ -889,6 +889,16 @@ h1.top#frequence {
        font-size:80%;
 }
 
+#Emission-tabs-menu .futur-episodes h5,
+#Emission-tabs-menu .recent-episodes h5 {
+       font-size: 1.2em;
+       margin-bottom: 0.5ex;
+}
+
+#Emission-tabs-menu #search-form {
+       margin-bottom: 1em;
+}
+
 ul.extra-soundfiles li {
        position: relative;
 }

diff --git a/panikweb_templates/templates/emissions/emission_detail.html b/panikweb_templates/templates/emissions/emission_detail.html
index 18423f5ff23a9ec2568f508242ad66f51dc8dc28..c0e904f6df675c502c560518f7f7ed5169bdc620 100644 (file)
--- a/panikweb_templates/templates/emissions/emission_detail.html
+++ b/panikweb_templates/templates/emissions/emission_detail.html
@@ -23,6 +23,7 @@
                        </div>
 
                        <div id="Emission-tabs-menu" class="rightPart episodes">
+
                                {% if news %}
                                        <div class="sub">
                                                <h5 class="sectionLabel">Actu</h5>
@@ -33,20 +34,27 @@
                                                </ul>
                                        </div>
                                {% endif %}
+
+
+                        <h5 class="sectionLabel right"><a class="" href="{% url 'emissionEpisodes' slug=emission.slug %}">Tous ({{ episodes.count }})</a></h5>
+                                               <h5 class="sectionLabel">Épisodes</h5>
+                    <form method="get" action="{% url 'emissionEpisodes' slug=emission.slug %}" class="" id="search-form">
+                                <input id="id_q" name="q" type="text" {% if search_query %}value="{{ search_query }}"{% endif %}>
+                                <button class="icon-search"></button>
+                        </form>
+
                                {% if futurEpisodes %}
-                                       <div class="sub">
-                                               <h5 class="sectionLabel">Bientôt</h5>
-                                               {% for episode in futurEpisodes %}
-                                                       <div class="legend">{{ episode.first_diffusion|date:"F Y" }}</div>
-                                                       {% episode_resume date="daytime" %}
+                                       <div class="sub futur-episodes">
+                                               <h5 class="sectionLabel">À venir</h5>
+                                               {% for episode in futurEpisodes|slice:":3" %}
+                                                       {% episode_inline %}
                                                {% endfor %}
                                        </div>
                                {% endif %}
 
                                {% if episodes.exists %}
-                                       <div class="sub">
-                        <h5 class="sectionLabel right"><a class="" href="{% url 'emissionEpisodes' slug=emission.slug %}">Tous ({{ episodes.count }})</a></h5>
-                                               <h5 class="sectionLabel">Derniers épisodes</h5>
+                                       <div class="sub recent-episodes">
+                                               <h5 class="sectionLabel">Récemment</h5>
 
                                                {% with episodes|slice:"0:5" as episodes %}
                                                        {% for episode in episodes %}

diff --git a/panikweb_templates/templates/emissions/nav.html b/panikweb_templates/templates/emissions/nav.html
index 00f5f467870a5c624c754412030fee60b47eb45b..9204935656e65ba720e98e4fe1d8e26bad07513b 100644 (file)
--- a/panikweb_templates/templates/emissions/nav.html
+++ b/panikweb_templates/templates/emissions/nav.html
@@ -49,13 +49,6 @@
                        </div>
                {% endif %}
             </div>
-            <div class="rightPart">
-                    <form method="get" action="{% url 'emissionEpisodes' slug=emission.slug %}" class="" id="search-form">
-                                <label for="id_q">Rechercher :</label>
-                                <input id="id_q" name="q" type="text" {% if search_query %}value="{{ search_query }}"{% endif %}>
-                                <button class="icon-search"></button>
-                        </form>
-            </div>
            </header>
 </div>