move day program fragment to django-panik-nonstop module

diff --git a/panikdb/static/css/style.scss b/panikdb/static/css/style.scss
index dc0a623f655d3730d5635b0ba92152df4f2ec3bf..ee6c300c8e9295722502d5cc95f929e16f2d6dcf 100644 (file)
--- a/panikdb/static/css/style.scss
+++ b/panikdb/static/css/style.scss
@@ -622,7 +622,7 @@ form#track-search button {
        min-width: 90%;
 }
 
-.block#program {
+.block.program {
        ul, li {
                list-style: none;
                margin: 0;

diff --git a/panikdb/templates/fragments/program.html b/panikdb/templates/fragments/program.html
deleted file mode 100644 (file)
index 73709c1..0000000
--- a/panikdb/templates/fragments/program.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% load nonstop %}
-<ul class="today">
-{% for prog in today_program %}
-<li {% if prog.now %}class="now"{% endif %}>{{prog.datetime|date:"H:i"}} -
-        {% if prog.klass == 'NonstopSlot' %}Nonstop, {{prog.title}}
-        {% elif prog.emission or prog.episode %}
-          {% if prog.emission %}
-          <a href="{% url 'emission-view' slug=prog.emission.slug %}">{{prog.emission}}</a>
-          {% elif prog.episode %}
-          <a href="{% url 'episode-view' emission_slug=prog.episode.emission.slug slug=prog.episode.slug %}">{{prog.episode.emission}}</a>
-          {% endif %}
-          {% if prog|is_already_in_soma %}
-            <span title="Programmé pour diffusion">⏰</span>
-            {% if prog.scheduleddiffusion_set.first.is_stream or prog.recurringstreamdiffusion_set.exists %}<span title="Stream">📡</span>{% endif %}
-          {% endif %}
-        {% endif %}
-</li>
-{% endfor %}
-</ul>

diff --git a/panikdb/templates/home.html b/panikdb/templates/home.html
index fe6df3ef872daabafd17448479b12c6e0ad19aa1..4c58473af3203cf1cff37a58f29ef0b4d98eb0f7 100644 (file)
--- a/panikdb/templates/home.html
+++ b/panikdb/templates/home.html
@@ -151,12 +151,15 @@ Aucune actu.
 {% block sidebar %}
 <aside id="sidebar">
 
-<div class="block" id="program" data-url="{% url 'program' %}">
+<div class="block program" data-url="{% url 'nonstop-ajax-program' date='' %}">
 <h3>Au programme</h3>
 <div></div>
 <script>
 $(function() {
-  $('#program > div').load($('#program').data('url'));
+  $('.block.program').each(function() {
+    var url = $(this).data('url');
+    $(this).find('> div').load(url);
+  });
 });
 </script>
 </div>

diff --git a/panikdb/urls.py b/panikdb/urls.py
index 68b0bd45b9798a1cfdf0d2f8a4285a218753fc36..ad1fe783a163926aeaedd8d5ca9daf71f6a8a69d 100644 (file)
--- a/panikdb/urls.py
+++ b/panikdb/urls.py
@@ -36,7 +36,6 @@ sqs = SearchQuerySet().models(Emission, Episode, NewsItem).facet('categories').f
 
 urlpatterns = [
     url(r'^$', views.home, name='home'),
-    url(r'^ajax/program$', views.program, name='program'),
 
     url(r'^ckeditor/upload/', login_required(ckeditor_upload)),
     url(r'^ckeditor/browse/', login_required(ckeditor_browse)),

diff --git a/panikdb/views.py b/panikdb/views.py
index 6d0141b95938b28931a216afde822d8c537f8442..2a0a00a3ccc90ba751a0ce248089a019ad0143a8 100644 (file)
--- a/panikdb/views.py
+++ b/panikdb/views.py
@@ -211,26 +211,3 @@ class FocusUnsetView(RedirectView):
             return reverse('combo-manager-page-view', kwargs={'pk': object_id})
 
 focus_unset = FocusUnsetView.as_view()
-
-
-class Program(TemplateView):
-    template_name = 'fragments/program.html'
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        now = datetime.datetime.now()
-        date_start = datetime.datetime.today().replace(hour=5, minute=0, second=0)
-        date_end = date_start + datetime.timedelta(days=1)
-        context['today_program'] = period_program(date_start, date_end, prefetch_categories=False)
-        for x in context['today_program']:
-            x.klass = x.__class__.__name__
-        previous_prog = None
-        for i, x in enumerate(context['today_program']):
-            if x.datetime > now and previous_prog:
-                previous_prog.now = True
-                break
-            previous_prog = x
-        return context
-
-
-program = login_required(Program.as_view())