diff --git a/apps/school/models.py b/apps/school/models.py
index 91d007e8..00e5afe2 100644
--- a/apps/school/models.py
+++ b/apps/school/models.py
@@ -101,7 +101,7 @@ class SchoolScheduleImage(models.Model):
class LiveLesson(BaseModel, DeactivatedMixin):
title = models.CharField('Название урока', max_length=100, default='', blank=True)
short_description = models.TextField('Краткое описание урока', default='', blank=True)
- stream = models.URLField('Ссылка на VIMEO', default='', blank=True)
+ stream = models.URLField('Ссылка на VIMEO/Youtube', default='', blank=True)
date = models.DateField(default=now, unique=True)
cover = models.ForeignKey(
ImageObject,
diff --git a/apps/school/templates/school/livelesson_detail.html b/apps/school/templates/school/livelesson_detail.html
index 1bcb3227..793ae70d 100644
--- a/apps/school/templates/school/livelesson_detail.html
+++ b/apps/school/templates/school/livelesson_detail.html
@@ -10,11 +10,20 @@
{{ livelesson.short_description }}
{% if livelesson.stream_index %}
-
+ {% if 'youtube.com' in livelesson.stream or 'youtu.be' in livelesson.stream %}
+
+ {% elif 'vimeo.com' in livelesson.stream %}
+
+ {% endif %}
Если видео не загрузилось обновите страницу
-
+ {% if 'youtube.com' in livelesson.stream or 'youtu.be' in livelesson.stream %}
+
+ {% elif 'vimeo.com' in livelesson.stream %}
+
+ {% endif %}
{% else %}
{% if livelesson.cover %}
diff --git a/project/context_processors.py b/project/context_processors.py
index e4788dc4..f5bcce74 100644
--- a/project/context_processors.py
+++ b/project/context_processors.py
@@ -1,4 +1,5 @@
from django.utils.timezone import now
+from django.conf import settings as project_settings
from paymentwall.pingback import Pingback
from apps.config.models import Config
@@ -29,3 +30,7 @@ def is_summer_school_purchased(request):
)
return {'is_summer_school_purchased': school_payment.exists()}
return {'is_summer_school_purchased': False}
+
+
+def settings(request):
+ return {'settings': project_settings}
diff --git a/project/settings.py b/project/settings.py
index 1aecdb8c..e8d9bbd9 100644
--- a/project/settings.py
+++ b/project/settings.py
@@ -91,6 +91,7 @@ TEMPLATES = [
],
'OPTIONS': {
'context_processors': [
+ 'project.context_processors.settings',
'project.context_processors.config',
'project.context_processors.baner',
'project.context_processors.is_summer_school_purchased',