Merge pull request #190 from DanielGrams/issue/189

Add sharing options to widget #189
This commit is contained in:
Daniel Grams 2021-06-02 15:11:45 +02:00 committed by GitHub
commit 984d15e1c7
3 changed files with 24 additions and 2 deletions

View File

@ -365,7 +365,7 @@
{{ render_int_prop(event.expected_participants, 'fa-users', 'Expected number of participants') }}
{% endmacro %}
{% macro render_event_props(event, start, end, dates = None, show_rating = False, show_admin_unit = True) %}
{% macro render_event_props(event, start, end, dates = None, show_rating = False, show_admin_unit = True, share_links=None, calendar_links=None) %}
<div class="card mb-3">
<div class="card-header">
{{ _('Event') }}
@ -407,6 +407,19 @@
<div class="mt-4">
{{ render_event_add_props(event) }}
</div>
{% if share_links or calendar_links %}
<div class="mt-4">
{% if share_links %}
<button type="button" class="btn btn-outline-secondary mr-1 mb-1" data-toggle="modal" data-target="#shareModal"><i class="fa fa-share-alt"></i> {{ _('Share') }}</button>
{{ render_share_modal(share_links) }}
{% endif %}
{% if calendar_links %}
<button type="button" class="btn btn-outline-secondary mb-1" data-toggle="modal" data-target="#calendarExportModal"><i class="fa fa-calendar"></i> {{ _('Add to calendar') }}</button>
{{ render_calendar_export_modal(calendar_links) }}
{% endif %}
</div>
{% endif %}
</div>
<div class="card-footer small">
{{ render_audit(event, show_rating) }}

View File

@ -13,7 +13,7 @@
{% block content %}
<div class="w-normal">
{{ render_event_props(event, event_date.start, event_date.end) }}
{{ render_event_props(event, event_date.start, event_date.end, share_links=share_links, calendar_links=calendar_links) }}
</div>
{% endblock %}

View File

@ -31,7 +31,9 @@ from project.views.event_date import prepare_event_date_form
from project.views.utils import (
flash_errors,
flash_message,
get_calendar_links,
get_pagination_urls,
get_share_links,
handleSqlError,
send_mail,
)
@ -75,11 +77,18 @@ def widget_event_date(au_short_name, id):
structured_data = json.dumps(
get_sd_for_event_date(event_date), indent=2, cls=DateTimeEncoder
)
url = url_for("event_date", id=id, _external=True)
share_links = get_share_links(url, event_date.event.name)
calendar_links = get_calendar_links(event_date)
return render_template(
"widget/event_date/read.html",
event_date=event_date,
styles=get_styles(admin_unit),
structured_data=structured_data,
share_links=share_links,
calendar_links=calendar_links,
)