Skip to content
Snippets Groups Projects
Commit a2b3bc4e authored by Tomáš Valenta's avatar Tomáš Valenta
Browse files

minor donation improvements & changes

parent 9f9a58d9
No related branches found
No related tags found
2 merge requests!916Minor donation improvements & changes,!915Minor improvements & changes - Dary
Pipeline #16557 passed
Stage: build
Hide whitespace changes
Inline Side-by-side
Showing
with 212 additions and 47 deletions
donate/migrations/0040_alter_donatehomepage_lead_body.py 0 → 100644
+ 18
− 0
View file @ a2b3bc4e
# Generated by Django 4.1.10 on 2024-01-30 13:15
import wagtail.fields
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("donate", "0039_remove_donatehomepage_custom_blocks_and_more"),
]
operations = [
migrations.AlterField(
model_name="donatehomepage",
name="lead_body",
field=wagtail.fields.RichTextField(blank=True, verbose_name="hlavní popis"),
),
]
donate/migrations/0041_donateprojectpage_is_sticky_and_more.py 0 → 100644
+ 98
− 0
View file @ a2b3bc4e
# Generated by Django 4.1.10 on 2024-01-30 13:32
import django.db.models.deletion
import wagtail.fields
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("wagtailimages", "0025_alter_image_file_alter_rendition_file"),
("donate", "0040_alter_donatehomepage_lead_body"),
]
operations = [
migrations.AddField(
model_name="donateprojectpage",
name="is_sticky",
field=models.BooleanField(
default=False,
help_text="Pokud je projekt připnutý, na domovské stránce se v seznamech projektů udrží na začátku.",
verbose_name="Je připnutý",
),
),
migrations.AlterField(
model_name="donateprojectpage",
name="allow_periodic_donations",
field=models.BooleanField(
default=False, verbose_name="Umožnit pravidelné dary"
),
),
migrations.AlterField(
model_name="donateprojectpage",
name="body",
field=wagtail.fields.RichTextField(verbose_name="Obsah"),
),
migrations.AlterField(
model_name="donateprojectpage",
name="coalition_design",
field=models.BooleanField(default=False, verbose_name="Koaliční design"),
),
migrations.AlterField(
model_name="donateprojectpage",
name="date",
field=models.DateField(verbose_name="Běží od"),
),
migrations.AlterField(
model_name="donateprojectpage",
name="donated_amount",
field=models.IntegerField(
blank=True, null=True, verbose_name="Vybraná částka"
),
),
migrations.AlterField(
model_name="donateprojectpage",
name="expected_amount",
field=models.IntegerField(
blank=True, null=True, verbose_name="Očekávaná částka"
),
),
migrations.AlterField(
model_name="donateprojectpage",
name="form_title",
field=models.CharField(
choices=[("project", "Podpoř projekt"), ("camapign", "Podpoř kampaň")],
default="project",
max_length=10,
verbose_name="Titulek formuláře",
),
),
migrations.AlterField(
model_name="donateprojectpage",
name="is_new",
field=models.BooleanField(
default=False, verbose_name='Označení "nový projekt"'
),
),
migrations.AlterField(
model_name="donateprojectpage",
name="perex",
field=models.TextField(verbose_name="Krátký popis"),
),
migrations.AlterField(
model_name="donateprojectpage",
name="photo",
field=models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.PROTECT,
to="wagtailimages.image",
verbose_name="Fotka",
),
),
migrations.AlterField(
model_name="donateprojectpage",
name="until",
field=models.DateField(blank=True, null=True, verbose_name="Běží do"),
),
]
donate/models.py
+ 28
− 15
View file @ a2b3bc4e
...@@ -110,7 +110,7 @@ class DonateHomePage( ...@@ -110,7 +110,7 @@ class DonateHomePage(
# lead section # lead section
lead_title = models.CharField("hlavní nadpis", max_length=250, blank=True) lead_title = models.CharField("hlavní nadpis", max_length=250, blank=True)
lead_body = models.TextField("hlavní popis", blank=True) lead_body = RichTextField("hlavní popis", blank=True)
lead_video = models.URLField("video na youtube", blank=True, null=True) lead_video = models.URLField("video na youtube", blank=True, null=True)
lead_preview = models.ForeignKey( lead_preview = models.ForeignKey(
"wagtailimages.Image", "wagtailimages.Image",
...@@ -414,7 +414,7 @@ class DonateProjectIndexPage( ...@@ -414,7 +414,7 @@ class DonateProjectIndexPage(
DonateProjectPage.objects.child_of(self) DonateProjectPage.objects.child_of(self)
.filter() .filter()
.distinct() .distinct()
.order_by("-date") .order_by("-is_sticky", "-date")
.live() .live()
)[:3] )[:3]
...@@ -459,17 +459,25 @@ class DonateProjectPage( ...@@ -459,17 +459,25 @@ class DonateProjectPage(
### FIELDS ### FIELDS
date = models.DateField("běží od") date = models.DateField("Běží od")
until = models.DateField("běží do", null=True, blank=True) until = models.DateField("Běží do", null=True, blank=True)
perex = models.TextField("krátký popis")
body = RichTextField("obsah") perex = models.TextField("Krátký popis")
is_new = models.BooleanField('označení "nový projekt"', default=False) body = RichTextField("Obsah")
is_new = models.BooleanField('Označení "nový projekt"', default=False)
is_sticky = models.BooleanField(
"Je připnutý",
help_text="Pokud je projekt připnutý, na domovské stránce se v seznamech projektů udrží na začátku.",
default=False,
)
allow_periodic_donations = models.BooleanField( allow_periodic_donations = models.BooleanField(
"umožnit pravidelné dary", default=False "Umožnit pravidelné dary", default=False
) )
photo = models.ForeignKey( photo = models.ForeignKey(
"wagtailimages.Image", "wagtailimages.Image",
verbose_name="fotka", verbose_name="Fotka",
on_delete=models.PROTECT, on_delete=models.PROTECT,
null=True, null=True,
blank=True, blank=True,
...@@ -481,14 +489,14 @@ class DonateProjectPage( ...@@ -481,14 +489,14 @@ class DonateProjectPage(
use_json_field=True, use_json_field=True,
) )
form_title = models.CharField( form_title = models.CharField(
"titulek formuláře", "Titulek formuláře",
max_length=10, max_length=10,
choices=FORM_TITLE_CHOICES, choices=FORM_TITLE_CHOICES,
default=TITLE_PROJECT, default=TITLE_PROJECT,
) )
expected_amount = models.IntegerField("očekávaná částka", blank=True, null=True) expected_amount = models.IntegerField("Očekávaná částka", blank=True, null=True)
donated_amount = models.IntegerField("vybraná částka", blank=True, null=True) donated_amount = models.IntegerField("Vybraná částka", blank=True, null=True)
coalition_design = models.BooleanField("koaliční design", default=False) coalition_design = models.BooleanField("Koaliční design", default=False)
# we will use photo as search image # we will use photo as search image
search_image = None search_image = None
...@@ -503,8 +511,13 @@ class DonateProjectPage( ...@@ -503,8 +511,13 @@ class DonateProjectPage(
content_panels = Page.content_panels + [ content_panels = Page.content_panels + [
MultiFieldPanel( MultiFieldPanel(
[FieldPanel("is_new"), FieldPanel("perex"), FieldPanel("photo")], [
"info do přehledu projektů", FieldPanel("is_new"),
FieldPanel("is_sticky"),
FieldPanel("perex"),
FieldPanel("photo"),
],
"Info do přehledu projektů",
), ),
MultiFieldPanel( MultiFieldPanel(
[ [
......
donate/static/donate/assets/css/icons.css
+ 1
− 1
View file @ a2b3bc4e
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
font-display: block; font-display: block;
} }
i { i[class^="icon"] {
/* use !important to prevent issues with browser extensions that change fonts */ /* use !important to prevent issues with browser extensions that change fonts */
font-family: 'icomoon' !important; font-family: 'icomoon' !important;
speak: none; speak: none;
......
donate/static/donate/assets/css/style.css
+ 5
− 1
View file @ a2b3bc4e
...@@ -71,6 +71,10 @@ h1.lead, h2.lead, h3.lead, h4.lead, h5.lead, h6.lead { ...@@ -71,6 +71,10 @@ h1.lead, h2.lead, h3.lead, h4.lead, h5.lead, h6.lead {
text-transform: uppercase; text-transform: uppercase;
} }
.lead-small {
font-size: 1.1rem !important
}
h1.homepage-heading { h1.homepage-heading {
...@@ -224,7 +228,7 @@ section { ...@@ -224,7 +228,7 @@ section {
} }
.section--lead { .section--lead {
padding: 6rem 0rem; padding: 2rem 0rem;
} }
.section--no-bottom-padding { .section--no-bottom-padding {
......
donate/templates/donate/base.html
+ 50
− 19
View file @ a2b3bc4e
...@@ -37,26 +37,40 @@ ...@@ -37,26 +37,40 @@
<body id="top"> <body id="top">
{% if settings.MAJAK_ENV == "test" %} {% if settings.MAJAK_ENV == "test" %}
<div class="pre-navbar d-none d-lg-flex" style="background: #884444; color: #FFFFFF;"> <div class="pre-navbar d-none d-lg-flex" style="background: #884444; color: #FFFFFF;">
<div class="container d-flex justify-content-center"> <div class="container d-flex justify-content-center">
<span>TESTOVACÍ WEB! Darujte na <a href="https://dary.pirati.cz/" class="header_link header_link--desktop mr-4 py-2">dary.pirati.cz</a></span> <span>TESTOVACÍ WEB! Darujte na <a href="https://dary.pirati.cz/" class="header_link header_link--desktop mr-4 py-2">dary.pirati.cz</a></span>
</div>
</div> </div>
</div>
{% endif %} {% endif %}
<!-- HEADER --> <!-- HEADER -->
{% block header %} {% block header %}
<div class="pre-navbar d-none d-lg-flex" style="background:black;"> <div class="pre-navbar d-none d-lg-flex" style="background:black;">
<div class="container d-flex justify-content-end"> <div class="container d-flex justify-content-end">
{% if page.root_page.custom_url_1 and page.root_page.custom_url_1_text %} {% if page.root_page.custom_url_1 and page.root_page.custom_url_1_text %}
<a href="{{ page.root_page.custom_url_1 }}" class="header_link header_link--desktop mr-4 py-2" target="_blank" <a
rel="noreferrer"><i class="icon-external-link mr-2" title="Ikona odkazu"></i>{{ page.root_page.custom_url_1_text }}</a> href="{{ page.root_page.custom_url_1 }}"
{% endif %} class="header_link header_link--desktop mr-4 py-2"
{% if page.root_page.custom_url_2 and page.root_page.custom_url_2_text %} target="_blank"
<a href="{{ page.root_page.custom_url_2 }}" class="header_link header_link--desktop mr-4 py-2" target="_blank" rel="noreferrer"
rel="noreferrer"><i class="icon-external-link mr-2" title="Ikona odkazu"></i>{{ page.root_page.custom_url_2_text }}</a> >
{% endif %} <i class="icon-external-link mr-2" title="Ikona odkazu"></i>
<a href="https://www.pirati.cz/" class="header_link header_link--desktop mr-4 py-2" target="_blank" rel="noreferrer"><i class="icon-external-link mr-2" title="Ikona odkazu"></i>www.pirati.cz</a> {{ page.root_page.custom_url_1_text }}
</a>
{% endif %}
{% if page.root_page.custom_url_2 and page.root_page.custom_url_2_text %}
<a
href="{{ page.root_page.custom_url_2 }}"
class="header_link header_link--desktop mr-4 py-2"
target="_blank"
rel="noreferrer"
>
<i class="icon-external-link mr-2" title="Ikona odkazu"></i>
{{ page.root_page.custom_url_2_text }}
</a>
{% endif %}
</div> </div>
</div> </div>
...@@ -66,7 +80,10 @@ ...@@ -66,7 +80,10 @@
<!-- Candidate name --> <!-- Candidate name -->
<div class="brand-wrapper"> <div class="brand-wrapper">
<a class="navbar-brand" href="/"> <a class="navbar-brand" href="/">
<img src="{% static "donate/img/logo_napis.svg" %}" alt="Logo podpoř piráty"> <img
src="{% static "styleguide2/images/logo-full-white.svg"%}"
alt="Logo"
>
</a> </a>
</div> </div>
...@@ -86,14 +103,28 @@ ...@@ -86,14 +103,28 @@
</ul> </ul>
{% if page.root_page.custom_url_1 and page.root_page.custom_url_1_text %} {% if page.root_page.custom_url_1 and page.root_page.custom_url_1_text %}
<a href="{{ page.root_page.custom_url_1 }}" class="d-block d-lg-none mb-3 header_link header_link--desktop" target="_blank" <a
rel="noreferrer"><i class="icon-external-link mr-2" title="Ikona odkazu"></i>{{ page.root_page.custom_url_1_text }}</a> href="{{ page.root_page.custom_url_1 }}"
class="d-block d-lg-none mb-3 header_link header_link--mobile"
target="_blank"
rel="noreferrer"
>
<i class="icon-external-link mr-2" title="Ikona odkazu"></i>
{{ page.root_page.custom_url_1_text }}
</a>
{% endif %} {% endif %}
{% if page.root_page.custom_url_2 and page.root_page.custom_url_2_text %} {% if page.root_page.custom_url_2 and page.root_page.custom_url_2_text %}
<a href="{{ page.root_page.custom_url_2 }}" class="d-block d-lg-none mb-3 header_link header_link--desktop" target="_blank" <a
rel="noreferrer"><i class="icon-external-link mr-2" title="Ikona odkazu"></i>{{ page.root_page.custom_url_2_text }}</a> href="{{ page.root_page.custom_url_2 }}"
class="d-block d-lg-none mb-3 header_link header_link--mobile"
target="_blank"
rel="noreferrer"
>
<i class="icon-external-link mr-2" title="Ikona odkazu"></i>
{{ page.root_page.custom_url_2_text }}
</a>
{% endif %} {% endif %}
<a href="https://www.pirati.cz/" class="d-block d-lg-none mb-3 header_link header_link--mobile" target="_blank" rel="noreferrer"><i class="icon-external-link mr-2" title="Ikona odkazu"></i>www.pirati.cz</a>
</div><!-- /navigation --> </div><!-- /navigation -->
</div><!-- /container --> </div><!-- /container -->
</nav> </nav>
......
donate/templates/donate/donate_home_page.html
+ 4
− 4
View file @ a2b3bc4e
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
<div class="container"> <div class="container">
<div class="row align-items-center"> <div class="row align-items-center">
<div class="col-12 col-lg-6 mb-4 mb-lg-0 py-4 text-center text-md-left"> <div class="col-12 col-lg-7 mb-4 mb-lg-0 py-4 text-md-left">
<h1 class="lead homepage-heading">{{ page.lead_title }}</h1> <h1 class="lead homepage-heading">{{ page.lead_title }}</h1>
<p class="lead mb-4">{{ page.lead_body }}</p> <div class="lead lead-small mb-4">{{ page.lead_body|richtext }}</div>
<div class="row align-items-center"> <div class="row align-items-center text-center">
<div class="col-12 col-md-auto mb-4 mb-md-0"> <div class="col-12 col-md-auto mb-4 mb-md-0">
<a href="#strana" class="btn btn-danger btn-lg btn-wide js-scroll-anchor">Chci darovat <i class="icon-chevron-right ml-2"></i></a> <a href="#strana" class="btn btn-danger btn-lg btn-wide js-scroll-anchor">Chci darovat <i class="icon-chevron-right ml-2"></i></a>
</div><!-- /column --> </div><!-- /column -->
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</div> <!-- /row --> </div> <!-- /row -->
</div><!-- /column --> </div><!-- /column -->
<div class="col-12 col-lg-6 text-center"> <div class="col-12 col-lg-5">
{% image page.lead_preview width-500 as lead_preview %} {% image page.lead_preview width-500 as lead_preview %}
{% if page.lead_video %} {% if page.lead_video %}
<a data-fancybox="" href="{{ page.lead_video }}" title="Přehrát video"> <a data-fancybox="" href="{{ page.lead_video }}" title="Přehrát video">
......
donate/templates/donate/donate_project_page.html
+ 2
− 2
View file @ a2b3bc4e
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
<div class="row project-images mb-3"> <div class="row project-images mb-3">
{% for block in page.gallery %} {% for block in page.gallery %}
{% image block.value width-2000 as img %} {% image block.value width-2000 as img %}
{% image block.value fill-150x100 as thumb %} {% image block.value max-150x100 as thumb %}
<div class="col-6 col-md-3"> <div>
<a data-fancybox="gallery" href="{{ img.url }}"><img data-src="{{ thumb.url }}" class="lazyload img-fluid" alt="{{ img.alt }}"></a> <a data-fancybox="gallery" href="{{ img.url }}"><img data-src="{{ thumb.url }}" class="lazyload img-fluid" alt="{{ img.alt }}"></a>
</div><!-- /column --> </div><!-- /column -->
{% endfor %} {% endfor %}
......
donate/templates/donate/donate_project_page_coalition.html
+ 1
− 1
View file @ a2b3bc4e
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<div class="row project-images mb-3"> <div class="row project-images mb-3">
{% for block in page.gallery %} {% for block in page.gallery %}
{% image block.value width-2000 as img %} {% image block.value width-2000 as img %}
{% image block.value fill-150x100 as thumb %} {% image block.value max-150x100 as thumb %}
<div class="col-6 col-md-3"> <div class="col-6 col-md-3">
<a data-fancybox="gallery" href="{{ img.url }}"><img data-src="{{ thumb.url }}" class="lazyload img-fluid" alt="{{ img.alt }}"></a> <a data-fancybox="gallery" href="{{ img.url }}"><img data-src="{{ thumb.url }}" class="lazyload img-fluid" alt="{{ img.alt }}"></a>
</div><!-- /column --> </div><!-- /column -->
......
donate/templates/donate/project_snippet.html
+ 5
− 4
View file @ a2b3bc4e
...@@ -21,11 +21,12 @@ ...@@ -21,11 +21,12 @@
<p>Zatím vybráno <strong>{{ project.get_donated_amount|intcomma }}&nbsp;Kč</strong></p> <p>Zatím vybráno <strong>{{ project.get_donated_amount|intcomma }}&nbsp;Kč</strong></p>
{% endif %} {% endif %}
</div> </div>
{% if project.is_new %} {% if project.is_new %}
<ul class="project__flags"> <ul class="project__flags">
<li class="project__flag new">Nový projekt</li> <li class="project__flag new">Nový projekt</li>
{# TODO <li class="project__flag almost">Už jen kousek</li> #} {# TODO <li class="project__flag almost">Už jen kousek</li> #}
</ul> </ul>
{% endif %} {% endif %}
</a> </a>
</div><!-- /column --> </div><!-- /column -->
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