Added published status.

This commit is contained in:
2018-02-24 15:50:21 +01:00
parent 0f0dbbd34c
commit 37264f783a
6 changed files with 149 additions and 30 deletions

View File

@@ -30,24 +30,64 @@
</div>
</div>
</div>
<div id="modal-setpublished-dialog" class="modal fade" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">{% trans 'Wird die Veranstaltung veröffentlicht?' %}</h4>
</div>
<div class="modal-body">
<p class="text-center">
<strong>{{ event }}</strong>
</p>
</div>
<div class="modal-footer">
<a class="btn btn-success" href="{% url 'dav_events:event_setpublished' event.pk %}">
{% bootstrap_icon 'ok' %}&thinsp;
{% trans 'Ja' %}
</a>
<button type="button" class="btn btn-danger" data-dismiss="modal">
{% bootstrap_icon 'remove' %}&thinsp;
{% trans 'Nein' %}
</button>
</div>
</div>
</div>
</div>
{% endblock modals %}
{% block page-container-fluid %}
<div class="action-tabs">
<div class="pull-right">
<a class="btn {% if has_permission_accept %}btn-success{% else %}btn-default disabled{% endif %}"
data-toggle="modal" data-target="#modal-accept-dialog">
{% bootstrap_icon 'check' %}&thinsp;
{% trans 'Freigeben' %}
</a>
<!--
<a class="btn btn-warning"
<a class="btn btn-primary"
href="{% url 'dav_events:event_detail' event.pk %}"
title="{% trans 'Diese Veranstaltung als Vorlage für eine neue Veranstaltung benutzen' %}">
{% bootstrap_icon 'duplicate' %}&thinsp;
{% trans 'Kopieren' %}
</a>
-->
{% if has_permission_accept %}
<a class="btn {% if event.get_status == 'submitted' %}btn-success{% else %}btn-default disabled{% endif %}"
data-toggle="modal" data-target="#modal-accept-dialog">
{% if event.accepted %}
{% bootstrap_icon 'check' %}&thinsp;
{% else %}
{% bootstrap_icon 'unchecked' %}&thinsp;
{% endif %}
{% trans 'Freigeben' %}
</a>
{% endif %}
{% if has_permission_publish %}
<a class="btn {% if event.get_status == 'accepted' %}btn-success{% else %}btn-default disabled{% endif %}"
data-toggle="modal" data-target="#modal-setpublished-dialog">
{% if event.published %}
{% bootstrap_icon 'check' %}&thinsp;
{% else %}
{% bootstrap_icon 'unchecked' %}&thinsp;
{% endif %}
{% trans 'Wird veröffentlicht' %}
</a>
{% endif %}
</div>
<ul class="nav nav-tabs" role="tablist">
<li>
@@ -71,14 +111,14 @@
<div class="panel panel-default">
<div class="panel-body">
<div class="row">
<div class="col-sm-10">
<div class="col-sm-9">
<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 }}
{% trans 'von' %} {{ event.owner.get_full_name }}
</div>
</div>
<div class="row">
@@ -88,7 +128,7 @@
<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 }}
{% trans 'von' %} {{ event.accepted_by.get_full_name }}
{% else %}
-
{% endif %}
@@ -101,25 +141,27 @@
<div class="col-sm-10">
{% if event.published %}
{{ event.published_at|date:'l, d. F Y, H:i' }} {% trans 'Uhr' %}<br />
{{ event.published_by.get_full_name }}
{% trans 'von' %} {{ event.published_by.get_full_name }}
{% else %}
-
{% endif %}
</div>
</div>
</div>
<div class="col-sm-2">
{% if event.get_status == 'expired' %}
<div class="col-sm-3">
<div class="pull-right">
{% if event.get_status == 'expired' %}
<span class="label label-info">{% trans 'Ausgelaufen' %}</span>
{% elif event.get_status == 'published' %}
{% elif event.get_status == 'published' %}
<span class="label label-success">{% trans 'Veröffentlicht' %}</span>
{% elif event.get_status == 'accepted' %}
{% elif event.get_status == 'accepted' %}
<span class="label label-warning">{% trans 'Freigegeben' %}</span>
{% elif event.get_status == 'submitted' %}
{% elif event.get_status == 'submitted' %}
<span class="label label-danger">{% trans 'Eingereicht' %}</span>
{% else %}
<span class="label label-default">{% trans 'Kaputt' %} (){{ event.get_status }}</span>
{% endif %}
{% else %}
<span class="label label-default">{% trans 'Kaputt' %} ({{ event.get_status }})</span>
{% endif %}
</div>
</div>
</div>
</div>