diff --git a/apps/course/templates/course/content/gallery.html b/apps/course/templates/course/content/gallery.html index 771df8b6..5cae9613 100644 --- a/apps/course/templates/course/content/gallery.html +++ b/apps/course/templates/course/content/gallery.html @@ -8,12 +8,28 @@ {% endfor %} {% else %} -
{{ content.title }}
-
- {% for image in content.gallery_images.all %} -
- +
+
+
{{ content.title }}
+
+ {% for image in content.gallery_images.all %} +
+ +
+ {% endfor %} +
- {% endfor %} +
+{% endif %} + + + \ No newline at end of file diff --git a/apps/course/templates/course/content/image.html b/apps/course/templates/course/content/image.html index 5daeba4e..9a5e5e7a 100644 --- a/apps/course/templates/course/content/image.html +++ b/apps/course/templates/course/content/image.html @@ -1,6 +1,10 @@ -
- {{ content.title }} -
-
- +
+
+
+ {{ content.title }} +
+
+ +
+
\ No newline at end of file diff --git a/apps/course/templates/course/content/imagetext.html b/apps/course/templates/course/content/imagetext.html index 9849e357..9e59062c 100644 --- a/apps/course/templates/course/content/imagetext.html +++ b/apps/course/templates/course/content/imagetext.html @@ -1,9 +1,13 @@ -
- {{ content.title }} -
-
- {{ content.txt | safe }} -
-
- -
\ No newline at end of file +
+
+
{{ content.title }}
+ +
+
+
+
{{ content.txt | safe }}
+
+
+ +
+
\ No newline at end of file diff --git a/apps/course/templates/course/content/text.html b/apps/course/templates/course/content/text.html index c362b529..18ce2235 100644 --- a/apps/course/templates/course/content/text.html +++ b/apps/course/templates/course/content/text.html @@ -1,6 +1,10 @@ -
-{{ content.title }} +
+
+
+ {{ content.title }} +
+
+ {{ content.txt | safe }}
-
-{{ content.txt | safe }} +
\ No newline at end of file diff --git a/apps/course/templates/course/content/video.html b/apps/course/templates/course/content/video.html index df9893f6..ae3afa1b 100644 --- a/apps/course/templates/course/content/video.html +++ b/apps/course/templates/course/content/video.html @@ -1,13 +1,17 @@ -
- {{ content.title }} -
-
- {% if 'youtube.com' in content.url or 'youtu.be' in content.url %} - - {% elif 'vimeo.com' in content.url %} - - {% endif %} +
+
+
+ {{ 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 diff --git a/apps/course/templates/course/course.html b/apps/course/templates/course/course.html index 5f7a00c8..4606e9b0 100644 --- a/apps/course/templates/course/course.html +++ b/apps/course/templates/course/course.html @@ -239,13 +239,11 @@ {% endif %}
{% for content in course.content.all %} -
-
+ {% with template="course/content/"|add:content.ctype|add:".html" %} {% include template %} {% endwith %} -
-
+ {% endfor %} {% if user.is_authenticated and course.lessons.exists %}
@@ -303,7 +301,7 @@
{% endcomment %} {% endif %} -{% if course.gallery %} +{% if False %}
{% include "course/content/gallery.html" with results=True %} diff --git a/apps/course/templates/course/lesson.html b/apps/course/templates/course/lesson.html index 9286f106..f2427d05 100644 --- a/apps/course/templates/course/lesson.html +++ b/apps/course/templates/course/lesson.html @@ -3,7 +3,7 @@ {% block title %}{{ lesson.title }} - {{ block.super }}{% endblock title %} {% block content %} -
diff --git a/apps/user/templates/user/profile-settings.html b/apps/user/templates/user/profile-settings.html index 68d41375..0b830d91 100644 --- a/apps/user/templates/user/profile-settings.html +++ b/apps/user/templates/user/profile-settings.html @@ -16,7 +16,7 @@
На электронный адрес {{ user.email }} отправлено письмо для подтверждения.
Если письмо где-то затерялось, вы можете повторить отправку письма для подтверждения. Отправить?
- ОТПРАВИТЬ + ОТПРАВИТЬ ПИСЬМО
diff --git a/project/templates/lilcity/main.html b/project/templates/lilcity/main.html index 817a23f6..b92772e8 100644 --- a/project/templates/lilcity/main.html +++ b/project/templates/lilcity/main.html @@ -13,7 +13,7 @@ {% endif %} class="main__btn btn" href="#" - >КУПИТЬ ДОСТУП ОТ 2000р. в мес. + >КУПИТЬ ДОСТУП ОТ 500р. в мес.
{% if messages %} diff --git a/web/src/components/CourseRedactor.vue b/web/src/components/CourseRedactor.vue index 0f94eb3e..20bc474d 100644 --- a/web/src/components/CourseRedactor.vue +++ b/web/src/components/CourseRedactor.vue @@ -549,7 +549,7 @@ this.savingDebounceTimeout = setTimeout(() => { this.courseSaving = true; clearTimeout(this.savingTimeout); - document.getElementById('course-redactor__saving-status').innerText = 'СОХРАНЕНИЕ'; + document.getElementById('course-redactor__saving-status').innerText = 'СОХРАНЕНИЕ...'; const courseObject = this.course; courseObject.url = slugify(courseObject.url); api.saveCourse(courseObject, this.accessToken)