Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add event state and topic name in the agenda templates [CPCN-633] #167

Merged
merged 1 commit into from
Mar 27, 2024
Merged

add event state and topic name in the agenda templates [CPCN-633] #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions server/theme/email_agenda.fr_ca.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<h1>{{ get_highlighted_field(item, ["headline", "name"]) | safe }}</h1>
<div><b>Nouvel élément pour votre sujet suivi: {{ topic_name }}</b></div>
<a href="{{ url_for_agenda(item) }}"><b>Voir cet élément dans votre compte: </b>{{ url_for_agenda(item) }}</a>

{% if item.event %}<p class="h3"><b>Quand: </b>{{ dateString }}</p>{% endif %}
{% if item.event %}<p class="h3"><b>Quand: </b>{{ dateString }} {{get_event_state(item)}}</p>{% endif %}

{% if location and location != '' %}
<p class="h3"><b>Où:</b> {{ location }}</p>
Expand All @@ -12,7 +13,7 @@ <h1>{{ get_highlighted_field(item, ["headline", "name"]) | safe }}</h1>
src={{ map | safe }} ></div>
{% endif %}

{% if contacts | length is gt 1 %}
{% if contacts | length is gt 0 %}
<p><b>Contact: </b>
{% for contact in contacts %}
<div>{{ contact.name or contact.organisation }}
Expand Down
5 changes: 3 additions & 2 deletions server/theme/email_agenda.fr_ca.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{{ item.headline or item.name }}
Nouvel élément pour votre sujet suivi: {{ topic_name }}
Voir cet élément dans votre compte: {{ url_for_agenda(item) }}
{% if item.event %}Quand: {{ dateString }}{% endif %}
{% if item.event %}Quand: {{ dateString }} {{get_event_state(item)}}{% endif %}
{% if location and location != '' %}Où: {{ location }}
{% endif %}{% if contacts | length is gt 1 %}Contact: {% for contact in contacts %}{{ contact.name or contact.organisation }} {{ contact.phone }} {{ contact.mobile }} {{ contact.email }}
{% endif %}{% if contacts | length is gt 0 %}Contact: {% for contact in contacts %}{{ contact.name or contact.organisation }} {{ contact.phone }} {{ contact.mobile }} {{ contact.email }}
{% endfor %}
{% endif %}{% if links | length is gt 1 %}Web: {% for link in links %}{{ link }}
{% endfor %}
Expand Down
5 changes: 3 additions & 2 deletions server/theme/email_agenda.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<h1>{{ get_highlighted_field(item, ["headline", "name"]) | safe }}</h1>
<div><b>New item for saved topic: {{ topic_name }}</b></div>
<a href="{{ url_for_agenda(item) }}"><b>View this item in your account: </b>{{ url_for_agenda(item) }}</a>
{% if item.event %}<p class="h3"><b>When:</b>{{ dateString }}</p>{% endif %}
{% if item.event %}<p class="h3"><b>When:</b>{{ dateString }} {{get_event_state(item)}}</p>{% endif %}

{% if location and location != '' %}
<p class="h3"><b>Where:</b> {{ location }}</p>
Expand All @@ -11,7 +12,7 @@ <h1>{{ get_highlighted_field(item, ["headline", "name"]) | safe }}</h1>
src={{ map | safe }} ></div>
{% endif %}

{% if contacts | length is gt 1 %}
{% if contacts | length is gt 0 %}
<p><b>Contact: </b>
{% for contact in contacts %}
<div>{{ contact.name or contact.organisation }}
Expand Down
7 changes: 4 additions & 3 deletions server/theme/email_agenda.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{{ item.headline or item.name }}
New item for saved topic: {{ topic_name }}
View this item in your account: {{ url_for_agenda(item) }}
{% if item.event %} When: {{ dateString }}{% endif %}
{% if location and location != '' %}Where: {{ location }}
{% endif %}{% if contacts | length is gt 1 %}Contact: {% for contact in contacts %}{{ contact.name or contact.organisation }} {{ contact.phone }} {{ contact.mobile }} {{ contact.email }}
{% if item.event %}When: {{ dateString }} {{get_event_state(item)}}{% endif %}
{% if location and location != '' %}Where: {{ location }}{% endif %}
{% if contacts | length is gt 0 %}Contact: {% for contact in contacts %}{{ contact.name or contact.organisation }} {{ contact.phone }} {{ contact.mobile }} {{ contact.email }}
{% endfor %}
{% endif %}{% if links | length is gt 1 %}Web: {% for link in links %}{{ link }}
{% endfor %}
Expand Down
Loading