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

update and simplify members

Browse Source
This commit is contained in:
Patrick Mayr
2022-01-20 12:19:43 +00:00
committed by root
parent 55d0276f3c
commit 0015b1f534
11 changed files with 157 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,39 +41,11 @@
</div>
<ul class="sideBarNav">
{% for job in pinned_job_groups %}
<li class="{% if job.slug in request.path %}active{% endif %}">
<a href="{% url 'jobs' job.slug %}">{{ job.name }}</a>
</li>
{% if job.slug in job_members.0.job.job_group.slug %}
{% regroup job_members by job.name as all_jobmem_list %}
<ul id="scrollspy-subNav">
{% for jobmem in all_jobmem_list %}
<li class="{% if jobmem.grouper %}active{% endif %}">
<a href="#{{ jobmem.list.0.job.slug }}">{{ jobmem.grouper }}</a>
</li>
{% endfor %}
</ul>
{% endif %}
{% include 'members/partials/_jobs_side_bar.html' %}
{% endfor %}
{% for job in unpinned_job_groups %}
<li class="{% if job.slug in request.path %}active{% endif %}">
<a href="{% url 'jobs' job.slug %}">{{ job.name }}</a>
</li>
{% if job.slug in job_members.0.job.job_group.slug %}
{% regroup job_members by job.name as all_jobmem_list %}
<ul id="scrollspy-subNav">
{% for jobmem in all_jobmem_list %}
<li class="{% if jobmem.grouper %}active{% endif %}">
<a href="#{{ jobmem.list.0.job.slug }}">{{ jobmem.grouper }}</a>
</li>
{% endfor %}
</ul>
{% endif %}
{% include 'members/partials/_jobs_side_bar.html' %}
{% endfor %}
<hr class="">
@@ -87,26 +59,12 @@
</li>
{% if request.user.is_authenticated %}
{% if pinned_job_groups%}
{% for job in pinned_job_groups %}
{% if job.slug in request.path %}
<li class="internalLI">
<a href="{% url 'admin:members_jobgroup_change' job.id %}">
<i class="fa-regular fa-pen-to-square mr-1"></i>{{ job.name|softhyphen|safe }} bearbeiten
</a>
</li>
{% endif %}
{% endfor %}
{% elif unpinned_job_groups %}
{% for job in unpinned_job_groups %}
{% if job.slug in request.path %}
<li class="internalLI">
<a href="{% url 'admin:members_jobgroup_change' job.id %}">
<i class="fa-regular fa-pen-to-square mr-1"></i>{{ job.name|softhyphen|safe }} bearbeiten
</a>
</li>
{% endif %}
{% endfor %}
{% if active_job_group %}
<li class="internalLI">
<a href="{% url 'admin:members_jobgroup_change' active_job_group.id %}">
<i class="fa-regular fa-pen-to-square mr-1"></i>{{ active_job_group.name|softhyphen|safe }} bearbeiten
</a>
</li>
{% endif %}
{% if fs_info %}
@@ -143,39 +101,23 @@
</aside>
<section class="flex-grow max-w-prose my-8 sm:my-0">
{% if description %}
<div class="db-page-content">
{{ description|safe }}
</div>
{% endif %}
{% if member %}
<!-- show details of a member -->
{% block members_content %}
{% block member_content %}
{% endblock %}
{% endif %}
{% if members %}
<!-- show all, active or pension members -->
{% if fs_info %}
<div class="db-page-content">
{{ fs_info.content|safe }}
</div>
{% endif %}
<article class="members-article">
<div class="members-listing">
{% for member in members %}
{% include 'members/partials/_member.html' %}
{% endfor %}
</div>
</article>
<!-- show all, active or pension members -->
{% block members_content %}
{% endblock %}
{% endif %}
<div>
<!-- show job lists in a job group -->
{% include 'members/jobs_list.html' %}
</div>
{% if job_members %}
<!-- show job lists in a job group -->
{% block jobs_content %}
{% endblock %}
{% endif %}
</section>
</div>
</main>