diff --git a/apps/content/migrations/0028_auto_20190726_0106.py b/apps/content/migrations/0028_auto_20190726_0106.py new file mode 100644 index 00000000..f7fbae1a --- /dev/null +++ b/apps/content/migrations/0028_auto_20190726_0106.py @@ -0,0 +1,39 @@ +# Generated by Django 2.0.7 on 2019-07-26 01:06 + +import django.contrib.postgres.fields +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('content', '0027_auto_20190621_1107'), + ] + + operations = [ + migrations.AlterField( + model_name='banner', + name='button_text', + field=models.CharField(blank=True, default='', max_length=50), + ), + migrations.AlterField( + model_name='banner', + name='main_banner', + field=django.contrib.postgres.fields.ArrayField(base_field=models.IntegerField(choices=[(1, 'Главная'), (2, 'Курсы'), (3, 'Школа')]), blank=True, default=[], size=None), + ), + migrations.AlterField( + model_name='banner', + name='pages', + field=django.contrib.postgres.fields.ArrayField(base_field=models.IntegerField(choices=[(1, 'Главная'), (2, 'Курсы'), (3, 'Школа')]), blank=True, default=[], size=None), + ), + migrations.AlterField( + model_name='banner', + name='text', + field=models.TextField(blank=True, default=''), + ), + migrations.AlterField( + model_name='banner', + name='url', + field=models.URLField(blank=True, default=''), + ), + ] diff --git a/apps/content/models.py b/apps/content/models.py index b2671380..101ffe7e 100644 --- a/apps/content/models.py +++ b/apps/content/models.py @@ -153,9 +153,9 @@ class Banner(models.Model): (PAGE_SCHOOL, 'Школа'), ) - text = models.TextField() - button_text = models.CharField(max_length=50) - url = models.URLField() + text = models.TextField(blank=True, default='') + button_text = models.CharField(max_length=50, blank=True, default='') + url = models.URLField(blank=True, default='') image = models.ImageField() use = models.BooleanField(default=False) color = models.CharField(max_length=7, blank=True, default='') diff --git a/apps/school/templates/school/free_lessons.html b/apps/school/templates/school/free_lessons.html index 083aced1..e740d2b1 100644 --- a/apps/school/templates/school/free_lessons.html +++ b/apps/school/templates/school/free_lessons.html @@ -1,6 +1,6 @@ {% extends "templates/lilcity/index.html" %} {% load static %} {% block title %}Месяц открытых дверей в LilCity{% endblock title%} -{% block ogimage %}http://{{request.META.HTTP_HOST}}{% static 'img/og_camp.jpg' %}{% endblock %} +{% block ogimage %}http://{{request.META.HTTP_HOST}}{% static 'img/og_free_lessons.jpg' %}{% endblock %} {% block ogsite-name %}Первая образовательная онлайн-платформа креативного мышления для детей{% endblock ogsite-name %} {% block content %} diff --git a/project/templates/blocks/about.html b/project/templates/blocks/about.html index a6cd2bb8..32b01137 100644 --- a/project/templates/blocks/about.html +++ b/project/templates/blocks/about.html @@ -2,7 +2,7 @@