LIL-592 Ютуб вместо вимео для стриминга, временный коммит

remotes/origin/feature/lil-592
gzbender 8 years ago
parent 84b4850702
commit 18c5ca4034
  1. 2
      apps/school/models.py
  2. 17
      apps/school/templates/school/livelesson_detail.html
  3. 5
      project/context_processors.py
  4. 1
      project/settings.py

@ -101,7 +101,7 @@ class SchoolScheduleImage(models.Model):
class LiveLesson(BaseModel, DeactivatedMixin): class LiveLesson(BaseModel, DeactivatedMixin):
title = models.CharField('Название урока', max_length=100, default='', blank=True) title = models.CharField('Название урока', max_length=100, default='', blank=True)
short_description = models.TextField('Краткое описание урока', 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) date = models.DateField(default=now, unique=True)
cover = models.ForeignKey( cover = models.ForeignKey(
ImageObject, ImageObject,

@ -10,11 +10,20 @@
<div class="lesson__content">{{ livelesson.short_description }}</div> <div class="lesson__content">{{ livelesson.short_description }}</div>
<a class="lesson__video video" href="#"> <a class="lesson__video video" href="#">
{% if livelesson.stream_index %} {% if livelesson.stream_index %}
<iframe class="lesson__video_frame" src="https://player.vimeo.com/video/{{ livelesson.stream_index }}?autoplay=1" frameborder="0" webkitallowfullscreen {% if 'youtube.com' in livelesson.stream or 'youtu.be' in livelesson.stream %}
mozallowfullscreen allowfullscreen> <iframe class="lesson__video_frame" src="https://www.youtube.com/embed/{{ livelesson.stream_index }}" frameborder="0" allow="autoplay; encrypted-media"
</iframe> allowfullscreen></iframe>
{% elif 'vimeo.com' in livelesson.stream %}
<iframe class="lesson__video_frame" src="https://player.vimeo.com/video/{{ livelesson.stream_index }}?autoplay=1" frameborder="0" webkitallowfullscreen
mozallowfullscreen allowfullscreen>
</iframe>
{% endif %}
<a href="#" onclick="location.reload();">Если видео не загрузилось обновите страницу</a> <a href="#" onclick="location.reload();">Если видео не загрузилось обновите страницу</a>
<iframe class="lesson__chat_frame" src="https://vimeo.com/live-chat/{{ livelesson.stream_index }}" frameborder="0"></iframe> {% if 'youtube.com' in livelesson.stream or 'youtu.be' in livelesson.stream %}
<iframe class="lesson__chat_frame" src="https://www.youtube.com/live_chat?v={{ livelesson.stream_index }}&embed_domain={{ settings.MAIN_HOST }}" frameborder="0"></iframe>
{% elif 'vimeo.com' in livelesson.stream %}
<iframe class="lesson__chat_frame" src="https://vimeo.com/live-chat/{{ livelesson.stream_index }}" frameborder="0"></iframe>
{% endif %}
{% else %} {% else %}
{% if livelesson.cover %} {% if livelesson.cover %}
<img class="video__pic" src="{{ livelesson.cover.image.url }}"/> <img class="video__pic" src="{{ livelesson.cover.image.url }}"/>

@ -1,4 +1,5 @@
from django.utils.timezone import now from django.utils.timezone import now
from django.conf import settings as project_settings
from paymentwall.pingback import Pingback from paymentwall.pingback import Pingback
from apps.config.models import Config 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': school_payment.exists()}
return {'is_summer_school_purchased': False} return {'is_summer_school_purchased': False}
def settings(request):
return {'settings': project_settings}

@ -91,6 +91,7 @@ TEMPLATES = [
], ],
'OPTIONS': { 'OPTIONS': {
'context_processors': [ 'context_processors': [
'project.context_processors.settings',
'project.context_processors.config', 'project.context_processors.config',
'project.context_processors.baner', 'project.context_processors.baner',
'project.context_processors.is_summer_school_purchased', 'project.context_processors.is_summer_school_purchased',

Loading…
Cancel
Save