diff --git a/senator/models.py b/senator/models.py
index e6153f1ae659cd63429ef291e83294948b145f15..efe69180a360258acee8c6eb75471f5967943cd9 100644
--- a/senator/models.py
+++ b/senator/models.py
@@ -43,6 +43,17 @@ class SenatorHomePage(Page):
class Meta:
verbose_name = "[senátor] Úvodnà stránka"
+ def get_context(self, request):
+ context = super().get_context(request)
+ articles = (
+ self.get_descendants()
+ .type(SenatorNewsPage)
+ .live()
+ .order_by("-senatornewspage__date")[:3]
+ )
+ context["articles"] = articles
+ return context
+
class SenatorNewsIndexPage(Page):
parent_page_types = ["senator.SenatorHomePage"]
@@ -52,9 +63,8 @@ class SenatorNewsIndexPage(Page):
verbose_name = "[senátor] Přehled novinek"
def get_context(self, request):
- # Update context to include only published posts, ordered by reverse-chron
context = super().get_context(request)
- articles = self.get_children().live().order_by("-first_published_at")
+ articles = self.get_children().live().order_by("-senatornewspage__date")
context["articles"] = articles
return context
diff --git a/senator/templates/senator/senator_home_page.html b/senator/templates/senator/senator_home_page.html
index aa5f1ef5b1fa8b3474ccac1bf949211bf8f3aa7a..d41571345020fcf865972d38ed1a9158258c7bff 100644
--- a/senator/templates/senator/senator_home_page.html
+++ b/senator/templates/senator/senator_home_page.html
@@ -83,6 +83,7 @@
</div>
</div>
+ {# TODO kalendář #}
<div class="wpb_text_column ">
<div class="wpb_wrapper">
<table>
@@ -122,13 +123,16 @@
</div>
</div>
<div class="w-separator type_invisible size_medium thick_1 style_solid color_border cont_none"><span class="w-separator-h"></span></div>
- <div class="w-btn-wrapper align_left"><a class="w-btn style_raised color_contrast icon_atright outlined-black" href="https://lukaswagenknecht.cz/kalendar/" style="font-size:20px;"><i class="fa fa-arrow-right"></i><span class="w-btn-label">Všechny události</span></a></div>
+ {# TODO link kalendář #}
+ <div class="w-btn-wrapper align_left"><a class="w-btn style_raised color_contrast icon_atright outlined-black" href="#" style="font-size:20px;"><i class="fa fa-arrow-right"></i><span class="w-btn-label">Všechny události</span></a></div>
</div>
</div>
</div>
</div>
</div>
</section>
+
+{% if articles %}
<section class="l-section wpb_row height_medium">
<div class="l-section-h i-cf">
<div class="g-cols vc_row type_default valign_top">
@@ -138,76 +142,40 @@
<div class="wpb_text_column ">
<div class="wpb_wrapper">
<h2 style="text-align: center;">Aktuality</h2>
-
</div>
</div>
<div class="w-separator type_invisible size_medium thick_1 style_solid color_border cont_none"><span class="w-separator-h"></span></div>
<div class="w-blog layout_flat type_carousel cols_3" itemscope itemtype="https://schema.org/Blog">
<div class="w-blog-list owl-carousel" data-breakpoint_1_cols="3" data-breakpoint_1_width="1200" data-breakpoint_2_cols="2" data-breakpoint_2_width="900" data-breakpoint_3_cols="1" data-breakpoint_3_width="600" data-items="3" data-nav="1" data-dots="1" data-center="1" data-autoplay="0" data-timeout="3000" data-autoheight="0" data-slideby="1">
- <article class="w-blog-post nezarazene post-23687 post type-post status-publish format-standard hentry category-nezarazene" data-id="23687" data-categories="nezarazene">
+
+ {% for article in articles %}
+ <article class="w-blog-post nezarazene post type-post status-publish format-standard hentry category-nezarazene" data-categories="nezarazene">
<div class="w-blog-post-h">
- <a href="https://lukaswagenknecht.cz/pozmenovaci-navrh-k-osetrovnemu/" aria-label="PozmÄ›ĹovacĂ návrh k ošetĹ™ovnĂ©mu">
+ <a href="{% pageurl article %}" aria-label="{{ article.title }}">
<div class="w-blog-post-preview">
+ {% if article.specific.image %}
+ {% image article.specific.image width-374 class="attachment-medium_large size-medium_large wp-post-image" %}
+ {% endif %}
<span class="w-blog-post-preview-icon"></span>
</div>
</a>
<div class="w-blog-post-body">
<h2 class="w-blog-post-title">
- <a class="entry-title" rel="bookmark" href="https://lukaswagenknecht.cz/pozmenovaci-navrh-k-osetrovnemu/">PozmÄ›ĹovacĂ návrh k ošetĹ™ovnĂ©mu</a>
+ <a class="entry-title" rel="bookmark" href="{% pageurl article %}">{{ article.title }}</a>
</h2>
-
<div class="w-blog-post-meta">
- <time class="w-blog-post-meta-date date updated" datetime="2020-03-25 17:10:07">25. 3. 2020</time><span class="w-blog-post-meta-author vcard author hidden"><a href="https://lukaswagenknecht.cz/author/admin/" class="fn">admin</a></span> </div>
- <a class="w-blog-post-more w-btn color_ style_" href="https://lukaswagenknecht.cz/pozmenovaci-navrh-k-osetrovnemu/">
- <span class="w-btn-label">Zobrazit celé</span>
- </a>
- </div>
- </div>
- </article>
-
-
- <article class="w-blog-post nezarazene post-23664 post type-post status-publish format-standard has-post-thumbnail hentry category-nezarazene" data-id="23664" data-categories="nezarazene">
- <div class="w-blog-post-h">
- <a href="https://lukaswagenknecht.cz/nove-cislo-casopisu-senat-1-2020/" aria-label="NovĂ© ÄŤĂslo ÄŤasopisu Senát 1/2020">
- <div class="w-blog-post-preview">
- <img width="212" height="300" src="https://lukaswagenknecht.cz/wp-content/uploads/2020/02/casopis_senat-212x300.jpg" class="attachment-medium size-medium wp-post-image" alt="" srcset="https://lukaswagenknecht.cz/wp-content/uploads/2020/02/casopis_senat-212x300.jpg 212w, https://lukaswagenknecht.cz/wp-content/uploads/2020/02/casopis_senat.jpg 566w" sizes="(max-width: 212px) 100vw, 212px" /> <span class="w-blog-post-preview-icon"></span>
+ <time class="w-blog-post-meta-date date updated">{{ article.specific.date }}</time>
</div>
- </a>
- <div class="w-blog-post-body">
- <h2 class="w-blog-post-title">
- <a class="entry-title" rel="bookmark" href="https://lukaswagenknecht.cz/nove-cislo-casopisu-senat-1-2020/">NovĂ© ÄŤĂslo ÄŤasopisu Senát 1/2020</a>
- </h2>
-
- <div class="w-blog-post-meta">
- <time class="w-blog-post-meta-date date updated" datetime="2020-02-18 15:17:32">18. 2. 2020</time><span class="w-blog-post-meta-author vcard author hidden"><a href="https://lukaswagenknecht.cz/author/admin/" class="fn">admin</a></span> </div>
- <a class="w-blog-post-more w-btn color_ style_" href="https://lukaswagenknecht.cz/nove-cislo-casopisu-senat-1-2020/">
- <span class="w-btn-label">Zobrazit celé</span>
- </a>
- </div>
- </div>
- </article>
-
-
- <article class="w-blog-post nezarazene post-23623 post type-post status-publish format-standard has-post-thumbnail hentry category-nezarazene" data-id="23623" data-categories="nezarazene">
- <div class="w-blog-post-h">
- <a href="https://lukaswagenknecht.cz/800-milionu-vracenych-eu-kvuli-spatne-zakazce-neni-vina-lukase-wagenknechta/" aria-label="800 milionů vrácených EU kvůli špatné zakázce nenà vina Lukáše Wagenknechta">
- <div class="w-blog-post-preview">
- <img width="300" height="200" src="https://lukaswagenknecht.cz/wp-content/uploads/2019/10/48864577843_656b7c97b5_o-300x200.jpg" class="attachment-medium size-medium wp-post-image" alt="" srcset="https://lukaswagenknecht.cz/wp-content/uploads/2019/10/48864577843_656b7c97b5_o-300x200.jpg 300w, https://lukaswagenknecht.cz/wp-content/uploads/2019/10/48864577843_656b7c97b5_o-768x512.jpg 768w, https://lukaswagenknecht.cz/wp-content/uploads/2019/10/48864577843_656b7c97b5_o-1024x683.jpg 1024w, https://lukaswagenknecht.cz/wp-content/uploads/2019/10/48864577843_656b7c97b5_o-600x400.jpg 600w" sizes="(max-width: 300px) 100vw, 300px" /> <span class="w-blog-post-preview-icon"></span>
+ <div class="w-blog-post-content">
+ <p>{{ article.specific.perex }}</p>
</div>
- </a>
- <div class="w-blog-post-body">
- <h2 class="w-blog-post-title">
- <a class="entry-title" rel="bookmark" href="https://lukaswagenknecht.cz/800-milionu-vracenych-eu-kvuli-spatne-zakazce-neni-vina-lukase-wagenknechta/">800 milionů vrácených EU kvůli špatné zakázce nenà vina Lukáše Wagenknechta</a>
- </h2>
-
- <div class="w-blog-post-meta">
- <time class="w-blog-post-meta-date date updated" datetime="2019-12-10 12:56:26">10. 12. 2019</time><span class="w-blog-post-meta-author vcard author hidden"><a href="https://lukaswagenknecht.cz/author/admin/" class="fn">admin</a></span> </div>
- <a class="w-blog-post-more w-btn color_ style_" href="https://lukaswagenknecht.cz/800-milionu-vracenych-eu-kvuli-spatne-zakazce-neni-vina-lukase-wagenknechta/">
+ <a class="w-blog-post-more w-btn color_ style_" href="{% pageurl article %}">
<span class="w-btn-label">Zobrazit celé</span>
</a>
</div>
</div>
</article>
+ {% endfor %}
</div>
<div class="g-preloader type_1">
@@ -222,6 +190,6 @@
</div>
</div>
</section>
-
+{% endif %}
{% endblock %}
diff --git a/senator/templates/senator/senator_news_index_page.html b/senator/templates/senator/senator_news_index_page.html
index 25acf6875d88b22c790cad590a1ace09568e37df..b2360e12eaf4c3d839688e580aaa18b94fc22d9e 100644
--- a/senator/templates/senator/senator_news_index_page.html
+++ b/senator/templates/senator/senator_news_index_page.html
@@ -36,7 +36,7 @@
<div class="w-blog-list">
{% for article in articles %}
- <article class="w-blog-post nezarazene post-23687 post type-post status-publish format-standard hentry category-nezarazene" data-id="23687" data-categories="nezarazene">
+ <article class="w-blog-post nezarazene post type-post status-publish format-standard hentry category-nezarazene" data-categories="nezarazene">
<div class="w-blog-post-h">
<a href="{% pageurl article %}" aria-label="{{ article.title }}">
<div class="w-blog-post-preview">
@@ -51,7 +51,8 @@
<a class="entry-title" rel="bookmark" href="{% pageurl article %}">{{ article.title }}</a>
</h2>
<div class="w-blog-post-meta">
- <time class="w-blog-post-meta-date date updated">{{ article.specific.date }}</time><span class="w-blog-post-meta-author vcard author hidden"><a href="https://lukaswagenknecht.cz/author/admin/" class="fn">admin</a></span> </div>
+ <time class="w-blog-post-meta-date date updated">{{ article.specific.date }}</time>
+ </div>
<div class="w-blog-post-content">
<p>{{ article.specific.perex }}</p>
</div>