fix merge with master

fet2020/posts/views.py

@@ -202,7 +202,7 @@ def show(request, id=None):
         "author": author,
         "author_image": author_image,
         "next": __next(post, public_only),
-        "previous": get_previous_dict(p),
+        "previous": __previous(post, public_only),
         "related_posts": related_posts[0:6],
         "ep_agenda_link": ep_agenda_link,
         "ep_protocol_link": ep_protocol_link,
@@ -285,17 +285,15 @@ def __next(post=None, public=True):
     return d
 
 
-def get_previous_dict(post=None):
+def __previous(post=None, public=True):
-    # TODO: Docstring
+    """
+    Helper function for getting previous post
+    """
     posts = None
     d = post.slug
 
     if post:
-        # TODO: bad implementation but it works!!
+        posts = Post.objects.date_sorted_list(public).filter(post_type=post.post_type)
-        if post.post_type == "N" or post.post_type == "E":
-            posts = Post.articles.get_visible_articles()
-        elif post.post_type == "F":
-            posts = FetMeeting.objects.get_queryset().order_by("-event_start")
 
     if posts:
         for k, v in enumerate(posts):

fet2020/templates/base.html

@@ -40,6 +40,8 @@
 	<link rel="stylesheet" href="{% static 'fonts/Besley-2.0/besley.css' %}">
     <link rel="stylesheet" href="{% static 'fonts/Fira_Code-6.2/fira_code.css' %}">
 
+    {% block galleryheader %}
+    {% endblock %}
     {% block extraheader %}
     {% endblock %}
 </head>
@@ -67,8 +69,8 @@
 				x-transition:leave-end="transform opacity-0 scale-90"
 			>
 				<li><a href="{% url 'posts:posts.index' %}">News</a></li>
-				<li><a href="{% url 'members_view' 'A' %}">Fachschaft</a></li>
+				<li><a href="{% url 'members_view' 'active' %}">Fachschaft</a></li>
-				<li><a href="/fotos/">Fotos</a></li>
+				<li><a href="{% url 'gallery' %}">Galerie</a></li>
 				<li><a href="{% url 'blackboard' %}">Blackboard</a></li>
 				<li><a href="{% url 'contact' %}">Kontakt</a></li>
 
@@ -120,16 +122,16 @@
     <footer>
         <ul class="icon-list">
             <li>
-                <a href="https://facebook.fet.at/"><i class="fab fa-facebook"></i></a>
+                <a href="{% url 'facebook' %}"><i class="fab fa-facebook"></i></a>
             </li>
             <li>
-                <a href="https://instagram.fet.at/"><i class="fab fa-instagram"></i></a>
+                <a href="{% url 'instagram' %}"><i class="fab fa-instagram"></i></a>
             </li>
             <li>
-                <a href="https://discord.fet.at/"><i class="fab fa-discord"></i></a>
+                <a href="{% url 'discord' %}"><i class="fab fa-discord"></i></a>
             </li>
             <li>
-                <a href="https://telegram.fet.at/"><i class="fab fa-telegram"></i></a>
+                <a href="{% url 'telegram' %}"><i class="fab fa-telegram"></i></a>
             </li>
             <li>
                 <a href="mailto:service@fet.at"><i class="fas fa-envelope"></i></a>

fet2020/templates/home.html

@@ -22,7 +22,9 @@
                         {% endwith %}
                     {% endif %}
                     {% for post in featured_meeting %}
-                        {% include 'posts/partials/_meeting_row.html' %}
+                        {% if post %}
+                            {% include 'posts/partials/_meeting_row.html' %}
+                        {% endif %}
                     {% endfor %}
 
 				</div>

fet2020/templates/layout.html

@@ -24,7 +24,7 @@
     <div class="title-bar">
         <div class="title-bar-left">
             <a href="{% url 'home' %}">
-                <img class="logo" src="{% static 'img/logo2014_64.png' %}"/>
+                <img class="logo" src="{% static 'img/fet_logo_white.png' %}"/>
             </a>
         </div>
 
@@ -37,7 +37,7 @@
 <div class="top-bar" id="example-menu">
     <div class="top-bar-left show-for-large">
         <a href="{% url 'home' %}">
-            <img class="logo" src="{% static 'img/logo2014_64.png' %}"/>
+            <img class="logo" src="{% static 'img/fet_logo_white.png' %}"/>
         </a>
     </div>