Merge remote-tracking branch 'origin/dev' into dev

apps/course/templates/course/_items.html

@@ -1,5 +1,18 @@
 {% load static %}
-<div class="courses__item" data-course data-course-id={{ course.id }} data-likes-count={{ course.likes.count }} {% if course.is_deferred_start %}data-future-course data-future-course-time={{ course.deferred_start_at.timestamp }}{% endif %}>
+{% load data_liked from data_liked %}
+
+<div 
+  class="courses__item" 
+  data-course data-course-id={{ course.id }} 
+  data-likes-count={{ course.likes.count }}
+  {% data_liked user course as liked %}
+  {% if liked %}
+  data-liked=1
+  {% else %}
+  data-liked=0
+  {% endif %}
+  {% if course.is_deferred_start %}data-future-course data-future-course-time={{ course.deferred_start_at.timestamp }}{% endif %}
+  >
   <a class="courses__preview" href="{% url 'course' course.id %}">
     <img class="courses__pic" src="{{ course.cover.url }}" />
     <div class="courses__view">Подробнее</div>
@@ -14,14 +27,16 @@
     {% endif %}
   </a>
   <div class="courses__details">
-    <a class="courses__theme theme {{ theme_color }}" href="#">{{ course.category | upper }}</a>
+    <a class="courses__theme theme {{ theme_color }}" href="{% url 'courses' %}?category={{ course.category.title }}">{{ course.category | upper }}</a>
     {% if not course.is_free %}
-    <div class="courses__price">{{ course.price|floatformat:"-2" }}$</div>{% endif %}
+    <div class="courses__price">{{ course.price|floatformat:"-2" }}$</div>
+    {% endif %}
   </div>
-  <a class="courses__title" href="#">{{ course.title }}</a>
+  <a class="courses__title" href="{% url 'course' course.id %}">{{ course.title }}</a>
   <div class="courses__content">{{ course.short_description }}
   </div>
   <div class="courses__user user">
+    <a href="{% url 'user' course.author.id %}">
     {% if course.author.photo %}
     <div class="user__ava ava">
       <img class="ava__pic" src="{{ course.author.photo.url }}"/>
@@ -31,6 +46,7 @@
       <img class="ava__pic" src="{% static 'img/user.jpg' %}"/>
     </div>
     {% endif %}
+    </a>
     <div class="user__info">
       <div class="user__name">{{ course.author.get_full_name }}</div>
       <div class="user__meta">

apps/course/templatetags/data_liked.py

@@ -0,0 +1,13 @@
+from django import template
+
+from ..models import Like
+
+register = template.Library()
+
+
+@register.simple_tag
+def data_liked(user, course):
+    for like in course.likes.all():
+        if user == like.user:
+            return True
+    return False

project/templates/lilcity/index.html

@@ -47,8 +47,8 @@
 
   </script>
   <script>
-    LIL_SERVER_TIME = {% now 'U' %};
-    LIL_SERVER_TIME_DIFF = Math.floor((new Date().getTime()) / 1000) - LIL_SERVER_TIME;
+    LIL_SERVER_TIME = "{% now 'U' %}";
+    LIL_SERVER_TIME_DIFF = Math.floor((new Date().getTime()) / 1000) - parseInt(LIL_SERVER_TIME);
   </script>
 </head>
 
@@ -127,7 +127,7 @@
           {% if user.photo %}
           <div class="header__ava ava"><img class="ava__pic" src="{{ user.photo.url }}"></div>
           {% else %}
-          <div class="header__ava ava"><img class="ava__pic" src="img/user.jpg"></div>
+          <div class="header__ava ava"><img class="ava__pic" src="{% static 'img/user.jpg' %}"></div>
           {% endif %}
           <div class="header__drop">
             {% comment %} <a class="header__link header__link_border" href="#">234.120.345 руб.</a> {% endcomment %}