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

UPD: display http and mailto links in html views (e.g. trainer email in

Browse Source 
registration howto).
This commit is contained in:
heinzel
2018-11-20 12:28:31 +01:00
parent 11b210c8aa
commit 6cae9d5e33
3 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
TODO.txt
View File

@@ -1,5 +1,4 @@
- verschiedene published einträge (facebook, webseite)
- email im anmeldedisclamer in html
- Save as Draft
- Draft-Status
- Done-Status

32
dav_events/templates/dav_events/emails/event_to_publish.txt
View File

@@ -20,28 +20,28 @@ Bearbeitungshinweis:
<h6>{{ normalized_long_date }}{% if alt_normalized_long_date %}<br />
({% trans 'Ersatztermin' %}: {{ alt_normalized_long_date }})
{% endif %}</h6>
<p>{{ description|linebreaksbr }}</p>
<p>{{ description|urlize|linebreaksbr }}</p>
{% if mode == 'training' %}
<p><strong>{% trans 'Kursinhalte' %}:</strong></p>
{% if course_topic_2 %}<ul>
<li>{{ course_topic_1 }}</li>
<li>{{ course_topic_2 }}</li>
{% if course_topic_3 %} <li>{{ course_topic_3 }}</li>
{% endif %}{% if course_topic_4 %} <li>{{ course_topic_4 }}</li>
{% endif %}{% if course_topic_5 %} <li>{{ course_topic_5 }}</li>
{% endif %}{% if course_topic_6 %} <li>{{ course_topic_6 }}</li>
<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|linebreaksbr }}</p>{% endif %}
{% else %}<p>{{ course_topic_1|urlize|linebreaksbr }}</p>{% endif %}
<p><strong>{% trans 'Kursziele' %}:</strong></p>
{% if course_goal_2 %}<ul>
<li>{{ course_goal_1 }}</li>
<li>{{ course_goal_2 }}</li>
{% if course_goal_3 %} <li>{{ course_goal_3 }}</li>
{% endif %}{% if course_goal_4 %} <li>{{ course_goal_4 }}</li>
{% endif %}{% if course_goal_5 %} <li>{{ course_goal_5 }}</li>
{% endif %}{% if course_goal_6 %} <li>{{ course_goal_6 }}</li>
<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|linebreaksbr }}</p>{% endif %}
{% else %}<p>{{ course_goal_1|urlize|linebreaksbr }}</p>{% endif %}
{% endif %}<hr id="system-readmore" />
<p>
@@ -64,7 +64,7 @@ Bearbeitungshinweis:
{% 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 }}</p>
{% if registration_required and registration_howto %}<p>{{ registration_howto|urlize }}</p>
{% endif %}
---------- Veröffentlichung ----------
{% if planned_publication_date %}Veröffentlichung starten: {{ planned_publication_date|date:'d.m.Y' }} 00:00:00

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

@@ -22,53 +22,53 @@
</li>
<li class="list-group-item">
<p>
{{ description|linebreaksbr }}
{{ description|urlize|linebreaksbr }}
</p>
{% if mode == 'training' %}
<div>
<p><strong>{% trans 'Kursinhalte' %}:</strong></p>
{% if course_topic_2 %}
<ul>
<li>{{ course_topic_1 }}</li>
<li>{{ course_topic_2 }}</li>
<li>{{ course_topic_1|urlize }}</li>
<li>{{ course_topic_2|urlize }}</li>
{% if course_topic_3 %}
<li>{{ course_topic_3 }}</li>
<li>{{ course_topic_3|urlize }}</li>
{% endif %}
{% if course_topic_4 %}
<li>{{ course_topic_4 }}</li>
<li>{{ course_topic_4|urlize }}</li>
{% endif %}
{% if course_topic_5 %}
<li>{{ course_topic_5 }}</li>
<li>{{ course_topic_5|urlize }}</li>
{% endif %}
{% if course_topic_6 %}
<li>{{ course_topic_6 }}</li>
<li>{{ course_topic_6|urlize }}</li>
{% endif %}
</ul>
{% else %}
<p>{{ course_topic_1|linebreaksbr }}</p>
<p>{{ course_topic_1|urlize|linebreaksbr }}</p>
{% endif %}
</div>
<div>
<p><strong>{% trans 'Kursziele' %}:</strong></p>
{% if course_goal_2 %}
<ul>
<li>{{ course_goal_1 }}</li>
<li>{{ course_goal_2 }}</li>
<li>{{ course_goal_1|urlize }}</li>
<li>{{ course_goal_2|urlize }}</li>
{% if course_goal_3 %}
<li>{{ course_goal_3 }}</li>
<li>{{ course_goal_3|urlize }}</li>
{% endif %}
{% if course_goal_4 %}
<li>{{ course_goal_4 }}</li>
<li>{{ course_goal_4|urlize }}</li>
{% endif %}
{% if course_goal_5 %}
<li>{{ course_goal_5 }}</li>
<li>{{ course_goal_5|urlize }}</li>
{% endif %}
{% if course_goal_6 %}
<li>{{ course_goal_6 }}</li>
<li>{{ course_goal_6|urlize }}</li>
{% endif %}
</ul>
{% else %}
<p>{{ course_goal_1|linebreaksbr }}</p>
<p>{{ course_goal_1|urlize|linebreaksbr }}</p>
{% endif %}
</div>
@@ -186,7 +186,7 @@
</div>
{% if registration_required and registration_howto %}
<div class="panel-footer">
<p>{{ registration_howto }}</p>
<p>{{ registration_howto|urlize }}</p>
</div>
{% endif %}
</div>