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

CONT: fixed the previous changes.

Browse Source
This commit is contained in:
heinzel
2019-01-30 16:35:37 +01:00
parent 7667277862
commit f0e225c5fd
11 changed files with 79 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@
<div class="panel panel-default">
<div class="panel-heading">
<div class="pull-right">
{% render_event_status event show_void='False' %}
{% render_event_status event show_void=False %}
</div>
<span class="panel-title">{{ number }} - {{ title }}</span>
</div>

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

@@ -23,7 +23,7 @@
</p>
</div>
<div class="modal-footer">
<a class="btn btn-success" href="{% url 'dav_events:confirmstatus' event.pk 'submitted' %}">
<a class="btn btn-success" href="{% url 'dav_events:updatestatus' event.pk 'submitted' %}">
{% bootstrap_icon 'ok' %}&thinsp;
{% trans 'Ja, alles klar!' %}
</a>
@@ -51,7 +51,7 @@
</p>
</div>
<div class="modal-footer">
<a class="btn btn-success" href="{% url 'dav_events:confirmstatus' event.pk 'accepted' %}">
<a class="btn btn-success" href="{% url 'dav_events:updatestatus' event.pk 'accepted' %}">
{% bootstrap_icon 'ok' %}&thinsp;
{% trans 'Ja, passt schon!' %}
</a>
@@ -84,15 +84,15 @@
</p>
</div>
<div class="modal-footer">
<a class="btn btn-info" href="{% if event.planned_publication_date %}{% url 'dav_events:confirmstatus' event.pk 'publishing_facebook' %}{% else %}{% url 'dav_events:confirmstatus' event.pk 'published' %}{% endif %}">
<a class="btn btn-info" href="{% url 'dav_events:updatestatus' event.pk 'publishing_facebook' %}">
{% bootstrap_icon 'ok' %}&thinsp;
{% trans 'Facebook' %}
</a>
<a class="btn btn-primary" href="{% if event.planned_publication_date %}{% url 'dav_events:confirmstatus' event.pk 'publishing_web' %}{% else %}{% url 'dav_events:confirmstatus' event.pk 'published' %}{% endif %}">
<a class="btn btn-primary" href="{% url 'dav_events:updatestatus' event.pk 'publishing_web' %}">
{% bootstrap_icon 'ok' %}&thinsp;
{% trans 'Webseite' %}
</a>
<a class="btn btn-success" href="{% if event.planned_publication_date %}{% url 'dav_events:confirmstatus' event.pk 'publishing' %}{% else %}{% url 'dav_events:confirmstatus' event.pk 'published' %}{% endif %}">
<a class="btn btn-success" href="{% url 'dav_events:updatestatus' event.pk 'publishing' %}">
{% bootstrap_icon 'ok' %}&thinsp;
{% trans 'Überall' %}
</a>
@@ -132,9 +132,9 @@
</a>
{% endif %}
{% if has_permission_publish %}
<a class="btn {% if is_accepted and not is_publishing %}btn-success{% else %}btn-default disabled{% endif %}"
<a class="btn {% if is_accepted and not is_publishing and not is_published %}btn-success{% else %}btn-default disabled{% endif %}"
data-toggle="modal" data-target="#modal-confirmpublication-dialog">
{% if is_publishing %}
{% if is_publishing_any %}
{% bootstrap_icon 'check' %}&thinsp;
{% else %}
{% bootstrap_icon 'unchecked' %}&thinsp;
@@ -171,7 +171,7 @@
<div class="panel panel-default">
<div class="panel-body">
<div class="row">
<div class="col-sm-5">
<div class="col-sm-7">
<h5>Status-Log</h5>
{% for flag in event.flags.all %}
<div class="row">
@@ -186,17 +186,15 @@
</div>
{% endfor %}
</div>
<div class="col-sm-3">
<h5>{% trans 'Veröffentlichen' %}</h5>
<div class="col-sm-5">
<h5>{% trans 'Veröffentlichung' %}</h5>
{% if event.planned_publication_date %}
{{ event.planned_publication_date|date:'l, d. F Y' }}
{% else %}
{% trans 'Unverzüglich' %}
{% endif %}
</div>
<div class="col-sm-4">
{% if event.internal_note %}
<h5>{% trans 'Bearbeitungshinweis' %}</h5>
<h5 style="margin-top: 1em;">{% trans 'Bearbeitungshinweis' %}</h5>
<div class="well well-sm"><small>{{ event.internal_note|linebreaksbr }}</small></div>
{% endif %}
</div>

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

@@ -26,7 +26,7 @@
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
{% trans 'Diese Veranstaltung ist bereits ausgelaufen.' %}
</div>
{% elif is_publishing %}
{% elif is_publishing_any %}
<div class="alert alert-danger alert-dismissible" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<strong>{% trans 'Achtung!' %}</strong> {% trans 'Diese Veranstaltung wird/wurde bereits veröffentlicht.' %}