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

update member view

Browse Source
This commit is contained in:
Patrick Mayr
2020-11-24 20:31:06 +00:00
parent b6847ab9fa
commit e0adc53dd3
7 changed files with 51 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
fet2020/templates/members/index.html
View File

@@ -23,19 +23,23 @@
<div class="grid-x grid-padding-x padding-top-1">
{% for job in pinned_job_groups %}
<div class="cell large-2 medium-4 small-6"><a class="button {% if job.slug in request.path %} active {% endif %}" style="width: 100%;" href="/members/jobs/{{job.slug}}">{{job.name}}</a></div>
<div class="cell large-2 medium-4 small-6">
<a class="button expanded {% if job.slug in request.path %} active {% endif %}" href="/members/jobs/{{job.slug}}">
{{job.name}}
</a>
</div>
{% endfor %}
{% for job in unpinned_job_groups %}
<div class="cell large-2 medium-4 small-6">
<a class="button {% if job.slug in request.path %} active {% endif %}" style="width: 100%;" href="/members/jobs/{{job.slug}}">
<a class="button expanded {% if job.slug in request.path %} active {% endif %}" href="/members/jobs/{{job.slug}}">
{{ job.name|softhyphen|safe }}
</a>
</div>
{% endfor %}
<div class="cell large-2 medium-4 small-6"><a class="button memb {% if '/members/' == request.path %} active {% endif %}" style="width: 100%;" href="/members">Alle Mitglieder</a></div>
<div class="cell large-2 medium-4 small-6"><a class="button memb {% if '/members/P' == request.path %} active {% endif %}" style="width: 100%;" href="/members/P">Pension Mitglieder</a></div>
<div class="cell large-2 medium-4 small-6"><a class="button memb expanded {% if '/members/P' == request.path %} active {% endif %}" href="/members/P">Pension</a></div>
<div class="cell large-2 medium-4 small-6"><a class="button memb expanded {% if '/members/' == request.path %} active {% endif %}" href="/members">Alle Mitglieder</a></div>
</div>
@@ -72,20 +76,16 @@
{% for jobmem in all_jobmem_list %}
<div class="padding-top-1 padding-left-1 padding-bottom-1 padding-right-1" style="background-color: white;">
<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">
<div class="grid-x align-bottom">
{% for jm in jobmem.list %}
{% with member=jm.member %}
<div class="medium-3 large-2 small-6 cell">
<h2>{{member.firstname}} {{member.surname}}</h2>
{% include 'members/partials/_member.html' %}
{{jm.get_job_role_display}} ({{jm.job_start|date}} - {{jm.job_end|date}})
</div>
{% include 'members/partials/_job_membership_grid.html' %}
{% endwith %}
{% endfor %}

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

@@ -1,7 +1,7 @@
<div class="grid-x">
<div class="grid-x align-bottom">
{% for member in members %}
<div class="cell large-2 medium-3 small-6">
<div class="cell large-2 medium-3 small-6 padding-right-1">
<h2>{{member.firstname}} {{member.surname}}</h2>
{% include 'members/partials/_member.html' %}
</div>

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

@@ -1,11 +1,15 @@
<div class="grid-x">
{% for mem in job_memberships %}
{% with member=mem.member %}
<div class="medium-3 large-2 small-6 cell">
<h2>{{member.firstname}} {{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 %}
{% endfor %}
</div>
{% load i18n %}
<div class="cell medium-3 large-2 small-6 padding-right-1 padding-bottom-1">
<h2>{{member.firstname}} {{member.surname}}</h2>
{% include 'members/partials/_member.html' %}
<br>
{{ jm.get_job_role_display }}<br>
({{ jm.job_start|date }} -
{% if jm.job_end %}
{{ jm.job_end|date }})<br>
{% else %}
)<br><br>
{% endif %}
</div>

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

@@ -4,7 +4,6 @@
<div class="thumb-layer">
<div>
<h1>{{member.nickname}}</h1>
<p>{{member.firstname}} {{member.surname}}</p>
</div>
</div>
</a>