removed members hashtag list; changed upload folder path nginx

deployment/nginx.conf

@@ -3,7 +3,12 @@ server {
     
     location /assets {
     	     alias /app/assets;
-	     try_files $uri $uri/ =404;
+	     try_files $uri =404;
+    }
+
+    location /files {
+             alias /app/files;
+             try_files $uri =404;
     }
     
     location /fotos {

fet2020/posts/serializers.py

@@ -21,6 +21,7 @@ class PostSerializer(serializers.HyperlinkedModelSerializer):
             'event_start',
             'event_end',
             'is_hidden',
-            'agenda_html'
+            'agenda_html',
+            'has_agenda',
             # 'author',
         ]

fet2020/posts/views.py

@@ -38,9 +38,9 @@ def tags(request, tag=""):
     featured_post = Post.objects.get_visible_articles().filter(slug=tag).first()
     members = []
 
-    job_names, slug_list = JobMember.jobs.get_job_names(slug=tag)
+    #job_names, slug_list = JobMember.jobs.get_job_names(slug=tag)
 
-    if job_names:
+    if None:
         active_members = JobMember.active_member.get_members_of_job(job_names=job_names)
 
         for idx, item in enumerate(job_names):
@@ -60,7 +60,7 @@ def tags(request, tag=""):
         "posts": posts,
         "author_image": author_image,
         "featured_post": featured_post,
-        "members": members,
+        "members": None,
         "tags_list": None,
     }
 

fet2020/templates/posts/show.html

@@ -34,35 +34,11 @@
 </div>
 
 <div class="grid-container">
-    <div class="grid-x">
+    <h1>{{ post.title|tags_to_url }}</h1>
+    <strong>{{ post.subtitle|default_if_none:"&nbsp;"|tags_to_url }}</strong>
+    <br>
+    <div class="grid-x grid-padding-x">
         <div class="cell medium-8">
-            <h1>{{ post.title|tags_to_url }}</h1>
-            <strong>{{ post.subtitle|default_if_none:"&nbsp;"|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 class="cell medium-4">
-            {% include 'posts/partials/_date_box.html' %}
-            </div>
-
-            Start: {{ post.event_start }}<br>
-            Ende: {{ post.event_end }}<br>
-
-            {% if request.user.is_authenticated %}
-
-            {% 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 %}
-
-            <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 }}
@@ -77,6 +53,25 @@
             {{ post.body|safe|add_internal_links|tags_to_url }}
             <hr>
         </div>
+        <div class="cell medium-4">
+            {% if request.user.is_authenticated %}
+
+            {% 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 %}
+
+            {% endif %}
+
+            Start: {{ post.event_start }}<br>
+            Ende: {{ post.event_end }}<br>
+            <a href="{% url 'posts.show' next %}">Nächster Artikel </a><span class="nav fa fa-chevron-right fa-1x"></span><br>
+            {% include 'posts/partials/_date_box.html' %}
+        </div>
+
     </div>
 
     <div class="grid-x grid-margin-x">
@@ -87,4 +82,4 @@
         {% endfor %}
     </div>
 </div>
-{% endblock %}
+{% endblock %}