BROKEN! MIGRATE! BIG UPD: not yet complete support for publish[ed|ing]_[web|facebook]

This commit is contained in:
2019-01-23 18:36:11 +01:00
parent 7f7b596b20
commit e6a5f9818a
19 changed files with 503 additions and 210 deletions

View File

@@ -0,0 +1,25 @@
{% load i18n %}Hallo {{ recipient.first_name }},
{{ trainer_firstname }} {{ trainer_familyname }} hat eine neue Veranstaltung eingereicht.
Die Veranstaltung wurde {% if editor %}von {{ editor.get_full_name }} {% endif %}zur Veröffentlichung
auf Facebook frei gegeben.
Der folgende Link führt zur Veranstaltung:
{{ base_url }}{{ event.get_absolute_url }}
Über den folgenden Link kannst du die Veröffentlichung auf Facebook unmittelbar bestätigen:
{{ base_url }}{{ confirm_publication_url }}
Veröffentlichung: ({% if planned_publication_date %}{{ planned_publication_date|date:'l, d. F Y' }}{% else %}sofort{% endif %})
=================
{% if planned_publication_date %}Veröffentlichung starten: {{ planned_publication_date|date:'d.m.Y' }} 00:00:00
{% endif %}Veröffentlichung beenden: {{ day_after|date:'d.m.Y' }} 00:00:00
Erstellungsdatum: {{ first_day|date:'d.m.Y' }} 00:00:00
Titel: {{ number }} - {{ title }}
{% if internal_note %}
Bearbeitungshinweis:
====================
{{ internal_note }}
{% endif %}
Ausschreibung:
==============
{{ event.render_as_text }}

View File

@@ -0,0 +1,73 @@
{% load i18n %}Hallo {{ recipient.first_name }},
{{ trainer_firstname }} {{ trainer_familyname }} hat eine neue Veranstaltung eingereicht.
Die Veranstaltung wurde {% if editor %}von {{ editor.get_full_name }} {% endif %}zur Veröffentlichung
auf der Webseite frei gegeben.
Der folgende Link führt zur Veranstaltung:
{{ base_url }}{{ event.get_absolute_url }}
Über den folgenden Link kannst du die Veröffentlichung auf der Webseite unmittelbar bestätigen:
{{ base_url }}{{ confirm_publication_url }}
Veröffentlichung: ({% if planned_publication_date %}{{ planned_publication_date|date:'l, d. F Y' }}{% else %}sofort{% endif %})
=================
{% if planned_publication_date %}Veröffentlichung starten: {{ planned_publication_date|date:'d.m.Y' }} 00:00:00
{% endif %}Veröffentlichung beenden: {{ day_after|date:'d.m.Y' }} 00:00:00
Erstellungsdatum: {{ first_day|date:'d.m.Y' }} 00:00:00
Titel: {{ number }} - {{ title }}
{% if internal_note %}
Bearbeitungshinweis:
====================
{{ internal_note }}
{% endif %}
Joomla HTML
===========
<h6>{{ normalized_long_date }}{% if alt_normalized_long_date %}<br />
({% trans 'Ersatztermin' %}: {{ alt_normalized_long_date }})
{% endif %}</h6>
<p>{{ description|urlize|linebreaksbr }}</p>
{% if mode == 'training' %}
<p><strong>{% trans 'Kursinhalte' %}:</strong></p>
{% if course_topic_2 %}<ul>
<li>{{ course_topic_1|urlize }}</li>
<li>{{ course_topic_2|urlize }}</li>
{% if course_topic_3 %} <li>{{ course_topic_3|urlize }}</li>
{% endif %}{% if course_topic_4 %} <li>{{ course_topic_4|urlize }}</li>
{% endif %}{% if course_topic_5 %} <li>{{ course_topic_5|urlize }}</li>
{% endif %}{% if course_topic_6 %} <li>{{ course_topic_6|urlize }}</li>
{% endif %}</ul>
{% else %}<p>{{ course_topic_1|urlize|linebreaksbr }}</p>{% endif %}
<p><strong>{% trans 'Kursziele' %}:</strong></p>
{% if course_goal_2 %}<ul>
<li>{{ course_goal_1|urlize }}</li>
<li>{{ course_goal_2|urlize }}</li>
{% if course_goal_3 %} <li>{{ course_goal_3|urlize }}</li>
{% endif %}{% if course_goal_4 %} <li>{{ course_goal_4|urlize }}</li>
{% endif %}{% if course_goal_5 %} <li>{{ course_goal_5|urlize }}</li>
{% endif %}{% if course_goal_6 %} <li>{{ course_goal_6|urlize }}</li>
{% endif %}</ul>
{% else %}<p>{{ course_goal_1|urlize|linebreaksbr }}</p>{% endif %}
{% endif %}<hr id="system-readmore" />
<p>
{% if requirements %}<strong>{% trans 'Anforderungen' %}:</strong> {{ requirements }}<br />
{% endif %}{% if equipment %}<strong>{% trans 'Ausrüstung' %}:</strong> {{ equipment }}<br />
{% endif %}{% if location %}<strong>{% trans 'Ort' %}:</strong> {{ location }} {% if country and country != 'DE' and country != 'XX' %}({{ country }}){% endif %}<br />
{% endif %}{% if basecamp %}<strong>{% trans 'Stützpunkt' %}:</strong> {{ basecamp }}<br />
{% endif %}{% if accommodation and accommodation != 'NONE' %}<strong>{% trans 'Unterkunft' %}:</strong> {% if accommodation == 'OTHER' %}{{ accommodation_other }}{% else %}{{ event.get_accommodation_display }}{% endif %}<br />
{% endif %}{% if meals and meals != 'NONE' %}<strong>{% trans 'Verpflegung' %}:</strong> {% if meals == 'OTHER' %}{{ meals_other }}{% else %}{{ event.get_meals_display }}{% endif %}<br />
{% endif %}{% if transport and transport != 'NONE' and transport != 'public' %}<strong>{% trans 'Hin- / Rückfahrt' %}:</strong> {% if transport == 'OTHER' %}{{ transport_other }}{% else %}{{ event.get_transport_display }}{% endif %}<br />
{% endif %}{% if meeting_point and meeting_point != 'NONE' %}<strong>{% trans 'Treffpunkt' %}:</strong> {% if meeting_time %}{{ meeting_time|time:'G:i'|cut:':00' }} Uhr, {% endif %}{% if meeting_point == 'OTHER' %}{{ meeting_point_other }}{% else %}{{ event.get_meeting_point_display }}{% endif %}<br />
{% endif %}{% if transport == 'public' %}{% if departure_time or departure_ride %}<strong>{% trans 'Abfahrt' %}:</strong> {% if departure_time %}{{ departure_time|time:'G:i'|cut:':00' }} Uhr{% endif %}{% if departure_time and departure_ride %}, {% endif %}{% if departure_ride %}{{ departure_ride }}{% endif %}<br />
{% endif %}{% endif %}{% if return_departure_time or return_arrival_time %}<strong>{% trans 'Rückfahrt' %}:</strong> {% if return_arrival_time %}{{ return_arrival_time|time:'G:i'|cut:':00' }} Uhr ({% trans 'Ankunft in' %} Karlsruhe){% elif return_departure_time %}{{ return_departure_time|time:'G:i'|cut:':00' }} Uhr ({% trans 'Abfahrt am Tourenort' %}){% endif %}<br />
{% endif %}{% if pre_meeting_1 %}{% if pre_meeting_2 %}<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, G:i'|cut:':00' }} {% trans 'Uhr' %}, DAV {% trans 'Sektionszentrum' %}<br />{% endif %}
{% endif %}{% if min_participants > 0 or max_participants > 0 %}<strong>{% trans 'Teilnehmerzahl' %}:</strong> {% if min_participants == max_participants %}{{ max_participants }} {% trans 'Teilnehmer' %}{% elif min_participants > 0 and max_participants > 0 %}{{ min_participants }} - {{ max_participants }} {% trans 'Teilnehmer' %}{% elif min_participants > 0 %}min. {{ min_participants }} {% trans 'Teilnehmer' %}{% else %}max. {{ max_participants }} {% trans 'Teilnehmer' %}{% endif %}<br />
{% endif %}{% if charge > 0 or additional_costs %}<strong>{% trans 'Kosten' %}:</strong> {% if charge > 0 %}{{ charge|floatformat:'-2' }} € {% trans 'Teilnahmegebühr' %}{% endif %}{% if additional_costs %}{% if charge > 0 %} {% trans 'zzgl.' %} {% endif %}{{ additional_costs }}{% endif %}<br />
{% endif %}{% if registration_required and deadline %}<strong>{% trans 'Anmeldeschluss' %}:</strong> {{ deadline|date:'l, d. F Y' }}<br />
{% endif %}{% if trainer_2_fullname %}{% if mode == 'training' %}<strong>{% trans 'Ausbildungsteam' %}:</strong>{% else %}<strong>{% trans 'Team' %}:</strong>{% endif %} {{ trainer_firstname }} {{ trainer_familyname }}, {{ trainer_2_fullname }}{% if trainer_3_fullname %}, {{ trainer_3_fullname }}{% endif %}<br />
{% endif %}{% if trainer_familyname %}<strong>{% trans 'Leitung' %}:</strong> {{ trainer_firstname }} {{ trainer_familyname }}{% if trainer_email or trainer_phone %} ({% if trainer_email %}<a href="mailto:{{ trainer_email }}">{{ trainer_email }}</a>{% endif %}{% if trainer_email and trainer_phone %}, {% endif %}{% if trainer_phone %}{{ trainer_phone }}{% endif %}){% endif %}
{% endif %}</p>
{% if registration_required and registration_howto %}<p>{{ registration_howto|urlize }}</p>
{% endif %}

View File

@@ -3,12 +3,12 @@
<div class="panel panel-default">
<div class="panel-heading">
<div class="pull-right">
{% if status.code != 'void' %}
{{ status.get_bootstrap_label|safe }}
{% if status.code == 'publishing' %}
<span class="label label-{{ status.bootstrap_context|default:'default' }}">{{ planned_publication_date|date:'d.m.Y' }}</span>
{% endif %}
{% for flag in event.get_status_flags %}
{{ flag.status.get_bootstrap_label|safe }}
{% if planned_publication_date and flag.status.code|slice:":10" == 'publishing' %}
<span class="label label-{{ flag.status.bootstrap_context|default:'default' }}">{{ planned_publication_date|date:'d.m.Y' }}</span>
{% endif %}
{% endfor %}
</div>
<span class="panel-title">{{ number }} - {{ title }}</span>
</div>

View File

@@ -102,7 +102,7 @@
<div class="action-tabs">
<div class="pull-right">
{% if has_permission_submit %}
<a class="btn {% if event.get_status.code == 'draft' %}btn-success{% else %}btn-default disabled{% endif %}"
<a class="btn {% if 'submitted' in event.get_status_codes %}btn-default disabled{% else %}btn-success{% endif %}"
data-toggle="modal" data-target="#modal-submit-dialog">
{% if 'submitted' in event.get_status_codes %}
{% bootstrap_icon 'check' %}&thinsp;
@@ -113,7 +113,7 @@
</a>
{% endif %}
{% if has_permission_accept %}
<a class="btn {% if event.get_status.code == 'submitted' %}btn-success{% else %}btn-default disabled{% endif %}"
<a class="btn {% if 'accepted' in event.get_status_codes %}btn-default disabled{% else %}btn-success{% endif %}"
data-toggle="modal" data-target="#modal-accept-dialog">
{% if 'accepted' in event.get_status_codes %}
{% bootstrap_icon 'check' %}&thinsp;

View File

@@ -65,10 +65,14 @@
{{ event.get_numeric_date }}
</td>
<td>
{{ event.get_status.get_bootstrap_label|safe }}
{% if event.get_status.code == 'publishing' %}
<span class="label label-{{ event.get_status.bootstrap_context|default:'default' }}">{{ event.planned_publication_date|date:'d.m.Y' }}</span>
{% for flag in event.get_status_flags %}
{{ flag.status.get_bootstrap_label|safe }}
{% if event.planned_publication_date and flag.status.code|slice:':10' == 'publishing' %}
<span class="label label-{{ flag.status.bootstrap_context|default:'default' }}">{{ event.planned_publication_date|date:'d.m.Y' }}</span>
{% endif %}
{% empty %}
{{ event.get_status.get_bootstrap_label|safe }}
{% endfor %}
</td>
</tr>
{% endfor %}