From 37dff3b310418c7dd7ba71ca7ed1de978d93a086 Mon Sep 17 00:00:00 2001
From: peter <pet@fet.at>
Date: Thu, 27 Aug 2020 20:01:24 +0000
Subject: [PATCH] calendar is now only future events; posts include members and
 images

---
 fet2020/fet2020/views.py                        |  2 +-
 fet2020/members/views.py                        |  2 +-
 fet2020/posts/models.py                         |  2 +-
 fet2020/posts/views.py                          | 11 ++++++++++-
 fet2020/templates/home.html                     |  8 ++++----
 fet2020/templates/members/partials/_member.html |  2 +-
 fet2020/templates/posts/partials/_date_box.html |  2 +-
 fet2020/templates/posts/show.html               |  4 ++--
 8 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/fet2020/fet2020/views.py b/fet2020/fet2020/views.py
index 4e020e00..cae104b9 100644
--- a/fet2020/fet2020/views.py
+++ b/fet2020/fet2020/views.py
@@ -20,7 +20,7 @@ def index(request):
 
     context = {
         'posts': posts,
-        'events': Event.objects.order_by("-event_start").all(),
+        'events': Event.objects.get_all_events(),
         'featured_post': featured_post,
         'featured_post2': FetMeeting.objects.first(),
         'tags_list': ", ".join(t)
diff --git a/fet2020/members/views.py b/fet2020/members/views.py
index 746d6b22..0358a367 100644
--- a/fet2020/members/views.py
+++ b/fet2020/members/views.py
@@ -70,7 +70,7 @@ def profile_view(request, member_name=None):
     job_group = deque(JobGroup.objects.all())
     member = None
 
-    member = deque(Member.all_members.filter(mailaccount=member_name))
+    member = deque(Member.all_members.filter(nickname=member_name))
 
     context = {
         "job_group": job_group,
diff --git a/fet2020/posts/models.py b/fet2020/posts/models.py
index c818d27f..87014f8b 100644
--- a/fet2020/posts/models.py
+++ b/fet2020/posts/models.py
@@ -61,7 +61,7 @@ class EventManager(models.Manager):
         return super().get_queryset().filter(
             Q(is_event=True)
             & Q(event_start__gt=date_today)
-        ).order_by('-public_date')
+        ).order_by('-event_start')
 
 
 class FetMeetingManager(models.Manager):
diff --git a/fet2020/posts/views.py b/fet2020/posts/views.py
index f0124de8..bcb70255 100644
--- a/fet2020/posts/views.py
+++ b/fet2020/posts/views.py
@@ -41,11 +41,20 @@ def show(request, id=None):
     elif id != "" and id is not None:
         p = Post.objects.get(slug=(id))
 
+    from members.models import Member
+    from easy_thumbnails.files import get_thumbnailer
+    
+
+    #post_author = p.author
+    post_author = Member.all_members.filter(nickname=p.author)
+    post_author_thumb_url = get_thumbnailer(post_author[0].image)['thumb'].url 
+
     context = {
         "post": p,
         "next": get_next_dict().get(p.slug, None),
         "related_posts": p.tags.similar_objects(),
-        "ep_link": get_pad_link(p.slug + "-agenda")
+        "ep_link": get_pad_link(p.slug + "-agenda"),
+        "author_image": post_author_thumb_url
     }
     response = render(request, 'posts/show.html', context)
     response.set_cookie("HelloWorld", "TestWert", domain="https://etherpad2.2020.fet.at")
diff --git a/fet2020/templates/home.html b/fet2020/templates/home.html
index 049e80cf..062fa43b 100644
--- a/fet2020/templates/home.html
+++ b/fet2020/templates/home.html
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+func{% extends 'layout.html' %}
 {% load post_helpers %}
 {% load static %}
 {% block content %}
@@ -13,7 +13,7 @@
       <div class="news-hero-text" >
  <hr>
           <div class="article-date">
-            <p>Published on Jan 12, 2020 Just added now</p>
+            <p>{{post.public_date}}</p>
           </div>
           <div class="article-title">
             <h1>{{post.title| safe}}</h1>
@@ -55,8 +55,8 @@
         {% endfor %}
     </div>
     <div class="medium-4 small-12 small-order-1 medium-order-2 padding-1">
-            {% for post in events %}
-    {% include 'posts/partials/_date_box.html' %}
+        {% for post in events %}
+            {% include 'posts/partials/_date_box.html' %}
         {% endfor %}
 
     </div>
diff --git a/fet2020/templates/members/partials/_member.html b/fet2020/templates/members/partials/_member.html
index 428e9a97..5c70a9a6 100644
--- a/fet2020/templates/members/partials/_member.html
+++ b/fet2020/templates/members/partials/_member.html
@@ -2,7 +2,7 @@
 
 {# only thumb and name of member #}
 {% load thumbnail %}
-<a class="thumbnail member-thumb" href="/members/member/{{member.mailaccount}}" style="width:150px;height:150px">
+<a class="thumbnail member-thumb" href="/members/member/{{member.nickname}}" style="width:150px;height:150px">
 {% if member.image %}
     <img src="{{member.image | thumbnail_url:'thumb'}}" />
 {% endif %}
diff --git a/fet2020/templates/posts/partials/_date_box.html b/fet2020/templates/posts/partials/_date_box.html
index a57b8307..63b0adab 100644
--- a/fet2020/templates/posts/partials/_date_box.html
+++ b/fet2020/templates/posts/partials/_date_box.html
@@ -1,4 +1,4 @@
-        <a href ="">
+        <a href ="posts/{{post.slug}}">
             <div class="date-box">
             <span>
         <span class="date-badge badge primary" style="">
diff --git a/fet2020/templates/posts/show.html b/fet2020/templates/posts/show.html
index 9d06e77c..b89480eb 100644
--- a/fet2020/templates/posts/show.html
+++ b/fet2020/templates/posts/show.html
@@ -16,8 +16,8 @@
           <div class="article-details">
           {{post.subtitle | tags_to_url }}
             <div class="article-author">
-              <img src="https://unsplash.it/50/50?image=1005" alt="" />
-              <a href="#">Jane Austen</a>
+              <img src="{{author_image}}" alt="" style="width:80px;height:80px"/>
+              <a href="/members/member/{{post.author}}">{{post.author}}</a>
             </div>
             
             <div class="article-comments">