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 %} - - - - {% 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 %}