diff --git a/aktuality/models.py b/aktuality/models.py index 972ba82..788d7eb 100644 --- a/aktuality/models.py +++ b/aktuality/models.py @@ -17,10 +17,7 @@ class Aktualita(Page): date = models.DateField("Post date") body = RichTextField(blank=True) - search_fields = Page.search_fields + [ - index.SearchField('body'), - ] - content_panels = Page.content_panels + [ FieldPanel('body', classname="full"), + FieldPanel('date'), ] diff --git a/aktuality/templates/aktuality/aktualita.html b/aktuality/templates/aktuality/aktualita.html new file mode 100644 index 0000000..a2bda9e --- /dev/null +++ b/aktuality/templates/aktuality/aktualita.html @@ -0,0 +1,9 @@ +{% extends "base.html" %} + +{% load wagtailcore_tags %} + +{% block body_class %}template-blogpage{% endblock %} + +{% block content %} + +{% endblock %} \ No newline at end of file diff --git a/aktuality/templates/aktuality/aktuality_index_page.html b/aktuality/templates/aktuality/aktuality_index_page.html new file mode 100644 index 0000000..361e187 --- /dev/null +++ b/aktuality/templates/aktuality/aktuality_index_page.html @@ -0,0 +1,27 @@ +{% extends "base.html" %} +{% load wagtailcore_tags wagtailimages_tags %} + +{% block body_class %}template-homepage{% endblock %} + + +{% block extra_css %} + +{% endblock extra_css %} + + +{% block content %} + {% for aktualita in page.get_children %} +
+
+

{{ aktualita.title }}

+
+
+
Datum přidání: {{ aktualita.specific.date }}
+

{{ aktualita.specific.body|richtext }}

+
+
+ + + + {% endfor %} +{% endblock content %} diff --git a/blog/migrations/0002_auto_20201207_0908.py b/blog/migrations/0002_auto_20201207_0908.py new file mode 100644 index 0000000..2e5a3cb --- /dev/null +++ b/blog/migrations/0002_auto_20201207_0908.py @@ -0,0 +1,23 @@ +# Generated by Django 3.1.3 on 2020-12-07 08:08 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('wagtailimages', '0022_uploadedimage'), + ('blog', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='blogpage', + name='image', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtailimages.image'), + ), + migrations.DeleteModel( + name='BlogPageGalleryImage', + ), + ] diff --git a/blog/models.py b/blog/models.py index 547168f..21a2842 100644 --- a/blog/models.py +++ b/blog/models.py @@ -21,35 +21,13 @@ class BlogPage(Page): date = models.DateField("Post date") intro = models.CharField(max_length=250) body = RichTextField(blank=True) - - def main_image(self): - gallery_item = self.gallery_images.first() - if gallery_item: - return gallery_item.image - else: - return None - - search_fields = Page.search_fields + [ - index.SearchField('intro'), - index.SearchField('body'), - ] + image = models.ForeignKey( + 'wagtailimages.Image', on_delete=models.PROTECT, null=True, related_name='+' + ) content_panels = Page.content_panels + [ FieldPanel('date'), FieldPanel('intro'), FieldPanel('body', classname="full"), - InlinePanel('gallery_images', label="Obrázky"), - ] - - -class BlogPageGalleryImage(Orderable): - page = ParentalKey(BlogPage, on_delete=models.CASCADE, related_name='gallery_images') - image = models.ForeignKey( - 'wagtailimages.Image', on_delete=models.CASCADE, related_name='+' - ) - caption = models.CharField(blank=True, max_length=250) - - panels = [ ImageChooserPanel('image'), - FieldPanel('caption'), - ] \ No newline at end of file + ] diff --git a/blog/templates/blog/blog_index_page.html b/blog/templates/blog/blog_index_page.html index 9f22baa..50ae386 100644 --- a/blog/templates/blog/blog_index_page.html +++ b/blog/templates/blog/blog_index_page.html @@ -1,18 +1,27 @@ {% extends "base.html" %} -{% load wagtailcore_tags %} +{% load wagtailcore_tags wagtailimages_tags %} {% block body_class %}template-blogindexpage{% endblock %} {% block content %} -

{{ page.title }}

+

{{ page.title }}

{{ page.intro|richtext }}
- {% for post in page.get_children %} -

{{ post.title }}

- {{ post.specific.intro }} -
{{ post.specific.body|richtext }}
- {% endfor %} +
+ {% for post in page.get_children %} +
+ {% image post.specific.image width-250 class="card-img-top" %} +
+
{{ post.specific.title }}
+

{{ post.specific.intro }}

+
+
+ Přejít na článek +
+
+ {% endfor %} +
{% endblock %} \ No newline at end of file diff --git a/blog/templates/blog/blog_page.html b/blog/templates/blog/blog_page.html index bf7da56..9f789f5 100644 --- a/blog/templates/blog/blog_page.html +++ b/blog/templates/blog/blog_page.html @@ -1,17 +1,18 @@ {% extends "base.html" %} -{% load wagtailcore_tags %} +{% load wagtailcore_tags wagtailimages_tags %} {% block body_class %}template-blogpage{% endblock %} {% block content %}

{{ page.title }}

{{ page.date }}

- + {% image page.image width-300 id="blog_img" %}
{{ page.intro }}
{{ page.body|richtext }} +

Return to blog

{% endblock %} \ No newline at end of file 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 3ccb246..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-1000 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/requirements.txt b/requirements.txt index 574b6c3..a8da09f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,4 @@ Django>=3.1,<3.2 wagtail>=2.11,<2.12 +wagtailmenus>=3.0,<3.1 + 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/migrations/0004_auto_20201205_2142.py b/stranka/migrations/0004_auto_20201205_2142.py new file mode 100644 index 0000000..32e7a30 --- /dev/null +++ b/stranka/migrations/0004_auto_20201205_2142.py @@ -0,0 +1,40 @@ +# Generated by Django 3.1.3 on 2020-12-05 20:42 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('stranka', '0003_auto_20201203_1614'), + ] + + operations = [ + migrations.RenameField( + model_name='strankapage', + old_name='image1', + new_name='image', + ), + migrations.RenameField( + model_name='strankapage', + old_name='pracoviste', + new_name='nadpis', + ), + migrations.RenameField( + model_name='strankapage', + old_name='sluzby', + new_name='text', + ), + migrations.RemoveField( + model_name='strankapage', + name='image2', + ), + migrations.RemoveField( + model_name='strankapage', + name='image3', + ), + migrations.RemoveField( + model_name='strankapage', + name='vybaveni', + ), + ] diff --git a/stranka/models.py b/stranka/models.py index 6a7da66..402fe5d 100644 --- a/stranka/models.py +++ b/stranka/models.py @@ -10,15 +10,18 @@ from wagtail.search import index class StrankaPage(Page): - body = RichTextField(blank=True) + nadpis = RichTextField(blank=True) + text = RichTextField(blank=True) + image = 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('nadpis', classname="full"), + FieldPanel('text', classname="full"), + ImageChooserPanel('image'), + ] diff --git a/stranka/templates/stranka/stranka_page.html b/stranka/templates/stranka/stranka_page.html new file mode 100644 index 0000000..2d5a149 --- /dev/null +++ b/stranka/templates/stranka/stranka_page.html @@ -0,0 +1,23 @@ +{% extends "base.html" %} +{% load wagtailcore_tags wagtailimages_tags %} + +{% block body_class %}template-homepage{% endblock %} + + +{% block extra_css %} + +{% endblock extra_css %} + + +{% block content %} +

{{ page.nadpis|richtext }}

+
+
+ {{ page.text|richtext }} +
+
+ {% image page.image max-540x540 %} +
+
+ +{% endblock content %} \ No newline at end of file diff --git a/veterina/settings/base.py b/veterina/settings/base.py index ed883dc..68c01d5 100644 --- a/veterina/settings/base.py +++ b/veterina/settings/base.py @@ -52,6 +52,9 @@ INSTALLED_APPS = [ 'blog', 'stranka', 'aktuality', + + 'wagtail.contrib.modeladmin', + 'wagtailmenus', ] MIDDLEWARE = [ @@ -81,6 +84,7 @@ TEMPLATES = [ 'django.template.context_processors.request', 'django.contrib.auth.context_processors.auth', 'django.contrib.messages.context_processors.messages', + 'wagtailmenus.context_processors.wagtailmenus', ], }, }, diff --git a/veterina/static/css/veterina.css b/veterina/static/css/veterina.css index 6fd5750..b00a0f3 100644 --- a/veterina/static/css/veterina.css +++ b/veterina/static/css/veterina.css @@ -1,8 +1,44 @@ #banner{ margin: 10 auto; + padding-top: 0; + margin-top: 0; } #homepage_text{ font-size: 20px; text-align: center; -} \ No newline at end of file +} + +body{ + margin: 0; + padding: 0; +} + +nav{ + padding-bottom: 0; + margin-bottom: 0; +} + +.col-sm p{ + width: 420px; + text-align: center; +} + +.col-sm img{ + width: 350px; +} + +.row{ + padding-top: 50px; +} + +.card{ + margin-top: 40px; + border-color: lightsteelblue; +} + +#blog_img{ + width: 300px; + margin: 0 auto; +} + diff --git a/veterina/templates/base.html b/veterina/templates/base.html index c73e176..f8cdbbe 100644 --- a/veterina/templates/base.html +++ b/veterina/templates/base.html @@ -1,4 +1,4 @@ -{% load static wagtailuserbar %} +{% load static wagtailuserbar menu_tags %} @@ -28,19 +28,11 @@ {% wagtailuserbar %} -
-
Company name
- - Sign up -
+ {% main_menu max_levels=1 template="menu.html"%}
+ {% block content %} - + {% endblock %}
diff --git a/veterina/templates/menu.html b/veterina/templates/menu.html new file mode 100644 index 0000000..8a92212 --- /dev/null +++ b/veterina/templates/menu.html @@ -0,0 +1,10 @@ +{% load menu_tags %} + +
+
+ +
\ No newline at end of file