From bec731ea532252a8f4849eafa83fd0b9f4fa3f32 Mon Sep 17 00:00:00 2001
From: Patrick <patrick@fet.at>
Date: Thu, 26 Nov 2020 14:08:12 +0000
Subject: [PATCH] fix tag view

---
 fet2020/templates/members/index.html          | 22 +--------------
 fet2020/templates/members/jobs_list.html      | 28 +++++++++++--------
 .../partials/_job_membership_grid.html        |  3 +-
 fet2020/templates/posts/tag.html              | 25 +----------------
 4 files changed, 19 insertions(+), 59 deletions(-)

diff --git a/fet2020/templates/members/index.html b/fet2020/templates/members/index.html
index 7f62c9d0..2465ef3b 100644
--- a/fet2020/templates/members/index.html
+++ b/fet2020/templates/members/index.html
@@ -72,27 +72,7 @@
     {% endif %}
 
     <!-- show job lists in a job group -->
-    {% regroup job_members by job.name as all_jobmem_list %}
-
-    {% for jobmem in all_jobmem_list %}
-
-        <div class="padding-top-1 padding-left-1 padding-right-1" style="background-color: white;">
-
-            <h2>{{jobmem.grouper}}<a class="headerlink" href="#{{jobmem.list.0.job.slug}}" title="Permalink to {{jobmem.grouper}}"> #</a></h2>
-            <b>Aktuelle Mitglieder:</b>
-
-            <div class="grid-x align-bottom">
-
-                {% for jm in jobmem.list %}
-                    {% with member=jm.member %}
-                    {% include 'members/partials/_job_membership_grid.html' %}
-                    {% endwith %}
-                {% endfor %}
-
-            </div>
-        </div>
-
-    {% endfor %}
+    {% include 'members/jobs_list.html' %}
 
 </div>
 
diff --git a/fet2020/templates/members/jobs_list.html b/fet2020/templates/members/jobs_list.html
index db5acb90..114f2d4e 100644
--- a/fet2020/templates/members/jobs_list.html
+++ b/fet2020/templates/members/jobs_list.html
@@ -1,18 +1,22 @@
 
-{% if active_members %}
+{% regroup job_members by job.name as all_jobmem_list %}
 
-    <b>Aktuelle Mitglieder:</b>
-    {% with job_memberships=active_members %}
-        {% include 'members/partials/_job_membership_grid.html' %}
-    {% endwith %}
+{% for jobmem in all_jobmem_list %}
 
-{% endif %}
+    <div class="padding-top-1 padding-left-1 padding-right-1" style="background-color: white;">
 
-{% if inactive_members %}
+        <h2>{{jobmem.grouper}}<a class="headerlink" href="#{{jobmem.list.0.job.slug}}" title="Permalink to {{jobmem.grouper}}"> #</a></h2>
+        <b>Aktuelle Mitglieder:</b>
 
-    <b>Vergangene Mitglieder: </b>
-    {% with job_memberships=inactive_members %}
-        {% include 'members/partials/_job_membership_grid.html' %}
-    {% endwith %}
+        <div class="grid-x align-bottom">
 
-{% endif %}
+            {% for jm in jobmem.list %}
+                {% with member=jm.member %}
+                {% include 'members/partials/_job_membership_grid.html' %}
+                {% endwith %}
+            {% endfor %}
+
+        </div>
+    </div>
+
+{% endfor %}
\ No newline at end of file
diff --git a/fet2020/templates/members/partials/_job_membership_grid.html b/fet2020/templates/members/partials/_job_membership_grid.html
index ee3180d3..8ab289fc 100644
--- a/fet2020/templates/members/partials/_job_membership_grid.html
+++ b/fet2020/templates/members/partials/_job_membership_grid.html
@@ -1,6 +1,5 @@
-{% load i18n %}
 
-<div class="cell medium-3 large-2 small-6 padding-right-1 padding-bottom-1">
+<div class="cell medium-3 large-2 small-6 padding-right-1">
     <h2>{{member.firstname}} {{member.surname}}</h2>
     {% include 'members/partials/_member.html' %}
     <br>
diff --git a/fet2020/templates/posts/tag.html b/fet2020/templates/posts/tag.html
index 8b116fc7..f1b12fc3 100644
--- a/fet2020/templates/posts/tag.html
+++ b/fet2020/templates/posts/tag.html
@@ -38,30 +38,7 @@
 
 <div class="grid-container">
     <!-- show job lists in a job group -->
-    {% regroup job_members by job.name as all_jobmem_list %}
-
-    {% for jobmem in all_jobmem_list %}
-
-        <div class="padding-top-1 padding-left-1 padding-bottom-1 padding-right-1" style="background-color: white;">
-
-            <h2>{{jobmem.grouper}}<a class="headerlink" href="#{{jobmem.list.0.job.slug}}" title="Permalink to {{jobmem.grouper}}"> #</a></h2>
-            <b>Aktuelle Mitglieder:</b>
-
-            <div class="grid-x">
-
-                {% for jm in jobmem.list %}
-                    {% with member=jm.member %}
-                    <div class="medium-3 large-2 small-6 cell">
-                        <h2>{{jm.member.firstname}} {{jm.member.surname}}</h2>
-                        {% include 'members/partials/_member.html' %}
-                    </div>
-                    {% endwith %}
-                {% endfor %}
-
-            </div>
-        </div>
-
-    {% endfor %}
+    {% include 'members/jobs_list.html' %}
 
 </div>