more BBB settings

diff --git a/app/settings.py b/app/settings.py
index e97d76166edc58a2c8d4155356735aa1208cde6f..8b53f30927ac1b0edddb237f9e768513848022ba 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -654,6 +654,13 @@ AWS_S3_REGION_NAME=""
 AWS_S3_ENDPOINT_URL=""
 AWS_S3_ENCRYPTION=True
 
+########################
+# BBB
+########################
+
+BBB_LOGO_URL = "/static/teleforma/images/logo_pb.png"
+BBB_PDF_URL = "/static/teleforma/pdf/pb-blank-slide.pdf"
+BBB_BANNER_COLOR = "#003768"
 
 ##################
 # LOCAL SETTINGS #

diff --git a/teleforma/webclass/models.py b/teleforma/webclass/models.py
index c59ac651b9110d5c3ffcffff484599d0bef5e62b..8562de46d88a7bbf46e48b4215eb1d0538e0420b 100644 (file)
--- a/teleforma/webclass/models.py
+++ b/teleforma/webclass/models.py
@@ -15,6 +15,7 @@ from django.dispatch import receiver
 from django.template.defaultfilters import slugify
 from django.utils import translation
 from django.utils.translation import ugettext_lazy as _
+from django.conf import settings
 from jxmlease import XMLDictNode, XMLListNode
 from teleforma.fields import DurationField, ShortTextField
 from teleforma.models import session_choices
@@ -288,6 +289,7 @@ class WebclassSlot(models.Model):
                 # check if meeting already exists
                 self.get_webclass_info()
             except BBBException:
+                site = Site.objects.get_current()
                 year = datetime.datetime.now().year
                 # site_url = 'https://' + request.get_host()
                 params = {
@@ -295,23 +297,23 @@ class WebclassSlot(models.Model):
                     'moderatorPW': self.room_password,
                     'attendeePW': "pwattendee",
                     # 'maxParticipants':self.webclass_max_participants + 1,
-                    'welcome': "Pré-Barreau CRFPA %d - Bienvenue sur la webclass \"%s\"." % (year, self.webclass.course.title,),
+                    'welcome': "Bienvenue sur la webclass \"%s\"." % self.webclass.course.title,
                     'record': True,
                     # 'autoStartRecording': False,
                     'allowStartStopRecording': True,
                     'muteOnStart': True,
                     'allowModsToUnmuteUsers': True,
-                    'logo':'https://e-learning.crfpa.pre-barreau.com/static/teleforma/images/logo_pb.png',
-                    'copyright': "© %d Pré-Barreau" % year,
+                    'logo':'https://%s%s' % (site, settings.BBB_LOGO_URL),
+                    'copyright': "© %d %s" % (year, settings.TELEFORMA_ORGANIZATION),
                     # 'guestPolicy':'ALWAYS_ACCEPT'
-                    'bannerText': "Pré-Barreau CRFPA",
-                    'bannerColor': "#003768",
+                    'bannerText': settings.TELEFORMA_ORGANIZATION,
+                    'bannerColor': settings.BBB_BANNER_COLOR,
                     # 'customStyleUrl': site_url+"/static/teleforma/css/bbb.css"
-                    'logoutURL': "https://e-learning.crfpa.pre-barreau.com",
+                    'logoutURL': "https://%s" % site,
                     'endWhenNoModerator': True,
                     'meetingLayout': "VIDEO_FOCUS",
                     "notifyRecordingIsOn": True,
-                    'preUploadedPresentation': "https://e-learning.crfpa.pre-barreau.com/static/teleforma/pdf/pb-blank-slide.pdf",
+                    'preUploadedPresentation': "https://%s%s" % (site, settings.BBB_PDF_URL),
                 }
                 meta = {
                     'origin': 'crfpa',