Merge branch '624-sos-events-misc' into 'develop'

Misc schedule/event/sos admin improvements

See merge request hub/hub!1104

src/api/serializers.py

@@ -257,6 +257,7 @@ class EventSerializer(HubModelSerializer):
             'track',
             'assembly',
             'room',
+            'location',
             'language',
             'description',
             'is_public',

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"

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"

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">

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 = [

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"