merged

fet2020/templates/admin/change_form.html

@@ -0,0 +1,6 @@
+{% extends "admin/change_form.html" %}
+{% load i18n admin_urls %}
+
+{% block form_top %}
+{% if help_text %}<p>{{ help_text }}</p>{% endif %}
+{% endblock %}

fet2020/templates/admin/submit_line.html

@@ -0,0 +1,7 @@
+{% extends "admin/submit_line.html" %}
+{% load i18n admin_urls %}
+
+{% block submit-row %}
+    <a href="{% url opts|admin_urlname:'changelist' %}" class="closelink">{% trans 'Close' %}</a>
+    {{ block.super }}
+{% endblock %}

fet2020/templates/home.html

@@ -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>

fet2020/templates/members/index.html

@@ -11,34 +11,38 @@
         <a id="members" data-toggle="tab" href="/members/A">Aktive Mitglieder</a>
         <a id="members" data-toggle="tab" href="/members/P">Inaktive Mitglieder</a>
         {% for job in job_group %}
-        <a id="jobs-{{job.id}}" data-toggle="tab" href="/members/jobs/{{job.slug}}">{{job.name}}</a>
+        <a id="jobs-{{job.slug}}" data-toggle="tab" href="/members/jobs/{{job.slug}}">{{job.name}}</a>
         {% endfor %}
     </ul>
 
     <!-- Tab panes -->
     <div class="tab-content" id="nav-tabContent">
 
+        {% for mem in member %}
+            {% with member=mem %}
+            {% include 'members/partials/_member_details.html' %}
+            {% endwith %}
+        {% endfor %}
+
         <div id="members" class="tab-pane fade in active">
-            {% if members == None %}
-            {% else %}
+            {% if members is not None %}
                 {% include 'members/members_list.html' %}
             {% endif %}
         </div>
 
-        <div id="jobs-{{job.id}}" class="tab-pane">
-            {% if members is None %}
+        {% for job in job_list %}
+            <div id="jobs-{{job.slug}}" class="tab-pane">
+            <div class="grid-container">
 
-                {% for job in job_list %}
-                    {% if job_list|length > 1 %}
-                        <h2>{{job.0}}</h2>
-                    {% endif %}
-                    {% with active_members=job.1 inactive_members=job.2 %}
-                    {% include 'members/jobs_list.html' %}
-                    {% endwith %}
-                {% endfor %}
+                {% if job_list|length > 1 %}
+                    <h2>{{job.0}}</h2>
+                {% endif %}
+                {% with active_members=job.1 inactive_members=job.2 %}
+                {% include 'members/jobs_list.html' %}
+                {% endwith %}
 
-            {% endif %}
-        </div>
+            </div>
+        {% endfor %}
     </div>
 
 </div>

fet2020/templates/members/jobs_list.html

@@ -1,6 +1,4 @@
 
-<div class="grid-container">
-
 Aktuelle Mitglieder: {{active_members.count}}
 <div class="grid-x">
     {% for mem in active_members %}

fet2020/templates/members/members_list.html

@@ -1,6 +1,5 @@
 
 <div class="grid-container">
-    <h1> Mitarbeiter Liste </h1>
     <h2> Grid Style</h2>
     <div class="grid-x">
     {% for member in members %}
@@ -16,11 +15,4 @@
         {% include 'members/partials/_member.html' %}
     {% endfor %}
     </div>
-
-    <h2>Detail List</h2>
-    <div class="grid-container">
-    {% for member in members %}
-        {% include 'members/partials/_member_details.html' %}
-    {% endfor %}
-    </div>
 </div>

fet2020/templates/members/partials/_member.html

@@ -2,7 +2,7 @@
 
 {# only thumb and name of member #}
 {% load thumbnail %}
-<a class="thumbnail member-thumb" style="width:150px;height:150px">
-{% if member.image %}<img src="{{member.image | thumbnail_url:'thumb'}}" />{% endif %}
+<a class="thumbnail member-thumb" href="/members/member/{{member.nickname}}" style="width:150px;height:150px">
+    <img src="{{member.image.thumb.url}}" alt="" />
 <div class="thumb-layer"><div><h1>{{member.nickname}}</h1> <p>{{member.firstname}} {{member.surname}}</p></div></div>
 </a>

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="">

fet2020/templates/posts/show.html

@@ -16,9 +16,12 @@
           <div class="article-details">
           {{post.subtitle | tags_to_url }}
           {% if post.username != None %}
-            <div class="article-author">
+            <div class="arti
               <img src="{{post.username.image | thumbnail_url:'avatar'}}" alt="" />
               <a href="{% url 'member' post.username.nickname %}">{{post.username.nickname}}</a>
+              <img src="{{author_image}}" alt="" />
+              <a href="/members/member/{{post.author}}">{{post.author}}</a>
+
             </div>
             {% endif  %}