if subtitle is None, it will be replacedwith a no-break space.

This commit is contained in:
2020-09-24 09:02:59 +00:00
parent 864a72e4dc
commit 77abe560c6
3 changed files with 64 additions and 71 deletions

View File

@@ -8,17 +8,17 @@
<div class="medium-8 small cell" style="background: grey"> <div class="medium-8 small cell" style="background: grey">
{% with post=featured_post %} {% with post=featured_post %}
<a href="{{post.url}}"> <a href="{{ post.url }}">
<div class="news-hero-large"style="background-image: url('{{post.imageurl}}');)"> <div class="news-hero-large"style="background-image: url('{{ post.imageurl }}');)">
<div class="news-hero-text" > <div class="news-hero-text" >
<hr> <hr>
<div class="article-date"> <div class="article-date">
<p>{{post.public_date}}</p> <p>{{ post.public_date }}</p>
</div> </div>
<div class="article-title"> <div class="article-title">
<h1>{{post.title| safe}}</h1> <h1>{{ post.title|safe }}</h1>
<p>{{post.subtitle | safe}}</p> <p>{{ post.subtitle|default_if_none:"&nbsp;"|safe }}</p>
</div> </div>
</div> </div>
</div> </div>
@@ -27,17 +27,15 @@
</div> </div>
<div class="medium-4 responsive-side-box cell"> <div class="medium-4 responsive-side-box cell">
<a href="{% url 'posts.index' %}"><h1>Neuigkeiten</h1></a> <a href="{% url 'posts.index' %}"><h1>Neuigkeiten</h1></a>
<div class="article-row-section"> <div class="article-row-section">
{% with post=featured_post %} {% with post=featured_post %}
{% include 'posts/partials/_article_row.html' %} {% include 'posts/partials/_article_row.html' %}
{% endwith %} {% endwith %}
{% for post in featured_meeting %} {% for post in featured_meeting %}
{% include 'posts/partials/_meeting_row.html' %} {% include 'posts/partials/_meeting_row.html' %}
{% endfor %} {% endfor %}
</div> </div>
</div> </div>
</div> </div>
@@ -46,7 +44,6 @@
{{ tags_list|tags_to_url }} {{ tags_list|tags_to_url }}
</div> </div>
<div class="grid-x grid-x-padding"> <div class="grid-x grid-x-padding">
<div class="medium-8 small-12 small-order-2 medium-order-1""> <div class="medium-8 small-12 small-order-2 medium-order-1"">
{% for post in posts %} {% for post in posts %}

View File

@@ -1,8 +1,9 @@
<a href="{% url 'posts.show' post.slug %}"> <a href="{% url 'posts.show' post.slug %}">
<div class="news-hero padding-bottom-1" style="background-image:url('{{post.imageurl}}')"> <div class="news-hero padding-bottom-1" style="background-image:url('{{ post.imageurl }}')">
<div class="news-hero-text"> <div class="news-hero-text">
<h1>{{post.title}}</h1> <h1>{{ post.title }}</h1>
<h2>{{post.subtitle}}</h2>{{post}} <h2>{{ post.subtitle|default_if_none:"&nbsp;" }}</h2>
{{ post }}
</div> </div>
</div> </div>
</a> </a>

View File

@@ -1,39 +1,34 @@
{% extends "layout.html" %} {% extends "layout.html" %}
{% load post_helpers %} {% load post_helpers %}
{% load admin_urls %} {% load admin_urls %}
{% block content %} {% block content %}
<div class="large-article-header" style="background-image:url('{{post.imageurl}}')"> <div class="large-article-header" style="background-image:url('{{ post.imageurl }}')">
<div class="large-article-header-content"> <div class="large-article-header-content">
<div class="center-container"> <div class="center-container">
<div class="article-date"> <div class="article-date">
<p>{{post.public_date}}</p> <p>{{ post.public_date }}</p>
</div> </div>
<div class="article-title"> <div class="article-title">
<h1>{{post.title |tags_to_url}}</h1> <h1>{{ post.title|tags_to_url }}</h1>
</div> </div>
<div class="article-details"> <div class="article-details">
{{post.subtitle |tags_to_url}} {{ post.subtitle|default_if_none:"&nbsp;"|tags_to_url }}
{% if post.author %} {% if post.author %}
<div class="article-author"><a href="{% url 'member' post.author %}"> <div class="article-author"><a href="{% url 'member' post.author %}">
<img src="{{author_image}}" alt="" /> {{post.author}} <img src="{{ author_image }}" alt="" /> {{ post.author }}
</a> </a>
</div> </div>
{% else %} {% else %}
<div class="article-author"><a href=""> <div class="article-author"><a href="">
<img src="" alt="" /> <img src="" alt="" />
{{post.author}}</a> {{ post.author }}</a>
</div> </div>
{% endif %} {% endif %}
</div>
</div> <button class="">
<span class="nav fa fa-chevron-right fa-3x"></span>
</button>
</div> </div>
</div> </div>
</div> </div>
@@ -41,48 +36,48 @@
<div class="grid-container"> <div class="grid-container">
<div class="grid-x"> <div class="grid-x">
<div class="cell medium-8"> <div class="cell medium-8">
<h1>{{post.title | tags_to_url}}</h1> <h1>{{ post.title|tags_to_url }}</h1>
<strong>{{post.subtitle | tags_to_url}}</strong><span class="nav fa fa-chevron-right fa-3x"></span> <strong>{{ post.subtitle|default_if_none:"&nbsp;"|tags_to_url }}</strong>
<span class="nav fa fa-chevron-right fa-3x"></span>
<br> <br>
<a href="{% url 'posts.show' next %}">Nächster Artikel</a><br> <a href="{% url 'posts.show' next %}">Nächster Artikel</a><br>
<div class="cell medium-4">
<div class="cell medium-4"> {% include 'posts/partials/_date_box.html' %}
{% include 'posts/partials/_date_box.html' %} </div>
Start: {{ post.event_start }}<br>
Ende: {{ post.event_end }}<br>
{% if post.has_agenda %}
<a href="{{ ep_agenda_link }}">Agenda</a><br>
{% endif %}
{% if post.has_protocol %}
<a href="{{ ep_protocol_link }}">Protokoll</a>
{% endif %}
{% if request.user.is_authenticated %}
<br>------<br>
<a href="{% url "admin:posts_news_change" post.id %}">Bearbeiten</a>
{% endif %}
<hr>
{% for tag in post.get_tagnames %}
{{ tag|tags_to_url }}
{% endfor %}
<hr>
{% if post.has_agenda %}
<h2>Agenda</h2>
{{ post.agenda_html|safe }}
{% endif %}
{{ post.body|safe|add_internal_links|tags_to_url }}
<hr>
</div> </div>
Start: {{post.event_start}}<br>
Ende: {{post.event_end}}<br>
{% if post.has_agenda %}
<a href="{{ep_agenda_link}}">Agenda</a><br>
{% endif %}
{% if post.has_protocol %}
<a href="{{ep_protocol_link}}">Protokoll</a>
{% endif %}
{% if request.user.is_authenticated %}
<br>------<br>
<a href="{% url "admin:posts_news_change" post.id %}">Bearbeiten</a>
{% endif %}
<hr>
{% for tag in post.get_tagnames %}
{{tag |tags_to_url}}
{% endfor %}
<hr>
{% if post.has_agenda %}
<h2>Agenda</h2>
{{post.agenda_html |safe}}
{% endif %}
{{post.body | safe | add_internal_links | tags_to_url}}
<hr>
</div>
</div> </div>
<div class="grid-x grid-margin-x"> <div class="grid-x grid-margin-x">
{% for post in related_posts %} {% for post in related_posts %}
<div class="medium-6 large-4 small-12 cell"> <div class="medium-6 large-4 small-12 cell">