2
0
Fork 0

Fix spelling and make spacing in templates more consistent

This commit is contained in:
Luca 2022-04-14 03:05:05 +02:00
parent 92e7cd6c2b
commit 78ac75423c
11 changed files with 74 additions and 70 deletions

View File

@ -2,12 +2,12 @@
{% block title %}Help!{% endblock %} {% block title %}Help!{% endblock %}
{% block body %} {% block body %}
{% if helper%} {% if helper %}
Hallo {{helper.name}} Hallo {{ helper.name }}
{%else%} {% else %}
<a href="{%url 'register'%}">Anmelden</a> <a href="{% url 'register' %}">Anmelden</a>
{%endif%} {% endif %}
<div id="content"> <div id="content">
{% block content %}{% endblock %} {% block content %}{% endblock %}
</div> </div>
{% endblock %} {% endblock %}

View File

@ -4,8 +4,8 @@
{% block content %} {% block content %}
<form action="" method="post"> <form action="" method="post">
{% csrf_token %} {% csrf_token %}
{{form.as_p}} {{ 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> <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"> <input type="submit" value="Anmelden">
</form> </form>
{% endblock %} {% endblock %}

View File

@ -2,28 +2,28 @@
{% block title %}Schichtansicht{% endblock %} {% block title %}Schichtansicht{% endblock %}
{% block content %} {% block content %}
{%if is_registered%} {% if is_registered %}
<div>Du bist zu dieser Schicht angemeldet</div> <div>Du bist zu dieser Schicht angemeldet</div>
{%endif%} {% endif %}
Ort: {{shift.room.name}}<br> Ort: {{ shift.room.name }}<br>
Start: {{shift.start_at}}<br> Start: {{ shift.start_at }}<br>
Dauer: {{shift.duration}}<br> Dauer: {{ shift.duration }}<br>
{%if can_register%} {% if can_register %}
<form action="" method="post"> <form action="" method="post">
{% csrf_token %} {% csrf_token %}
{{shift_form.as_p}} {{ shift_form.as_p }}
<input type="submit" value="Anmelden"> <input type="submit" value="Anmelden">
</form> </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 %} {% endif %}
{% endblock %} {% 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 %}

View File

@ -4,20 +4,20 @@
{% block content %} {% block content %}
{% if current_shift %} {% if current_shift %}
<h2>Aktuelle Schicht</h2> <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 %} {% endif %}
{% if my_shifts %} {% if my_shifts %}
<h2>Meine Schichten</h2> <h2>Meine Schichten</h2>
<ul> <ul>
{% for reg in my_shifts %} {% 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 %} {% endfor %}
</ul> </ul>
{% endif %} {% endif %}
<h2>Freie Scchichten:</h2> <h2>Freie Schichten:</h2>
<ul> <ul>
{% for shift in free_shifts %} {% 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 %} {% endfor %}
</ul> </ul>
{% endblock %} {% endblock %}

View File

@ -2,6 +2,6 @@
{% block title %}Registrierung{% endblock %} {% block title %}Registrierung{% endblock %}
{% block content %} {% block content %}
Hallo {{helper.name}},<br> Hallo {{ helper.name }},<br>
wir haben dir eine SMS an {{helper.phone}} mit einem Bestaetigunslink geschickt. Sobald du diesen anklickst kann es losgehen! wir haben dir eine SMS an {{ helper.phone }} mit einem Bestätigungslink geschickt. Sobald du diesen anklickst, kann es losgehen!
{% endblock %} {% endblock %}

View File

@ -2,12 +2,12 @@
{% block title %}Schichtdetails{% endblock %} {% block title %}Schichtdetails{% endblock %}
{% block content %} {% block content %}
<h2>{{helper.name}}</h2> <h2>{{ helper.name }}</h2>
Telefon: <a href="tel:{{helper.phone}}">{{helper.phone}}</a> Telefon: <a href="tel:{{ helper.phone }}">{{ helper.phone }}</a>
<h2>Schichten:</h2> <h2>Schichten:</h2>
<ul> <ul>
{% for reg in helper.shiftregistration_set.all %} {% 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> <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%} {% endfor %}
</ul> </ul>
{% endblock %} {% endblock %}

View File

@ -2,11 +2,11 @@
{% block title %}Schichtdetails{% endblock %} {% block title %}Schichtdetails{% endblock %}
{% block content %} {% 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> <h2>Helfer</h2>
<ul> <ul>
{% for reg in shift.shiftregistration_set.all %} {% 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> <li><a href="{% url 'team:helper' reg.helper.pk %}">{{ reg.helper.name }}</a> <a href="tel:{{ reg.helper.phone }}">📞</a></li>
{%endfor%} {% endfor %}
</ul> </ul>
{% endblock %} {% endblock %}

View File

@ -4,9 +4,8 @@
{% block content %} {% block content %}
<h2>Schichten</h2> <h2>Schichten</h2>
<ul> <ul>
{%for shift in object_list%} {% 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> <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%} {% endfor %}
</ul> </ul>
{% endblock %} {% endblock %}

View File

@ -1,17 +1,19 @@
{% extends "team_base.html" %} {% extends "team_base.html" %}
{% block title %}Schichtuebersicht{% endblock %} {% block title %}Schichtübersicht{% endblock %}
{% block content %} {% block content %}
{%if running_shifts%} {% if running_shifts %}
<h2>Laufende Schichten</h2> <h2>Laufende Schichten</h2>
<ul> <ul>
{%for shift in running_shifts%} {% 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> <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%} {% endfor %}
</ul> </ul>
{%endif%} {% endif %}
<h2>Naechste Schichten</h2> <h2>Nächste Schichten</h2>
{%for shift in next_shifts%} <ul>
<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> {% for shift in next_shifts %}
{%endfor%} <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>
{% endblock %} {% endfor %}
</ul>
{% endblock %}

View File

@ -3,10 +3,11 @@
{% block title %}Team{% endblock %} {% block title %}Team{% endblock %}
{% block body %} {% block body %}
<nav> <nav>
<a href="{%url 'team:shift_overview'%}">Schichtuebersicht</a> <a href="{% url 'team:shift_overview' %}">Schichtuebersicht</a>
<a href="{%url 'team:shift_all'%}">Alle Schichten</a> <a href="{% url 'team:shift_all' %}">Alle Schichten</a>
</nav><hr> </nav>
<hr>
<div id="content"> <div id="content">
{% block content %}{% endblock %} {% block content %}{% endblock %}
</div> </div>
{% endblock %} {% endblock %}

View File

@ -1,11 +1,13 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="de"> <html lang="de">
<head> <head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1">
<title>{% block title %}Help!{% endblock %}</title> <title>{% block title %}Help!{% endblock %}</title>
<link rel="icon" href="data:;base64,iVBORw0KGgo=">
</head> </head>
<body> <body>
{%block body%} {% block body %}
{%endblock%} {% endblock %}
</body> </body>
</html> </html>