kontakt
/
shiftregister
2
0
Fork 0
Code

Merge branch 'live'

This commit is contained in:
Florian Sorg 2023-05-07 01:18:02 +02:00
parent b897bed39c 5c60b5165e
commit 4c47546415
3 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
shiftregister/app/templates/shift.html
View File

@ -20,14 +20,18 @@
<strong>Dauer:</strong> {{ shift.duration }}<br> <strong>Dauer:</strong> {{ shift.duration }}<br>
<strong>Treffpunkt:</strong> {{ shift.room.meeting_location|linebreaksbr }} <strong>Treffpunkt:</strong> {{ shift.room.meeting_location|linebreaksbr }}
</p> </p>
{% if shift.room.description %} {% if shift.room.description %}
<strong>Beschreibung:</strong> <div class="description">
<p>{{ shift.room.description|linebreaksbr }}</p> <strong>Beschreibung:</strong>
{% endif %} <p>{{ shift.room.description|linebreaksbr|safe }}</p>
{% if shift.description %} </div>
<strong>Zusatzinfo:</strong> {% endif %}
<p>{{ shift.description|linebreaksbr }}</p> {% if shift.description %}
{% endif %} <div class="description">
<strong>Zusatzinfo:</strong>
<p>{{ shift.description|linebreaksbr }}</p>
</div>
{% endif %}
</div> </div>
{% if can_register and not shift.deleted %} {% if can_register and not shift.deleted %}
<form action="" method="post"> <form action="" method="post">

4
shiftregister/core/templates/base.html
View File

@ -27,6 +27,10 @@
--background: #fff; --background: #fff;
} }
.description {
margin-bottom: 1em;
}
.sticky-nav { .sticky-nav {
background-color: var(--background); background-color: var(--background);
margin: 0 -0.75rem; margin: 0 -0.75rem;

13
shiftregister/team/templates/shift_detail.html
View File

@ -4,10 +4,17 @@
{% block content %} {% block content %}
<h3 class="title is-spaced">{% if shift.deleted %}(gelöscht) {% endif %}{{ shift.room.name }} {{ shift.start_at }} ({{ shift.registration_count }}/{{ shift.required_helpers|default:shift.room.required_helpers }})</h3> <h3 class="title is-spaced">{% if shift.deleted %}(gelöscht) {% endif %}{{ shift.room.name }} {{ shift.start_at }} ({{ shift.registration_count }}/{{ shift.required_helpers|default:shift.room.required_helpers }})</h3>
{% if shift.room.description %}
<div class="description">
<strong>Beschreibung:</strong>
<p>{{ shift.room.description|safe|linebreaksbr }}</p>
</div>
{% endif %}
{% if shift.description %} {% if shift.description %}
<div class="content"> <div class="description">
<em>{{ shift.description|linebreaksbr }}</em> <strong>Zusatzinfo:</strong>
</div> <p>{{ shift.description|linebreaksbr }}</p>
</div>
{% endif %} {% endif %}
{% if shift.shiftregistration_set.all %} {% if shift.shiftregistration_set.all %}
<h5 class="subtitle">Helfer*innen</h5> <h5 class="subtitle">Helfer*innen</h5>