From f9e5f50a579c98ce68d340c7ba0c26fd4615194e Mon Sep 17 00:00:00 2001 From: Patrick Date: Thu, 10 Sep 2020 00:40:26 +0000 Subject: [PATCH 1/3] clean-up --- fet2020/templates/home.html | 94 +++++++++---------- .../partials/_job_membership_grid.html | 10 +- fet2020/templates/members/show.html | 5 - fet2020/templates/posts/index.html | 18 ++-- fet2020/templates/posts/show.html | 2 +- fet2020/templates/posts/tag.html | 1 - 6 files changed, 59 insertions(+), 71 deletions(-) delete mode 100644 fet2020/templates/members/show.html diff --git a/fet2020/templates/home.html b/fet2020/templates/home.html index cd5d3f09..07fffbcf 100644 --- a/fet2020/templates/home.html +++ b/fet2020/templates/home.html @@ -6,62 +6,60 @@
-
-{% with post=featured_post %} - -
-
-
-
-

{{post.public_date}}

-
-
-

{{post.title| safe}}

-

{{post.subtitle | safe}}

-
+
+ {% with post=featured_post %} + +
+
+
+
+

{{post.public_date}}

+
+ +
+

{{post.title| safe}}

+

{{post.subtitle | safe}}

+
+
+
+ + {% endwith %} +
-
-
- - {% endwith %} -
+
-
+

Neuigkeiten

 +
+ {% with post=featured_post %} + {% include 'posts/partials/_article_row.html' %} + {% endwith %} + {% for post in featured_meeting %} + {% include 'posts/partials/_meeting_row.html' %} + {% endfor %} +
-

Neuigkeiten

- -
- {% with post=featured_post %} - {% include 'posts/partials/_article_row.html' %} - {% endwith %} - {% for post in featured_meeting %} - {% include 'posts/partials/_meeting_row.html' %} - {% endfor %} -
- -
+
-
- {{ tags_list|tags_to_url }} -
- - -
-
- {% for post in posts %} - {% include 'posts/partials/_posts_hero.html' %} - {% endfor %} +
+ {{ tags_list|tags_to_url }}
-
- {% for post in events %} - {% include 'posts/partials/_date_box.html' %} - {% endfor %} + +
+
+ {% for post in posts %} + {% include 'posts/partials/_posts_hero.html' %} + {% endfor %} +
+
+ {% for post in events %} + {% include 'posts/partials/_date_box.html' %} + {% endfor %} + +
-
- -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/fet2020/templates/members/partials/_job_membership_grid.html b/fet2020/templates/members/partials/_job_membership_grid.html index fe2bc2d0..1cd9683d 100644 --- a/fet2020/templates/members/partials/_job_membership_grid.html +++ b/fet2020/templates/members/partials/_job_membership_grid.html @@ -1,11 +1,11 @@
{% for mem in job_memberships %} - {% with member=mem.member %} + {% with member=mem.member %}
-

{{mem.member.surname}}

- {% include 'members/partials/_member.html' %} -

{{mem.get_job_role_display}} ({{mem.job_start|date}} - {{mem.job_end|date}})

+

{{mem.member.surname}}

+ {% include 'members/partials/_member.html' %} +

{{mem.get_job_role_display}} ({{mem.job_start|date}} - {{mem.job_end|date}})

- {%endwith %} + {% endwith %} {% endfor %}
\ No newline at end of file diff --git a/fet2020/templates/members/show.html b/fet2020/templates/members/show.html deleted file mode 100644 index 6842361c..00000000 --- a/fet2020/templates/members/show.html +++ /dev/null @@ -1,5 +0,0 @@ -{% extends 'layout.html' %} - -{% block content %} -Memeber -{% endblock %} diff --git a/fet2020/templates/posts/index.html b/fet2020/templates/posts/index.html index 9043926b..dd5c4e0f 100644 --- a/fet2020/templates/posts/index.html +++ b/fet2020/templates/posts/index.html @@ -3,16 +3,12 @@ {% block content %}
- - -
-
- {% for post in posts %} - {% include 'posts/partials/_posts_hero.html' %} - {% endfor %} - - +
+
+ {% for post in posts %} + {% include 'posts/partials/_posts_hero.html' %} + {% endfor %} +
-
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/fet2020/templates/posts/show.html b/fet2020/templates/posts/show.html index d8053268..7b73d2cb 100644 --- a/fet2020/templates/posts/show.html +++ b/fet2020/templates/posts/show.html @@ -86,4 +86,4 @@ {% endfor %}
-{% endblock %}fffsdfag \ No newline at end of file +{% endblock %} \ No newline at end of file diff --git a/fet2020/templates/posts/tag.html b/fet2020/templates/posts/tag.html index f518f382..d3a4d828 100644 --- a/fet2020/templates/posts/tag.html +++ b/fet2020/templates/posts/tag.html @@ -1,6 +1,5 @@ {% extends 'layout.html' %} {% load post_helpers %} -{% load thumbnail %} {% block content %} {% if featured_post != None %} {% with post=featured_post %} From ea2efe31f1ce437d38719f1b3d35fac9b752f54f Mon Sep 17 00:00:00 2001 From: Patrick Date: Thu, 10 Sep 2020 06:42:59 +0000 Subject: [PATCH 2/3] make master pep8-ready again --- fet2020/posts/models.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/fet2020/posts/models.py b/fet2020/posts/models.py index 857d37f8..fad52d39 100644 --- a/fet2020/posts/models.py +++ b/fet2020/posts/models.py @@ -6,17 +6,12 @@ from django.utils import timezone from django.utils.text import slugify from django.utils.translation import gettext_lazy as _ from taggit.managers import TaggableManager -import logging -request_logger = logging.getLogger('django.request') -# import documents from documents import ep from .managers import ( PostManager, ArticleManager, NewsManager, AllEventManager, EventManager, FetMeetingManager ) -# from ckeditor_uploader import RichTextUploadingField -# import uuid import re from rest_framework import serializers @@ -24,6 +19,7 @@ from datetime import timedelta import logging logger = logging.getLogger('posts') +request_logger = logging.getLogger('django.request') class Category(models.Model): @@ -101,12 +97,13 @@ class Post(models.Model): def get_tags(self): """Returns assigned tags as a comma seperated list.""" return ",".join(self.tags.names()) + @property def agenda_html(self): return "

Agenda

" - #@agenda_html.setter - #def agenda_html_set(self, value): + # @agenda_html.setter + # def agenda_html_set(self, value): # return value @property def get_tagnames(self): @@ -160,7 +157,7 @@ class Post(models.Model): if self.has_protocol: self.protocol_key = ep.createPadifNotExists(self.slug + "-protocol") request_logger.info(self.post_type) - + super().save(*args, **kwargs) self.tags.set( @@ -187,8 +184,9 @@ class PostSerializer(serializers.HyperlinkedModelSerializer): 'image', 'event_start', 'event_end', - 'is_hidden', 'agenda_html' - # 'author'#, + 'is_hidden', + 'agenda_html', + # 'author', ] From 72b4b7d982139cd76d2d5389e7b906097d75a0c0 Mon Sep 17 00:00:00 2001 From: Patrick Date: Thu, 10 Sep 2020 06:43:35 +0000 Subject: [PATCH 3/3] fix master (fix thunbnail url) --- fet2020/posts/views.py | 8 ++++++++ fet2020/templates/posts/tag.html | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/fet2020/posts/views.py b/fet2020/posts/views.py index a57dc68e..4c65f118 100644 --- a/fet2020/posts/views.py +++ b/fet2020/posts/views.py @@ -48,8 +48,16 @@ def tags(request, tag=""): (job_names[idx], active_members[idx], tag + "#" + slug_list[idx]) ) + author_image = None + if featured_post: + post_author = Member.all_members.filter(nickname=featured_post.author).first() + + if post_author: + author_image = post_author.image['avatar'].url + context = { "posts": posts, + "author_image": author_image, "featured_post": featured_post, "members": members, "tags_list": None, diff --git a/fet2020/templates/posts/tag.html b/fet2020/templates/posts/tag.html index d3a4d828..7c773635 100644 --- a/fet2020/templates/posts/tag.html +++ b/fet2020/templates/posts/tag.html @@ -16,7 +16,7 @@ {{post.subtitle | tags_to_url }} {% if post.author_member != None %}
- + {{post.author}}
{% else %}