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

removed members hashtag list; changed upload folder path nginx

Browse Source
This commit is contained in:
root (fetsite6)
2020-10-23 20:50:42 +02:00
parent 0b7b99e41d
commit cb23846a09
4 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
deployment/nginx.conf
View File

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

3
fet2020/posts/serializers.py
View File

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

6
fet2020/posts/views.py
View File

@@ -38,9 +38,9 @@ def tags(request, tag=""):
featured_post = Post.objects.get_visible_articles().filter(slug=tag).first() featured_post = Post.objects.get_visible_articles().filter(slug=tag).first()
members = [] 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) active_members = JobMember.active_member.get_members_of_job(job_names=job_names)
for idx, item in enumerate(job_names): for idx, item in enumerate(job_names):
@@ -60,7 +60,7 @@ def tags(request, tag=""):
"posts": posts, "posts": posts,
"author_image": author_image, "author_image": author_image,
"featured_post": featured_post, "featured_post": featured_post,
"members": members, "members": None,
"tags_list": None, "tags_list": None,
} }

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

@@ -34,35 +34,11 @@
</div> </div>
<div class="grid-container"> <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"> <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> <hr>
{% for tag in post.get_tagnames %} {% for tag in post.get_tagnames %}
{{ tag|tags_to_url }} {{ tag|tags_to_url }}
@@ -77,6 +53,25 @@
{{ post.body|safe|add_internal_links|tags_to_url }} {{ post.body|safe|add_internal_links|tags_to_url }}
<hr> <hr>
</div> </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>
<div class="grid-x grid-margin-x"> <div class="grid-x grid-margin-x">