From a4705ef059a4f2d67de9546467a305ddb51041f8 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Mon, 29 Jan 2018 09:53:13 +0300 Subject: [PATCH 1/2] Add server time to base page head --- project/templates/lilcity/index.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/project/templates/lilcity/index.html b/project/templates/lilcity/index.html index bc262a5d..0a954517 100644 --- a/project/templates/lilcity/index.html +++ b/project/templates/lilcity/index.html @@ -46,6 +46,9 @@ } + From ef9e1baa8cf379ed93f00d587b9a86e62f352389 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Mon, 29 Jan 2018 09:54:11 +0300 Subject: [PATCH 2/2] Work on deferred courses --- apps/course/templates/course/_items.html | 32 ++++++++++++++---------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/apps/course/templates/course/_items.html b/apps/course/templates/course/_items.html index eba23759..aeded34a 100644 --- a/apps/course/templates/course/_items.html +++ b/apps/course/templates/course/_items.html @@ -1,29 +1,35 @@ {% load static %} - -
-
Подробнее
- {% if course.is_featured %} +
+ + +
Подробнее
+ {% if course.is_featured %}
- {% endif %} - {% if course.is_deferred_start %} + {% endif %} {% if course.is_deferred_start %}
До запуска курса осталось:
-
{{ course.deferred_start_at_humanize }}
+
{{ course.deferred_start_at.timestamp }}
- {% endif %} - -
{{ course.category | upper }} - {% if not course.is_free %}
{{ course.price|floatformat:"-2" }}$
{% endif %} + {% endif %} + +
+ {{ course.category | upper }} + {% if not course.is_free %} +
{{ course.price|floatformat:"-2" }}$
{% endif %}
{{ course.title }}
{{ course.short_description }}
{% if course.author.photo %} -
+
+ +
{% else %} -
+
+ +
{% endif %}
{{ course.author.first_name }} {{ course.author.last_name }}