From c488fb6313ca509afe30c632b4fb806a750d4aec Mon Sep 17 00:00:00 2001 From: Daniel Grams Date: Sun, 11 Oct 2020 16:43:36 +0200 Subject: [PATCH] =?UTF-8?q?-=20Erkl=C3=A4rungstexte=20in=20Verwaltung=20-?= =?UTF-8?q?=20Event-Seite:=20Dropdown=20mit=20Aktionen=20-=20Dropdown=20au?= =?UTF-8?q?ch=20auf=20EventDate-Seite?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/_macros.html | 27 +++- templates/event/read.html | 20 +-- templates/event_date/read.html | 4 +- .../manage/reference_requests_incoming.html | 3 +- .../manage/reference_requests_outgoing.html | 3 +- templates/manage/references_incoming.html | 3 +- templates/manage/references_outgoing.html | 3 +- templates/manage/reviews.html | 3 +- translations/de/LC_MESSAGES/messages.mo | Bin 14695 -> 14728 bytes translations/de/LC_MESSAGES/messages.po | 135 +++++++++++------- views/event.py | 18 ++- views/event_date.py | 5 +- 12 files changed, 138 insertions(+), 86 deletions(-) diff --git a/templates/_macros.html b/templates/_macros.html index 89b1669..197f7f5 100644 --- a/templates/_macros.html +++ b/templates/_macros.html @@ -686,4 +686,29 @@ $( function() { {{ render_field_with_errors(form_field.copyright_text) }} -{% endmacro %} \ No newline at end of file +{% endmacro %} + +{% macro render_event_menu(user_rights, event) %} + {% if user_rights['can_update_event'] or user_rights['can_verify_event'] %} +
+ +
+ {% if user_rights['can_verify_event'] %} + {{ _('Review event') }} + {% endif %} + {% if user_rights['can_update_event'] %} + {{ _('Edit event') }} + {{ _('Delete event') }}... + {% endif %} + {% if user_rights['can_reference_event'] %} + {{ _('Reference event') }} + {% endif %} + {% if user_rights['can_create_reference_request'] %} + {{ _('Empfehlung anfragen') }} + {% endif %} +
+
+ {% endif %} +{% endmacro %} diff --git a/templates/event/read.html b/templates/event/read.html index aeb8b3d..8748dee 100644 --- a/templates/event/read.html +++ b/templates/event/read.html @@ -1,27 +1,11 @@ {% extends "layout.html" %} -{% from "_macros.html" import render_event_props, render_image_with_link, render_place, render_link_prop %} +{% from "_macros.html" import render_event_menu, render_event_props, render_image_with_link, render_place, render_link_prop %} {% block title %} {{ event.name }} {% endblock %} {% block content %} - {% if can_update_event or user_can_verify_event %} -
- {% if user_can_verify_event %} - {{ _('Review event') }} - {% endif %} - {% if can_update_event %} - {{ _('Edit event') }} - {{ _('Delete event') }}... - {% endif %} - {% if user_can_reference_event %} - {{ _('Reference event') }} - {% endif %} - {% if user_can_create_reference_request %} - {{ _('Empfehlung anfragen') }} - {% endif %} -
- {% endif %} + {{ render_event_menu(user_rights, event) }}
diff --git a/templates/event_date/read.html b/templates/event_date/read.html index 3340851..633108c 100644 --- a/templates/event_date/read.html +++ b/templates/event_date/read.html @@ -1,5 +1,5 @@ {% extends "layout.html" %} -{% from "_macros.html" import render_event_props, render_image_with_link, render_place, render_link_prop %} +{% from "_macros.html" import render_event_menu, render_event_props, render_image_with_link, render_place, render_link_prop %} {% set event = event_date.event %} {% block title %} {{ event.name }} @@ -18,6 +18,8 @@ +{{ render_event_menu(user_rights, event_date.event) }} +
{{ render_event_props(event, event_date.start, event_date.end) }}
diff --git a/templates/manage/reference_requests_incoming.html b/templates/manage/reference_requests_incoming.html index 4b90dae..fa1093b 100644 --- a/templates/manage/reference_requests_incoming.html +++ b/templates/manage/reference_requests_incoming.html @@ -6,7 +6,8 @@ {% endblock %} {% block content %} -

{{ _('Incoming reference requests') }}

+

{{ _('Incoming reference requests') }}

+

Hier findest du Anfragen anderer Verwaltungseinheiten, die dich bitten, eine ihrer Veranstaltungen zu empfehlen.