From 48fb80cd97ac665daa1aabea7ed6a6ad46f85e18 Mon Sep 17 00:00:00 2001 From: ptitloup Date: Fri, 25 Feb 2022 10:22:02 +0100 Subject: [PATCH 1/7] add sites relation to link footer and post save to this and type model --- pod/main/context_processors.py | 2 +- pod/main/models.py | 10 ++++++++++ pod/video/models.py | 6 ++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/pod/main/context_processors.py b/pod/main/context_processors.py index ed28543e85..8e68312eac 100644 --- a/pod/main/context_processors.py +++ b/pod/main/context_processors.py @@ -225,7 +225,7 @@ def context_navbar(request): .annotate(video_count=Count("video", distinct=True)) ) - linkFooter = LinkFooter.objects.all().filter(page__sites=get_current_site(request)) + linkFooter = LinkFooter.objects.all().filter(sites=get_current_site(request)) list_videos = Video.objects.filter( encoding_in_progress=False, diff --git a/pod/main/models.py b/pod/main/models.py index 21fc13ddfa..dc32f7f030 100644 --- a/pod/main/models.py +++ b/pod/main/models.py @@ -2,8 +2,11 @@ from django.conf import settings from django.utils.translation import ugettext_lazy as _ from django.contrib.flatpages.models import FlatPage +from django.contrib.sites.models import Site from django.core.exceptions import ValidationError from django.template.defaultfilters import slugify +from django.dispatch import receiver +from django.db.models.signals import post_save from django.db import connection import os import mimetypes @@ -133,6 +136,7 @@ class LinkFooter(models.Model): null=True, help_text=_("Select the page of Pod you want to link with."), ) + sites = models.ManyToManyField(Site) class Meta: ordering = ["order", "title"] @@ -152,6 +156,12 @@ def clean(self): raise ValidationError(_("You must give an URL or a page to link the link")) +@receiver(post_save, sender=LinkFooter) +def default_site_link_footer(sender, instance, created, **kwargs): + if len(instance.sites.all()) == 0: + instance.sites.add(Site.objects.get_current()) + + class Configuration(models.Model): key = models.SlugField( _("Key"), diff --git a/pod/video/models.py b/pod/video/models.py index eaf9505373..408f2dd54f 100755 --- a/pod/video/models.py +++ b/pod/video/models.py @@ -574,6 +574,12 @@ class Meta: verbose_name_plural = _("Types") +@receiver(post_save, sender=Type) +def default_site_type(sender, instance, created, **kwargs): + if len(instance.sites.all()) == 0: + instance.sites.add(Site.objects.get_current()) + + class Discipline(models.Model): title = models.CharField(_("title"), max_length=100, unique=True) slug = models.SlugField( From b9d5b140ad236aa03107cb3b827ca58bdda78daa Mon Sep 17 00:00:00 2001 From: ptitloup Date: Fri, 25 Feb 2022 11:59:09 +0100 Subject: [PATCH 2/7] put default langage for studio from pod --- .../templates/recorder/opencast-studio.html | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pod/recorder/templates/recorder/opencast-studio.html b/pod/recorder/templates/recorder/opencast-studio.html index f85c08821f..bc8fce53c7 100644 --- a/pod/recorder/templates/recorder/opencast-studio.html +++ b/pod/recorder/templates/recorder/opencast-studio.html @@ -1,6 +1,7 @@ {% extends 'base.html' %} {% load i18n %} {% load staticfiles %} +{% get_current_language as LANGUAGE_CODE %} {% block page_extra_head %} - + {% endblock page_extra_head %} {% block breadcrumbs %}{{ block.super }} @@ -41,8 +49,7 @@ {% else %} const list_value = [["mid", "50/50 - {% trans "Same size for screen and camera" %}"], ["piph", "Pip - {% trans "Camera inside the screen video to top right" %}"], ["pipb", "Pip - {% trans "Camera inside the screen video to bottom right" %}"]]; {% endif %} - // put local storage default value - localStorage.setItem('ocStudioLastPresenter', "{{default_presenter}}"); + //Create and append select list let selectList = document.createElement("select"); selectList.id = "input_presenter"; From fa7e25b7ba5d7fce398cfed9c29cf12f1b4a13cd Mon Sep 17 00:00:00 2001 From: ptitloup Date: Fri, 25 Feb 2022 12:13:29 +0100 Subject: [PATCH 3/7] add some css var into studio to deal with css pod --- pod/recorder/templates/recorder/opencast-studio.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pod/recorder/templates/recorder/opencast-studio.html b/pod/recorder/templates/recorder/opencast-studio.html index bc8fce53c7..9a56ecf477 100644 --- a/pod/recorder/templates/recorder/opencast-studio.html +++ b/pod/recorder/templates/recorder/opencast-studio.html @@ -5,6 +5,10 @@ {% block page_extra_head %}