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

update member view (add jobs for each member, delete one grid style)

Browse Source
This commit is contained in:
Patrick Mayr
2020-09-05 09:51:47 +00:00
parent 992ddcced1
commit b578f7679c
6 changed files with 34 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fet2020/templates/members/jobs_list.html
View File

@@ -3,10 +3,11 @@ Aktuelle Mitglieder: {{active_members.count}}
<div class="grid-x">
{% for mem in active_members %}
<div class="medium-6 cell">
<h2>{{mem.get_job_role_display}} (seit {{mem.job_start}})</h2>
<h2>{{mem.member.surname}}</h2>
{% with member=mem.member %}
{% include 'members/partials/_member_details.html' %}
{% include 'members/partials/_member.html' %}
{% endwith %}
<h2>{{mem.get_job_role_display}} (seit {{mem.job_start}})</h2>
</div>
{% endfor %}
</div>
@@ -15,10 +16,11 @@ Vergangene Mitglieder: {{inactive_members.count}}
<div class="grid-x">
{% for mem in inactive_members %}
<div class="medium-6 cell">
<h2>{{mem.get_job_role_display}} ({{mem.job_start}} - {{mem.job_end}})</h2>
<h2>{{mem.member.surname}}</h2>
{% with member=mem.member %}
{% include 'members/partials/_member_details.html' %}
{% include 'members/partials/_member.html' %}
{% endwith %}
<h2>{{mem.get_job_role_display}} ({{mem.job_start}} - {{mem.job_end}})</h2>
</div>
{% endfor %}
</div>

9
fet2020/templates/members/members_list.html
View File

@@ -1,18 +1,11 @@
<div class="grid-container">
<h2> Grid Style</h2>
<div class="grid-x">
{% for member in members %}
<div class="medium-3 large-2 small-6 cell">
<h2>{{member.surname}}</h2>
{% include 'members/partials/_member.html' %}
</div>
{% endfor %}
</div>
<h2> Grid Style 2</h2>
<div class="grid-x">
{% for member in members %}
{% include 'members/partials/_member.html' %}
{% endfor %}
</div>
</div>

12
fet2020/templates/members/partials/_member.html
View File

@@ -1,8 +1,10 @@
{# only thumb and name of member #}
{% load thumbnail %}
<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>
<div class="thumb-layer">
<div>
<h1>{{member.nickname}}</h1>
<p>{{member.firstname}} {{member.surname}}</p>
</div>
</div>
</a>

31
fet2020/templates/members/partials/_member_details.html
View File

@@ -1,19 +1,20 @@
{# This template shows one member and all the details (that are ment for public) including a list of current jobs #}
{% load thumbnail %}
<div class="media-object">
<div class="media-object-section">
<div class="thumbnail">
<img src= "{{member.image.url}}" style="width:150px;">
<div class="media-object-section">
<div class="thumbnail">
<img src= "{{member.image.url}}" style="width:150px;">
</div>
</div>
<div class="media-object-section main-section">
<h1>{{member.firstname}} {{member.surname}}</h1>
<p>Spitzname: {{member.nickname}} </br>
Name: {{member.firstname}} {{member.surname}} </br>
Mailaccount: {{member.mailaccount}} </br>
Beschreibung: {{member.description|safe}} </br>
</p>
ehrenamtliche Tätigkeiten </br>
{% for jobm in jobs %}
{{jobm.job.name}}: {{jobm.job_start|date}} - {{jobm.job_end|date}} </br>
{% endfor %}
</div>
</div>
<div class="media-object-section main-section">
<h1>{{member.firstname}} {{member.surname}}</h1>
<p>Spitzname: {{member.nickname}} </br>
Name: {{member.firstname}} {{member.surname}} </br>
Mailaccount: {{member.mailaccount}} </br>
Beschreibung: {{member.description|safe}} </br>
</p>
</div>
</div>