shiftregister/app/templates/partials/shift_detail_buttons.html

@@ -1,18 +0,0 @@
-{% if can_register and not shift.deleted %}
-    <form action="" method="post">
-        {% csrf_token %}
-        {{ shift_form.as_p }}
-        <input type="submit" class="button is-link" value="Anmelden">
-    </form>
-{% endif %}
-{% if is_registered and not shift.deleted %}
-{% if can_cancel %}
-    <form action="{% url 'cancel' shift.pk %}" method="post">
-        {% csrf_token %}
-        {{ shift_form.as_p }}
-        <input type="submit" class="button is-danger is-small" value="Abmelden">
-    </form>
-{% elif not shift.has_ended %}
-    <div class="content">Bitte wende dich an den Infopoint, falls du es nicht zu deiner Schicht schaffst.</div>
-{% endif %}
-{% endif %}

shiftregister/app/templates/shift.html

@@ -23,9 +23,6 @@
             <strong>Treffpunkt:</strong> {{ shift.room.meeting_location|linebreaksbr }}<br>
             <strong>Belegung:</strong> {{ shift.registration_count }}/{{ shift.required_helpers|default:shift.room.required_helpers }}
         </p>
-        {% if shift.room.description|length > 100 or shift.description|length > 100 %}
-            {% include 'partials/shift_detail_buttons.html'%}
-        {% endif %}
         {% if shift.room.description %}
             <div class="description">
                 <strong>Beschreibung:</strong>
@@ -39,6 +36,23 @@
             </div>
         {% endif %}
     </div>
-{% include 'partials/shift_detail_buttons.html'%}
+{% if can_register and not shift.deleted %}
+    <form action="" method="post">
+        {% csrf_token %}
+        {{ shift_form.as_p }}
+        <input type="submit" class="button is-link" value="Anmelden">
+    </form>
+{% endif %}
+{% if is_registered and not shift.deleted %}
+{% if can_cancel %}
+    <form action="{% url 'cancel' shift.pk %}" method="post">
+        {% csrf_token %}
+        {{ shift_form.as_p }}
+        <input type="submit" class="button is-danger is-small" value="Abmelden">
+    </form>
+{% elif not shift.has_ended %}
+    <div class="content">Bitte wende dich an den Infopoint, falls du es nicht zu deiner Schicht schaffst.</div>
+{% endif %}
+{% endif %}
 </div>
 {% endblock %}

shiftregister/team/templates/checkin_list.html

@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-{% load shift_extras %}
 
 {% block title %}{{ title }}{% endblock %}
 
@@ -11,28 +10,15 @@
             <th>Name</th>
             <th>Schicht</th>
             <th>Startzeit</th>
-            <th>Dauer</th>
             <th>Aktionen</th>
         </tr>
     </thead>
     <tbody>
 {% for reg in object_list %}
         <tr>
-            <td>
-                <a href="{% url 'team:helper' reg.helper.pk %}">
-                    {{ reg.helper.name }} ({{ reg.helper.phone|stringformat:"s"|slice:"-3:" }})
-                    {% if not reg.helper.asta_confirmed %}
-                        <span class="tag is-danger">AStA</span>
-                    {% endif %}
-                </a>
-            </td>
-            <td>
-                <span class="{{ reg.shift.event.calendar.needs_fallback|yesno:"is-underlined," }}">
-                    <a href="{% url 'team:shift_room' reg.shift.room.pk %}">{{ reg.shift.room }}</a>
-                </span>
-            </td>
+            <td>{{ reg.helper.name }} ({{ reg.helper.phone|stringformat:"s"|slice:"-3:" }})</td>
+            <td>{{ reg.shift.room }}</td>
 	    <td><a href="{% url 'team:shift' reg.shift.pk %}">{{ reg.shift.start_at }}</a></td>
-	    <td><a href="{% url 'team:shift' reg.shift.pk %}">{{ reg.shift.duration|duration }}</a></td>
             <td>
                 <a class="button is-success is-small" href="{% url 'team:checkin' reg.pk %}">Als angekommen markieren</a>
                 <a class="button is-danger is-small" href="{% url 'team:mark_as_failed' reg.pk %}">Nicht angetreten</a>

shiftregister/team/templates/partials/shift_box.html

@@ -3,7 +3,7 @@
 {% if shift.deleted %}
         <em>gelöscht</em><br>
 {% endif %}
-        <strong>Ort:</strong> <span class="{{ shift.event.calendar.needs_fallback|yesno:"is-underlined," }}">{{ shift.room.name }}</span><br>
+        <strong>Ort:</strong> {{ shift.room.name }}<br>
         <strong>Beginn:</strong> {{ shift.start_at }}<br>
         <strong>Dauer:</strong> {{ shift.duration }}<br>
         <strong>Belegung:</strong> {{ shift.registration_count }}/{{ shift.required_helpers|default:shift.room.required_helpers }}