Merge branch 'feature/lil-580' into 'master'

Feature/lil 580

See merge request lilcity/backend!90

apps/course/templates/course/lesson.html

@@ -37,6 +37,25 @@
         <div>
           <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>
         </div>
       </div>
     </div>

apps/school/templates/school/livelesson_detail.html

@@ -18,7 +18,6 @@
         {% else %}
           {% if livelesson.cover %}
           <img class="video__pic" src="{{ livelesson.cover.image.url }}"/>
-          {% else %}
           {% endif %}
         {% endif %}
       </div>

web/src/sass/_common.sass

@@ -2725,6 +2725,8 @@ a.grey-link
     object-fit: cover
     width: 100%
     height: 100%
+  &__user
+    margin-bottom: 30px
 
 
 .lessons