From 1e753eec6be725ed0a734c3ac20c48050cf7a1d8 Mon Sep 17 00:00:00 2001
From: Alexander Burdeinyi <bonus05@gmail.com>
Date: Fri, 9 Dec 2016 17:01:17 +0200
Subject: [PATCH] m

---
 templates/client/article/article.html | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/templates/client/article/article.html b/templates/client/article/article.html
index 332c0fe2..61fdf3e1 100644
--- a/templates/client/article/article.html
+++ b/templates/client/article/article.html
@@ -32,15 +32,15 @@
             <h1><a href="#" class="preview_toggle" data-short="{% trans 'Краткое содержание' %}" data-full="{% trans 'Полное содержание' %}">{% trans 'Краткое содержание' %}</a>{{ object.main_title }}</h1>
             <ul class="article_info">
                 {# TODO: подставить переменную #}
-                <li><i class="fa fa-user"></i> Мануковская</li>
+                <li><i class="fa fa-user"></i> {{ object.author_s.fullname }}</li>
                 <li><i class="fa fa-calendar"></i> {{ object.publish_date|date:"d E Y" }}</li>
                 {# TODO: подставить переменную #}
-                <li>Раздел: <a href="#">Event-индустрия</a></li>
+                <li>Раздел: <a href="/blogs/theme/{{ object.theme.all.0.url }}"> {{ object.theme.all.0 }} </a></li>
             </ul>
             {# <strong><span>{{ object.publish_date|date:"d E Y" }}</span></strong> #}
             {% if object.theme.all.exists %}
                 <div class="article_tags">
-                    {% trans 'Теги:' %}&nbsp;&nbsp; {% include 'client/includes/article_theme.html' with obj=object %}
+                    {% trans 'Теги:' %}&nbsp;&nbsp; {% include 'includes/article_tags.html' with obj=object %}
                 </div>
             {% endif %}
 
@@ -69,16 +69,16 @@
             {% include 'client/includes/sharing_block_full.html' %}
         </div>
 
-        <div class="blog_avtor">
+{#        <div class="blog_avtor">#}
             {# <i>{% trans 'Источник' %}: {{ object.author }}</i> #}
-            {% if object.tag.all.exists %}
-            <div class="blog_avtor_right">
-                {% include 'includes/article_tags.html' with obj=object %}
-            </div>
-            {% endif %}
-
-            <div class="clear"></div>
-        </div>
+{#            {% if object.tag.all.exists %}#}
+{#            <div class="blog_avtor_right">#}
+{#                {% include 'includes/article_tags.html' with obj=object %}#}
+{#            </div>#}
+{#            {% endif %}#}
+{##}
+{#            <div class="clear"></div>#}
+{#        </div>#}
 
 
         <div class="article_author">