fix master

fet2020/posts/views.py

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

fet2020/templates/posts/partials/_date_box.html

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

fet2020/templates/posts/show.html

@@ -10,12 +10,15 @@
             <div class="article-date">
                 <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 %}
+
+            {% if post.author %}
                 <div class="article-author"><a href="{% url 'member' post.author %}">
                 <img src="{{author_image}}" alt="" /> {{post.author}}
                 </a>
@@ -32,7 +35,9 @@
             <span class="nav fa fa-chevron-right fa-3x"></span>
         </button>
         </div>
-</div></div>
+    </div>
+</div>
+
 <div class="grid-container">
     <div class="grid-x">
         <div class="cell medium-8">
@@ -40,9 +45,14 @@
             <strong>{{post.subtitle | tags_to_url}}</strong><span class="nav fa fa-chevron-right fa-3x"></span>
             <br>
             <a href="{% url 'posts.show' next %}">Nächster Artikel</a><br>
-</div>
+
+        
         <div class="cell medium-4">
         {% 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>
@@ -51,40 +61,24 @@
         {% if post.has_protocol %}
         <a href="{{ep_protocol_link}}">Protocol</a>
         {% endif %}
-</div>
-</div>
-
-<a href="{% url "admin:posts_news_change" post.id %}">Bearbeiten</a>
-
-Start: {{post.event_start}}<br>
-Ende: {{post.event_end}}<br>
-
-{% if post.has_agenda %}
-<a href="{{ep_link.0}}">Agenda</a>
-{% endif %}
-
-{% if post.has_protocol %}
-<a href="{{ep_link.1}}">Protokoll</a>
-{% endif %}
 
         {% if request.user.is_authenticated %}
-<br>------<br>
+        ------<br>
         <a href="{% url "admin:posts_news_change" post.id %}">Bearbeiten</a>
         {% endif %}
 
-<hr>
-{{post.body | safe | add_internal_links | tags_to_url}}
-
         <hr>
         {% for tag in post.get_tagnames %}
             {{tag |tags_to_url}}
         {% endfor %}
+
         <hr>
         {{post.body | safe | add_internal_links | tags_to_url}}
-
         <hr>
-<div class="grid-x grid-margin-x">
+        </div>
 
+    </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' %}