mitri4
/
LilSchool
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'feature/courses' into dev

Browse Source
remotes/origin/hasaccess
Ivlev Denis 8 years ago
parent 9fc83089b7 28ab123154
commit 69edee2f45
2 changed files with 31 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      apps/course/templates/course/blocks/comments.html
  2. 34
      apps/course/templates/course/course.html

30
apps/course/templates/course/blocks/comments.html
Unescape View File

@ -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 %}

34
apps/course/templates/course/course.html
Unescape View File

@ -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 %}
<!-- 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> -->
{% include "./blocks/comments.html" with course=course %}
</div>
</div>
</div>

Write Preview
Loading…
Cancel
Save