Skip to content
Snippets Groups Projects
Commit ce2bc034 authored by jarmil's avatar jarmil
Browse files

mswebs: pridani datumu clanku

parent 62b9c53c
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 310 additions and 45 deletions
.pre-commit-config.yaml
+ 0
− 5
View file @ ce2bc034
......@@ -20,11 +20,6 @@ repos:
hooks:
- id: seed-isort-config
- repo: https://github.com/timothycrosley/isort
rev: 4.3.21
hooks:
- id: isort
- repo: https://github.com/psf/black
rev: 19.10b0
hooks:
......
district/templates/shared/article.html
+ 1
− 1
View file @ ce2bc034
......@@ -17,7 +17,7 @@
<div class="flex flex-col md:flex-row md:items-center">
<div class="inline-flex divide-x flex-grow">
<span class="pr-2">{{ page.last_published_at|date:"SHORT_DATE_FORMAT" }}</span>
<span class="pr-2">{{ page.date|date:"SHORT_DATE_FORMAT" }}</span>
<span class="pl-2" itemprop="author" itemtype="http://schema.org/Person" itemscope="">
<span itemprop="name">
<a href="{{ page.author.url }}">{{ page.author.name }}</a>
......
regulace_konopi/apps.py
+ 1
− 1
View file @ ce2bc034
......@@ -2,4 +2,4 @@ from django.apps import AppConfig
class RegulaceKonopiConfig(AppConfig):
name = 'regulace_konopi'
name = "regulace_konopi"
regulace_konopi/migrations/0001_initial.py
+ 264
− 22
View file @ ce2bc034
# Generated by Django 3.1.1 on 2020-10-28 12:50
from django.db import migrations, models
import django.db.models.deletion
import uniweb.models
import wagtail.core.blocks
import wagtail.core.fields
import wagtail.images.blocks
import wagtailmetadata.models
from django.db import migrations, models
import uniweb.models
class Migration(migrations.Migration):
......@@ -14,35 +15,276 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
('wagtailcore', '0052_pagelogentry'),
('wagtailimages', '0022_uploadedimage'),
("wagtailcore", "0052_pagelogentry"),
("wagtailimages", "0022_uploadedimage"),
]
operations = [
migrations.CreateModel(
name='RegkonSubPage',
name="RegkonSubPage",
fields=[
('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.page')),
('content', wagtail.core.fields.StreamField([('title', wagtail.core.blocks.CharBlock(icon='title', label='nadpis')), ('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')), ('carousel', wagtail.core.blocks.ListBlock(wagtail.images.blocks.ImageChooserBlock(label='obrázek'), icon='image', label='carousel')), ('FAQ', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('question', wagtail.core.blocks.TextBlock()), ('answer', wagtail.core.blocks.RichTextBlock())], template='regulace_konopi/blocks/faq.html'), label='faq')), ('meps', wagtail.core.blocks.StructBlock([('name', wagtail.core.blocks.CharBlock(label='název')), ('mep', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('name', wagtail.core.blocks.CharBlock(label='jméno')), ('approved', wagtail.core.blocks.ChoiceBlock(choices=[(1, 'schváleno'), (0, 'odmítá'), (-1, 'nevyjádřil se')], label='hlasoval'))])))], template='regulace_konopi/blocks/party.html'))], blank=True, verbose_name='obsah stránky')),
('search_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image', verbose_name='Search image')),
(
"page_ptr",
models.OneToOneField(
auto_created=True,
on_delete=django.db.models.deletion.CASCADE,
parent_link=True,
primary_key=True,
serialize=False,
to="wagtailcore.page",
),
),
(
"content",
wagtail.core.fields.StreamField(
[
(
"title",
wagtail.core.blocks.CharBlock(
icon="title", label="nadpis"
),
),
(
"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",
),
),
(
"carousel",
wagtail.core.blocks.ListBlock(
wagtail.images.blocks.ImageChooserBlock(
label="obrázek"
),
icon="image",
label="carousel",
),
),
(
"FAQ",
wagtail.core.blocks.ListBlock(
wagtail.core.blocks.StructBlock(
[
(
"question",
wagtail.core.blocks.TextBlock(),
),
(
"answer",
wagtail.core.blocks.RichTextBlock(),
),
],
template="regulace_konopi/blocks/faq.html",
),
label="faq",
),
),
(
"meps",
wagtail.core.blocks.StructBlock(
[
(
"name",
wagtail.core.blocks.CharBlock(
label="název"
),
),
(
"mep",
wagtail.core.blocks.ListBlock(
wagtail.core.blocks.StructBlock(
[
(
"name",
wagtail.core.blocks.CharBlock(
label="jméno"
),
),
(
"approved",
wagtail.core.blocks.ChoiceBlock(
choices=[
(1, "schváleno"),
(0, "odmítá"),
(
-1,
"nevyjádřil se",
),
],
label="hlasoval",
),
),
]
)
),
),
],
template="regulace_konopi/blocks/party.html",
),
),
],
blank=True,
verbose_name="obsah stránky",
),
),
(
"search_image",
models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.SET_NULL,
related_name="+",
to="wagtailimages.image",
verbose_name="Search image",
),
),
],
options={
'verbose_name': 'Podstránka',
},
bases=('wagtailcore.page', uniweb.models.SubpageMixin, wagtailmetadata.models.MetadataMixin, models.Model),
options={"verbose_name": "Podstránka",},
bases=(
"wagtailcore.page",
uniweb.models.SubpageMixin,
wagtailmetadata.models.MetadataMixin,
models.Model,
),
),
migrations.CreateModel(
name='RegkonHomePage',
name="RegkonHomePage",
fields=[
('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.page')),
('content', wagtail.core.fields.StreamField([('title', wagtail.core.blocks.CharBlock(icon='title', label='nadpis')), ('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')), ('carousel', wagtail.core.blocks.ListBlock(wagtail.images.blocks.ImageChooserBlock(label='obrázek'), icon='image', label='carousel'))], blank=True, verbose_name='obsah stránky')),
('matomo_id', models.IntegerField(blank=True, null=True, verbose_name='Matomo ID pro sledování návštěvnosti')),
('top_menu', wagtail.core.fields.StreamField([('item', wagtail.core.blocks.StructBlock([('name', wagtail.core.blocks.CharBlock(label='název')), ('page', wagtail.core.blocks.PageChooserBlock(label='stránka', page_type=['regulace_konopi.RegkonHomePage', 'regulace_konopi.RegkonSubPage']))]))], blank=True, verbose_name='horní menu')),
('search_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image', verbose_name='Search image')),
(
"page_ptr",
models.OneToOneField(
auto_created=True,
on_delete=django.db.models.deletion.CASCADE,
parent_link=True,
primary_key=True,
serialize=False,
to="wagtailcore.page",
),
),
(
"content",
wagtail.core.fields.StreamField(
[
(
"title",
wagtail.core.blocks.CharBlock(
icon="title", label="nadpis"
),
),
(
"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",
),
),
(
"carousel",
wagtail.core.blocks.ListBlock(
wagtail.images.blocks.ImageChooserBlock(
label="obrázek"
),
icon="image",
label="carousel",
),
),
],
blank=True,
verbose_name="obsah stránky",
),
),
(
"matomo_id",
models.IntegerField(
blank=True,
null=True,
verbose_name="Matomo ID pro sledování návštěvnosti",
),
),
(
"top_menu",
wagtail.core.fields.StreamField(
[
(
"item",
wagtail.core.blocks.StructBlock(
[
(
"name",
wagtail.core.blocks.CharBlock(
label="název"
),
),
(
"page",
wagtail.core.blocks.PageChooserBlock(
label="stránka",
page_type=[
"regulace_konopi.RegkonHomePage",
"regulace_konopi.RegkonSubPage",
],
),
),
]
),
)
],
blank=True,
verbose_name="horní menu",
),
),
(
"search_image",
models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.SET_NULL,
related_name="+",
to="wagtailimages.image",
verbose_name="Search image",
),
),
],
options={
'verbose_name': 'Regulace konpí',
},
bases=(wagtailmetadata.models.MetadataMixin, 'wagtailcore.page', models.Model),
options={"verbose_name": "Regulace konpí",},
bases=(
wagtailmetadata.models.MetadataMixin,
"wagtailcore.page",
models.Model,
),
),
]
regulace_konopi/models.py
+ 14
− 11
View file @ ce2bc034
......@@ -3,7 +3,12 @@ from django.db import models
# Create your models here.
from django.utils.translation import gettext_lazy
from wagtail.admin import blocks
from wagtail.admin.edit_handlers import StreamFieldPanel, MultiFieldPanel, FieldPanel, HelpPanel
from wagtail.admin.edit_handlers import (
FieldPanel,
HelpPanel,
MultiFieldPanel,
StreamFieldPanel,
)
from wagtail.core.fields import StreamField
from wagtail.core.models import Page
from wagtail.images.blocks import ImageChooserBlock
......@@ -12,11 +17,7 @@ from wagtailmetadata.models import MetadataPageMixin
from tuning import help
SUPPORT_CHOICES = (
(1, 'Pro'),
(0, 'Proti'),
(-1, 'Zdržel se')
)
SUPPORT_CHOICES = ((1, "Pro"), (0, "Proti"), (-1, "Zdržel se"))
RICH_TEXT_FEATURES = [
"h2",
......@@ -146,11 +147,13 @@ class RegkonSubPage(Page, MetadataPageMixin):
ImageChooserBlock(label="obrázek"), label="carousel", icon="image"
),
),
("FAQ",
blocks.ListBlock(
FaqBlock(template='regulace_konopi/blocks/faq.html'), label="faq")
),
("meps", PartyBlock(template='regulace_konopi/blocks/party.html'))
(
"FAQ",
blocks.ListBlock(
FaqBlock(template="regulace_konopi/blocks/faq.html"), label="faq"
),
),
("meps", PartyBlock(template="regulace_konopi/blocks/party.html")),
],
verbose_name="obsah stránky",
blank=True,
......
regulace_konopi/static/regulace_konopi/assets/css/styles.css
+ 1
− 1
View file @ ce2bc034
......@@ -10,4 +10,4 @@
.nav-link {
color: white !important;
}
\ No newline at end of file
}
regulace_konopi/templates/regulace_konopi/blocks/party.html
+ 1
− 1
View file @ ce2bc034
......@@ -22,4 +22,4 @@
$(function () {
$('[data-toggle="popover"]').popover()
})
</script>
\ No newline at end of file
</script>
shared/migrations/0012_article_date.py 0 → 100644
+ 22
− 0
View file @ ce2bc034
# Generated by Django 3.1.1 on 2020-11-04 09:02
import datetime
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("shared", "0011_personpage_profile_id"),
]
operations = [
migrations.AddField(
model_name="article",
name="date",
field=models.DateField(
default=datetime.datetime.now, verbose_name="datum článku"
),
),
]
shared/models.py
+ 3
− 0
View file @ ce2bc034
import datetime
import random
import requests
......@@ -41,6 +42,7 @@ class Article(SharedSubpageMixin, MetadataPageMixin, Page):
perex = models.CharField("perex", max_length=250, blank=True)
text = models.TextField("text článku", blank=True)
date = models.DateField("datum článku", blank=False, default=datetime.datetime.now)
image = models.ForeignKey(
"wagtailimages.Image",
on_delete=models.PROTECT,
......@@ -61,6 +63,7 @@ class Article(SharedSubpageMixin, MetadataPageMixin, Page):
content_panels = Page.content_panels + [
FieldPanel("perex"),
FieldPanel("date"),
FieldPanel("text"),
HelpPanel(
"""Text článku lze formátovat s použitím <a href="https://www.markdownguide.org/basic-syntax/">markdown</a>"""
......
shared/templates/shared/article_preview.html
+ 1
− 1
View file @ ce2bc034
......@@ -29,7 +29,7 @@
<div class="article-card-meta" class="c-metadata-block-section__item" >
<span itemprop="description" class="article-card-meta__item">
{{ article.last_published_at|date:"SHORT_DATE_FORMAT" }}
{{ article.date|date:"SHORT_DATE_FORMAT" }}
<meta itemprop="datePublished" content="{{ article.last_published_at }}" />
</span>
<span class="article-card-meta__item" itemprop="author" itemtype="http://schema.org/Person" itemscope="">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Pirátský GitLab - Home of the CopyLeft