diff --git a/GeneralApp/admin.py b/GeneralApp/admin.py index 5737e74..85e4877 100644 --- a/GeneralApp/admin.py +++ b/GeneralApp/admin.py @@ -48,7 +48,7 @@ class Admin_StackedInline_Block(Admin_Trans_GenericBaseIconStackedInline, SuperI 'classes': [], 'fields': [ ('block_type', 'title', 'description', 'picture'), - ('bg_color', ), + ('bg_color', 'bg_image'), ('but_title', 'but_color', 'but_icon'), ('url',), ('child_in_row_count', 'order'), diff --git a/GeneralApp/migrations/0011_block_bg_image_alter_block_block_type.py b/GeneralApp/migrations/0011_block_bg_image_alter_block_block_type.py new file mode 100644 index 0000000..e51b147 --- /dev/null +++ b/GeneralApp/migrations/0011_block_bg_image_alter_block_block_type.py @@ -0,0 +1,24 @@ +# Generated by Django 4.2.7 on 2023-11-28 13:29 + +import BaseModels.base_models +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('GeneralApp', '0010_block_but_icon_widgetforblock_but_icon_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='block', + name='bg_image', + field=models.FileField(blank=True, null=True, upload_to='uploads/', validators=[BaseModels.base_models.validate_file_extension], verbose_name='Фоновое изображение блока'), + ), + migrations.AlterField( + model_name='block', + name='block_type', + field=models.CharField(choices=[('photo_n_text', 'Фото + текст'), ('photo150_n_title', 'Фото 150x150 + заголовок'), ('how_work', 'Как с нами работать'), ('feedback_form', 'Форма обратной связи')], default='photo_n_text', max_length=100, verbose_name='Тип блока'), + ), + ] diff --git a/GeneralApp/migrations/0012_alter_block_bg_color.py b/GeneralApp/migrations/0012_alter_block_bg_color.py new file mode 100644 index 0000000..beddde7 --- /dev/null +++ b/GeneralApp/migrations/0012_alter_block_bg_color.py @@ -0,0 +1,19 @@ +# Generated by Django 4.2.7 on 2023-11-28 13:32 + +import colorfield.fields +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('GeneralApp', '0011_block_bg_image_alter_block_block_type'), + ] + + operations = [ + migrations.AlterField( + model_name='block', + name='bg_color', + field=colorfield.fields.ColorField(blank=True, default=None, image_field=None, max_length=25, null=True, samples=None, verbose_name='Цвет фона'), + ), + ] diff --git a/GeneralApp/migrations/0013_alter_widgetforblock_bg_color.py b/GeneralApp/migrations/0013_alter_widgetforblock_bg_color.py new file mode 100644 index 0000000..cd38761 --- /dev/null +++ b/GeneralApp/migrations/0013_alter_widgetforblock_bg_color.py @@ -0,0 +1,19 @@ +# Generated by Django 4.2.7 on 2023-11-28 13:37 + +import colorfield.fields +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('GeneralApp', '0012_alter_block_bg_color'), + ] + + operations = [ + migrations.AlterField( + model_name='widgetforblock', + name='bg_color', + field=colorfield.fields.ColorField(blank=True, default=None, image_field=None, max_length=25, null=True, samples=None, verbose_name='Цвет фона'), + ), + ] diff --git a/GeneralApp/models.py b/GeneralApp/models.py index 7491657..e30e49c 100644 --- a/GeneralApp/models.py +++ b/GeneralApp/models.py @@ -45,7 +45,11 @@ class Block(Block_Abstract): url = models.TextField(verbose_name=_('URL привязанной страницы'), null=True, blank=True) - bg_color = ColorField(verbose_name=_('Цвет фона'), default='#FFFFFF') + bg_color = ColorField(verbose_name=_('Цвет фона'), default=None, null=True, blank=True) + bg_image = models.FileField( + upload_to='uploads/', verbose_name=_('Фоновое изображение блока'), null=True, blank=True, + validators=[validate_file_extension] + ) but_title = models.CharField(max_length=100, verbose_name=_('Текст на кнопке'), null=True, blank=True) but_color = ColorField(verbose_name=_('Цвет кнопки'), default='#000000') @@ -85,7 +89,7 @@ class WidgetForBlock(BaseModel): url = models.TextField(verbose_name=_('URL привязанной страницы'), null=True, blank=True) - bg_color = ColorField(verbose_name=_('Цвет фона'), default='#FFFFFF') + bg_color = ColorField(verbose_name=_('Цвет фона'), default=None, null=True, blank=True) but_title = models.CharField(max_length=100, verbose_name=_('Текст на кнопке'), null=True, blank=True) but_color = ColorField(verbose_name=_('Цвет кнопки'), default='#000000') diff --git a/ServicesApp/views.py b/ServicesApp/views.py index 0dce0ff..aa44a23 100644 --- a/ServicesApp/views.py +++ b/ServicesApp/views.py @@ -10,14 +10,16 @@ from GeneralApp.funcs import get_inter_http_respose def section_view(request, url): try: - page = Section.objects.get(url=url) + section = Section.objects.get(url=url) # from ArticlesApp.models import ArticleModel # arts = ArticleModel.objects.filter(enable=True).order_by('-createDT')[:4] + services = section.rel_services_for_section.filter(enable=True).order_by('order') Dict = { - 'page': page, + 'page': section, + 'services': services, # 'articles': arts, } diff --git a/SlidesApp/migrations/0002_alter_slide_bg_color.py b/SlidesApp/migrations/0002_alter_slide_bg_color.py new file mode 100644 index 0000000..c5eb1ff --- /dev/null +++ b/SlidesApp/migrations/0002_alter_slide_bg_color.py @@ -0,0 +1,19 @@ +# Generated by Django 4.2.7 on 2023-11-28 13:39 + +import colorfield.fields +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('SlidesApp', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='slide', + name='bg_color', + field=colorfield.fields.ColorField(blank=True, default=None, image_field=None, max_length=25, null=True, samples=None, verbose_name='Цвет фона'), + ), + ] diff --git a/SlidesApp/models.py b/SlidesApp/models.py index 385710a..e43b3fa 100644 --- a/SlidesApp/models.py +++ b/SlidesApp/models.py @@ -21,7 +21,7 @@ class Slide(BaseModel): picture = models.ImageField( upload_to='uploads/', verbose_name=_('Фоновое изображение'), null=True, blank=True) - bg_color = ColorField(verbose_name=_('Цвет фона'), default='#FFFFFF') + bg_color = ColorField(verbose_name=_('Цвет фона'), default=None, null=True, blank=True) but_title = models.CharField(max_length=100, verbose_name=_('Текст на кнопке'), null=True, blank=True) but_color = ColorField(verbose_name=_('Цвет кнопки'), default='#000000') diff --git a/templates/block_settings/blocks_settings.html b/templates/block_settings/blocks_settings.html index b0797a4..0b3b52e 100644 --- a/templates/block_settings/blocks_settings.html +++ b/templates/block_settings/blocks_settings.html @@ -1 +1 @@ -{% load static %} \ No newline at end of file +style="width: 100%;{% if block.bg_image %} background: {{ block.bg_color }}{% endif %}" \ No newline at end of file diff --git a/templates/forms/f_consultation.html b/templates/forms/f_consultation.html index e33ae84..d5d8780 100644 --- a/templates/forms/f_consultation.html +++ b/templates/forms/f_consultation.html @@ -1,6 +1,6 @@ {% load static %} {% load i18n %} -
+