Merge branch 'longread-fixes' into 'dev'

Longread layout fixes

See merge request lilcity/backend!7

apps/course/templates/course/content/gallery.html

@@ -1,28 +1,32 @@
 {% load thumbnail %}
 {% if results %}
-<div class="title">Галерея итогов обучения</div>
+  <div class="title">Галерея итогов обучения</div>
-<div class="examples gallery">
+  <div class="examples gallery">
-  {% for image in course.gallery.gallery_images.all %}
+    {% for image in course.gallery.gallery_images.all %}
-  <div class="examples__item">
+      <div class="examples__item">
-    <a href="{{ image.img.image.url }}">
+        <a href="{{ image.img.image.url }}">
-      {% thumbnail image.img.image "140x140" crop="center" as im %}
+          {% thumbnail image.img.image "140x140" crop="center" as im %}
-      <img class="examples__pic" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}">
+            <img class="examples__pic" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}">
-      {% endthumbnail %}
+          {% endthumbnail %}
-    </a>
+        </a>
+      </div>
+    {% endfor %}
   </div>
-  {% endfor %}
-</div>
 {% else %}
-<div class="content-block title">{{ content.title }}</div>
+  <div class="section section_gradient">
-<div class="examples gallery">
+    <div class="section__center center center_sm">
-  {% for image in content.gallery_images.all %}
+      <div class="title">{{ content.title }}</div>
-  <div class="examples__item">
+      <div class="examples gallery">
-    <a href="{{ image.img.image.url }}">
+        {% for image in content.gallery_images.all %}
-      {% thumbnail image.img.image "140x140" crop="center" as im %}
+          <div class="examples__item">
-      <img class="examples__pic" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}">
+            <a href="{{ image.img.image.url }}">
-      {% endthumbnail %}
+              {% thumbnail image.img.image "140x140" crop="center" as im %}
-    </a>
+                <img class="examples__pic" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}">
+              {% endthumbnail %}
+            </a>
+          </div>
+        {% endfor %}
+      </div>
+    </div>
   </div>
-  {% endfor %}
-</div>
 {% endif %}

apps/course/templates/course/content/image.html

@@ -1,8 +1,10 @@
-<div class="content-block title">
+<div class="section section_border">
-  {{ content.title }}
+  <div class="section__center center center_sm">
-</div>
+    <div class="content-block title">
-<div class="gallery">
+      {{ content.title }}
-  <a href="{{ content.img.image.url }}">
+    </div>
-    <img class="content-block pic" src="{{ content.img.image.url }}" alt="">
+    <div>
-  </a>
+      <img class="content-block pic" src="{{ content.img.image.url }}" alt="">
+    </div>
+  </div>
 </div>

apps/course/templates/course/content/imagetext.html

@@ -1,11 +1,13 @@
-<div class="content-block title">
+<div class="section section_border">
-  {{ content.title }}
+  <div class="section__center center center_sm">
-</div>
+    <div class="content-block title">{{ content.title }}</div>
-<div class="content-block text">
+
-  {{ content.txt | safe }}
+    <div class="lessons__item">
-</div>
+      <div class="lessons__row">
-<div class="gallery">
+        <div class="lessons__preview"><img class="lessons__pic" style="display: block;border-radius:50%;width:130px;height: 130px" src="{{ content.img.image.url }}"></div>
-  <a href="{{ content.img.image.url }}">
+        <div class="lessons__content">{{ content.txt | safe }}</div>
-    <img class="content-block pic" src="{{ content.img.image.url }}" alt="">
+      </div>
-  </a>
+    </div>
-</div>
+
+  </div>
+ </div>

apps/course/templates/course/content/text.html

@@ -1,6 +1,10 @@
-<div class="content-block title">
+<div class="section section_border">
-{{ content.title }}
+  <div class="section__center center center_sm">
+    <div class="content-block title">
+    {{ content.title }}
+    </div>
+    <div class="content-block text" style="margin-bottom:0">
+    {{ content.txt | safe }}
 </div>
-<div class="content-block text">
+  </div>
-{{ content.txt | safe }}
 </div>

apps/course/templates/course/content/video.html

@@ -1,13 +1,17 @@
-<div class="content-block title">
+<div class="section section_border">
-  {{ content.title }}
+  <div class="section__center center center_sm">
-</div>
+    <div class="content-block title">
-<div>
+      {{ content.title }}
-  {% if 'youtube.com' in content.url or 'youtu.be' in content.url %}
+    </div>
-  <iframe width="640" height="360" src="https://www.youtube.com/embed/{{ content.video_index }}" frameborder="0" allow="autoplay; encrypted-media"
+    <div>
-    allowfullscreen></iframe>
+      {% if 'youtube.com' in content.url or 'youtu.be' in content.url %}
-  {% elif 'vimeo.com' in content.url %}
+      <iframe width="640" height="360" src="https://www.youtube.com/embed/{{ content.video_index }}" frameborder="0" allow="autoplay; encrypted-media"
-  <iframe src="https://player.vimeo.com/video/{{ content.video_index }}" width="640" height="360" frameborder="0" webkitallowfullscreen
+        allowfullscreen></iframe>
-    mozallowfullscreen allowfullscreen>
+      {% elif 'vimeo.com' in content.url %}
-  </iframe>
+      <iframe src="https://player.vimeo.com/video/{{ content.video_index }}" width="640" height="360" frameborder="0" webkitallowfullscreen
-  {% endif %}
+        mozallowfullscreen allowfullscreen>
+      </iframe>
+      {% endif %}
+    </div>
+  </div>
 </div>

apps/course/templates/course/course.html

@@ -240,13 +240,11 @@
   {% endif %}
 </div>
 {% for content in course.content.all %}
-<div class="section section_border">
+
-  <div class="section__center center center_sm">
     {% with template="course/content/"|add:content.ctype|add:".html" %}
     {% include template %}
     {% endwith %}
-  </div>
+
-</div>
 {% endfor %}
 {% if user.is_authenticated and course.lessons.exists %}
 <div class="section">
@@ -304,7 +302,7 @@
   </div>
 </div> {% endcomment %}
 {% endif %}
-{% if course.gallery %}
+{% if False %}
 <div class="section section_gradient">
   <div class="section__center center center_sm">
     {% include "course/content/gallery.html" with results=True %}

apps/course/templates/course/course_only_lessons.html

@@ -172,10 +172,6 @@
               <div class="lessons__preview">
                 <img class="lessons__pic" src="{{ lesson.cover.url }}">
               </div>
-              {% else %}
-              <div class="lessons__preview">
-                <img class="lessons__pic" src="{% static 'img/pic-3.jpg' %}">
-              </div>
               {% endif %}
               <div class="lessons__content">{{ lesson.short_description | safe }}</div>
             </div>

apps/course/templates/course/lesson.html

@@ -3,7 +3,7 @@
 {% block title %}{{ lesson.title }} - {{ block.super }}{% endblock title %}
 
 {% block content %}
-<div class="section">
+<div class="section" style="margin-bottom:0;padding-bottom:0">
   <div class="section__center center center_sm">
     <div class="go">
       <a class="go__item" href="{% if next %}{{next}}{% else %}{% url 'course' lesson.course.id %}{% endif %}">
@@ -42,13 +42,11 @@
   </div>
 </div>
 {% for content in lesson.content.all %}
-<div class="section section_border">
+
-  <div class="section__center center center_sm">
     {% with template="course/content/"|add:content.ctype|add:".html" %}
     {% include template %}
     {% endwith %}
-    </div>
+    
-  </div>
 {% endfor %}
 {% comment %} <div class="section section_gradient">
   <div class="section__center center center_sm">

apps/user/templates/user/notification-settings.html

@@ -16,7 +16,7 @@
       <div class="confirm__content">На электронный адрес
         <strong>{{ user.email }}</strong> отправлено письмо для подтверждения.</div>
         <div class="confirm__content">Если письмо где-то затерялось, вы можете повторить отправку письма для подтверждения. Отправить?</div>
-        <a href="{% url 'resend-email-verify' %}" class="confirm__btn btn btn_dark">ОТПРАВИТЬ</a>
+        <a style="margin-top:18px; margin-left: 90px" href="{% url 'resend-email-verify' %}" class="confirm__btn btn btn_dark">ОТПРАВИТЬ ПИСЬМО</a>
       </div>
     </div>
   </div>

apps/user/templates/user/payment-history.html

@@ -16,7 +16,7 @@
       <div class="confirm__content">На электронный адрес
         <strong>{{ user.email }}</strong> отправлено письмо для подтверждения.</div>
         <div class="confirm__content">Если письмо где-то затерялось, вы можете повторить отправку письма для подтверждения. Отправить?</div>
-        <a href="{% url 'resend-email-verify' %}" class="confirm__btn btn btn_dark">ОТПРАВИТЬ</a>
+        <a style="margin-top:18px; margin-left: 90px" href="{% url 'resend-email-verify' %}" class="confirm__btn btn btn_dark">ОТПРАВИТЬ ПИСЬМО</a>
       </div>
     </div>
   </div>

apps/user/templates/user/profile-settings.html

@@ -16,7 +16,7 @@
       <div class="confirm__content">На электронный адрес
         <strong>{{ user.email }}</strong> отправлено письмо для подтверждения.</div>
         <div class="confirm__content">Если письмо где-то затерялось, вы можете повторить отправку письма для подтверждения. Отправить?</div>
-        <a href="{% url 'resend-email-verify' %}" class="confirm__btn btn btn_dark">ОТПРАВИТЬ</a>
+        <a style="margin-top:18px; margin-left: 90px" href="{% url 'resend-email-verify' %}" class="confirm__btn btn btn_dark">ОТПРАВИТЬ ПИСЬМО</a>
       </div>
     </div>
   </div>

project/settings.py

@@ -254,6 +254,8 @@ RAVEN_CONFIG = {
 
 INSTAGRAM_RESULTS_PATH = 'media/instagram/results/'
 
+DATA_UPLOAD_MAX_MEMORY_SIZE = 20242880
+
 try:
     from .local_settings import *
 except ImportError:

web/src/components/CourseRedactor.vue

@@ -612,7 +612,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 = (courseObject.url) ? slugify(courseObject.url):courseObject.url;
                     api.saveCourse(courseObject, this.accessToken)