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

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

@ -21,12 +21,16 @@
<strong>Treffpunkt:</strong> {{ shift.room.meeting_location|linebreaksbr }}
</p>
{% if shift.room.description %}
<div class="description">
<strong>Beschreibung:</strong>
<p>{{ shift.room.description|linebreaksbr }}</p>
<p>{{ shift.room.description|linebreaksbr|safe }}</p>
</div>
{% endif %}
{% if shift.description %}
<div class="description">
<strong>Zusatzinfo:</strong>
<p>{{ shift.description|linebreaksbr }}</p>
</div>
{% endif %}
</div>
{% if can_register and not shift.deleted %}

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

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

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

@ -4,9 +4,16 @@
{% 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>
{% if shift.room.description %}
<div class="description">
<strong>Beschreibung:</strong>
<p>{{ shift.room.description|safe|linebreaksbr }}</p>
</div>
{% endif %}
{% if shift.description %}
<div class="content">
<em>{{ shift.description|linebreaksbr }}</em>
<div class="description">
<strong>Zusatzinfo:</strong>
<p>{{ shift.description|linebreaksbr }}</p>
</div>
{% endif %}
{% if shift.shiftregistration_set.all %}