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

Publish workflow is now fully functional.

Browse Source
This commit is contained in:
heinzel
2018-02-26 14:44:30 +01:00
parent 87787c5eea
commit 69204a6d0d
16 changed files with 114 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,7 @@
</div>
</div>
</div>
<div id="modal-setpublished-dialog" class="modal fade" tabindex="-1" role="dialog">
<div id="modal-confirmpublication-dialog" class="modal fade" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
@@ -43,7 +43,7 @@
</p>
</div>
<div class="modal-footer">
<a class="btn btn-success" href="{% url 'dav_events:event_setpublished' event.pk %}">
<a class="btn btn-success" href="{% url 'dav_events:event_confirmpublication' event.pk %}">
{% bootstrap_icon 'ok' %}&thinsp;
{% trans 'Ja' %}
</a>
@@ -81,8 +81,8 @@
{% 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 %}
data-toggle="modal" data-target="#modal-confirmpublication-dialog">
{% if event.publication_confirmed %}
{% bootstrap_icon 'check' %}&thinsp;
{% else %}
{% bootstrap_icon 'unchecked' %}&thinsp;
@@ -144,7 +144,7 @@
</div>
<div class="row">
<div class="col-sm-4">
{% if event.published %}
{% if event.publication_confirmed %}
<span class="text-success">{% bootstrap_icon 'check' %}</span>
{% else %}
{% bootstrap_icon 'unchecked' %}
@@ -152,9 +152,9 @@
&thinsp;<strong>{% trans 'Veröffentlicht' %}:</strong>
</div>
<div class="col-sm-8">
{% if event.published %}
{{ event.published_at|date:'l, d. F Y, H:i' }} {% trans 'Uhr' %}<br />
{% trans 'von' %} {{ event.published_by.get_full_name }}
{% if event.publication_confirmed %}
{{ event.publication_confirmed_at|date:'l, d. F Y, H:i' }} {% trans 'Uhr' %}<br />
{% trans 'von' %} {{ event.publication_confirmed_by.get_full_name }}
{% else %}
<br /><br />
{% endif %}
@@ -163,8 +163,8 @@
</div>
<div class="col-sm-3">
<strong>{% trans 'Veröffentlichen' %}</strong><br />
{% if event.planned_publish_date %}
{{ event.planned_publish_date|date:'l, d. F Y' }}
{% if event.planned_publication_date %}
{{ event.planned_publication_date|date:'l, d. F Y' }}
{% else %}
{% trans 'Unverzüglich' %}
{% endif %}