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

Enabled event numbers.

Browse Source
This commit is contained in:
heinzel
2018-01-24 17:19:29 +01:00
parent 05d5a77a97
commit 9f2ba9912c
11 changed files with 145 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dav_events/templates/dav_events/emails/event_accepted.txt
View File

@@ -1,6 +1,6 @@
Hallo {{ trainer_firstname }},
deine folgende Veranstaltung wurde von einem Tourenreferent freigegeben:
ein Tourenreferent hat deine Veranstaltung freigegeben:
-----
{{ event.render_as_text }}-----

2
dav_events/templates/dav_events/event.html
View File

@@ -2,7 +2,7 @@
<div class="panel panel-default">
<div class="panel-heading">
<span class="panel-title">{{ sport|upper }}**/{{ first_day|date:'y' }} - {{ title }}</span>
<span class="panel-title">{{ number }} - {{ title }}</span>
</div>
<ul class="list-group">
<li class="list-group-item">

2
dav_events/templates/dav_events/event.txt
View File

@@ -1,4 +1,4 @@
{% load i18n %}{{ sport|upper }}**/{{ first_day|date:'y' }} - {{ title }}
{% load i18n %}{{ number }} - {{ title }}
{{ short_date }}
{% if alt_short_date %}({% trans 'Ersatztermin' %}: {{ alt_short_date }})

34
dav_events/templates/dav_events/event_detail.html
View File

@@ -1,7 +1,7 @@
{% extends 'dav_events/base.html' %}
{% load i18n %}
{% block head-title %}{{ event.title }} - {{ block.super }}{% endblock head-title %}
{% block head-title %}{{ event }} - {{ block.super }}{% endblock head-title %}
{% block page-container-fluid %}
<div class="action-tabs">
@@ -34,17 +34,35 @@
<div class="panel panel-default">
<div class="panel-body">
<div class="row">
<div class="col-sm-2">
<strong>{% trans 'Eingereicht' %}:</strong>
</div>
<div class="col-sm-7">
{{ event.created_at|date:'l, d. F Y, H:i' }} Uhr
<div class="col-sm-10">
<div class="row">
<div class="col-sm-2">
<strong>{% trans 'Eingereicht' %}:</strong>
</div>
<div class="col-sm-10">
{{ event.created_at|date:'l, d. F Y, H:i' }} {% trans 'Uhr' %}<br />
{{ event.owner.get_full_name }}
</div>
</div>
<div class="row">
<div class="col-sm-2">
<strong>{% trans 'Freigegeben' %}:</strong>
</div>
<div class="col-sm-10">
{% if event.accepted %}
{{ event.accepted_at|date:'l, d. F Y, H:i' }} {% trans 'Uhr' %}<br />
{{ event.accepted_by.get_full_name }}
{% else %}
-
{% endif %}
</div>
</div>
</div>
<div class="col-sm-2">
{% if event.accepted %}
<span class="label label-success">{% trans 'Freigegeben' %}</span>
<span class="label label-warning">{% trans 'Freigegeben' %}</span>
{% else %}
<span class="label label-danger">{% trans 'Nicht Freigegeben' %}</span>
<span class="label label-danger">{% trans 'Eingereicht' %}</span>
{% endif %}
</div>
</div>

9
dav_events/templates/dav_events/event_list.html
View File

@@ -21,6 +21,7 @@
<thead>
<tr>
<th>{% trans 'Spielart' %}</th>
<th>{% trans 'Nummer' %}</th>
<th>{% trans 'Titel' %}</th>
<th>{% trans 'Trainer' %}</th>
<th>{% trans 'Datum' %}</th>
@@ -32,6 +33,7 @@
<th><input type="text" placeholder="{% trans 'Filter' %}" /></th>
<th><input type="text" placeholder="{% trans 'Filter' %}" /></th>
<th><input type="text" placeholder="{% trans 'Filter' %}" /></th>
<th><input type="text" placeholder="{% trans 'Filter' %}" /></th>
</tr>
</thead>
<tbody>
@@ -40,6 +42,9 @@
<td>
{{ event.get_sport_display }}
</td>
<td>
<a href="{% url 'dav_events:event_detail' event.pk %}">{{ event.get_number }}</a>
</td>
<td>
<a href="{% url 'dav_events:event_detail' event.pk %}">{{ event.title }}</a>
</td>
@@ -55,9 +60,9 @@
</td>
<td>
{% if event.accepted %}
<span class="label label-success">{% trans 'Freigegeben' %}</span>
<span class="label label-warning">{% trans 'Freigegeben' %}</span>
{% else %}
<span class="label label-danger">{% trans 'Nicht Freigegeben' %}</span>
<span class="label label-danger">{% trans 'Eingereicht' %}</span>
{% endif %}
</td>
</tr>