diff --git a/home/migrations/0005_auto_20201203_1611.py b/home/migrations/0005_auto_20201203_1611.py new file mode 100644 index 0000000..9e816d4 --- /dev/null +++ b/home/migrations/0005_auto_20201203_1611.py @@ -0,0 +1,34 @@ +# Generated by Django 3.1.3 on 2020-12-03 15:11 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('wagtailimages', '0022_uploadedimage'), + ('home', '0004_auto_20201202_1134'), + ] + + operations = [ + migrations.RemoveField( + model_name='homepage', + name='image', + ), + migrations.AddField( + model_name='homepage', + name='image1', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtailimages.image'), + ), + migrations.AddField( + model_name='homepage', + name='image2', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtailimages.image'), + ), + migrations.AddField( + model_name='homepage', + name='image3', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtailimages.image'), + ), + ] diff --git a/home/migrations/0006_auto_20201203_1614.py b/home/migrations/0006_auto_20201203_1614.py new file mode 100644 index 0000000..e783e60 --- /dev/null +++ b/home/migrations/0006_auto_20201203_1614.py @@ -0,0 +1,26 @@ +# Generated by Django 3.1.3 on 2020-12-03 15:14 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('home', '0005_auto_20201203_1611'), + ] + + operations = [ + migrations.RenameField( + model_name='homepage', + old_name='image1', + new_name='image', + ), + migrations.RemoveField( + model_name='homepage', + name='image2', + ), + migrations.RemoveField( + model_name='homepage', + name='image3', + ), + ] diff --git a/home/templates/home/home_page.html b/home/templates/home/home_page.html index 23e6f26..d39b95f 100644 --- a/home/templates/home/home_page.html +++ b/home/templates/home/home_page.html @@ -10,7 +10,15 @@ {% block content %} - {% image page.image width-1100 id="banner" %} + {% image page.image width-1110 id="banner" %} {{ page.body|richtext }} - +

Kde nás najdete?{{ page.address|richtext }}

+
+
+

Email:

{{ page.email|richtext }} +
+
+

Telefon:

{{ page.phone|richtext }} +
+
{% endblock content %} diff --git a/stranka/migrations/0002_auto_20201203_1606.py b/stranka/migrations/0002_auto_20201203_1606.py new file mode 100644 index 0000000..3af909e --- /dev/null +++ b/stranka/migrations/0002_auto_20201203_1606.py @@ -0,0 +1,36 @@ +# Generated by Django 3.1.3 on 2020-12-03 15:06 + +from django.db import migrations, models +import django.db.models.deletion +import wagtail.core.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('wagtailimages', '0022_uploadedimage'), + ('stranka', '0001_initial'), + ] + + operations = [ + migrations.RenameField( + model_name='strankapage', + old_name='body', + new_name='vybaveni', + ), + migrations.AddField( + model_name='strankapage', + name='image', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtailimages.image'), + ), + migrations.AddField( + model_name='strankapage', + name='pracoviste', + field=wagtail.core.fields.RichTextField(blank=True), + ), + migrations.AddField( + model_name='strankapage', + name='sluzby', + field=wagtail.core.fields.RichTextField(blank=True), + ), + ] diff --git a/stranka/migrations/0003_auto_20201203_1614.py b/stranka/migrations/0003_auto_20201203_1614.py new file mode 100644 index 0000000..27606eb --- /dev/null +++ b/stranka/migrations/0003_auto_20201203_1614.py @@ -0,0 +1,30 @@ +# Generated by Django 3.1.3 on 2020-12-03 15:14 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('wagtailimages', '0022_uploadedimage'), + ('stranka', '0002_auto_20201203_1606'), + ] + + operations = [ + migrations.RenameField( + model_name='strankapage', + old_name='image', + new_name='image1', + ), + migrations.AddField( + model_name='strankapage', + name='image2', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtailimages.image'), + ), + migrations.AddField( + model_name='strankapage', + name='image3', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtailimages.image'), + ), + ] diff --git a/stranka/models.py b/stranka/models.py index 6a7da66..7f42546 100644 --- a/stranka/models.py +++ b/stranka/models.py @@ -10,15 +10,28 @@ from wagtail.search import index class StrankaPage(Page): - body = RichTextField(blank=True) + vybaveni = RichTextField(blank=True) + sluzby = RichTextField(blank=True) + pracoviste = RichTextField(blank=True) + image1 = models.ForeignKey( + 'wagtailimages.Image', on_delete=models.PROTECT, null=True, related_name='+' + ) + image2 = models.ForeignKey( + 'wagtailimages.Image', on_delete=models.PROTECT, null=True, related_name='+' + ) + image3 = models.ForeignKey( + 'wagtailimages.Image', on_delete=models.PROTECT, null=True, related_name='+' + ) - search_fields = Page.search_fields + [ - index.SearchField('body'), - ] content_panels = Page.content_panels + [ - FieldPanel('body', classname="full"), - InlinePanel('gallery_images', label="Obrázky"), + FieldPanel('vybaveni', classname="full"), + FieldPanel('sluzby', classname="full"), + FieldPanel('pracoviste', classname="full"), + ImageChooserPanel('image1'), + ImageChooserPanel('image2'), + ImageChooserPanel('image3'), + ] diff --git a/stranka/templates/stranka/stranka_page.html b/stranka/templates/stranka/stranka_page.html new file mode 100644 index 0000000..adb9b26 --- /dev/null +++ b/stranka/templates/stranka/stranka_page.html @@ -0,0 +1,38 @@ +{% extends "base.html" %} +{% load wagtailcore_tags wagtailimages_tags %} + +{% block body_class %}template-homepage{% endblock %} + + +{% block extra_css %} + +{% endblock extra_css %} + + +{% block content %} +
+
+ {{ page.vybaveni|richtext }} +
+
+ {% image page.image1 width-300 %} +
+
+
+
+ {% image page.image2 width-300 %} +
+
+ +
+
+
+
+ +
+
+ {% image page.image3 width-300 %} +
+
+ +{% endblock content %} \ No newline at end of file diff --git a/veterina/settings/base.py b/veterina/settings/base.py index ed883dc..b78e581 100644 --- a/veterina/settings/base.py +++ b/veterina/settings/base.py @@ -122,7 +122,7 @@ AUTH_PASSWORD_VALIDATORS = [ # Internationalization # https://docs.djangoproject.com/en/3.1/topics/i18n/ -LANGUAGE_CODE = 'cs' +LANGUAGE_CODE = 'en' TIME_ZONE = 'Europe/Prague' diff --git a/veterina/static/css/veterina.css b/veterina/static/css/veterina.css index 6fd5750..098b1ad 100644 --- a/veterina/static/css/veterina.css +++ b/veterina/static/css/veterina.css @@ -1,8 +1,24 @@ #banner{ margin: 10 auto; + padding-top: 0; + margin-top: 0; } #homepage_text{ font-size: 20px; text-align: center; +} + +body{ + margin: 0; + padding: 0; +} + +nav{ + padding-bottom: 0; + margin-bottom: 0; +} + +.mb-3 .my-3{ + margin-bottom: 0; } \ No newline at end of file diff --git a/veterina/templates/base.html b/veterina/templates/base.html index c73e176..0f0a5da 100644 --- a/veterina/templates/base.html +++ b/veterina/templates/base.html @@ -29,14 +29,13 @@ {% wagtailuserbar %}
-
Company name
+
- Sign up
{% block content %}