LIL-580 Добавить отображение преподавателя на странице урока школы

remotes/origin/hotfix/LIL-661
gzbender 8 years ago
parent a0a4b0b059
commit bd2da70c3b
  1. 19
      apps/course/templates/course/lesson.html
  2. 21
      apps/school/templates/school/livelesson_detail.html
  3. 2
      web/src/sass/_common.sass

@ -29,6 +29,25 @@
<div class="lesson">
<div class="lesson__subtitle subtitle">{{ lesson.title }}</div>
<div class="lesson__content">{{ lesson.short_description }}</div>
<a href="{% url 'user' lesson.author.id %}">
<div class="lesson__user user">
{% if lesson.author.photo %}
<div class="user__ava ava">
<img class="ava__pic" src="{{ lesson.author.photo.url }}">
</div>
{% else %}
<div class="user__ava ava">
<img class="ava__pic" src="{% static 'img/user_default.jpg' %}">
</div>
{% endif %}
<div class="user__info">
<div class="user__name">{{ lesson.author.get_full_name }}</div>
<div class="user__meta">
<div class="user__date">{{ lesson.created_at_humanize }}</div>
</div>
</div>
</div>
</a>
{% comment %} <a class="lesson__video video" href="#">
{% if lesson.cover %}
<img class="video__pic" src="{{ lesson.cover.image.url }}"/>

@ -8,6 +8,27 @@
<div class="lesson">
<div class="lesson__subtitle subtitle">{{ livelesson.title }}</div>
<div class="lesson__content">{{ livelesson.short_description }}</div>
{% comment %}
<a href="{% url 'user' livelesson.author.id %}">
<div class="lesson__user user">
{% if livelesson.author.photo %}
<div class="user__ava ava">
<img class="ava__pic" src="{{ livelesson.author.photo.url }}">
</div>
{% else %}
<div class="user__ava ava">
<img class="ava__pic" src="{% static 'img/user_default.jpg' %}">
</div>
{% endif %}
<div class="user__info">
<div class="user__name">{{ livelesson.author.get_full_name }}</div>
<div class="user__meta">
<div class="user__date">{{ livelesson.created_at_humanize }}</div>
</div>
</div>
</div>
</a>
{% endcomment %}
<a class="lesson__video video" href="#">
{% if livelesson.stream_index %}
<iframe class="lesson__video_frame" src="https://player.vimeo.com/video/{{ livelesson.stream_index }}?autoplay=1" frameborder="0" webkitallowfullscreen

@ -2708,6 +2708,8 @@ a.grey-link
&__chat_frame
width: 100%
height: 600px
&__user
margin-bottom: 40px
.lessons

Loading…
Cancel
Save