From b86f0d2704397bda0007e6115c43ef6b6658e3a5 Mon Sep 17 00:00:00 2001 From: Sanasol Date: Tue, 19 Jun 2018 16:19:45 +0300 Subject: [PATCH 1/2] fix iframe, thumbnails --- .../templates/course/content/gallery.html | 8 ++--- .../templates/course/content/video.html | 34 ++++++++++++++++--- web/src/sass/_common.sass | 6 +++- 3 files changed, 39 insertions(+), 9 deletions(-) diff --git a/apps/course/templates/course/content/gallery.html b/apps/course/templates/course/content/gallery.html index 41fbf409..1116322a 100644 --- a/apps/course/templates/course/content/gallery.html +++ b/apps/course/templates/course/content/gallery.html @@ -5,8 +5,8 @@ {% for image in course.gallery.gallery_images.all %}
- {% thumbnail image.img.image "140x140" crop="center" as im %} - + {% thumbnail image.img.image "165x165" crop="center" as im %} + {% endthumbnail %}
@@ -20,8 +20,8 @@ {% for image in content.gallery_images.all %}
- {% thumbnail image.img.image "140x140" crop="center" as im %} - + {% thumbnail image.img.image "165x165" crop="center" as im %} + {% endthumbnail %}
diff --git a/apps/course/templates/course/content/video.html b/apps/course/templates/course/content/video.html index ae3afa1b..3527507f 100644 --- a/apps/course/templates/course/content/video.html +++ b/apps/course/templates/course/content/video.html @@ -3,15 +3,41 @@
{{ content.title }}
-
+
{% if 'youtube.com' in content.url or 'youtu.be' in content.url %} - {% elif 'vimeo.com' in content.url %} - {% endif %}
- \ No newline at end of file + + + \ No newline at end of file diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass index 19aad276..9cfbfee2 100755 --- a/web/src/sass/_common.sass +++ b/web/src/sass/_common.sass @@ -2752,7 +2752,11 @@ a.grey-link flex: 0 0 calc(33.33% - 10px) &__pic display: block - width: 100% + width: 165px + height: 165px + +s + width: 160px + height: 160px .questions &__anchor From 1ecc8b37a9dd2ada848611b862278639f7aaf458 Mon Sep 17 00:00:00 2001 From: Sanasol Date: Tue, 19 Jun 2018 16:31:07 +0300 Subject: [PATCH 2/2] href to fix cursor --- apps/course/templates/course/course.html | 2 ++ apps/course/templates/course/course_only_lessons.html | 1 + 2 files changed, 3 insertions(+) diff --git a/apps/course/templates/course/course.html b/apps/course/templates/course/course.html index 615cb945..630aeb61 100644 --- a/apps/course/templates/course/course.html +++ b/apps/course/templates/course/course.html @@ -35,6 +35,7 @@ {% endif %} {% else %} data-popup=".js-popup-auth" + href="#" {% endif %} >{% if pending %}ОЖИДАЕТСЯ ПОДТВЕРЖДЕНИЕ ОПЛАТЫ{% else %}КУПИТЬ КУРС{% endif %} {% endif %} @@ -320,6 +321,7 @@ {% endif %} {% else %} data-popup=".js-popup-auth" + href="#" {% endif %} >{% if pending %}ОЖИДАЕТСЯ ПОДТВЕРЖДЕНИЕ ОПЛАТЫ{% else %}КУПИТЬ КУРС{% endif %} {% endif %} diff --git a/apps/course/templates/course/course_only_lessons.html b/apps/course/templates/course/course_only_lessons.html index e9e5c6e6..3ea64dba 100644 --- a/apps/course/templates/course/course_only_lessons.html +++ b/apps/course/templates/course/course_only_lessons.html @@ -34,6 +34,7 @@ {% endif %} {% else %} data-popup=".js-popup-auth" + href="#" {% endif %} >{% if pending %}ОЖИДАЕТСЯ ПОДТВЕРЖДЕНИЕ ОПЛАТЫ{% else %}КУПИТЬ КУРС{% endif %} {% endif %}