shiftregister/app/templates/shift.html

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

shiftregister/core/templates/base.html

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

shiftregister/team/templates/shift_detail.html

@@ -4,17 +4,10 @@
 
 {% 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="description">
+<div class="content">
-        <strong>Zusatzinfo:</strong>
+    <em>{{ shift.description|linebreaksbr }}</em>
-        <p>{{ shift.description|linebreaksbr }}</p>
+</div>
-    </div>
 {% endif %}
 {% if shift.shiftregistration_set.all %}
 <h5 class="subtitle">Helfer*innen</h5>