diff --git a/elections2021/models.py b/elections2021/models.py
index 91ca5951c17cd3b50a4401815595d160de5e6efd..44c1c035d35e7eeff31c9a5882e5cb70d4360231 100644
--- a/elections2021/models.py
+++ b/elections2021/models.py
@@ -229,7 +229,7 @@ class Elections2021ArticlePage(ArticleMixin, SubpageMixin, MetadataPageMixin, Pa
self.get_siblings(inclusive=False)
.live()
.specific()
- .order_by("-uniwebarticlepage__date")[:3]
+ .order_by("-elections2021articlepage__date")[:3]
)
return context
@@ -280,7 +280,10 @@ class Elections2021ArticlesPage(SubpageMixin, MetadataPageMixin, Page):
def get_context(self, request):
context = super().get_context(request)
context["articles"] = Paginator(
- self.get_children().live().specific(),
+ self.get_children()
+ .live()
+ .specific()
+ .order_by("-elections2021articlepage__date"),
ARTICLES_PER_PAGE,
).get_page(request.GET.get("page"))
return context
@@ -598,6 +601,8 @@ class Elections2021ProgramPage(
context["plan_choices"] = PLAN_CHOICES
context["ministry_choices"] = MINISTRY_CHOICES
context["show_archetype_icon"] = True
+ context["show_app_banner"] = True
+ context["show_pagination"] = True
points = self.get_children().live().specific()
context["points"] = Paginator(points, PROGRAM_POINTS_PER_PAGE).get_page(
@@ -662,16 +667,14 @@ class Elections2021ProgramPage(
elections2021programpointpage__weight_plan_care__gt=0
).order_by("-elections2021programpointpage__weight_plan_care")
- points = Paginator(points, PROGRAM_POINTS_PER_PAGE).get_page(
- request.GET.get("page")
- )
-
context = {
"active_plan": plan,
"title": title,
"head_image": head_image,
"head_text": head_text,
"points": points,
+ "show_app_banner": False,
+ "show_pagination": False,
}
return self.render(request, context_overrides=context)
@@ -745,10 +748,6 @@ class Elections2021ProgramPage(
elections2021programpointpage__weight_ministry_environment__gt=0
).order_by("-elections2021programpointpage__weight_ministry_environment")
- points = Paginator(points, PROGRAM_POINTS_PER_PAGE).get_page(
- request.GET.get("page")
- )
-
context = {
"active_ministry": ministry,
"title": title,
@@ -756,6 +755,8 @@ class Elections2021ProgramPage(
"head_text": head_text,
"points": points,
"show_archetype_icon": False,
+ "show_app_banner": False,
+ "show_pagination": False,
}
return self.render(request, context_overrides=context)
diff --git a/elections2021/templates/elections2021/_program_app_banner.html b/elections2021/templates/elections2021/_program_app_banner.html
index 69fee6d9b8c78742727556eac30fa8111bd8f5d9..26ba1a892db3896e6d608df47a94fda0abc184a7 100644
--- a/elections2021/templates/elections2021/_program_app_banner.html
+++ b/elections2021/templates/elections2021/_program_app_banner.html
@@ -1,12 +1,12 @@
-<div class="lead-collector inline-flex col-span-1 md:col-span-2 lg:col-span-3 mx-auto">
+<div class="lead-collector inline-flex col-span-1 md:col-span-2 lg:col-span-3">
<div class="lead-collector-icon bg-acidgreen max-w-max p-10 hidden md:flex" style="height: max-content">
<i class="ico--app text-black" style="font-size: 51px"></i>
</div>
<div class="lead-collector-body bg-lemon py-10 px-8 w-full">
- <p class="head-alt-lg text-black mb-4">Vyselektujte si programové body díky naší programové aplikaci</p>
+ <p class="head-alt-lg text-black mb-4">Připravili jsme program přímo pro vás</p>
<button class="btn btn--icon ">
<div class="btn__body-wrap">
- <div class="btn__body bg-acidgreen text-black py-4">Programová aplikace</div>
+ <div class="btn__body bg-acidgreen text-black py-4">Chci ho vidět</div>
<div class="btn__icon ">
<i class="ico--chevron-right"></i>
</div>
diff --git a/elections2021/templates/elections2021/base.html b/elections2021/templates/elections2021/base.html
index f80023fb7aefdd9e3c8dbcca053de878a0966ab3..47ee11834ba448396310c9dd2606ab720b85d809 100644
--- a/elections2021/templates/elections2021/base.html
+++ b/elections2021/templates/elections2021/base.html
@@ -60,20 +60,15 @@
<a href="{{ page.root_page.articles_page_url }}" data-href="{{ page.root_page.articles_page_url }}" class="navbar-menu__link">Aktuality</a>
</li>
<li class="navbar-menu__item">
- <ui-navbar-subitem label="Kandidáti" href="{{ page.root_page.candidates_list_page_url }}">
- <ul class="navbar-menu__submenu">
- <li><a href="{{ page.root_page.candidates_list_page_url }}" data-href="{{ page.root_page.candidates_list_page_url }}" class="navbar-menu__link">Výpis kandidátů</a></li>
- <li><a href="{{ page.root_page.candidates_map_page_url }}" data-href="{{ page.root_page.candidates_map_page_url }}" class="navbar-menu__link">Výpis kandidátů podle mapy</a></li>
- </ul>
- </ui-navbar-subtitem>
+ <a href="{{ page.root_page.candidates_list_page_url }}" data-href="{{ page.root_page.candidates_list_page_url }}" class="navbar-menu__link">Naši lidé</a></li>
</li>
<li class="navbar-menu__item">
- <a href="{{ page.root_page.questions_page_url }}" data-href="{{ page.root_page.questions_page_url }}" class="navbar-menu__link">FAQ</a>
+ <a href="{{ page.root_page.questions_page_url }}" data-href="{{ page.root_page.questions_page_url }}" class="navbar-menu__link">Časté dotazy</a>
</li>
<li class="navbar-menu__item">
- <ui-navbar-subitem label="Program" href="#">
+ <ui-navbar-subitem label="Volební program" href="#">
<ul class="navbar-menu__submenu">
- <li><a href="#" data-href="#" class="navbar-menu__link">Celý program</a></li>
+ <li><a href="#" data-href="#" class="navbar-menu__link">Úplný program</a></li>
<li><a href="#" data-href="#" class="navbar-menu__link">Program v kostce</a></li>
</ul>
</ui-navbar-subtitem>
@@ -88,7 +83,7 @@
<div class="navbar__actions navbar__section lg:container-padding--auto self-start flex flex-col sm:flex-row lg:flex-col sm:space-x-4 space-y-2 sm:space-y-0 lg:space-y-2 xl:flex-row xl:space-x-2 xl:space-y-0 h-full justify-center">
<button class="btn btn--icon btn--hoveractive btn--autowidth lg:text-sm xl:text-base focus:outline-none">
<div class="btn__body-wrap">
- <div class="btn__body bg-acidgreen text-black hover:bg-darkacidgreen px-1 sm:px-4 py-2 sm:py-4">Programová aplikace</div>
+ <div class="btn__body bg-acidgreen text-black hover:bg-darkacidgreen px-1 sm:px-4 py-2 sm:py-4">Program pro vás</div>
<div class="btn__icon bg-darkacidgreen text-black">
<i class="ico--app"></i>
</div>
@@ -112,37 +107,43 @@
<section class="footer__brand">
<img src="{% static "elections2021/images/logo-koalicni.svg" %}" alt="Piráti a Starostové" class="w-32 mb-6 pr-8 border-r border-grey-400 border-solid" />
<p class="para hidden md:block md:mb-4 lg:mb-0 text-grey-200">
- Piráti, {% now "Y" %}. Všechna práva vyhlazena. Sdílejte a nechte
- ostatní sdílet za stejných podmínek.
+ Piráti a Starostové, {% now "Y" %}. Všechna práva vyhlazena.<br>
+ Sdílejte a nechte ostatní<br>
+ sdílet za stejných podmínek.
</p>
</section>
<section class="footer__main-links text-white lg:grid lg:grid-cols-3 2xl:grid-cols-4 gap-4">
<div class="pt-8 pb-4 lg:py-0">
- <ui-footer-collapsible label="Odkazy">
+ <ui-footer-collapsible label="Projděte si">
<ul class="mt-4 md:mt-6 space-y-2 text-grey-200">
<li>
- <a href="{{ page.root_page.articles_page_url }}">Aktality</a>
+ <a href="{{ page.root_page.articles_page_url }}">Aktuality</a>
+ </li>
+ <li>
+ <a href="{{ page.root_page.candidates_list_page_url }}">Naši lidé</a>
</li>
<li>
- <a href="{{ page.root_page.candidates_list_page_url }}">Kandidáti</a>
+ <a href="#">Volební program</a>
</li>
<li>
- <a href="#">Programové body</a>
+ <a href="{{ page.root_page.questions_page_url }}">Časté dotazy</a>
</li>
<li>
- <a href="{{ page.root_page.questions_page_url }}">FAQ</a>
+ <a href="#">Informace o programu</a>
</li>
+ {% comment %}
<li>
<a href="#">Strategické dokumenty</a>
</li>
<li>
<a href="#">Individuální články</a>
</li>
+ {% endcomment %}
</ul>
</ui-footer-collapsible>
</div>
<div class="py-4 lg:py-0 border-t border-grey-400 lg:border-t-0 2xl:col-span-2">
- <ui-footer-collapsible label="Připoj se">
+ <ui-footer-collapsible label="Sledujte nás">
<div class="2xl:space-x-3">
<ul class="mt-6 space-y-2 text-grey-200 block 2xl:inline-block">
<li>
@@ -200,7 +201,7 @@
</ui-footer-collapsible>
</div>
<div class="pt-4 lg:py-0 border-t border-grey-400 lg:border-t-0">
- <ui-footer-collapsible label="Kontakt">
+ <ui-footer-collapsible label="Ozvěte se">
<ul class="mt-6 space-y-2 text-grey-200 inline-block">
<li>Informační linka:</li>
<li class="text-grey-200"><a href="tel:00420608963111">+420 608 963 111</a></li>
@@ -213,7 +214,7 @@
<div class="flex flex-col md:flex-row lg:flex-col lg:items-end space-y-2 md:space-y-0 md:space-x-2 lg:space-x-0 lg:space-y-2">
<button class="btn btn--icon btn--hoveractive btn--autowidth lg:text-sm xl:text-base focus:outline-none">
<div class="btn__body-wrap">
- <div class="btn__body bg-acidgreen text-black hover:bg-darkacidgreen px-1 sm:px-4 py-4">Programová aplikace</div>
+ <div class="btn__body bg-acidgreen text-black hover:bg-darkacidgreen px-1 sm:px-4 py-4">Program pro vás</div>
<div class="btn__icon bg-darkacidgreen text-black">
<i class="ico--app"></i>
</div>
diff --git a/elections2021/templates/elections2021/elections2021_candidates_list_page.html b/elections2021/templates/elections2021/elections2021_candidates_list_page.html
index 6a5e9024db53d7f3e2c7b6be6ce84b48c0340549..3ed23fff228af06a428faca71c3b8e55b71a6246 100644
--- a/elections2021/templates/elections2021/elections2021_candidates_list_page.html
+++ b/elections2021/templates/elections2021/elections2021_candidates_list_page.html
@@ -5,8 +5,9 @@
<article class="relative bg-lemon md:bg-split-color px-4 md:pl-8 md:pr-0 2xl:px-8 hero py-0 w-full ">
<div class="2xl:container w-auto bg-lemon md:pl-20 pr-0 grid lg:grid-rows-2 lg:grid-cols-7 items-center 2xl:mx-auto">
<div class="lg:row-span-1 lg:col-span-4 order-1 pt-14 md:pr-20">
- <h1 class="head-alt-md sm:head-alt-lg max-w-xs">{{ page.title }}</h1>
+ <h1 class="head-alt-md sm:head-alt-lg max-w-md">{{ page.title }}</h1>
</div>
+ {% comment %}
<div class="lg:row-span-1 lg:col-span-4 order-3 pb-14 md:pr-20">
<div class="hidden md:block pt-8">
<div class="switch">
@@ -15,6 +16,7 @@
</div>
</div>
</div>
+ {% endcomment %}
<div class="hidden lg:block lg:row-span-2 lg:col-span-3 order-2 h-full 2xl:absolute 2xl:right-0 2xl:w-1/3">
{% image page.photo fill-618x256 as img %}
<img class="object-cover w-full h-full" src="{{ img.url }}">
diff --git a/elections2021/templates/elections2021/elections2021_program_page.html b/elections2021/templates/elections2021/elections2021_program_page.html
index 9200b21411229536377489ad293bc3854b0f4888..b69ca64a0bdcf56a9aaa913619aa06833d39f2a3 100644
--- a/elections2021/templates/elections2021/elections2021_program_page.html
+++ b/elections2021/templates/elections2021/elections2021_program_page.html
@@ -31,15 +31,15 @@
{% comment %}
<!-- set data-chosen of #progamswitch container by serverside script based on current url-->
<div id="progamswitch" class="switch mb-4" data-chosen="mujprogram">
- <a class="switch__item switch__item--active" data-chosen="mujprogram">Můj program</a>
- <a class="switch__item" data-chosen="celyprogram">Celý program</a>
+ <a class="switch__item switch__item--active" data-chosen="mujprogram">Program pro mě</a>
+ <a class="switch__item" data-chosen="uplnyprogram">Úplný program</a>
</div>
{% endcomment %}
<div class="filters">
<div class="select inline-flex w-auto {% if active_ministry %}text-black{% else %}text-white{% endif %}">
<select id="select_ministry" class="select__control form-field__control bg-black block filter-pirati-stan" data-chosen="{{ active_ministry }}">
- <option value="x" {% if not active_ministry %}selected="selected"{% endif %}>Podle resortu</option>
+ <option value="x" {% if not active_ministry %}selected="selected"{% endif %}>Podle oblasti</option>
{% for val, name in ministry_choices %}
<option value="{{ val }}" {% if active_ministry == val %}selected="selected"{% endif %}>{{ name }}</option>
{% endfor %}
@@ -92,16 +92,20 @@
</div>
</div>
- {% if forloop.counter == 3 or forloop.counter < 3 and forloop.last %}
- {% include "elections2021/_program_app_banner.html" %}
+ {% if show_app_banner %}
+ {% if forloop.counter == 3 or forloop.counter < 3 and forloop.last %}
+ {% include "elections2021/_program_app_banner.html" %}
+ {% endif %}
{% endif %}
{% endfor %}
</div>
- <div class="text-center mt-16">
- {% include "elections2021/_pagination.html" with paginator=points %}
- </div>
+ {% if show_pagination %}
+ <div class="text-center mt-16">
+ {% include "elections2021/_pagination.html" with paginator=points %}
+ </div>
+ {% endif %}
</div>
</main>
</div>