Fix : articles / homes

diff --git a/app/organization/core/templatetags/organization_tags.py b/app/organization/core/templatetags/organization_tags.py
index ce12849c13e119c8ba0fe3427fea90aacf8cdd07..3ebd45dbabb130f50b57098b323526c813d8c281 100644 (file)
--- a/app/organization/core/templatetags/organization_tags.py
+++ b/app/organization/core/templatetags/organization_tags.py
@@ -96,7 +96,7 @@ def get_type(objects, type):
     if objs:
         return objs[0]
     return None
-        
+
 @register.filter
 def in_category(objects, category):
     return objects.filter(category=type)

diff --git a/app/organization/magazine/views.py b/app/organization/magazine/views.py
index 445034ce1bb885d0f9c17baab752dfe6d1c769e1..d9ea5699b69c2b557068ecaffc39c9ed6f5d9171 100644 (file)
--- a/app/organization/magazine/views.py
+++ b/app/organization/magazine/views.py
@@ -23,23 +23,13 @@ class ArticleDetailView(SlugMixin, DetailView):
     template_name='magazine/article/article_detail.html'
     context_object_name = 'article'
 
-    def get(self, request, *args, **kwargs):
-        previous_page_url = request.META['HTTP_REFERER']
-        previous_page_slug = request.META['HTTP_REFERER'].rsplit("/")[-2]
-        if previous_page_slug:
-            #find parents page
-            parsed_url = urlparse(previous_page_url)
-            self.department_parent = DepartmentPage.objects.filter(slug=parsed_url.path[1:][:-1])
-            self.topic_parent = Topic.objects.filter(slug=previous_page_slug)
-        return super(ArticleDetailView, self).get(request, *args, **kwargs)
-
-    def get_context_data(self, **kwargs):
-        context = super(ArticleDetailView, self).get_context_data(**kwargs)
-        if self.topic_parent:
-            context['topic_parent'] = self.topic_parent.all()[0]
-        if self.department_parent:
-            context['department_parent'] =  self.department_parent.all()[0]
-        return context
+    # def get_context_data(self, **kwargs):
+    #     # context = super(ArticleDetailView, self).get_context_data(**kwargs)
+    #     # if self.topic_parent:
+    #     #     context['topic_parent'] = self.topic_parent.all()[0]
+    #     # if self.department_parent:
+    #     #     context['department_parent'] =  self.department_parent.all()[0]
+    #     return context
 
 
 class ArticleListView(SlugMixin, ListView):

diff --git a/app/templates/home/inc/slider.html b/app/templates/home/inc/slider.html
index b3ad988a079eaa882155d10eb9080884a4078724..f9ee413c256fdc292e0394977a119adb64fd4c44 100644 (file)
--- a/app/templates/home/inc/slider.html
+++ b/app/templates/home/inc/slider.html
@@ -3,6 +3,7 @@
 <h1>Slider</h1>
 <br/>
 {% for slider in home.dynamiccontenthomeslider_set.all %}
+{{ slider.content_object }}
   {% with slider.content_object.images.all|get_type:'slider' as image %}
     {% if image %}
           <h2>{{ slider.content_object.title }}<h2><br/>

diff --git a/app/templates/magazine/article/article_detail.html b/app/templates/magazine/article/article_detail.html
index 5b7a524c67a0bbc3a3111facd12ee103790843fa..0bd5118a9dc2618989e914b71d609c0110cc93bd 100644 (file)
--- a/app/templates/magazine/article/article_detail.html
+++ b/app/templates/magazine/article/article_detail.html
@@ -24,13 +24,6 @@
 
 {% block breadcrumb_menu %}
     {{ block.super }}
-    {% if topic_parent %}
-        <li class="breadcrumb__item">{% trans "Magazine" %}</li>
-        <li class="breadcrumb__item"><a href="{% url "topic-detail" parent_topic.slug %}" class="breadcrumb__link" title="{{ parent_topic.title }}">{{ parent_topic.title }}</a></li>
-    {% endif %}
-    {% if department_parent %}
-        <li class="breadcrumb__item"><a href="{% url "page" department_parent.slug %}" class="breadcrumb__link" title="{{ department_parent.title }}">{{ department_parent.title }}</a></li>
-    {% endif %}
 
     <li class="breadcrumb__item active">{{ article.title }}</li>
 {% endblock %}

diff --git a/app/templates/magazine/article/includes/article_card.html b/app/templates/magazine/article/includes/article_card.html
index ffc868db4ef05e540ddb9fe72bfea8ffec6b34b7..133f0af84c3564127cceac66001ae447878d30dd 100644 (file)
--- a/app/templates/magazine/article/includes/article_card.html
+++ b/app/templates/magazine/article/includes/article_card.html
@@ -1,9 +1,11 @@
-{% load i18n pages_tags mezzanine_tags media_tags %}
+{% load i18n pages_tags mezzanine_tags media_tags organization_tags %}
 
 <a class="article-box" href="{% url 'magazine-article-detail' article.slug %}">
     <div class="article-box__header">
         <figure class="article-box__image">
-            <img src="{{ MEDIA_URL }}{% thumbnail article.photo_card.url 427 286 top=0.5 left=article.photo_alignment|get_photo_alignment %}" data-src="{{ MEDIA_URL }}{% thumbnail article.photo_card.url 427 286 %}" class="lazyload" />
+          {% with article.images.all|get_type:'card' as image %}
+            <img src="{{ MEDIA_URL }}{% thumbnail image.file 427 286 top=0.5 left=article.photo_alignment|get_photo_alignment %}" data-src="{{ MEDIA_URL }}{% thumbnail image.file 427 286 %}" class="lazyload" />
+          {% endwith %}
         </figure>
         <div class="article-box__tags">
             <div class="tag tag--small tag--category">

diff --git a/lib/mezzanine-agenda b/lib/mezzanine-agenda
index 85265dec14e637e41a2f8adfc64b4b62a990ce95..02dcb08dd9b735507ceec68a084fc07774a595d1 160000 (submodule)
--- a/lib/mezzanine-agenda
+++ b/lib/mezzanine-agenda
@@ -1 +1 @@
-Subproject commit 85265dec14e637e41a2f8adfc64b4b62a990ce95
+Subproject commit 02dcb08dd9b735507ceec68a084fc07774a595d1