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

More work on planned publish date and internal note. improved event

Browse Source 
detail page and some form code.
This commit is contained in:
heinzel
2018-02-25 20:30:52 +01:00
parent e669d5b55b
commit 11a5e3c0c8
6 changed files with 167 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,17 @@
<div class="panel panel-default">
<div class="panel-heading">
<div class="pull-right">
{% if status == 'expired' %}
<span class="label label-info">{% trans 'Ausgelaufen' %}</span>
{% elif status == 'published' %}
<span class="label label-success">{% trans 'Veröffentlicht' %}</span>
{% elif status == 'accepted' %}
<span class="label label-warning">{% trans 'Freigegeben' %}</span>
{% elif status == 'submitted' %}
<span class="label label-danger">{% trans 'Eingereicht' %}</span>
{% endif %}
</div>
<span class="panel-title">{{ number }} - {{ title }}</span>
</div>
<ul class="list-group">

22
dav_events/templates/dav_events/event_create/SummaryForm.html
View File

@@ -3,10 +3,26 @@
{% load i18n %}
{% block form-fields-visible %}
{{ event.render_as_html }}
<div class="row">
<div class="col-sm-12">
{% bootstrap_field form.publish_date %}
<div class="col-sm-8">
{{ event.render_as_html }}
</div>
<div class="col-sm-4">
<div class="row">
<div class="col-sm-12">
<label>{{ form.planned_publish_date.label }}</label>
{% if form.planned_publish_date.value %}
<p>{{ form.planned_publish_date.value|date:'l, d. F Y' }} ({{ form.planned_publish_issue.value }})</p>
{% else %}
<p>{% trans 'In wenigen Tagen' %}</p>
{% endif %}
</div>
</div>
<div class="row">
<div class="col-sm-12">
{% bootstrap_field form.internal_note %}
</div>
</div>
</div>
</div>
{% endblock form-fields-visible %}

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

@@ -113,57 +113,67 @@
<div class="panel panel-default">
<div class="panel-body">
<div class="row">
<div class="col-sm-9">
<div class="col-sm-5">
<div class="row">
<div class="col-sm-2">
<strong>{% trans 'Eingereicht' %}:</strong>
<div class="col-sm-4">
<span class="text-danger">{% bootstrap_icon 'check' %}</span>
&thinsp;<strong>{% trans 'Eingereicht' %}:</strong>
</div>
<div class="col-sm-10">
<div class="col-sm-8">
{{ event.created_at|date:'l, d. F Y, H:i' }} {% trans 'Uhr' %}<br />
{% trans 'von' %} {{ event.owner.get_full_name }}
</div>
</div>
<div class="row">
<div class="col-sm-2">
<strong>{% trans 'Freigegeben' %}:</strong>
<div class="col-sm-4">
{% if event.accepted %}
<span class="text-warning">{% bootstrap_icon 'check' %}</span>
{% else %}
{% bootstrap_icon 'unchecked' %}
{% endif %}
&thinsp;<strong>{% trans 'Freigegeben' %}:</strong>
</div>
<div class="col-sm-10">
<div class="col-sm-8">
{% if event.accepted %}
{{ event.accepted_at|date:'l, d. F Y, H:i' }} {% trans 'Uhr' %}<br />
{% trans 'von' %} {{ event.accepted_by.get_full_name }}
{% else %}
-
<br /><br />
{% endif %}
</div>
</div>
<div class="row">
<div class="col-sm-2">
<strong>{% trans 'Veröffentlicht' %}:</strong>
<div class="col-sm-4">
{% if event.published %}
<span class="text-success">{% bootstrap_icon 'check' %}</span>
{% else %}
{% bootstrap_icon 'unchecked' %}
{% endif %}
&thinsp;<strong>{% trans 'Veröffentlicht' %}:</strong>
</div>
<div class="col-sm-10">
<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 }}
{% else %}
-
<br /><br />
{% endif %}
</div>
</div>
</div>
<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' %}
<span class="label label-success">{% trans 'Veröffentlicht' %}</span>
{% elif event.get_status == 'accepted' %}
<span class="label label-warning">{% trans 'Freigegeben' %}</span>
{% 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 %}
</div>
<strong>{% trans 'Veröffentlichen' %}</strong><br />
{% if event.planned_publish_date %}
{{ event.planned_publish_date|date:'l, d. F Y' }}
{% else %}
{% trans 'Sofort' %}
{% endif %}
</div>
<div class="col-sm-4">
{% if event.internal_note %}
<strong>{% trans 'Bearbeitungshinweis' %}</strong>
<div class="well well-sm"><small>{{ event.internal_note|linebreaksbr }}</small></div>
{% endif %}
</div>
</div>
</div>