Merge branch 'feature/courses' into dev

apps/course/templates/course/blocks/comments.html

@@ -0,0 +1,30 @@
+{% load static %}
+{% load mptt_tags %}
+
+{% recursetree course.comments.all %}
+<!-- Node template -->
+<div class="questions__item {% if node.is_child_node %}questions__item_reply{% endif %}">
+    {% if node.author.photo %}
+    <div class="questions__ava ava">
+        <img class="ava__pic" src="{{ node.author.photo.url }}">
+    </div>
+    {% else %}
+    <div class="questions__ava ava">
+        <img class="ava__pic" src="{% static 'img/user.jpg' %}">
+    </div>
+    {% endif %}
+    <div class="questions__wrap">
+        <div class="questions__details">
+            <div class="questions__head">
+                <span class="questions__author">{{ node.author.get_full_name }}</span>
+                <span class="questions__date">{{ node.created_at_humanize }}</span>
+            </div>
+            <div class="questions__content">{{ node.content }}</div>
+        </div>
+        <div class="questions__foot">
+            <button class="questions__action">ОТВЕТИТЬ</button>
+        </div>
+    </div>
+</div>
+<!-- End Node template -->
+{{ children }} {% endrecursetree %}

apps/course/templates/course/course.html

@@ -1,6 +1,5 @@
 {% extends "templates/lilcity/index.html" %}
 {% load static %}
-{% load mptt_tags %}
 
 {% block content %}
 <div class="section section_border">
@@ -201,38 +200,7 @@
           <div class="questions__field"><textarea class="questions__textarea" placeholder="Спросите автора курса интересующие вас вопросы"></textarea></div><button class="questions__btn btn btn_light">ОТПРАВИТЬ</button></div>
       </div>
       <div class="questions__list">
-          {% recursetree course.comments.all %}
+          {% include "./blocks/comments.html" with course=course %}
-          <!-- Node template -->
-          <div class="questions__item {% if node.is_leaf_node %}questions__item_reply{% endif %}">
-            {% if node.author.photo %}
-            <div class="questions__ava ava"><img class="ava__pic" src="{{ node.author.photo.url }}"></div>
-            {% else %}
-            <div class="questions__ava ava"><img class="ava__pic" src="{% static 'img/user.jpg' %}"></div>
-            {% endif %}        
-            <div class="questions__wrap">
-              <div class="questions__details">
-                <div class="questions__head"><span class="questions__author">{{ node.author.get_full_name }}</span><span class="questions__date">{{ node.created_at_humanize }}</span></div>
-                <div class="questions__content">{{ node.content }}</div>
-              </div>
-              <div class="questions__foot"><button class="questions__action">ОТВЕТИТЬ</button></div>
-            </div>
-          </div>
-          <!-- End Node template -->
-          {% if not node.is_leaf_node %}
-            {{ children }}
-          {% endif %}
-          {% endrecursetree %}
-        
-        <!-- <div class="questions__item questions__item_reply">
-          <div class="questions__ava ava"><img class="ava__pic" src="{% static 'img/user.jpg' %}"></div>
-          <div class="questions__wrap">
-            <div class="questions__details">
-              <div class="questions__head"><span class="questions__author">Богиня Недалекая</span><span class="questions__date">16 Сен, 16:52</span></div>
-              <div class="questions__content">А можно ли заниматься если у меня нет интернета и компьютера. Можно ли запустить видео на моей микроволновке?</div>
-            </div>
-            <div class="questions__foot"><button class="questions__action">ОТВЕТИТЬ</button></div>
-          </div>
-        </div> -->
       </div>
     </div>
   </div>