From 78ac75423c842f9a273ecdeded43b7b08361cdca Mon Sep 17 00:00:00 2001
From: Luca <Luca@hackerspace-bamberg.de>
Date: Thu, 14 Apr 2022 03:05:05 +0200
Subject: [PATCH] Fix spelling and make spacing in templates more consistent

---
 shiftregister/app/templates/helper_base.html  | 12 +++---
 shiftregister/app/templates/register.html     |  8 ++--
 shiftregister/app/templates/shift.html        | 40 +++++++++----------
 shiftregister/app/templates/shiftlist.html    | 10 ++---
 .../app/templates/wait_confirmation.html      |  6 +--
 .../team/templates/helper_detail.html         | 10 ++---
 .../team/templates/shift_detail.html          |  8 ++--
 shiftregister/team/templates/shift_list.html  |  7 ++--
 .../team/templates/shift_overview.html        | 24 ++++++-----
 shiftregister/team/templates/team_base.html   |  9 +++--
 templates/base.html                           | 10 +++--
 11 files changed, 74 insertions(+), 70 deletions(-)

diff --git a/shiftregister/app/templates/helper_base.html b/shiftregister/app/templates/helper_base.html
index fc19041..feb6e2a 100644
--- a/shiftregister/app/templates/helper_base.html
+++ b/shiftregister/app/templates/helper_base.html
@@ -2,12 +2,12 @@
 
 {% block title %}Help!{% endblock %}
 {% block body %}
-{% if helper%}
-Hallo {{helper.name}}
-{%else%}
-<a href="{%url 'register'%}">Anmelden</a>
-{%endif%}
+{% if helper %}
+Hallo {{ helper.name }}
+{% else %}
+<a href="{% url 'register' %}">Anmelden</a>
+{% endif %}
 <div id="content">
     {% block content %}{% endblock %}
 </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/shiftregister/app/templates/register.html b/shiftregister/app/templates/register.html
index 8e91ff8..fd81ef8 100644
--- a/shiftregister/app/templates/register.html
+++ b/shiftregister/app/templates/register.html
@@ -4,8 +4,8 @@
 {% block content %}
 <form action="" method="post">
     {% csrf_token %}
-{{form.as_p}}
-<p>Wir nutzen deine Handynummer um dir Benachrictigungen zu deinen Schichten zu schicken. Wir loeschen alle Daten 7 Tage nach dem Festival.</p>
-<input type="submit" value="Anmelden">
+    {{ form.as_p }}
+    <p>Wir nutzen deine Handynummer, um dir Benachrichtigungen zu deinen Schichten zu schicken. Wir löschen alle Daten 7 Tage nach dem Festival.</p>
+    <input type="submit" value="Anmelden">
 </form>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/shiftregister/app/templates/shift.html b/shiftregister/app/templates/shift.html
index e22f991..d32f73b 100644
--- a/shiftregister/app/templates/shift.html
+++ b/shiftregister/app/templates/shift.html
@@ -2,28 +2,28 @@
 
 {% block title %}Schichtansicht{% endblock %}
 {% block content %}
-{%if is_registered%}
+{% if is_registered %}
 <div>Du bist zu dieser Schicht angemeldet</div>
-{%endif%}
-Ort: {{shift.room.name}}<br>
-Start: {{shift.start_at}}<br>
-Dauer: {{shift.duration}}<br>
-{%if can_register%}
+{% endif %}
+Ort: {{ shift.room.name }}<br>
+Start: {{ shift.start_at }}<br>
+Dauer: {{ shift.duration }}<br>
+{% if can_register %}
 <form action="" method="post">
     {% csrf_token %}
-{{shift_form.as_p}}
-<input type="submit" value="Anmelden">
+    {{ shift_form.as_p }}
+    <input type="submit" value="Anmelden">
 </form>
-{%endif%}
-{% if is_registered%}
-{% if can_cancel %}
-<form action="{%url 'cancel' shift.pk%}" method="post">
-    {% csrf_token %}
-{{shift_form.as_p}}
-<input type="submit" value="Abmelden">
-</form>
-{%else%}
-Bitte wende dich an den Infopoint falls du es nicht zu deiner Schicht schaffst.
-{%endif%}
 {% endif %}
-{% endblock %}
\ No newline at end of file
+{% if is_registered %}
+{% if can_cancel %}
+<form action="{% url 'cancel' shift.pk %}" method="post">
+    {% csrf_token %}
+    {{ shift_form.as_p }}
+    <input type="submit" value="Abmelden">
+</form>
+{% else %}
+Bitte wende dich an den Infopoint, falls du es nicht zu deiner Schicht schaffst.
+{% endif %}
+{% endif %}
+{% endblock %}
diff --git a/shiftregister/app/templates/shiftlist.html b/shiftregister/app/templates/shiftlist.html
index 68447e2..3e6360c 100644
--- a/shiftregister/app/templates/shiftlist.html
+++ b/shiftregister/app/templates/shiftlist.html
@@ -4,20 +4,20 @@
 {% block content %}
 {% if current_shift %}
 <h2>Aktuelle Schicht</h2>
-{{current_shift.shift.room.name }} {{current_shift.shift.start_at}}<a href="{%url 'shift' current_shift.shift.id%}">Details</a>
+{{ current_shift.shift.room.name }} {{ current_shift.shift.start_at }}<a href="{% url 'shift' current_shift.shift.id %}">Details</a>
 {% endif %}
 {% if my_shifts %}
 <h2>Meine Schichten</h2>
 <ul>
     {% for reg in my_shifts %}
-        <li>{{ reg.shift.room.name }} {{reg.shift.start_at}}<a href="{%url 'shift' reg.shift.id%}">Details</a></li>
+        <li>{{ reg.shift.room.name }} {{ reg.shift.start_at }}<a href="{% url 'shift' reg.shift.id %}">Details</a></li>
     {% endfor %}
     </ul>
 {% endif %}
-<h2>Freie Scchichten:</h2>
+<h2>Freie Schichten:</h2>
 <ul>
     {% for shift in free_shifts %}
-        <li>{{ shift.room.name }} {{shift.start_at}}<a href="{%url 'shift' shift.id%}">Mithelfen</a></li>
+        <li>{{ shift.room.name }} {{ shift.start_at }}<a href="{% url 'shift' shift.id %}">Mithelfen</a></li>
     {% endfor %}
     </ul>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/shiftregister/app/templates/wait_confirmation.html b/shiftregister/app/templates/wait_confirmation.html
index 8f167d2..1e48c3d 100644
--- a/shiftregister/app/templates/wait_confirmation.html
+++ b/shiftregister/app/templates/wait_confirmation.html
@@ -2,6 +2,6 @@
 
 {% block title %}Registrierung{% endblock %}
 {% block content %}
-Hallo {{helper.name}},<br>
-wir haben dir eine SMS an {{helper.phone}} mit einem Bestaetigunslink geschickt. Sobald du diesen anklickst kann es losgehen!
-{% endblock %}
\ No newline at end of file
+Hallo {{ helper.name }},<br>
+wir haben dir eine SMS an {{ helper.phone }} mit einem Bestätigungslink geschickt. Sobald du diesen anklickst, kann es losgehen!
+{% endblock %}
diff --git a/shiftregister/team/templates/helper_detail.html b/shiftregister/team/templates/helper_detail.html
index 124ab24..bc60450 100644
--- a/shiftregister/team/templates/helper_detail.html
+++ b/shiftregister/team/templates/helper_detail.html
@@ -2,12 +2,12 @@
 
 {% block title %}Schichtdetails{% endblock %}
 {% block content %}
-<h2>{{helper.name}}</h2>
-Telefon: <a href="tel:{{helper.phone}}">{{helper.phone}}</a>
+<h2>{{ helper.name }}</h2>
+Telefon: <a href="tel:{{ helper.phone }}">{{ helper.phone }}</a>
 <h2>Schichten:</h2>
 <ul>
     {% for reg in helper.shiftregistration_set.all %}
-    <li>{{ reg.shift.room.name }} {{reg.shift.start_at}}({{reg.shift.shiftregistration_set.count}}/{{reg.shift.room.required_helpers}})<a href="{%url 'team:shift' reg.shift.id%}">Details</a></li>
-    {%endfor%}
+    <li>{{ reg.shift.room.name }} {{ reg.shift.start_at }}({{ reg.shift.shiftregistration_set.count }}/{{ reg.shift.room.required_helpers }})<a href="{% url 'team:shift' reg.shift.id %}">Details</a></li>
+    {% endfor %}
 </ul>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/shiftregister/team/templates/shift_detail.html b/shiftregister/team/templates/shift_detail.html
index 67da4e0..9b52721 100644
--- a/shiftregister/team/templates/shift_detail.html
+++ b/shiftregister/team/templates/shift_detail.html
@@ -2,11 +2,11 @@
 
 {% block title %}Schichtdetails{% endblock %}
 {% block content %}
-{{ shift.room.name }} {{shift.start_at}}({{shift.shiftregistration_set.count}}/{{shift.room.required_helpers}})
+{{ shift.room.name }} {{ shift.start_at }}({{ shift.shiftregistration_set.count }}/{{ shift.room.required_helpers }})
 <h2>Helfer</h2>
 <ul>
     {% for reg in shift.shiftregistration_set.all %}
-    <li><a href="{%url 'team:helper' reg.helper.pk%}">{{reg.helper.name}}</a> <a href="tel:{{reg.helper.phone}}">📞</a></li>
-    {%endfor%}
+    <li><a href="{% url 'team:helper' reg.helper.pk %}">{{ reg.helper.name }}</a> <a href="tel:{{ reg.helper.phone }}">📞</a></li>
+    {% endfor %}
 </ul>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/shiftregister/team/templates/shift_list.html b/shiftregister/team/templates/shift_list.html
index 64a17b1..a2e8274 100644
--- a/shiftregister/team/templates/shift_list.html
+++ b/shiftregister/team/templates/shift_list.html
@@ -4,9 +4,8 @@
 {% block content %}
 <h2>Schichten</h2>
 <ul>
-    {%for shift in object_list%}
-    <li>{{ shift.room.name }} {{shift.start_at}}({{shift.shiftregistration_set.count}}/{{shift.room.required_helpers}})<a href="{%url 'team:shift' shift.id%}">Details</a></li>
-    {%endfor%}
+    {% for shift in object_list %}
+    <li>{{ shift.room.name }} {{ shift.start_at }}({{ shift.shiftregistration_set.count }}/{{ shift.room.required_helpers }})<a href="{% url 'team:shift' shift.id %}">Details</a></li>
+    {% endfor %}
 </ul>
-
 {% endblock %}
diff --git a/shiftregister/team/templates/shift_overview.html b/shiftregister/team/templates/shift_overview.html
index c9e9129..78de7fe 100644
--- a/shiftregister/team/templates/shift_overview.html
+++ b/shiftregister/team/templates/shift_overview.html
@@ -1,17 +1,19 @@
 {% extends "team_base.html" %}
 
-{% block title %}Schichtuebersicht{% endblock %}
+{% block title %}Schichtübersicht{% endblock %}
 {% block content %}
-{%if  running_shifts%}
+{% if running_shifts %}
 <h2>Laufende Schichten</h2>
 <ul>
-    {%for shift in running_shifts%}
-    <li>{{ shift.room.name }} {{shift.start_at}}({{shift.shiftregistration_set.count}}/{{shift.room.required_helpers}})<a href="{%url 'team:shift' shift.id%}">Details</a></li>
-    {%endfor%}
+    {% for shift in running_shifts %}
+    <li>{{ shift.room.name }} {{ shift.start_at }}({{ shift.shiftregistration_set.count }}/{{ shift.room.required_helpers }})<a href="{% url 'team:shift' shift.id %}">Details</a></li>
+    {% endfor %}
 </ul>
-{%endif%}
-<h2>Naechste Schichten</h2>
-{%for shift in next_shifts%}
-<li>{{ shift.room.name }} {{shift.start_at}}({{shift.shiftregistration_set.count}}/{{shift.room.required_helpers}})<a href="{%url 'team:shift' shift.id%}">Details</a></li>
-{%endfor%}
-{% endblock %}
\ No newline at end of file
+{% endif %}
+<h2>Nächste Schichten</h2>
+<ul>
+    {% for shift in next_shifts %}
+    <li>{{ shift.room.name }} {{ shift.start_at }}({{ shift.shiftregistration_set.count }}/{{ shift.room.required_helpers }})<a href="{% url 'team:shift' shift.id %}">Details</a></li>
+    {% endfor %}
+</ul>
+{% endblock %}
diff --git a/shiftregister/team/templates/team_base.html b/shiftregister/team/templates/team_base.html
index c1c4d54..53ab2b9 100644
--- a/shiftregister/team/templates/team_base.html
+++ b/shiftregister/team/templates/team_base.html
@@ -3,10 +3,11 @@
 {% block title %}Team{% endblock %}
 {% block body %}
 <nav>
-    <a href="{%url 'team:shift_overview'%}">Schichtuebersicht</a>
-    <a href="{%url 'team:shift_all'%}">Alle Schichten</a>
-</nav><hr>
+    <a href="{% url 'team:shift_overview' %}">Schichtuebersicht</a>
+    <a href="{% url 'team:shift_all' %}">Alle Schichten</a>
+</nav>
+<hr>
 <div id="content">
     {% block content %}{% endblock %}
 </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/base.html b/templates/base.html
index 1a9c68c..0e359e9 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,11 +1,13 @@
 <!DOCTYPE html>
 <html lang="de">
 <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width,initial-scale=1">
     <title>{% block title %}Help!{% endblock %}</title>
+    <link rel="icon" href="data:;base64,iVBORw0KGgo=">
 </head>
-
 <body>
-{%block body%}
-{%endblock%}
+{% block body %}
+{% endblock %}
 </body>
-</html>
\ No newline at end of file
+</html>