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

mostly auth stuff.

Browse Source
This commit is contained in:
heinzel
2018-01-19 16:16:39 +01:00
parent b72b5a519f
commit 3f9cc11dbd
9 changed files with 174 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dav_events/templates/dav_events/base.html
View File

@@ -36,13 +36,13 @@
<div id="page-body">
{% block page-body %}
<div class="container">
{% block page-container %}
{% endblock page-container %}
</div>
<div class="container-fluid">
{% block page-container-fluid %}
{% endblock page-container-fluid %}
</div>
<div class="container">
{% block page-container %}
{% endblock page-container %}
</div>
{% endblock page-body %}
</div>

11
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 }}XX/{{ first_day|date:'y' }} - {{ title }}</span>
<span class="panel-title">{{ sport|upper }}**/{{ first_day|date:'y' }} - {{ title }}</span>
</div>
<ul class="list-group">
<li class="list-group-item">
@@ -101,7 +101,7 @@
{% endif %}
{% if meeting_point and meeting_point != 'NONE' %}
<strong>{% trans 'Treffpunkt' %}:</strong>
{% if meeting_time %}{{ meeting_time }} Uhr, {% endif %}
{% if meeting_time %}{{ meeting_time|time:'G:i'|cut:':00' }} Uhr, {% endif %}
{% if meeting_point == 'OTHER' %}
{{ meeting_point_other }}
{% else %}
@@ -111,10 +111,10 @@
{% endif %}
{% if pre_meeting_1 %}
{% if pre_meeting_2 %}
<strong>{% trans 'Vortreffen' %} 1:</strong> {{ pre_meeting_1|date:'l, d. F Y, H:i' }} {% trans 'Uhr' %}, DAV {% trans 'Sektionszentrum' %}<br />
<strong>{% trans 'Vortreffen' %} 2:</strong> {{ pre_meeting_2|date:'l, d. F Y, H:i' }} {% trans 'Uhr' %}, DAV {% trans 'Sektionszentrum' %}<br />
<strong>{% trans 'Vortreffen' %} 1:</strong> {{ pre_meeting_1|date:'l, d. F Y, G:i'|cut:':00' }} {% trans 'Uhr' %}, DAV {% trans 'Sektionszentrum' %}<br />
<strong>{% trans 'Vortreffen' %} 2:</strong> {{ pre_meeting_2|date:'l, d. F Y, G:i'|cut:':00' }} {% trans 'Uhr' %}, DAV {% trans 'Sektionszentrum' %}<br />
{% else %}
<strong>{% trans 'Vortreffen' %}:</strong> {{ pre_meeting_1|date:'l, d. F Y, H:i' }} {% trans 'Uhr' %}, DAV {% trans 'Sektionszentrum' %}<br />
<strong>{% trans 'Vortreffen' %}:</strong> {{ pre_meeting_1|date:'l, d. F Y, G:i'|cut:':00' }} {% trans 'Uhr' %}, DAV {% trans 'Sektionszentrum' %}<br />
{% endif %}
{% endif %}
{% if min_participants > 0 or max_participants > 0 %}
@@ -134,6 +134,7 @@
{{ charge|floatformat:'-2' }} € {% trans 'Teilnahmegebühr' %}
{% endif %}
{% if additional_costs %}
{% if charge > 0 %}{% trans 'zzgl.' %}{% endif %}
{{ additional_costs }}
{% endif %}
<br />

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

@@ -3,32 +3,53 @@
{% block head-title %}{{ event.title }} - {{ block.super }}{% endblock head-title %}
{% block page-container-fluid %}
<div class="action-tabs">
<ul class="nav nav-tabs" role="tablist">
<li>
<a href="{% url 'dav_events:event_list' %}">{% trans 'Veranstaltungsliste' %}</a>
</li>
<li class="active">
<a href="{% url 'dav_events:event_detail' event.pk %}">{% trans 'Details' %}</a>
</li>
<li class="{% if not has_permission_accept or event.accepted %}disabled{% endif %}">
<a class="{% if has_permission_accept and not event.accepted %}btn-success{% endif %}"
href="{% url 'dav_events:event_accept' event.pk %}">{% trans 'Freigeben' %}</a>
</li>
<li class="disabled">
<a href="{% url 'dav_events:event_detail' event.pk %}">{% trans 'Ändern' %}</a>
</li>
<li class="disabled">
<a href="{% url 'dav_events:event_detail' event.pk %}"
title="{% trans 'Diese Veranstaltung als Vorlage für eine neue Veranstaltung benutzen' %}">{% trans 'Kopieren' %}</a>
</li>
</ul>
</div>
{% endblock page-container-fluid %}
{% block page-container %}
<div class="row">
<div class="col-sm-10">
<div class="col-sm-12">
{{ event.render_as_html }}
<div class="panel panel-default">
<div class="panel-body">
<strong>{% trans 'Eingereicht' %}:</strong> {{ event.created_at|date:'l, d. F Y, H:i' }} Uhr
<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>
<div class="col-sm-2">
{% if event.accepted %}
<span class="label label-success">{% trans 'Freigegeben' %}</span>
{% else %}
<span class="label label-danger">{% trans 'Nicht Freigegeben' %}</span>
{% endif %}
</div>
</div>
</div>
</div>
</div>
<div class="col-sm-2">
<ul class="list-group">
<li class="list-group-item"><strong>Status</strong></li>
{% if event.accepted %}
<li class="list-group-item list-group-item-success">{% trans 'Freigegeben' %}</li>
{% else %}
<li class="list-group-item list-group-item-danger">{% trans 'Nicht Freigegeben' %}</li>
{% endif %}
</ul>
<div class="btn-group-vertical" role="group">
<a class="btn btn-primary" href="{% url 'dav_events:event_list' %}">{% trans 'Zurück' %}</a>
{% if not event.accepted %}
<a disabled="disabled" class="btn btn-warning" href="">{% trans 'Ändern' %}</a>
<a class="btn btn-success" href="{% url 'dav_events:event_accept' event.pk %}">{% trans 'Freigeben' %}</a>
{% endif %}
</div>
</div>
</div>
{% endblock page-container %}

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

@@ -2,6 +2,17 @@
{% load i18n %}
{% block page-container-fluid %}
<div class="action-tabs">
<ul class="nav nav-tabs" role="tablist">
<li class="active">
<a href="{% url 'dav_events:event_list' %}">{% trans 'Veranstaltungsliste' %}</a>
</li>
<li>
<a class="btn-primary" href="{% url 'dav_events:event_create' %}">{% trans 'Neue Veranstaltung' %}</a>
</li>
</ul>
</div>
<div>
<table id="objects_table" class="table table-striped">
<thead>
@@ -30,9 +41,13 @@
<a href="{% url 'dav_events:event_detail' event.pk %}">{{ event.title }}</a>
</td>
<td>
{{ event.trainer_firstname }} {{ event.trainer_familyname }}
{% if event.owner.get_full_name %}
{{ event.owner.get_full_name }}<br />{{ event.owner.email }}
{% else %}
{{ event.owner }}
{% endif %}
</td>
<td data-order="{{ first_day|date:'U' }}">
<td data-order="{{ event.first_day|date:'U' }}">
{{ event.get_short_date }}
</td>
<td>
@@ -48,7 +63,7 @@
</table>
<script type="text/javascript">
$(document).ready( function () {
var table = $('#objects_table').DataTable( {
var table = $("#objects_table").DataTable( {
orderCellsTop: true,
paging: false,
language: {
@@ -59,12 +74,13 @@
}
} );
$('#objects_table thead input').on( 'keyup change', function() {
$("#objects_table thead input").on( "keyup change", function() {
table
.column( $(this).parent().index() )
.search( this.value )
.draw();
} );
$("#objects_table_filter").hide();
} );
</script>
</div>