From bd2da70c3bdb98f15fcbb48ec634eb8511cd26b2 Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Sat, 21 Jul 2018 01:05:09 +0500
Subject: [PATCH] =?UTF-8?q?LIL-580=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D1=82=D1=8C=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=B5=D0=BF=D0=BE=D0=B4=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8F=20=D0=BD=D0=B0=20=D1=81?=
 =?UTF-8?q?=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D0=B5=20=D1=83=D1=80=D0=BE?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D1=88=D0=BA=D0=BE=D0=BB=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/course/templates/course/lesson.html      | 19 +++++++++++++++++
 .../templates/school/livelesson_detail.html   | 21 +++++++++++++++++++
 web/src/sass/_common.sass                     |  2 ++
 3 files changed, 42 insertions(+)

diff --git a/apps/course/templates/course/lesson.html b/apps/course/templates/course/lesson.html
index 662a4dd5..dd3c178d 100644
--- a/apps/course/templates/course/lesson.html
+++ b/apps/course/templates/course/lesson.html
@@ -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 }}"/>
diff --git a/apps/school/templates/school/livelesson_detail.html b/apps/school/templates/school/livelesson_detail.html
index 1bcb3227..2637da2c 100644
--- a/apps/school/templates/school/livelesson_detail.html
+++ b/apps/school/templates/school/livelesson_detail.html
@@ -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
diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass
index 8386a037..174fd777 100755
--- a/web/src/sass/_common.sass
+++ b/web/src/sass/_common.sass
@@ -2708,6 +2708,8 @@ a.grey-link
   &__chat_frame
     width: 100%
     height: 600px
+  &__user
+    margin-bottom: 40px
 
 
 .lessons