diff --git a/uniweb/migrations/0009_auto_20201126_1505.py b/uniweb/migrations/0009_auto_20201126_1505.py
new file mode 100644
index 0000000000000000000000000000000000000000..067d2aa1ab87ba07acd29696f64df4985913b234
--- /dev/null
+++ b/uniweb/migrations/0009_auto_20201126_1505.py
@@ -0,0 +1,783 @@
+# Generated by Django 3.1.3 on 2020-11-26 14:05
+
+import wagtail.contrib.table_block.blocks
+import wagtail.core.blocks
+import wagtail.core.fields
+import wagtail.documents.blocks
+import wagtail.images.blocks
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("uniweb", "0008_auto_20200916_1151"),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name="uniwebhomepage",
+ name="narrow_layout",
+ field=models.BooleanField(
+ default=False,
+ help_text="užší stránka je vhodná pro lepší čitelnost textů",
+ verbose_name="zúžený obsah stránky",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="uniwebflexiblepage",
+ name="content",
+ field=wagtail.core.fields.StreamField(
+ [
+ (
+ "title",
+ wagtail.core.blocks.CharBlock(
+ group="nadpisy",
+ icon="title",
+ label="nadpis",
+ template="uniweb/blocks/title.html",
+ ),
+ ),
+ (
+ "advanced_title",
+ wagtail.core.blocks.StructBlock(
+ [
+ (
+ "align",
+ wagtail.core.blocks.ChoiceBlock(
+ choices=[
+ ("left", "vlevo"),
+ ("center", "uprostřed"),
+ ("right", "vpravo"),
+ ],
+ label="zarovnání",
+ ),
+ ),
+ (
+ "color",
+ wagtail.core.blocks.ChoiceBlock(
+ choices=[
+ ("black_on_white", "černá na bílé"),
+ ("white_on_black", "bílá na černé"),
+ ("white_on_blue", "bílá na modré"),
+ ("white_on_cyan", "bílá na tyrkysové"),
+ ("white_on_violet", "bílá na fialové"),
+ ],
+ label="barva",
+ ),
+ ),
+ (
+ "title",
+ wagtail.core.blocks.CharBlock(label="nadpis"),
+ ),
+ ]
+ ),
+ ),
+ (
+ "picture_title",
+ wagtail.core.blocks.StructBlock(
+ [
+ (
+ "color",
+ wagtail.core.blocks.ChoiceBlock(
+ choices=[
+ ("black_on_white", "černá na bílé"),
+ ("white_on_black", "bílá na černé"),
+ ("white_on_blue", "bílá na modré"),
+ ("white_on_cyan", "bílá na tyrkysové"),
+ ("white_on_violet", "bílá na fialové"),
+ ],
+ label="barva",
+ ),
+ ),
+ (
+ "title",
+ wagtail.core.blocks.CharBlock(label="nadpis"),
+ ),
+ (
+ "picture",
+ wagtail.images.blocks.ImageChooserBlock(
+ help_text="rozměr na výšku 75px nebo více (obrázek bude zmenšen na výšku 75px)",
+ label="obrázek",
+ ),
+ ),
+ ]
+ ),
+ ),
+ (
+ "text",
+ wagtail.core.blocks.RichTextBlock(
+ features=[
+ "h2",
+ "h3",
+ "h4",
+ "h5",
+ "bold",
+ "italic",
+ "ol",
+ "ul",
+ "hr",
+ "link",
+ "document-link",
+ "image",
+ "superscript",
+ "subscript",
+ "strikethrough",
+ "blockquote",
+ ],
+ group="texty",
+ label="text",
+ template="uniweb/blocks/text.html",
+ ),
+ ),
+ (
+ "advanced_text",
+ wagtail.core.blocks.StructBlock(
+ [
+ (
+ "align",
+ wagtail.core.blocks.ChoiceBlock(
+ choices=[
+ ("left", "vlevo"),
+ ("center", "uprostřed"),
+ ("right", "vpravo"),
+ ],
+ label="zarovnání",
+ ),
+ ),
+ (
+ "color",
+ wagtail.core.blocks.ChoiceBlock(
+ choices=[
+ ("black_on_white", "černá na bílé"),
+ ("white_on_black", "bílá na černé"),
+ ("white_on_blue", "bílá na modré"),
+ ("white_on_cyan", "bílá na tyrkysové"),
+ ("white_on_violet", "bílá na fialové"),
+ ],
+ label="barva",
+ ),
+ ),
+ (
+ "text",
+ wagtail.core.blocks.RichTextBlock(
+ features=[
+ "h2",
+ "h3",
+ "h4",
+ "h5",
+ "bold",
+ "italic",
+ "ol",
+ "ul",
+ "hr",
+ "link",
+ "document-link",
+ "image",
+ "superscript",
+ "subscript",
+ "strikethrough",
+ "blockquote",
+ ],
+ label="text",
+ ),
+ ),
+ ]
+ ),
+ ),
+ (
+ "text_columns",
+ wagtail.core.blocks.StructBlock(
+ [
+ (
+ "left_text",
+ wagtail.core.blocks.RichTextBlock(
+ features=[
+ "h2",
+ "h3",
+ "h4",
+ "h5",
+ "bold",
+ "italic",
+ "ol",
+ "ul",
+ "hr",
+ "link",
+ "document-link",
+ "image",
+ "superscript",
+ "subscript",
+ "strikethrough",
+ "blockquote",
+ ],
+ label="levý sloupec",
+ ),
+ ),
+ (
+ "right_text",
+ wagtail.core.blocks.RichTextBlock(
+ features=[
+ "h2",
+ "h3",
+ "h4",
+ "h5",
+ "bold",
+ "italic",
+ "ol",
+ "ul",
+ "hr",
+ "link",
+ "document-link",
+ "image",
+ "superscript",
+ "subscript",
+ "strikethrough",
+ "blockquote",
+ ],
+ label="pravý sloupec",
+ ),
+ ),
+ ]
+ ),
+ ),
+ (
+ "advanced_text_columns",
+ wagtail.core.blocks.StructBlock(
+ [
+ (
+ "align",
+ wagtail.core.blocks.ChoiceBlock(
+ choices=[
+ ("left", "vlevo"),
+ ("center", "uprostřed"),
+ ("right", "vpravo"),
+ ],
+ label="zarovnání",
+ ),
+ ),
+ (
+ "color",
+ wagtail.core.blocks.ChoiceBlock(
+ choices=[
+ ("black_on_white", "černá na bílé"),
+ ("white_on_black", "bílá na černé"),
+ ("white_on_blue", "bílá na modré"),
+ ("white_on_cyan", "bílá na tyrkysové"),
+ ("white_on_violet", "bílá na fialové"),
+ ],
+ label="barva",
+ ),
+ ),
+ (
+ "left_text",
+ wagtail.core.blocks.RichTextBlock(
+ features=[
+ "h2",
+ "h3",
+ "h4",
+ "h5",
+ "bold",
+ "italic",
+ "ol",
+ "ul",
+ "hr",
+ "link",
+ "document-link",
+ "image",
+ "superscript",
+ "subscript",
+ "strikethrough",
+ "blockquote",
+ ],
+ label="levý sloupec",
+ ),
+ ),
+ (
+ "right_text",
+ wagtail.core.blocks.RichTextBlock(
+ features=[
+ "h2",
+ "h3",
+ "h4",
+ "h5",
+ "bold",
+ "italic",
+ "ol",
+ "ul",
+ "hr",
+ "link",
+ "document-link",
+ "image",
+ "superscript",
+ "subscript",
+ "strikethrough",
+ "blockquote",
+ ],
+ label="pravý sloupec",
+ ),
+ ),
+ ]
+ ),
+ ),
+ (
+ "gallery",
+ wagtail.core.blocks.ListBlock(
+ wagtail.images.blocks.ImageChooserBlock(label="obrázek"),
+ group="ostatní",
+ icon="image",
+ label="galerie",
+ template="uniweb/blocks/gallery.html",
+ ),
+ ),
+ (
+ "picture_list",
+ wagtail.core.blocks.StructBlock(
+ [
+ (
+ "color",
+ wagtail.core.blocks.ChoiceBlock(
+ choices=[
+ ("black_on_white", "černá na bílé"),
+ ("white_on_black", "bílá na černé"),
+ ("white_on_blue", "bílá na modré"),
+ ("white_on_cyan", "bílá na tyrkysové"),
+ ("white_on_violet", "bílá na fialové"),
+ ],
+ label="barva",
+ ),
+ ),
+ (
+ "items",
+ wagtail.core.blocks.ListBlock(
+ wagtail.core.blocks.RichTextBlock(
+ features=[
+ "h2",
+ "h3",
+ "h4",
+ "h5",
+ "bold",
+ "italic",
+ "ol",
+ "ul",
+ "hr",
+ "link",
+ "document-link",
+ "image",
+ "superscript",
+ "subscript",
+ "strikethrough",
+ "blockquote",
+ ],
+ label="odstavec",
+ ),
+ label="odstavce",
+ ),
+ ),
+ (
+ "picture",
+ wagtail.images.blocks.ImageChooserBlock(
+ help_text="rozměr 25x25px nebo více (obrázek bude zmenšen na 25x25px)",
+ label="obrázek",
+ ),
+ ),
+ ]
+ ),
+ ),
+ (
+ "table",
+ wagtail.contrib.table_block.blocks.TableBlock(
+ group="ostatní",
+ label="tabulka",
+ template="uniweb/blocks/table.html",
+ ),
+ ),
+ (
+ "jupyter",
+ wagtail.documents.blocks.DocumentChooserBlock(
+ group="ostatní", label="Jupyter notebook"
+ ),
+ ),
+ ],
+ blank=True,
+ verbose_name="obsah stránky",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="uniwebhomepage",
+ name="content",
+ field=wagtail.core.fields.StreamField(
+ [
+ (
+ "title",
+ wagtail.core.blocks.CharBlock(
+ group="nadpisy",
+ icon="title",
+ label="nadpis",
+ template="uniweb/blocks/title.html",
+ ),
+ ),
+ (
+ "advanced_title",
+ wagtail.core.blocks.StructBlock(
+ [
+ (
+ "align",
+ wagtail.core.blocks.ChoiceBlock(
+ choices=[
+ ("left", "vlevo"),
+ ("center", "uprostřed"),
+ ("right", "vpravo"),
+ ],
+ label="zarovnání",
+ ),
+ ),
+ (
+ "color",
+ wagtail.core.blocks.ChoiceBlock(
+ choices=[
+ ("black_on_white", "černá na bílé"),
+ ("white_on_black", "bílá na černé"),
+ ("white_on_blue", "bílá na modré"),
+ ("white_on_cyan", "bílá na tyrkysové"),
+ ("white_on_violet", "bílá na fialové"),
+ ],
+ label="barva",
+ ),
+ ),
+ (
+ "title",
+ wagtail.core.blocks.CharBlock(label="nadpis"),
+ ),
+ ]
+ ),
+ ),
+ (
+ "picture_title",
+ wagtail.core.blocks.StructBlock(
+ [
+ (
+ "color",
+ wagtail.core.blocks.ChoiceBlock(
+ choices=[
+ ("black_on_white", "černá na bílé"),
+ ("white_on_black", "bílá na černé"),
+ ("white_on_blue", "bílá na modré"),
+ ("white_on_cyan", "bílá na tyrkysové"),
+ ("white_on_violet", "bílá na fialové"),
+ ],
+ label="barva",
+ ),
+ ),
+ (
+ "title",
+ wagtail.core.blocks.CharBlock(label="nadpis"),
+ ),
+ (
+ "picture",
+ wagtail.images.blocks.ImageChooserBlock(
+ help_text="rozměr na výšku 75px nebo více (obrázek bude zmenšen na výšku 75px)",
+ label="obrázek",
+ ),
+ ),
+ ]
+ ),
+ ),
+ (
+ "text",
+ wagtail.core.blocks.RichTextBlock(
+ features=[
+ "h2",
+ "h3",
+ "h4",
+ "h5",
+ "bold",
+ "italic",
+ "ol",
+ "ul",
+ "hr",
+ "link",
+ "document-link",
+ "image",
+ "superscript",
+ "subscript",
+ "strikethrough",
+ "blockquote",
+ ],
+ group="texty",
+ label="text",
+ template="uniweb/blocks/text.html",
+ ),
+ ),
+ (
+ "advanced_text",
+ wagtail.core.blocks.StructBlock(
+ [
+ (
+ "align",
+ wagtail.core.blocks.ChoiceBlock(
+ choices=[
+ ("left", "vlevo"),
+ ("center", "uprostřed"),
+ ("right", "vpravo"),
+ ],
+ label="zarovnání",
+ ),
+ ),
+ (
+ "color",
+ wagtail.core.blocks.ChoiceBlock(
+ choices=[
+ ("black_on_white", "černá na bílé"),
+ ("white_on_black", "bílá na černé"),
+ ("white_on_blue", "bílá na modré"),
+ ("white_on_cyan", "bílá na tyrkysové"),
+ ("white_on_violet", "bílá na fialové"),
+ ],
+ label="barva",
+ ),
+ ),
+ (
+ "text",
+ wagtail.core.blocks.RichTextBlock(
+ features=[
+ "h2",
+ "h3",
+ "h4",
+ "h5",
+ "bold",
+ "italic",
+ "ol",
+ "ul",
+ "hr",
+ "link",
+ "document-link",
+ "image",
+ "superscript",
+ "subscript",
+ "strikethrough",
+ "blockquote",
+ ],
+ label="text",
+ ),
+ ),
+ ]
+ ),
+ ),
+ (
+ "text_columns",
+ wagtail.core.blocks.StructBlock(
+ [
+ (
+ "left_text",
+ wagtail.core.blocks.RichTextBlock(
+ features=[
+ "h2",
+ "h3",
+ "h4",
+ "h5",
+ "bold",
+ "italic",
+ "ol",
+ "ul",
+ "hr",
+ "link",
+ "document-link",
+ "image",
+ "superscript",
+ "subscript",
+ "strikethrough",
+ "blockquote",
+ ],
+ label="levý sloupec",
+ ),
+ ),
+ (
+ "right_text",
+ wagtail.core.blocks.RichTextBlock(
+ features=[
+ "h2",
+ "h3",
+ "h4",
+ "h5",
+ "bold",
+ "italic",
+ "ol",
+ "ul",
+ "hr",
+ "link",
+ "document-link",
+ "image",
+ "superscript",
+ "subscript",
+ "strikethrough",
+ "blockquote",
+ ],
+ label="pravý sloupec",
+ ),
+ ),
+ ]
+ ),
+ ),
+ (
+ "advanced_text_columns",
+ wagtail.core.blocks.StructBlock(
+ [
+ (
+ "align",
+ wagtail.core.blocks.ChoiceBlock(
+ choices=[
+ ("left", "vlevo"),
+ ("center", "uprostřed"),
+ ("right", "vpravo"),
+ ],
+ label="zarovnání",
+ ),
+ ),
+ (
+ "color",
+ wagtail.core.blocks.ChoiceBlock(
+ choices=[
+ ("black_on_white", "černá na bílé"),
+ ("white_on_black", "bílá na černé"),
+ ("white_on_blue", "bílá na modré"),
+ ("white_on_cyan", "bílá na tyrkysové"),
+ ("white_on_violet", "bílá na fialové"),
+ ],
+ label="barva",
+ ),
+ ),
+ (
+ "left_text",
+ wagtail.core.blocks.RichTextBlock(
+ features=[
+ "h2",
+ "h3",
+ "h4",
+ "h5",
+ "bold",
+ "italic",
+ "ol",
+ "ul",
+ "hr",
+ "link",
+ "document-link",
+ "image",
+ "superscript",
+ "subscript",
+ "strikethrough",
+ "blockquote",
+ ],
+ label="levý sloupec",
+ ),
+ ),
+ (
+ "right_text",
+ wagtail.core.blocks.RichTextBlock(
+ features=[
+ "h2",
+ "h3",
+ "h4",
+ "h5",
+ "bold",
+ "italic",
+ "ol",
+ "ul",
+ "hr",
+ "link",
+ "document-link",
+ "image",
+ "superscript",
+ "subscript",
+ "strikethrough",
+ "blockquote",
+ ],
+ label="pravý sloupec",
+ ),
+ ),
+ ]
+ ),
+ ),
+ (
+ "gallery",
+ wagtail.core.blocks.ListBlock(
+ wagtail.images.blocks.ImageChooserBlock(label="obrázek"),
+ group="ostatní",
+ icon="image",
+ label="galerie",
+ template="uniweb/blocks/gallery.html",
+ ),
+ ),
+ (
+ "picture_list",
+ wagtail.core.blocks.StructBlock(
+ [
+ (
+ "color",
+ wagtail.core.blocks.ChoiceBlock(
+ choices=[
+ ("black_on_white", "černá na bílé"),
+ ("white_on_black", "bílá na černé"),
+ ("white_on_blue", "bílá na modré"),
+ ("white_on_cyan", "bílá na tyrkysové"),
+ ("white_on_violet", "bílá na fialové"),
+ ],
+ label="barva",
+ ),
+ ),
+ (
+ "items",
+ wagtail.core.blocks.ListBlock(
+ wagtail.core.blocks.RichTextBlock(
+ features=[
+ "h2",
+ "h3",
+ "h4",
+ "h5",
+ "bold",
+ "italic",
+ "ol",
+ "ul",
+ "hr",
+ "link",
+ "document-link",
+ "image",
+ "superscript",
+ "subscript",
+ "strikethrough",
+ "blockquote",
+ ],
+ label="odstavec",
+ ),
+ label="odstavce",
+ ),
+ ),
+ (
+ "picture",
+ wagtail.images.blocks.ImageChooserBlock(
+ help_text="rozměr 25x25px nebo více (obrázek bude zmenšen na 25x25px)",
+ label="obrázek",
+ ),
+ ),
+ ]
+ ),
+ ),
+ (
+ "table",
+ wagtail.contrib.table_block.blocks.TableBlock(
+ group="ostatní",
+ label="tabulka",
+ template="uniweb/blocks/table.html",
+ ),
+ ),
+ (
+ "jupyter",
+ wagtail.documents.blocks.DocumentChooserBlock(
+ group="ostatní", label="Jupyter notebook"
+ ),
+ ),
+ ],
+ blank=True,
+ verbose_name="obsah stránky",
+ ),
+ ),
+ ]
diff --git a/uniweb/models.py b/uniweb/models.py
index 267201a2d7fc8ad73b2e49304864cece9348f723..73e9f53cd0296de2ac31e9bc2a5f52d28dc9ba75 100644
--- a/uniweb/models.py
+++ b/uniweb/models.py
@@ -233,6 +233,11 @@ class UniwebHomePage(Page, UniwebContentMixin, MetadataPageMixin):
verbose_name="horní menu",
blank=True,
)
+ narrow_layout = models.BooleanField(
+ "zúžený obsah stránky",
+ default=False,
+ help_text="užší stránka je vhodná pro lepší čitelnost textů",
+ )
### PANELS
@@ -253,7 +258,13 @@ class UniwebHomePage(Page, UniwebContentMixin, MetadataPageMixin):
]
settings_panels = [
- FieldPanel("matomo_id"),
+ MultiFieldPanel(
+ [
+ FieldPanel("matomo_id"),
+ FieldPanel("narrow_layout"),
+ ],
+ "nastavení webu",
+ ),
StreamFieldPanel("top_menu"),
]
diff --git a/uniweb/templates/uniweb/base.html b/uniweb/templates/uniweb/base.html
index e718e0e9700188e091968723656d1a9443aa4ce0..d8bd8508be5cdd766dd1d17cb3e1854e9b3b1910 100644
--- a/uniweb/templates/uniweb/base.html
+++ b/uniweb/templates/uniweb/base.html
@@ -47,7 +47,7 @@
<ui-app inline-template>
<ui-navbar inline-template>
<div>
- <div class="container container--wide navbar__content max-w-screen-xl" :class="{'navbar__content--initialized': true}">
+ <div class="container container--default navbar__content" :class="{'navbar__content--initialized': true}">
<div class="navbar__brand my-4 flex items-center lg:pr-8 lg:my-0">
<a href="/">
<img src="{% static "styleguide18/assets/images/logo-round-white.svg" %}" class="w-8" />
@@ -76,7 +76,7 @@
</ui-app>
</nav>
- <div class="container container--default lg:py-4">
+ <div class="container container--default {% if page.root_page.narrow_layout %}max-w-screen-lg{% endif%} lg:py-4">
{% block content %}{% endblock %}
</div>
diff --git a/uniweb/templates/uniweb/blocks/gallery.html b/uniweb/templates/uniweb/blocks/gallery.html
index 3cf2f1aca4a1aeff2a736e4249764ce703071bc0..84fe4d690928ce2572d1bbabdd0d61554b864201 100644
--- a/uniweb/templates/uniweb/blocks/gallery.html
+++ b/uniweb/templates/uniweb/blocks/gallery.html
@@ -1,5 +1,5 @@
{% load wagtailimages_tags %}
-<div class="content-block w-full my-6 grid grid-cols-4 gap-4{% if first %} mt-8 lg:mt-12{% endif %}">
+<div class="content-block w-full px-4 my-6 grid grid-cols-4 gap-4{% if first %} mt-8 lg:mt-12{% endif %}">
{% for picture in block.value %}
{% image picture width-2000 as img %}
{% image picture fill-300x200 as thumb %}
diff --git a/uniweb/templates/uniweb/blocks/picture_title.html b/uniweb/templates/uniweb/blocks/picture_title.html
index 863e5ef8877c68325c9c4c7efdd928998e28abc8..ef3b4f63a017abddf078404fac6b3152c1ae9107 100644
--- a/uniweb/templates/uniweb/blocks/picture_title.html
+++ b/uniweb/templates/uniweb/blocks/picture_title.html
@@ -1,5 +1,5 @@
{% load wagtailimages_tags %}
<h1 class="head-alt-md md:head-alt-lg px-4 pt-4 pb-2 lg:mt-16 clearfix {{ css_class|join:" " }}">
- {% image block.value.picture height-75 class="float-right mb-2" %}
+ {% image block.value.picture height-75 class="float-right mb-2 ml-2" %}
{{ block.value.title }}
</h1>