bofh/fet2020
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merged

Browse Source
This commit is contained in:
Andreas Stephanides
2020-09-13 08:22:45 +00:00
parent c0285001d5
commit 0b05b7d513
8 changed files with 73 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
fet2020/templates/home.html
View File

@@ -6,62 +6,60 @@
<div class="grid-x">
<div class="medium-8 small cell" style="background: grey">
{% with post=featured_post %}
<a href="{{post.url}}">
<div class="news-hero-large"style="background-image: url('{{post.imageurl}}');)">
<div class="news-hero-text" >
<hr>
<div class="article-date">
<p>{{post.public_date}}</p>
</div>
<div class="article-title">
<h1>{{post.title| safe}}</h1>
<p>{{post.subtitle | safe}}</p>
</div>
<div class="medium-8 small cell" style="background: grey">
{% with post=featured_post %}
<a href="{{post.url}}">
<div class="news-hero-large"style="background-image: url('{{post.imageurl}}');)">
<div class="news-hero-text" >
<hr>
<div class="article-date">
<p>{{post.public_date}}</p>
</div>
<div class="article-title">
<h1>{{post.title| safe}}</h1>
<p>{{post.subtitle | safe}}</p>
</div>
</div>
</div>
</a>
{% endwith %}
</div>
</div>
</div>
</a>
{% endwith %}
</div>
<div class="medium-4 responsive-side-box cell">
<div class="medium-4 responsive-side-box cell">
<a href="{% url 'posts.index' %}"><h1>Neuigkeiten</h1></a>
<div class="article-row-section">
{% with post=featured_post %}
{% include 'posts/partials/_article_row.html' %}
{% endwith %}
{% for post in featured_meeting %}
{% include 'posts/partials/_meeting_row.html' %}
{% endfor %}
</div>
<a href="{% url 'posts.index' %}"><h1>Neuigkeiten</h1>
</a>
<div class="article-row-section">
{% with post=featured_post %}
{% include 'posts/partials/_article_row.html' %}
{% endwith %}
{% for post in featured_meeting %}
{% include 'posts/partials/_meeting_row.html' %}
{% endfor %}
</div>
</div>
</div>
</div>
<div class="grid-container">
<div class="grid-x grid-padding-x padding-top-1">
{{ tags_list|tags_to_url }}
</div>
<div class="grid-x grid-x-padding">
<div class="medium-8 small-12 small-order-2 medium-order-1"">
{% for post in posts %}
{% include 'posts/partials/_posts_hero.html' %}
{% endfor %}
<div class="grid-x grid-padding-x padding-top-1">
{{ tags_list|tags_to_url }}
</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' %}
{% endfor %}
<div class="grid-x grid-x-padding">
<div class="medium-8 small-12 small-order-2 medium-order-1"">
{% for post in posts %}
{% include 'posts/partials/_posts_hero.html' %}
{% 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' %}
{% endfor %}
</div>
</div>
</div>
</div>
{% endblock %}
{% endblock %}

10
fet2020/templates/members/partials/_job_membership_grid.html
View File

@@ -1,11 +1,11 @@
<div class="grid-x">
{% for mem in job_memberships %}
{% with member=mem.member %}
{% with member=mem.member %}
<div class="medium-3 large-2 small-6 cell">
<h2>{{mem.member.surname}}</h2>
{% include 'members/partials/_member.html' %}
<h2>{{mem.get_job_role_display}} ({{mem.job_start|date}} - {{mem.job_end|date}})</h2>
<h2>{{mem.member.surname}}</h2>
{% include 'members/partials/_member.html' %}
<h2>{{mem.get_job_role_display}} ({{mem.job_start|date}} - {{mem.job_end|date}})</h2>
</div>
{%endwith %}
{% endwith %}
{% endfor %}
</div>

5
fet2020/templates/members/show.html
View File

@@ -1,5 +0,0 @@
{% extends 'layout.html' %}
{% block content %}
Memeber
{% endblock %}

18
fet2020/templates/posts/index.html
View File

@@ -3,16 +3,12 @@
{% block content %}
<div class="grid-container">
<div class="grid-x">
<div class="medium-8 cell">
{% for post in posts %}
{% include 'posts/partials/_posts_hero.html' %}
{% endfor %}
<div class="grid-x">
<div class="medium-8 cell">
{% for post in posts %}
{% include 'posts/partials/_posts_hero.html' %}
{% endfor %}
</div>
</div>
</div>
</div>
{% endblock %}
{% endblock %}

2
fet2020/templates/posts/show.html
View File

@@ -91,4 +91,4 @@
{% endfor %}
</div>
</div>
{% endblock %}fffsdfag
{% endblock %}

3
fet2020/templates/posts/tag.html
View File

@@ -1,6 +1,5 @@
{% extends 'layout.html' %}
{% load post_helpers %}
{% load thumbnail %}
{% block content %}
{% if featured_post != None %}
{% with post=featured_post %}
@@ -17,7 +16,7 @@
{{post.subtitle | tags_to_url }}
{% if post.author_member != None %}
<div class="article-author"><a href="{% url 'member' post.author_member.nickname %}">
<img src="{{post.author_member.image | thumbnail_url:'avatar'}}" alt="" />
<img src="{{author_image}}" alt="" />
{{post.author}}</a>
</div>
{% else %}