mitri4
/
LilSchool
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'longread-fixes' into 'dev'

Browse Source 
Longread layout fixes

See merge request lilcity/backend!7
remotes/origin/hasaccess
cfwme 8 years ago
parent 178cf83777 ba6ab468d0
commit 19da4b6c29
13 changed files with 84 additions and 74 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 48
      apps/course/templates/course/content/gallery.html
  2. 16
      apps/course/templates/course/content/image.html
  3. 24
      apps/course/templates/course/content/imagetext.html
  4. 12
      apps/course/templates/course/content/text.html
  5. 28
      apps/course/templates/course/content/video.html
  6. 8
      apps/course/templates/course/course.html
  7. 4
      apps/course/templates/course/course_only_lessons.html
  8. 8
      apps/course/templates/course/lesson.html
  9. 2
      apps/user/templates/user/notification-settings.html
  10. 2
      apps/user/templates/user/payment-history.html
  11. 2
      apps/user/templates/user/profile-settings.html
  12. 2
      project/settings.py
  13. 2
      web/src/components/CourseRedactor.vue

48
apps/course/templates/course/content/gallery.html
Unescape View File

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

16
apps/course/templates/course/content/image.html
Unescape View File

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

24
apps/course/templates/course/content/imagetext.html
Unescape View File

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

12
apps/course/templates/course/content/text.html
Unescape View File

@ -1,6 +1,10 @@
<div class="content-block title">
{{ content.title }}
<div class="section section_border">
<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">
{{ content.txt | safe }}
</div>
</div>

28
apps/course/templates/course/content/video.html
Unescape View File

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

8
apps/course/templates/course/course.html
Unescape View File

@ -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 %}

4
apps/course/templates/course/course_only_lessons.html
Unescape View File

@ -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>

8
apps/course/templates/course/lesson.html
Unescape View File

@ -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">

2
apps/user/templates/user/notification-settings.html
Unescape View File

@ -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>

2
apps/user/templates/user/payment-history.html
Unescape View File

@ -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>

2
apps/user/templates/user/profile-settings.html
Unescape View File

@ -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>

2
project/settings.py
Unescape View File

@ -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:

2
web/src/components/CourseRedactor.vue
Unescape View File

@ -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)

Write Preview
Loading…
Cancel
Save