bofh/fet2020
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix master

Browse Source
This commit is contained in:
Patrick Mayr
2020-09-08 16:14:35 +00:00
parent e62bdb4c88
commit 4a22a27248
3 changed files with 71 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fet2020/posts/views.py
View File

@@ -70,8 +70,6 @@ def show(request, id=None):
if post_author: if post_author:
author_image = post_author.image['avatar'].url author_image = post_author.image['avatar'].url
ep_link = (get_pad_link(p.agenda_key), get_pad_link(p.protocol_key))
context = { context = {
"post": p, "post": p,
"author_image": author_image, "author_image": author_image,
@@ -79,7 +77,6 @@ def show(request, id=None):
"related_posts": p.tags.similar_objects(), "related_posts": p.tags.similar_objects(),
"ep_agenda_link": get_pad_link(p.agenda_key), "ep_agenda_link": get_pad_link(p.agenda_key),
"ep_protocol_link": get_pad_link(p.protocol_key), "ep_protocol_link": get_pad_link(p.protocol_key),
} }
response = render(request, 'posts/show.html', context) response = render(request, 'posts/show.html', context)

4
fet2020/templates/posts/partials/_date_box.html
View File

@@ -2,8 +2,8 @@
<div class="date-box"> <div class="date-box">
<span> <span>
<span class="date-badge badge primary" style=""> <span class="date-badge badge primary" style="">
<span class="date-badge-day">{{post.event_start_day}}</span> <span class="date-badge-day">{{post.event_start|date:"d"}}</span>
<span class="date-badge-month">{{post.event_start_month}}</span> <span class="date-badge-month">{{post.event_start|date:"M"}}</span>
</span> </span>
</span> </span>
<span class="date-text"><strong>{{post.title}}</strong></span> <span class="date-text"><strong>{{post.title}}</strong></span>

136
fet2020/templates/posts/show.html
View File

@@ -5,91 +5,85 @@
{% 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 class="article-title">
<h1>{{post.title | tags_to_url }}</h1>
</div>
<div class="article-details">
{{post.subtitle | tags_to_url }}
{% if post.author != None %}
<div class="article-author"><a href="{% url 'member' post.author %}">
<img src="{{author_image}}" alt="" /> {{post.author}}
</a>
</div> </div>
{% else %}
<div class="article-author"><a href=""> <div class="article-title">
<img src="" alt="" /> <h1>{{post.title |tags_to_url}}</h1>
{{post.author}}</a>
</div> </div>
{% endif %}
</div> <button class=""> <div class="article-details">
{{post.subtitle |tags_to_url}}
<span class="nav fa fa-chevron-right fa-3x"></span> {% if post.author %}
</button> <div class="article-author"><a href="{% url 'member' post.author %}">
<img src="{{author_image}}" alt="" /> {{post.author}}
</a>
</div>
{% else %}
<div class="article-author"><a href="">
<img src="" alt="" />
{{post.author}}</a>
</div>
{% endif %}
</div> <button class="">
<span class="nav fa fa-chevron-right fa-3x"></span>
</button>
</div>
</div> </div>
</div></div> </div>
<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 | 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>
<div class="cell medium-4">
{% include 'posts/partials/_date_box.html' %}
{% if post.has_agenda %}
<a href="{{ep_agenda_link}}">Agenda</a><br>
{% endif %}
{% if post.has_protocol %} <div class="cell medium-4">
<a href="{{ep_protocol_link}}">Protocol</a> {% include 'posts/partials/_date_box.html' %}
{% endif %} </div>
</div>
</div>
<a href="{% url "admin:posts_news_change" post.id %}">Bearbeiten</a> Start: {{post.event_start}}<br>
Ende: {{post.event_end}}<br>
Start: {{post.event_start}}<br> {% if post.has_agenda %}
Ende: {{post.event_end}}<br> <a href="{{ep_agenda_link}}">Agenda</a><br>
{% endif %}
{% if post.has_agenda %} {% if post.has_protocol %}
<a href="{{ep_link.0}}">Agenda</a> <a href="{{ep_protocol_link}}">Protocol</a>
{% endif %} {% endif %}
{% if post.has_protocol %} {% if request.user.is_authenticated %}
<a href="{{ep_link.1}}">Protokoll</a> ------<br>
{% endif %} <a href="{% url "admin:posts_news_change" post.id %}">Bearbeiten</a>
{% endif %}
{% if request.user.is_authenticated %} <hr>
<br>------<br> {% for tag in post.get_tagnames %}
<a href="{% url "admin:posts_news_change" post.id %}">Bearbeiten</a> {{tag |tags_to_url}}
{% endif %} {% endfor %}
<hr> <hr>
{{post.body | safe | add_internal_links | tags_to_url}} {{post.body | safe | add_internal_links | tags_to_url}}
<hr>
</div>
<hr> </div>
{% for tag in post.get_tagnames %} <div class="grid-x grid-margin-x">
{{tag |tags_to_url}} {% for post in related_posts %}
{% endfor %} <div class="medium-6 large-4 small-12 cell">
<hr> {% include 'posts/partials/_posts_hero.html' %}
{{post.body | safe | add_internal_links | tags_to_url}} </div>
{% endfor %}
<hr> </div>
<div class="grid-x grid-margin-x">
{% for post in related_posts %}
<div class="medium-6 large-4 small-12 cell">
{% include 'posts/partials/_posts_hero.html' %}
</div>
{% endfor %}
</div>
</div> </div>
{% endblock %}fffsdfag {% endblock %}fffsdfag