diff --git a/src/api/serializers.py b/src/api/serializers.py index 9911bf1f29505a3e3ae7e278b46c06109ad71827..e0a344ae4a481f727e1d5d525ca9f6a29684a07f 100644 --- a/src/api/serializers.py +++ b/src/api/serializers.py @@ -257,6 +257,7 @@ class EventSerializer(HubModelSerializer): 'track', 'assembly', 'room', + 'location', 'language', 'description', 'is_public', diff --git a/src/backoffice/locale/de/LC_MESSAGES/django.po b/src/backoffice/locale/de/LC_MESSAGES/django.po index 64ffad6a43f9e5b08bab706bbede6dab43bbfa40..fb8bd7e1b18b1c56a1fd2675c2c3b81f086e725b 100644 --- a/src/backoffice/locale/de/LC_MESSAGES/django.po +++ b/src/backoffice/locale/de/LC_MESSAGES/django.po @@ -1396,10 +1396,6 @@ msgstr "" msgid "ScheduleSource__last_import" msgstr "" -# use translation from core -msgid "ScheduleSource__import_frequency" -msgstr "" - msgid "ScheduleSource__has_running_import" msgstr "laufender Import" @@ -1477,7 +1473,7 @@ msgid "Event__location" msgstr "" msgid "Event__room__none" -msgstr "Freitext, siehe \"Ort\"" +msgstr "siehe Feld \"Ort\"" msgid "Event__room__choose" msgstr "Raum wählen" diff --git a/src/backoffice/locale/en/LC_MESSAGES/django.po b/src/backoffice/locale/en/LC_MESSAGES/django.po index b04ff9a200019d4cbaf213b25ae1f6242969f6bb..a32d0eabdf1e2e8c505021a0d6e82c3313bd348a 100644 --- a/src/backoffice/locale/en/LC_MESSAGES/django.po +++ b/src/backoffice/locale/en/LC_MESSAGES/django.po @@ -1401,10 +1401,6 @@ msgstr "" msgid "ScheduleSource__last_import" msgstr "" -# use translation from core -msgid "ScheduleSource__import_frequency" -msgstr "" - msgid "ScheduleSource__has_running_import" msgstr "import running" @@ -1482,7 +1478,7 @@ msgid "Event__location" msgstr "" msgid "Event__room__none" -msgstr "The selected room is not available (in the given time-frame)." +msgstr "see field \"Location\"" msgid "Event__room__choose" msgstr "choose room" diff --git a/src/backoffice/templates/backoffice/schedules_index.html b/src/backoffice/templates/backoffice/schedules_index.html index 4a6fb5ac40f8439146d07b97316ca5a5775a4a6a..2dcbccbf6f554c4253936b45610e8bb094f1d473 100644 --- a/src/backoffice/templates/backoffice/schedules_index.html +++ b/src/backoffice/templates/backoffice/schedules_index.html @@ -27,22 +27,11 @@ <div class="card-body"> <p> <span class="text-muted small">{% trans "ScheduleSource__import_url" %} (<span title="{% trans "ScheduleSource__import_type" %}">{{ source.import_type }}</span>):</span> - <br> {{ source.import_url_masked }} </p> <p> <span class="text-muted small">{% trans "ScheduleSource__last_import" %}:</span> - <br> - {{ source.last_import|naturaltime|default:"-/-" }} - </p> - <p> - <span class="text-muted small">{% trans "ScheduleSource__import_frequency" %}:</span> - <br> - {% if source.frequency %} - {{ source.frequency|naturaltimespan }} - {% else %} - -/- - {% endif %} + {{ latest.summary|linebreaksbr|default:"" }} </p> {% if source.has_running_import %} <p class="text-primary"> diff --git a/src/core/admin.py b/src/core/admin.py index 53d7b59b8add694d25d18e50e932e9b72f8fc178..8158cdcd2d8298de242c0e11d39fd529859fa8aa 100644 --- a/src/core/admin.py +++ b/src/core/admin.py @@ -651,12 +651,13 @@ class EventAdmin(admin.ModelAdmin): 'is_public', 'kind', 'room', + 'location', 'schedule_start', 'schedule_duration', 'get_is_imported', ] list_display_links = ['name'] - list_filter = ['conference', 'track', 'is_public', 'kind', 'room', IsImportedListFilter] + list_filter = ['conference', 'track', 'is_public', 'kind', 'room', 'location', IsImportedListFilter] save_as = True search_fields = ['name', 'abstract', 'description_de', 'description_en'] inlines = [ diff --git a/src/plainui/jinja2/plainui/search.html.j2 b/src/plainui/jinja2/plainui/search.html.j2 index ca787b0a7ab973f438b1fb0f6d70eccc2e139bbd..2d8346fb380621dac45eac5d72a010ebfd9e8d21 100644 --- a/src/plainui/jinja2/plainui/search.html.j2 +++ b/src/plainui/jinja2/plainui/search.html.j2 @@ -35,7 +35,7 @@ {% elif result.type == 'ConferenceTrack' %} {{ result.type }}: {{ result.item }} {% elif result.type == 'StaticPage' %} - {{ tagMacros.tag(result.type, + {{ tagMacros.tag('Page', style='clear', icon='book') }} <a class="hub-text-list-item-title"