Merge branch 'develop' into style/minifixes

src/backoffice/locale/de/LC_MESSAGES/django.po

@@ -730,6 +730,12 @@ msgstr "SoS speichern"
 msgid "Event--sos-edit"
 msgstr "SoS bearbeiten"
 
+msgid "Event--sos-public-links"
+msgstr "Öffentlicher Link"
+
+msgid "Event--sos-participants-only"
+msgstr "Achtung: An Selforganized Sessions können nur Konferenzteilnehmer teilnehmen!"
+
 msgid "Event--sos-delete"
 msgstr "SoS löschen"
 

src/backoffice/locale/en/LC_MESSAGES/django.po

@@ -731,6 +731,12 @@ msgstr "submit sos"
 msgid "Event--sos-edit"
 msgstr "edit sos"
 
+msgid "Event--sos-public-links"
+msgstr "Public Link"
+
+msgid "Event--sos-participants-only"
+msgstr "Warning: Only conference visitors can visit selforganized sessions!"
+
 msgid "Event--sos-delete"
 msgstr "delete sos"
 

src/backoffice/templates/backoffice/sos_edit.html

@@ -5,7 +5,11 @@
 {% block content %}
 <div class="card">
 	<div class="card-header">
-		{% trans "Event--sos-edit" %}
+		<p>{% trans "Event--sos-edit" %}</p>
+		<small>
+			<a href="{{plainui_link}}">{% trans 'Event--sos-public-links' %}</a><br>
+			{% trans 'Event--sos-participants-only' %}
+		</small>
 	</div>
 	<div class="card-body">
 		<form action="{% url 'backoffice:sos-edit' pk=object.pk %}" method="POST">

src/backoffice/views/events.py

 import logging
 
 from django import forms
+from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.views.generic import ListView
@@ -162,6 +163,8 @@ class SosEditView(LoginRequiredMixin, ConferenceMixin, UpdateView):
         return {
             'active_page': 'sos',
             **super().get_context_data(*args, **kwargs),
+            # 'plainui_link': settings.PLAINUI_BASE_URL + reverse('plainui:event', kwargs={'event_slug': self.object.slug}),
+            'plainui_link': settings.PLAINUI_BASE_URL + '/2021/event/' + self.object.slug + '/',
         }
 
     def get_form_kwargs(self):

src/plainui/jinja2/plainui/components/integrations.html

@@ -10,7 +10,7 @@
             vocLecture: "{{ vocLecture }}",
             {%- endif %}
             parentId: "#{{playerId}}",
-            h264only: true,
+            h264Only: true,
         });
     </script>
 {%- endmacro %}

src/rc3platform/settings/base.py

@@ -320,7 +320,7 @@ WORKADVENTURE_BACKEND_PUSH_ON_MAPSERVICE_DATA = True
 # ----------------------------------
 
 # base domain of the frontend (used to generate links in API and BackOffice, not in the plain UI itself)
-PLAINUI_BASE_URL = os.getenv('PLAINUI_BASE_URL', default=None)
+PLAINUI_BASE_URL = os.getenv('PLAINUI_BASE_URL', default='')
 
 # Database ID of the active conference for the PlainUI.
 # To initialize create a conference in the backend, then configure the conference, then restart the UI workers