Merge branch 'master' of https://gitlab.com/lilcity/backend into feature/lil-583
gzbender
7 years ago
commit
ba3f95362e
42 changed files with 483 additions and 160 deletions
@ -1,43 +1,43 @@ |
||||
<div class="section section_border"> |
||||
<div class="section__center center center_sm"> |
||||
<div class="content-block title"> |
||||
{{ content.title }} |
||||
</div> |
||||
<div class="iframe__container"> |
||||
{% if 'youtube.com' in content.url or 'youtu.be' in content.url %} |
||||
<iframe 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 }}" frameborder="0" webkitallowfullscreen |
||||
mozallowfullscreen allowfullscreen> |
||||
</iframe> |
||||
{% endif %} |
||||
</div> |
||||
</div> |
||||
</div> |
||||
|
||||
<style> |
||||
@media only screen and (max-width: 639px) { |
||||
iframe { |
||||
width: 100%; |
||||
height: 240px; |
||||
} |
||||
|
||||
.iframe__container { |
||||
text-align: center; |
||||
width: 100%; |
||||
padding-bottom: 56.25%; |
||||
margin-bottom: -56.25%; |
||||
} |
||||
} |
||||
|
||||
@media only screen and (min-width: 640px) { |
||||
.iframe__container { |
||||
text-align: center; |
||||
} |
||||
iframe { |
||||
width: 640px; |
||||
height: 360px; |
||||
} |
||||
} |
||||
</style> |
||||
<div class="section section_border"> |
||||
<div class="section__center center center_sm"> |
||||
<div class="content-block title"> |
||||
{{ content.title }} |
||||
</div> |
||||
<div class="content-block__video iframe__container"> |
||||
{% if 'youtube.com' in content.url or 'youtu.be' in content.url %} |
||||
<iframe 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 }}" frameborder="0" webkitallowfullscreen |
||||
mozallowfullscreen allowfullscreen> |
||||
</iframe> |
||||
{% endif %} |
||||
</div> |
||||
</div> |
||||
</div> |
||||
|
||||
<style> |
||||
@media only screen and (max-width: 639px) { |
||||
iframe { |
||||
width: 100%; |
||||
height: 240px; |
||||
} |
||||
|
||||
.iframe__container { |
||||
text-align: center; |
||||
width: 100%; |
||||
padding-bottom: 56.25%; |
||||
margin-bottom: -56.25%; |
||||
} |
||||
} |
||||
|
||||
@media only screen and (min-width: 640px) { |
||||
.iframe__container { |
||||
text-align: center; |
||||
} |
||||
iframe { |
||||
width: 640px; |
||||
height: 360px; |
||||
} |
||||
} |
||||
</style> |
||||
|
||||
@ -0,0 +1,29 @@ |
||||
# Generated by Django 2.0.6 on 2018-08-24 21:32 |
||||
|
||||
from django.db import migrations, models |
||||
import django.db.models.deletion |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('course', '0042_like_ip'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.AlterField( |
||||
model_name='course', |
||||
name='cover', |
||||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='course_covers', to='content.ImageObject', verbose_name='Обложка курса'), |
||||
), |
||||
migrations.AlterField( |
||||
model_name='lesson', |
||||
name='cover', |
||||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='lesson_covers', to='content.ImageObject', verbose_name='Обложка урока'), |
||||
), |
||||
migrations.AlterField( |
||||
model_name='material', |
||||
name='cover', |
||||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='material_covers', to='content.ImageObject', verbose_name='Обложка материала'), |
||||
), |
||||
] |
||||
@ -0,0 +1,20 @@ |
||||
# Generated by Django 2.0.6 on 2018-08-24 19:56 |
||||
|
||||
from django.db import migrations, models |
||||
import django.db.models.deletion |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('content', '0022_auto_20180815_2129'), |
||||
('school', '0018_auto_20180629_1501'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.AddField( |
||||
model_name='schoolschedule', |
||||
name='cover', |
||||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='schoolschedule_cover', to='content.ImageObject', verbose_name='Обложка дня'), |
||||
), |
||||
] |
||||
@ -0,0 +1,29 @@ |
||||
# Generated by Django 2.0.6 on 2018-08-24 21:32 |
||||
|
||||
from django.db import migrations, models |
||||
import django.db.models.deletion |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('school', '0019_schoolschedule_cover'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.AlterField( |
||||
model_name='livelesson', |
||||
name='cover', |
||||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='livelesson_covers', to='content.ImageObject', verbose_name='Обложка урока школы'), |
||||
), |
||||
migrations.AlterField( |
||||
model_name='schoolschedule', |
||||
name='cover', |
||||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='schoolschedule_cover', to='content.ImageObject', verbose_name='Обложка дня'), |
||||
), |
||||
migrations.AlterField( |
||||
model_name='schoolscheduleimage', |
||||
name='img', |
||||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='schoolschedule_images', to='content.ImageObject', verbose_name='Объект изображения'), |
||||
), |
||||
] |
||||
@ -0,0 +1,18 @@ |
||||
# Generated by Django 2.0.6 on 2018-08-27 21:58 |
||||
|
||||
from django.db import migrations, models |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('school', '0020_auto_20180824_2132'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.AddField( |
||||
model_name='schoolschedule', |
||||
name='trial_lesson', |
||||
field=models.URLField(blank=True, default=''), |
||||
), |
||||
] |
||||
@ -1,7 +1,5 @@ |
||||
<a |
||||
{% if not user.is_authenticated %} |
||||
data-popup=".js-popup-auth" |
||||
{% endif %} |
||||
data-popup=".js-popup-buy" |
||||
class="timing__btn btn" |
||||
href="{% url 'school-checkout' %}?weekdays={{ school_schedule.weekday }}&add_days=true" |
||||
>купить</a> |
||||
|
||||
@ -0,0 +1,18 @@ |
||||
# Generated by Django 2.0.6 on 2018-08-22 12:11 |
||||
|
||||
from django.db import migrations, models |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('user', '0022_user_instagram_hashtag'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.AddField( |
||||
model_name='user', |
||||
name='trial_lesson', |
||||
field=models.URLField(blank=True, default='', null=True), |
||||
), |
||||
] |
||||
Loading…
Reference in new issue