diff --git a/aleksis/apps/paweljong/templates/paweljong/event/create.html b/aleksis/apps/paweljong/templates/paweljong/event/create.html
new file mode 100644
index 0000000000000000000000000000000000000000..66611ee318621d25386f23b239441c42a0172030
--- /dev/null
+++ b/aleksis/apps/paweljong/templates/paweljong/event/create.html
@@ -0,0 +1,22 @@
+{% extends "core/base.html" %}
+{% load material_form i18n any_js %}
+
+{% block page_title %}{% blocktrans %}Create event{% endblocktrans %}{% endblock %}
+{% block browser_title %}{% blocktrans %}Create event{% endblocktrans %}{% endblock %}
+
+{% block extra_head %}
+ {{ form.media.css }}
+ {% include_css "select2-materialize" %}
+{% endblock %}
+
+{% block content %}
+
+ <form method="post">
+ {% csrf_token %}
+ {% form form=form %}{% endform %}
+ {% include "core/partials/save_button.html" %}
+ </form>
+ {% include_js "select2-materialize" %}
+ {{ form.media.js }}
+
+{% endblock %}
diff --git a/aleksis/apps/paweljong/templates/paweljong/event/edit.html b/aleksis/apps/paweljong/templates/paweljong/event/edit.html
index 61d7275df4296a3d42fdf8bcbbaff8d668b4e13a..256ca05e12fb9027093e4646b87d1b25b4a8548b 100644
--- a/aleksis/apps/paweljong/templates/paweljong/event/edit.html
+++ b/aleksis/apps/paweljong/templates/paweljong/event/edit.html
@@ -5,7 +5,7 @@
{% block browser_title %}{% blocktrans %}Edit event{% endblocktrans %}{% endblock %}
{% block extra_head %}
- {{ edit_event_form.media.css }}
+ {{ form.media.css }}
{% include_css "select2-materialize" %}
{% endblock %}
@@ -13,10 +13,10 @@
<form method="post">
{% csrf_token %}
- {% form form=edit_event_form %}{% form %}
+ {% form form=form %}{% form %}
{% include "core/partials/save_button.html" %}
</form>
{% include_js "select2-materialize" %}
- {{ edit_event_form.media.js }}
+ {{ form.media.js }}
{% endblock %}
diff --git a/aleksis/apps/paweljong/templates/paweljong/event/feedback.html b/aleksis/apps/paweljong/templates/paweljong/event/feedback.html
index d3bb5a2c52663d44293a4e25ccd9edeacafe2684..2993ea969eccbda379b731af03a817c7a67940c4 100644
--- a/aleksis/apps/paweljong/templates/paweljong/event/feedback.html
+++ b/aleksis/apps/paweljong/templates/paweljong/event/feedback.html
@@ -4,6 +4,10 @@
{% block page_title %}{% blocktrans %}Feedback on an event{% endblocktrans %}{% endblock %}
{% block browser_title %}{% blocktrans %}Feedback on an event{% endblocktrans %}{% endblock %}
+{% block extra_head %}
+ {{ form.media.css }}
+{% endblock %}
+
{% block content %}
<h5>
{% blocktrans %}Feedback on{% endblocktrans %} {{ event.display_name }}
@@ -43,4 +47,6 @@
{% form form=feedback_form %}{% endform %}
{% include "core/partials/save_button.html" %}
</form>
+
+ {{ form.media.js }}
{% endblock %}
diff --git a/aleksis/apps/paweljong/templates/paweljong/event/full.html b/aleksis/apps/paweljong/templates/paweljong/event/full.html
new file mode 100644
index 0000000000000000000000000000000000000000..e48f728d2dab9518c192f33d2c05b58b3922b95b
--- /dev/null
+++ b/aleksis/apps/paweljong/templates/paweljong/event/full.html
@@ -0,0 +1,96 @@
+{% extends "core/base.html" %}
+{% load material_form i18n any_js coerce static %}
+
+{% block browser_title %}{% blocktrans %}Event{% endblocktrans %} {{ event.display_name }}{% endblock %}
+
+{% block extra_head %}
+ <link rel="stylesheet" href="{% static 'css/paweljong.css' %}"/>
+{% endblock %}
+
+{% block content %}
+
+ <div class="card">
+ <div class="card-content">
+ <div class="row">
+ <div class="col s1">
+ <time datetime="{{ event.date_event|date:'Y-m-d' }}" class="icon">
+ <em>{{ event.date_event|date:'l' }}</em>
+ <strong>{{ event.date_event|date:'F' }}</strong>
+ <span>{{ event.date_event|date:'d' }}</span>
+ </time>
+ </div>
+ <div class="col s11">
+ <span class="card-title">
+ {{ event.display_name }}
+ </span>
+ <ul>
+ <li>
+ {{ event.description }}
+ </li>
+ <br />
+ <li>
+ {% blocktrans %}
+ The event takes place in <strong>{{ event.place }}</strong>
+ (Information on overnight stays and shared trips see description)
+ {% endblocktrans %}
+ </li>
+ <li>
+ Registration possible until <strong>{{ event.date_registration }}</strong>
+ </li>
+ <li>
+ Cost: <strong>{{ event.cost }} €</strong> incl. program, overnight stays, trips and meals
+ (if part of the event)
+ </li>
+ <li>
+ Booked participants slots: <strong>{{ event.linked_group.members.count }} of {{ event.max_participants }}</strong>
+ </li>
+ <div class="progress">
+ <div class="determinate" style="min-width: 2em;width:{{ event.booked_percentage|coerce_max:100|floatformat:0 }}%">
+ </div>
+ </div>
+ <p class="center">{{ event.booked_percentage|coerce_max:100 }} %</p>
+ </ul>
+ </div>
+ </div>
+ </div>
+ <div class="card-tabs">
+ <ul class="tabs tabs-fixed-width">
+ {% if can_register %}
+ <li class="tab">
+ <a href="#with_email">
+ Register now (i have an email)
+ </a>
+ </li>
+ <li class="tab">
+ <a href="#without_email">
+ Register now (i don't have an email)
+ </a>
+ </li>
+ {% else %}
+ <li class="tab">
+ <a href="#not_possible">{% trans "Not available" %}</a>
+ </li>
+ {% endif %}
+ </div>
+ <div class="card-content grey lighten-4">
+ {% if can_register %}
+ <div id="with_email">
+ <p>Lorem Ipsum dolor sit amet (mit Mail)</p>
+ </div>
+ <div id="without_email">
+ <p>Lorem Ipsum dolor sit amet (ohne Mail)</p>
+ </div>
+ {% else %}
+ <div id="not_possible">
+ <p>
+ {% blocktrans %}
+ Registration is no longer possible.
+ {% endblocktrans %}
+ </div>
+ {% endif %}
+ </div>
+ </div>
+
+ {{ event.information | safe }}
+
+{% endblock %}
diff --git a/aleksis/apps/paweljong/templates/paweljong/event/manage.html b/aleksis/apps/paweljong/templates/paweljong/event/manage.html
index 3ecb26394bfbd2b16c709e310d095fc24e0b8490..3a455fc507c338e632580524e2d0ab19dfaa13ea 100644
--- a/aleksis/apps/paweljong/templates/paweljong/event/manage.html
+++ b/aleksis/apps/paweljong/templates/paweljong/event/manage.html
@@ -1,15 +1,25 @@
{% extends "core/base.html" %}
-{% load i18n %}
+{% load material_form i18n %}
+
{% load render_table from django_tables2 %}
{% block page_title %}{% blocktrans %}Manage events{% endblocktrans %}{% endblock %}
{% block browser_title %}{% blocktrans %}Manage events{% endblocktrans %}{% endblock %}
{% block content %}
- <h5>
- {% blocktrans %}Upcoming events{% endblocktrans %}
- </h5>
- {% render_table object_list %}
+ <h5>{% trans "Filter events" %}</h5>
+ <form method="get">
+ {% form form=events_filter.form %}{% endform %}
+ {% trans "Search" as caption %}
+ {% include "core/partials/save_button.html" with caption=caption icon="search" %}
+ <button type="reset" class="btn red waves-effect waves-light">
+ <i class="material-icons left">clear</i>
+ {% trans "Clear" %}
+ </button>
+ </form>
+
+ <h5>{% trans "Selected events" %}</h5>
+ {% render_table events_table %}
{% endblock %}
diff --git a/aleksis/apps/paweljong/templates/paweljong/event/register_wizard.html b/aleksis/apps/paweljong/templates/paweljong/event/register_wizard.html
new file mode 100644
index 0000000000000000000000000000000000000000..f6dedea3d32fadcc907ffaa37952409ad3380900
--- /dev/null
+++ b/aleksis/apps/paweljong/templates/paweljong/event/register_wizard.html
@@ -0,0 +1,47 @@
+{% extends "core/base.html" %}
+{% load material_form i18n %}
+
+{% block browser_title %}{{ browser_title }}{% endblock %}
+{% block page_title %}{{ page_title }}{% endblock %}
+
+{% block content %}
+ <div class="row">
+ <div class="col s12">
+ <div class="card info">
+ <div class="card-content">
+ <span class="card-title">{{ info_title }}</span>
+ <p>
+ {{ info_text }}
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <form method="post" enctype="multipart/form-data">
+ {% csrf_token %}
+ {{ wizard.form.media }}
+ {{ wizard.management_form }}
+ {% if wizard.form.forms %}
+ {{ wizard.form.management_form }}
+ {% for form in wizard.form.forms %}
+ {% form form=form %}{% endform %}
+ {% endfor %}
+ {% else %}
+ {% form form=wizard.form %}{% endform %}
+ {% endif %}
+
+ {% if wizard.steps.prev %}
+ <button type="submit" value="{{ wizard.steps.first }}" class="btn waves-effect waves-light color-primary" name="wizard_goto_step">
+ <i class="material-icons left">first_page</i>
+ {% trans "first step" %}
+ </button>
+ <button type="submit" value="{{ wizard.steps.prev }}" class="btn waves-effect waves-light color-secondary" name="wizard_goto_step">
+ <i class="material-icons left">arrow_back_ios</i>
+ {% trans "previous step" %}
+ </button>
+ {% endif %}
+ {% trans "Next" as caption %}
+ {% include "core/partials/save_button.html" with caption=caption icon="navigate_next" %}
+ </form>
+{% endblock %}
diff --git a/aleksis/apps/paweljong/templates/paweljong/event/registered.html b/aleksis/apps/paweljong/templates/paweljong/event/registered.html
new file mode 100644
index 0000000000000000000000000000000000000000..5100c5c815ed1a9f922a8de040267966d6219a7a
--- /dev/null
+++ b/aleksis/apps/paweljong/templates/paweljong/event/registered.html
@@ -0,0 +1,12 @@
+{% extends "core/base.html" %}
+{% load material_form i18n %}
+
+{% block page_title %}{% blocktrans %}Registered successfully{% endblocktrans %}{% endblock %}
+{% block browser_title %}{% blocktrans %}Registered successfully{% endblocktrans %}{% endblock %}
+
+{% block content %}
+
+
+ {{ form_data }}
+
+{% endblock %}
diff --git a/aleksis/apps/paweljong/templates/paweljong/event_registration/full.html b/aleksis/apps/paweljong/templates/paweljong/event_registration/full.html
index f6a95d25a5606489d8943b4547307c09802e3815..6b0444fa22b776e14de1239773a6bd27f35f1370 100644
--- a/aleksis/apps/paweljong/templates/paweljong/event_registration/full.html
+++ b/aleksis/apps/paweljong/templates/paweljong/event_registration/full.html
@@ -16,14 +16,14 @@
{% if can_manage_registration or can_manage_registration_preferences or can_delete_registration %}
<p>
{% if can_manage_registration %}
- <a href="{% url 'edit_registration_by_id' registration.id %}" class="btn waves-effect waves-light">
+ <a href="{% url 'edit_registration_by_pk' registration.pk %}" class="btn waves-effect waves-light">
<i class="material-icons left">edit</i>
{% trans "Edit" %}
</a>
{% endif %}
{% if can_delete_registration %}
- <a href="{% url 'delete_registration_by_id' registration.id %}" class="btn waves-effect waves-light red">
+ <a href="{% url 'delete_registration_by_pk' registration.pk %}" class="btn waves-effect waves-light red">
<i class="material-icons left">delete</i>
{% trans "Delete" %}
</a>
@@ -107,23 +107,35 @@
<td>
<i class="material-icons small">local_activity</a>
</td>
- <td colspan="3"><a href="{% url 'edit_event_by_id' registration.event.id %}">{{ registration.event }}</a></td>
+ <td colspan="3"><a href="{% url 'edit_event_by_pk' registration.event.pk %}">{{ registration.event }}</a></td>
</tr>
<tr>
<td>
- <i class="material-icons small">redeem</a>
+ <i class="material-icons small">redeem</i>
</td>
<td colspan="3">{{ registration.donation }}</td>
</tr>
<tr>
<td>
- <i class="material-icons small">payment</a>
+ <i class="material-icons small">payment</i>
</td>
<td>{% trans "SEPA direct debit" %}: {{ registration.accept_sepa }}</td>
{% if registration.accept_sepa %}
<td>{% trans "IBAN" %}: {{ registration.iban }}</td>
{% endif %}
</tr>
+ {% if registration.extended_data %}
+ {% for field, value in registration.extended_data.items %}
+ <tr>
+ <td>
+ {{ field }}
+ </td>
+ <td>
+ {{ value }}
+ </td>
+ </tr>
+ {% endfor %}
+ {% endif %}
</table>
</p>
</div>
diff --git a/aleksis/apps/paweljong/templates/paweljong/feedback_aspect/create.html b/aleksis/apps/paweljong/templates/paweljong/feedback_aspect/create.html
new file mode 100644
index 0000000000000000000000000000000000000000..60230d55c100416130b940188165543f6423ab71
--- /dev/null
+++ b/aleksis/apps/paweljong/templates/paweljong/feedback_aspect/create.html
@@ -0,0 +1,13 @@
+{% extends "core/base.html" %}
+{% load material_form i18n %}
+
+{% block page_title %}{% blocktrans %}Create feedback aspect{% endblocktrans %}{% endblock %}
+{% block browser_title %}{% blocktrans %}Create feedback aspect{% endblocktrans %}{% endblock %}
+
+{% block content %}
+ <form method="post">
+ {% csrf_token %}
+ {% form form=form %}{% endform %}
+ {% include "core/partials/save_button.html" %}
+ </form>
+{% endblock %}
diff --git a/aleksis/apps/paweljong/templates/paweljong/feedback_aspect/edit.html b/aleksis/apps/paweljong/templates/paweljong/feedback_aspect/edit.html
index 96f73df934d06b93ad7bba523f10c904bb5e947c..f6c3b89035470cc0a67021fdee2acee9af679c9d 100644
--- a/aleksis/apps/paweljong/templates/paweljong/feedback_aspect/edit.html
+++ b/aleksis/apps/paweljong/templates/paweljong/feedback_aspect/edit.html
@@ -7,7 +7,7 @@
{% block content %}
<form method="post">
{% csrf_token %}
- {% form form=edit_feedback_aspect_form %}{% endform %}
+ {% form form=form %}{% endform %}
{% include "core/partials/save_button.html" %}
</form>
{% endblock %}
diff --git a/aleksis/apps/paweljong/templates/paweljong/print/corona.html b/aleksis/apps/paweljong/templates/paweljong/print/corona.html
index 5f06adfa8aa0fef1c7e1f855332449f1dc5eb848..1ecf0e79096f707baadbefcfe204c83f862836d2 100644
--- a/aleksis/apps/paweljong/templates/paweljong/print/corona.html
+++ b/aleksis/apps/paweljong/templates/paweljong/print/corona.html
@@ -6,7 +6,7 @@
{% endblock %}
{% block extra_head %}
- <link rel="stylesheet" href="{% static 'ticdesk.css' %}">
+ <link rel="stylesheet" href="{% static 'css/paweljong.css' %}"/>
{% endblock %}
{% block browser_title %}{{ group }} — {% trans "Corona" %}{% endblock %}
diff --git a/aleksis/apps/paweljong/templates/paweljong/print/list_attendance.html b/aleksis/apps/paweljong/templates/paweljong/print/list_attendance.html
index 00645156d75413b00db0dd355076d848a2eb03f4..8c27ec1bff26eba50780ed21c7a4bbd57eca7111 100644
--- a/aleksis/apps/paweljong/templates/paweljong/print/list_attendance.html
+++ b/aleksis/apps/paweljong/templates/paweljong/print/list_attendance.html
@@ -6,7 +6,7 @@
{% endblock %}
{% block extra_head %}
- <link rel="stylesheet" href="{% static 'ticdesk.css' %}">
+ <link rel="stylesheet" href="{% static 'css/paweljong.css' %}"/>
{% endblock %}
{% block browser_title %}{{ group }} — {% trans "attendance list" %}{% endblock %}
diff --git a/aleksis/apps/paweljong/templates/paweljong/print/list_participants.html b/aleksis/apps/paweljong/templates/paweljong/print/list_participants.html
index 3ab8aa80d0242eeb2b37da4fb1590ba1985ce7ed..f6b9ea3d15a0bd2b6285e290f71201fd093d3942 100644
--- a/aleksis/apps/paweljong/templates/paweljong/print/list_participants.html
+++ b/aleksis/apps/paweljong/templates/paweljong/print/list_participants.html
@@ -6,7 +6,7 @@
{% endblock %}
{% block extra_head %}
- <link rel="stylesheet" href="{% static 'css/ticdesk/ticdesk.css' %}">
+ <link rel="stylesheet" href="{% static 'css/paweljong.css' %}"/>
{% endblock %}
{% block browser_title %}{{ group }} — {% trans "participant list" %}{% endblock %}
@@ -21,8 +21,6 @@
<th class="table-print">{% trans "First name" %}</th>
<th class="table-print">{% trans "Date of birth" %}</th>
<th class="table-print">{% trans "Mobile number" %}</th>
- <th class="table-print">{% trans "School" %}</th>
- <th class="table-print">{% trans "Class" %}</th>
</tr>
</thead>
<tbody>
@@ -43,8 +41,6 @@
<td class="table-print">{{ person.first_name }}</td>
<td class="table-print">{{ person.date_of_birth }}</td>
<td class="table-print">{{ person.mobile_number }}</td>
- <td class="table-print">{{ person.school }}</td>
- <td class="table-print">{{ person.school_class }}</td>
</tr>
{% endfor %}
</tbody>
diff --git a/aleksis/apps/paweljong/templates/paweljong/print/list_sign.html b/aleksis/apps/paweljong/templates/paweljong/print/list_sign.html
index 499105aae70dd65a249971eab84e4c03cc201a76..cd6e41c710b58a1b2129e488ee263631ab155713 100644
--- a/aleksis/apps/paweljong/templates/paweljong/print/list_sign.html
+++ b/aleksis/apps/paweljong/templates/paweljong/print/list_sign.html
@@ -6,7 +6,7 @@
{% endblock %}
{% block extra_head %}
- <link rel="stylesheet" href="{% static 'ticdesk.css' %}">
+ <link rel="stylesheet" href="{% static 'css/paweljong.css' %}"/>
{% endblock %}
{% block browser_title %}{{ group }} — {% trans "signature list" %}{% endblock %}
diff --git a/aleksis/apps/paweljong/templates/paweljong/print/voucher.html b/aleksis/apps/paweljong/templates/paweljong/print/voucher.html
index 2102cd43900b5f0b5c9b87ba04b062d9f4ef246f..59bb677c7505381a10585a2ce8b0c4ef7bcaf65c 100644
--- a/aleksis/apps/paweljong/templates/paweljong/print/voucher.html
+++ b/aleksis/apps/paweljong/templates/paweljong/print/voucher.html
@@ -5,6 +5,10 @@
{% trans "Voucher for "%} {{ voucher.event }}
{% endblock %}
+{% block extra_head %}
+ <link rel="stylesheet" href="{% static 'css/paweljong.css' %}"/>
+{% endblock %}
+
{% block browser_title %}{% trans "Voucher for "%} {{ voucher.event }}{% endblock %}
{% block content %}
@@ -14,7 +18,7 @@
<h3>{{ voucher.event }}<h3>
<h4>{{ voucher.code }}</h4>
<p>{% trans "Voucher for" %} {{ voucher.person.first_name }} {{ voucher.person.last_name }} {% trans "to visit event" %} {{ voucher.event }} {% trans "on" %} {{ voucher.event.date_event }} {% trans "at" %} {{ voucher.event.place }}!</p>
- <p>{% trans "To use the voucher, register for the event " %} <a href="{% url 'register_event_by_id' voucher.event.id %}">{% trans "here" %}</a></p>
+ <p>{% trans "To use the voucher, register for the event " %} <a href="{% url 'register_event_by_pk' voucher.event.pk %}">{% trans "here" %}</a></p>
</div>
{% endblock %}
diff --git a/aleksis/apps/paweljong/templates/paweljong/voucher/create.html b/aleksis/apps/paweljong/templates/paweljong/voucher/create.html
new file mode 100644
index 0000000000000000000000000000000000000000..8e130babd885fd46019391819b0fbebf706b6831
--- /dev/null
+++ b/aleksis/apps/paweljong/templates/paweljong/voucher/create.html
@@ -0,0 +1,20 @@
+{% extends "core/base.html" %}
+{% load material_form i18n any_js %}
+
+{% block page_title %}{% blocktrans %}Create voucher{% endblocktrans %}{% endblock %}
+{% block browser_title %}{% blocktrans %}Create voucher{% endblocktrans %}{% endblock %}
+
+{% block extra_head %}
+ {{ form.media.css }}
+ {% include_css "select2-materialize" %}
+{% endblock %}
+
+{% block content %}
+ <form method="post">
+ {% csrf_token %}
+ {% form form=form %}{% endform %}
+ {% include "core/partials/save_button.html" %}
+ </form>
+ {{ form.media.js }}
+ {% include_js "select2-materialize" %}
+{% endblock %}
diff --git a/aleksis/apps/paweljong/templates/paweljong/voucher/edit.html b/aleksis/apps/paweljong/templates/paweljong/voucher/edit.html
index 7b9e0ec2318c8ec1132055f4f4c9f73366d2d9f2..1c6fbdabc3abfba36c647f1d1801618d3d2f3f3e 100644
--- a/aleksis/apps/paweljong/templates/paweljong/voucher/edit.html
+++ b/aleksis/apps/paweljong/templates/paweljong/voucher/edit.html
@@ -1,13 +1,20 @@
{% extends "core/base.html" %}
-{% load material_form i18n %}
+{% load material_form i18n any_js %}
{% block page_title %}{% blocktrans %}Edit voucher{% endblocktrans %}{% endblock %}
{% block browser_title %}{% blocktrans %}Edit voucher{% endblocktrans %}{% endblock %}
+{% block extra_head %}
+ {{ form.media.css }}
+ {% include_css "select2-materialize" %}
+{% endblock %}
+
{% block content %}
<form method="post">
{% csrf_token %}
- {% form form=edit_voucher_form %}{% endform %}
+ {% form form=form %}{% endform %}
{% include "core/partials/save_button.html" %}
</form>
+ {{ form.media.js }}
+ {% include_js "select2-materialize" %}
{% endblock %}
diff --git a/aleksis/apps/paweljong/templates/templated_email/event_registred.email b/aleksis/apps/paweljong/templates/templated_email/event_registred.email
index da83ae3eb4a976d82870724edaee78499cdb2f27..03b03566273dad95f9f07696af6ac0e14a904e83 100644
--- a/aleksis/apps/paweljong/templates/templated_email/event_registred.email
+++ b/aleksis/apps/paweljong/templates/templated_email/event_registred.email
@@ -9,7 +9,7 @@
* {% trans "Event" %}: {{ registration.event }}
- **** {% trans "Person " %} ****
+ **** {% trans "Person" %} ****
* {% trans "Name" %}: {{ registration.person }}
* {% trans "Date of birth" %}: {{ registration.date_of_birth }}
@@ -52,7 +52,7 @@
<ul>
<li>{% trans "Event" %}: {{ registration.event }}</li>
</ul>
- <h5>{% trans "Person " %</h5>
+ <h5>{% trans "Person" %}</h5>
<ul>
<li>{% trans "Name" %}: {{ registration.person }}</li>
<li>{% trans "Date of birth" %}: {{ registration.date_of_birth }}</li>