Topic details first implementation

diff --git a/app/templates/magazine/article/includes/article_card.html b/app/templates/magazine/article/includes/article_card.html
index 12f2a127990ec59ebfa208afedbba6544f1fa809..2e5f6835c9ef43d01cc9715ccc953dcb768defd8 100644 (file)
--- a/app/templates/magazine/article/includes/article_card.html
+++ b/app/templates/magazine/article/includes/article_card.html
@@ -1,31 +1,34 @@
-{% load i18n pages_tags mezzanine_tags %}
+{% load i18n pages_tags mezzanine_tags media_tags %}
 
-<div class="col-md-3 col-sm-4 col-xs-6">
-    <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 %}" data-src="{{ MEDIA_URL }}{% thumbnail article.photo_card.url 427 286 %}" class="lazyload" />
-            </figure>
-            <div class="article-box__tags">
-                <div class="tag tag--small tag--category">
-                    {% trans 'Actualité' %}
-                </div>
-                {% if article.keywords %}
-                <div class="tag tag--small dashed dashed--gray">
-                  {{ article.keywords.first }}
-                </div>
-                {% endif %}
+<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" />
+        </figure>
+        <div class="article-box__tags">
+            <div class="tag tag--small tag--category">
+                {% trans 'Actualité' %}
             </div>
+            {% if article.keywords %}
+            <div class="tag tag--small dashed dashed--gray">
+              {{ article.keywords.first }}
+            </div>
+            {% endif %}
         </div>
+    </div>
 
-        <div class="article-box__content tal">
-            <h3 class="article-box__title">{{ article.title }}</h3>
-            <div class="article-box__subtitle">
-                {{ article.publish_date|date:"DATE_FORMAT" }}
-            </div>
-            <div class="article-box__desc">
-                {{ article.content|richtext_filters|safe|truncatechars:200 }}
-            </div>
+    <div class="article-box__content tal">
+        <h3 class="article-box__title">{{ article.title }}</h3>
+        <div class="article-box__subtitle">
+            {{ article.publish_date|date:"DATE_FORMAT" }}
+            {% for category in article.categories.all %}
+                {% if forloop.first %} | {% endif %}
+                {% if not forloop.first %}, {% endif %}
+                <strong>{{ category }}</strong>
+            {% endfor %}
+        </div>
+        <div class="article-box__desc">
+             {{ article.content|richtext_filters|safe|truncatechars_html:200 }}
         </div>
-    </a>
-</div>
+    </div>
+</a>

diff --git a/app/templates/magazine/topic/topic_detail.html b/app/templates/magazine/topic/topic_detail.html
index 9e54e093aeef255ada4637be20832bf105992d54..4f387d5ade29205da62fdf72b3db937d8deffa21 100644 (file)
--- a/app/templates/magazine/topic/topic_detail.html
+++ b/app/templates/magazine/topic/topic_detail.html
@@ -1,64 +1,72 @@
 {% extends "base.html" %}
 {% load i18n mezzanine_tags blog_tags keyword_tags disqus_tags %}
 
-{% block meta_title %}{% if page %}{{ page.meta_title }}{% else %}{% trans "Articles" %}{% endif %}{% endblock %}
+{% block meta_title %}
+    {{ topic.title }} | {% trans "Magazine" %}
+{% endblock %}
 
 {% block meta_keywords %}{% metablock %}
-{% keywords_for page as keywords %}
-{% for keyword in keywords %}
-    {% if not forloop.first %}, {% endif %}
-    {{ keyword }}
-{% endfor %}
+    {% keywords_for topic as keywords %}
+    {% for keyword in keywords %}
+        {% if not forloop.first %}, {% endif %}
+        {{ keyword }}
+    {% endfor %}
 {% endmetablock %}{% endblock %}
 
 {% block meta_description %}{% metablock %}
-{{ page.description }}
+    {{ topic.description }}
 {% endmetablock %}{% endblock %}
 
 {% block title %}
-{% if page %}
-{% editable page.title %}{{ page.title }}{% endeditable %}
-{% else %}
-{% trans "Articles" %}
-{% endif %}
+    {% if page %}
+        {% editable page.title %}{{ page.title }}{% endeditable %}
+    {% else %}
+        {% trans "Articles" %}
+    {% endif %}
 {% endblock %}
 
 {% block breadcrumb_menu %}
-{{ block.super }}
-{% if tag or category or year or month or author %}
-<li>{% spaceless %}
-{% if tag %}
-    {% trans "Tag:" %} {{ tag }}
-{% else %}{% if category %}
-    {% trans "Category:" %} {{ category }}
-{% else %}{% if year or month %}
-    {% if month %}{{ month }}, {% endif %}{{ year }}
-{% else %}{% if author %}
-    {% trans "Author:" %} {{ author.get_full_name|default:author.username }}
-{% endif %}{% endif %}{% endif %}{% endif %}
-{% endspaceless %}
-</li>
-{% endif %}
+    {{ block.super }}
+    <li class="breadcrumb__item">{% trans "Magazine" %}</li>
+    <li class="breadcrumb__item active">{{ topic.title }}</li>
 {% endblock %}
 
 {% block main %}
-<div class="msry__container">
-  <div class="msry__sizer"></div>
+    <div class="mb2 page page--{% spaceless %}{% block page_class %}{% endblock %}{% endspaceless %}">
+        <div class="container">
 
-  <h1>{{ topic.title }}</h1>
-  <p>{{ topic.description }}</p>
+            <div class="row">
+                <div class="col-sm-9 col-lg-8 col-lg-push-2 white-bg">
+                    {% editable topic.title %}
+                        <h1 class="dotted">{{ topic.title }}</h1>
+                    {% endeditable %}
+                </div>
+            </div>
 
-  {% for article in topic.articles.all %}
-     {% include 'magazine/article/includes/article_card.html' %}
-  {% endfor %}
-</div>
+            <div class="row">
+                <div class="col-sm-9 col-lg-8 col-lg-push-2 white-bg page__content">
+                    {% if topic.description %}
+                        {% editable topic.description %}
+                            <div class="chapo">
+                                {{ topic.description }}
+                            </div>
+                        {% endeditable %}
+                    {% endif %}
+                </div>
+            </div>
 
-{% if settings.COMMENTS_DISQUS_SHORTNAME %}
-{% include "generic/includes/disqus_counts.html" %}
-{% endif %}
+        </div>
 
-{% endblock %}
+    </div>
+
+    <div class="container">
+        <div class="row">
+            {% for article in topic.articles.all %}
+                <div class="col-lg-4 col-md-4 col-sm-4 col-xs-6">
+                    {% include 'magazine/article/includes/article_card.html' %}
+                </div>
+            {% endfor %}
+        </div>
+    </div>
 
-{% block right_panel %}
-{% include "blog/includes/filter_panel.html" %}
 {% endblock %}