use pages to get to topiks

diff --git a/panikweb/paniktags/templatetags/paniktags.py b/panikweb/paniktags/templatetags/paniktags.py
index ffd377eca3f4bd1cc0bbbb71be94119b08ca3c88..219295582b88c682f12f8adb1f356d61ff0f19c9 100644 (file)
--- a/panikweb/paniktags/templatetags/paniktags.py
+++ b/panikweb/paniktags/templatetags/paniktags.py
@@ -90,7 +90,7 @@ def episode_detail(context, date=None):
         'diffusions': context.get('diffusions'),
         'soundfiles': soundfiles,
         'date': date,
         'diffusions': context.get('diffusions'),
         'soundfiles': soundfiles,
         'date': date,

-        'topiks': context.get('topiks'),
+        'topik_pages': context.get('topik_pages'),

     }
 
 @register.inclusion_tag('emissions/detail.html', takes_context=True)
     }
 
 @register.inclusion_tag('emissions/detail.html', takes_context=True)


@@ -332,7 +332,8 @@ def related_objects(object):
 
 @register.inclusion_tag('includes/topik.html', takes_context=True)
 def topik(context, topik):
 
 @register.inclusion_tag('includes/topik.html', takes_context=True)
 def topik(context, topik):

-    return {'topik': topik}
+    return {'page': topik}
+

 
 @register.filter
 def get_focus_url(object):
 
 @register.filter
 def get_focus_url(object):

diff --git a/panikweb/views.py b/panikweb/views.py
index e42fd1d01aaa2019b6fd5a5c1ac0732d4107b18b..8fe72b975ff8bb8e4720da470dcfb1a7556dac3c 100644 (file)
--- a/panikweb/views.py
+++ b/panikweb/views.py
@@ -139,8 +139,10 @@ class EpisodeDetailView(EmissionEpisodeMixin, DetailView, EmissionMixin):
         if self.kwargs.get('emission_slug') != context['emission'].slug:
             raise Http404()
         context.update(self.get_emission_context(context['emission']))
         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)]
+        context['topik_pages'] = [x.page for x in ItemTopik.objects.filter(episode=self.object)]

         return context
         return context

+
+

 episode = EpisodeDetailView.as_view()
 
 
 episode = EpisodeDetailView.as_view()
 
 


@@ -531,16 +533,21 @@ class Home(TemplateView):
 
 home = Home.as_view()
 
 
 home = Home.as_view()
 

+

 class NewsItemView(DetailView):
     model = NewsItem
 class NewsItemView(DetailView):
     model = NewsItem

+

     def get_context_data(self, **kwargs):
         context = super(NewsItemView, self).get_context_data(**kwargs)
         context['categories'] = NewsCategory.objects.all()
         context['news'] = NewsItem.objects.all().order_by('-date')
     def get_context_data(self, **kwargs):
         context = super(NewsItemView, self).get_context_data(**kwargs)
         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)]
+        context['topik_pages'] = [x.page for x in ItemTopik.objects.filter(newsitem=self.object)]

         return context
         return context

+
+

 newsitemview = NewsItemView.as_view()
 
 newsitemview = NewsItemView.as_view()
 

+

 class News(TemplateView):
     template_name = 'news.html'
     def get_context_data(self, **kwargs):
 class News(TemplateView):
     template_name = 'news.html'
     def get_context_data(self, **kwargs):

diff --git a/panikweb_templates/templates/emissions/newsitem_detail.html b/panikweb_templates/templates/emissions/newsitem_detail.html
index 79dde5d7506e24bbeb03dbab606e684917c1ea2b..ed4690466c50815e3cee27b32560f83943b3c09c 100644 (file)
--- a/panikweb_templates/templates/emissions/newsitem_detail.html
+++ b/panikweb_templates/templates/emissions/newsitem_detail.html
@@ -46,7 +46,7 @@
                        </div>
 
 {% block topik %}
                        </div>
 
 {% block topik %}

-{% for topik in topiks %}
+{% for topik in topik_pages %}

   {% topik topik=topik %}
 {% endfor %}
 {% endblock %}
   {% topik topik=topik %}
 {% endfor %}
 {% endblock %}

diff --git a/panikweb_templates/templates/episodes/detail.html b/panikweb_templates/templates/episodes/detail.html
index 1309fe2ffa1abc526d8f9725366efff812de37b6..80d8c6937c9bf727a820224ef9040f5ebfedc713 100644 (file)
--- a/panikweb_templates/templates/episodes/detail.html
+++ b/panikweb_templates/templates/episodes/detail.html
@@ -56,7 +56,7 @@
                {% endif %}
         </div>
 {% block topik %}
                {% endif %}
         </div>
 {% block topik %}

-{% for topik in topiks %}
+{% for topik in topik_pages %}

   {% topik topik=topik %}
 {% endfor %}
 {% endblock %}
   {% topik topik=topik %}
 {% endfor %}
 {% endblock %}

diff --git a/panikweb_templates/templates/includes/topik.html b/panikweb_templates/templates/includes/topik.html
index b59ec450702fe9c76eba54ad5e333762a2b5675c..784f412784dc02f24a9c0c07b8c4c1b40d6dad9d 100644 (file)
--- a/panikweb_templates/templates/includes/topik.html
+++ b/panikweb_templates/templates/includes/topik.html
@@ -1,14 +1,14 @@
 {% load thumbnail paniktags staticfiles %}
 {% load thumbnail paniktags staticfiles %}

-<a href="{{ topik.page.get_online_url }}" class="topik-link">
+<a href="{{ page.get_online_url }}" class="topik-link">

 <div>
   <div class="logo">
 <div>
   <div class="logo">

-    {% thumbnail topik.image "60x60" crop="50% 25%" as im %}
+    {% thumbnail page.picture "60x60" crop="50% 25%" as im %}

     <img src="{{im.url}}"/>
     {% endthumbnail %}
   </div>
   <div class="content">
     <div class="title">
     <img src="{{im.url}}"/>
     {% endthumbnail %}
   </div>
   <div class="content">
     <div class="title">

-     <h5 class="title">{{ topik.page.title }}</h5>
+     <h5 class="title">{{ page.title }}</h5>

     </div>
     <div class="description ellipsis">
     </div>
     </div>
     <div class="description ellipsis">
     </div>