DAV-KA/django-dav-events
1
0
Fork 0
Code Issues 24 Pull Requests Actions Releases Wiki Activity

MIGRATION: dav_registration: try to incoorporate feedback from trainers

Browse Source
This commit is contained in:
heinzel
2019-04-01 16:50:34 +02:00
parent 0e1ec5c733
commit aa353ec6a5
8 changed files with 75 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dav_registration/templates/dav_registration/event/facts.html
View File

@@ -98,7 +98,11 @@
{% endif %}
<br />
{% endif %}
{% if event.registration_required and event.deadline %}<strong>{% trans 'Anmeldeschluss' %}:</strong> {{ event.deadline|date:'l, d. F Y' }}<br />{% endif %}
{% if event.registration_required and event.deadline %}
{% if event.is_deadline_expired %}<span class="text-danger">{% endif %}
<strong>{% trans 'Anmeldeschluss' %}:</strong> {{ event.deadline|date:'l, d. F Y' }}<br />
{% if event.is_deadline_expired %}</span>{% endif %}
{% endif %}
{% if event.trainer_2_fullname %}
{% if event.mode == 'training' %}
<strong>{% trans 'Ausbildungsteam' %}:</strong>

23
dav_registration/templates/dav_registration/event_detail.html
View File

@@ -4,6 +4,17 @@
{% block head-title %}{{ event.number }} - {{ block.super }}{% endblock head-title %}
{% block messages %}
{% if event.is_deadline_expired %}
<div class="container-fluid">
<div class="alert alert-danger">
Der Anmeldeschluss ist bereits abgelaufen!<br />
Eine Anmeldung ist nicht mehr möglich.
</div>
</div>
{% endif %}
{% endblock messages %}
{% block page-container-fluid %}
<div class="row">
<div class="col-sm-12">
@@ -26,7 +37,17 @@
{% render_event_facts event %}
</li>
<li class="list-group-item">
<a class="btn btn-primary" href="{% url 'dav_registration:register' event.pk %}">{% trans 'Anmelden' %}</a>
{% if not event.registration_required %}
<div class="alert alert-info">
{% blocktrans %}
Zu dieser Veranstaltung ist keine Anmeldung notwendig.<br />
Du kannst das Anmeldeformular natürlich trotzdem ausfüllen.
{% endblocktrans %}
</div>
{% endif %}
{% if not event.is_deadline_expired %}
<a class="btn btn-primary" href="{% url 'dav_registration:register' event.pk %}">{% trans 'Anmeldung' %}</a>
{% endif %}
<a class="btn btn-danger" href="{% url 'dav_registration:events' %}">{% trans 'Zurück' %}</a>
</li>
</ul>

13
dav_registration/templates/dav_registration/event_list.html
View File

@@ -5,7 +5,7 @@
{% block page-container-fluid %}
<div>
<h3 class="top-most">Touren & Kurse</h3>
<h3 class="top-most">{% trans 'Touren & Kurse' %}</h3>
<table id="objects_table" class="table table-bordered table-hover">
<thead>
<tr>
@@ -24,7 +24,12 @@
</a>
</div>
<div class="pull-right" style="margin-left: 1em;">
<a class="btn btn-primary" href="{% url 'dav_registration:event' event.pk %}">Details & Anmeldung</a>
{% if event.is_deadline_expired %}
<span class="text-danger"><span class="glyphicon glyphicon-exclamation-sign"></span></span>
<span class="text-danger">{% trans 'Anmeldeschluss abgelaufen' %}</span>
{% else %}
<a class="btn btn-primary" href="{% url 'dav_registration:event' event.pk %}">{% trans 'Details & Anmeldung' %}</a>
{% endif %}
</div>
<div class="pull-left" style="margin-right: 12px;">
{% with event.sport as sport %}
@@ -53,9 +58,11 @@
<li class="list-group-item">
{% render_event_facts event %}
</li>
{% if not event.is_deadline_expired %}
<li class="list-group-item">
<a class="btn btn-primary" href="{% url 'dav_registration:event' event.pk %}">zur Anmeldung</a>
<a class="btn btn-primary" href="{% url 'dav_registration:event' event.pk %}">{% trans 'zur Anmeldung' %}</a>
</li>
{% endif %}
</ul>
</div>
</div>