backlinking topiks

diff --git a/panikweb/paniktags/templatetags/paniktags.py b/panikweb/paniktags/templatetags/paniktags.py
index d59c6c5755ea70b0cc61bced61643bdfa9eb971d..15ecdb91f56b55e5ed491407e4d811094d3d4eaf 100644 (file)
--- a/panikweb/paniktags/templatetags/paniktags.py
+++ b/panikweb/paniktags/templatetags/paniktags.py
@@ -86,6 +86,7 @@ def episode_detail(context, date=None):
         'diffusions': context.get('diffusions'),
         'soundfiles': soundfiles,
         'date': date,
+        'topiks': context.get('topiks'),
     }
 
 @register.inclusion_tag('emissions/detail.html', takes_context=True)
@@ -307,6 +308,9 @@ def related_objects(object):
     sqs = search.MoreLikeThisSearchQuerySet().models(Emission, Episode, NewsItem)
     return {'more_like_this': sqs.more_like_this(object)[:12]}
 
+@register.inclusion_tag('includes/topik.html', takes_context=True)
+def topik(context, topik):
+    return {'topik': topik}
 
 @register.filter
 def get_focus_url(object):

diff --git a/panikweb/views.py b/panikweb/views.py
index 2131cc71140534f060eb952e099fae3b4c07325b..effe895a6e46e343d38a1d15774f895b8b6df896 100644 (file)
--- a/panikweb/views.py
+++ b/panikweb/views.py
@@ -32,6 +32,8 @@ from emissions.utils import whatsonair, period_program
 from newsletter.forms import SubscribeForm
 from nonstop.utils import get_current_nonstop_track
 
+from panikombo.models import ItemTopik
+
 from . import utils
 
 
@@ -120,6 +122,7 @@ class EpisodeDetailView(DetailView, EmissionMixin):
         if self.kwargs.get('emission_slug') != context['emission'].slug:
             raise Http404()
         context.update(self.get_emission_context(context['emission']))
+        context['topiks'] = [x.topik for x in ItemTopik.objects.filter(episode=self.object)]
         return context
 episode = EpisodeDetailView.as_view()
 
@@ -454,6 +457,7 @@ class NewsItemView(DetailView):
         context['sectionName'] = "News"
         context['categories'] = NewsCategory.objects.all()
         context['news'] = NewsItem.objects.all().order_by('-date')
+        context['topiks'] = [x.topik for x in ItemTopik.objects.filter(newsitem=self.object)]
         return context
 newsitemview = NewsItemView.as_view()
 

diff --git a/panikweb_templates/static/css/specifics.css b/panikweb_templates/static/css/specifics.css
index 14ff700f794b2bcf92eb41260597e7d09265bd59..1e03407cb2a497716eeb9dfe01e4ccb448115143 100644 (file)
--- a/panikweb_templates/static/css/specifics.css
+++ b/panikweb_templates/static/css/specifics.css
@@ -874,6 +874,7 @@ h1.top#frequence {
 .episode.resume .logo{
        float: right;
 }
+.topik.inline .logo,
 .episode.inline .logo {
        min-height: 50px;
        float: left;
@@ -1619,3 +1620,13 @@ div.gallery div.first img {
        top: 50%;
        left: 50%;
 }
+
+ul.tags {
+       padding-top: 1em;
+       clear: both;
+}
+
+div.topik.inline {
+       clear: both;
+        margin-top: 1em;
+}

diff --git a/panikweb_templates/templates/emissions/newsitem_detail.html b/panikweb_templates/templates/emissions/newsitem_detail.html
index e59d0396a19aa17da95aab73396a2a173f3f033d..15c200476706702fbb1a3ca32f1e7d478f5dddce 100644 (file)
--- a/panikweb_templates/templates/emissions/newsitem_detail.html
+++ b/panikweb_templates/templates/emissions/newsitem_detail.html
@@ -36,8 +36,14 @@
                                {{ newsitem.text|safe}}
                        </div>
 
+{% block topik %}
+{% for topik in topiks %}
+  {% topik topik=topik %}
+{% endfor %}
+{% endblock %}
+
                        {% if newsitem.tags.all %}
-                       <ul class="custom inline">
+                       <ul class="custom inline tags">
                                {% for tag in newsitem.tags.all %}
                                <li><a class="tag" href="{% url 'search' %}?&selected_facets=tags_exact:{{tag|facet_tag}}">{{ tag }}</a></li>
                                {% endfor %}

diff --git a/panikweb_templates/templates/episodes/detail.html b/panikweb_templates/templates/episodes/detail.html
index 511921b416364268640f1175e871df70374cbed0..df30bd740d274697cc6830e79c3447e744a4af5e 100644 (file)
--- a/panikweb_templates/templates/episodes/detail.html
+++ b/panikweb_templates/templates/episodes/detail.html
@@ -54,6 +54,13 @@
                        {{ episode.text|safe}}
                </article>
                {% endif %}
+        </div>
+{% block topik %}
+{% for topik in topiks %}
+  {% topik topik=topik %}
+{% endfor %}
+{% endblock %}
+
                <div class="metas">
                        {% if episode.serie  or episode.auteur or episode.redif %}
                        <dl class="credits cf">
@@ -63,7 +70,7 @@
                        </dl>
                        {% endif %}
                        {% if episode.tags.all %}
-                       <ul class="custom inline">
+                       <ul class="custom inline tags">
                                {% for tag in episode.tags.all %}
                                <li><a class="tag" href="{% url 'search' %}?&selected_facets=tags_exact:{{tag|facet_tag}}">{{ tag }}</a></li>
                                {% endfor %}

diff --git a/panikweb_templates/templates/includes/topik.html b/panikweb_templates/templates/includes/topik.html
new file mode 100644 (file)
index 0000000..c306549
--- /dev/null
+++ b/panikweb_templates/templates/includes/topik.html
@@ -0,0 +1,17 @@
+{% load thumbnail paniktags staticfiles %}
+<a href="{{ topik.page.get_online_url }}">
+<div class="topik inline">
+  <div class="logo">
+    {% thumbnail topik.image "60x60" crop="50% 25%" as im %}
+    <img src="{{im.url}}"/>
+    {% endthumbnail %}
+  </div>
+  <div class="content">
+    <div class="title">
+     <h5 class="title">{{ topik.page.title }}</h5>
+    </div>
+    <div class="description ellipsis">
+    </div>
+  </div>
+</div>
+</a>