| 
| 
Ministère de lʼEnseignement supérieur, de la Recherche et de lʼInnovation
:-----:|:-----:|:----:
diff --git a/pod/authentication/admin.py b/pod/authentication/admin.py
index 10b50c9744..8a3ffa6388 100644
--- a/pod/authentication/admin.py
+++ b/pod/authentication/admin.py
@@ -113,6 +113,13 @@ def clickable_email(self, obj):
if USE_ESTABLISHMENT_FIELD:
list_display = list_display + ("owner_establishment",)
+ # readonly_fields=('is_superuser',)
+ def get_readonly_fields(self, request, obj=None):
+ if request.user.is_superuser:
+ return []
+ self.readonly_fields += ("is_superuser",)
+ return self.readonly_fields
+
def owner_hashkey(self, obj):
return "%s" % Owner.objects.get(user=obj).hashkey
diff --git a/pod/authentication/models.py b/pod/authentication/models.py
index 5d297be2a3..29254655cc 100644
--- a/pod/authentication/models.py
+++ b/pod/authentication/models.py
@@ -170,7 +170,7 @@ def create_groupsite_profile(sender, instance, created, **kwargs):
class AccessGroup(models.Model):
display_name = models.CharField(max_length=128, blank=True, default="")
- code_name = models.CharField(max_length=128, unique=True)
+ code_name = models.CharField(max_length=250, unique=True)
sites = models.ManyToManyField(Site)
users = select2_fields.ManyToManyField(
Owner,
diff --git a/pod/authentication/populatedCASbackend.py b/pod/authentication/populatedCASbackend.py
index 9a92aa99fb..8265c5e754 100644
--- a/pod/authentication/populatedCASbackend.py
+++ b/pod/authentication/populatedCASbackend.py
@@ -219,14 +219,16 @@ def populate_user_from_entry(user, owner, entry):
)
else ""
)
- user.last_name = (
- entry[USER_LDAP_MAPPING_ATTRIBUTES["last_name"]].value
- if (
- USER_LDAP_MAPPING_ATTRIBUTES.get("last_name")
- and entry[USER_LDAP_MAPPING_ATTRIBUTES["last_name"]]
+ user.last_name = ""
+ if (
+ USER_LDAP_MAPPING_ATTRIBUTES.get("last_name")
+ and entry[USER_LDAP_MAPPING_ATTRIBUTES["last_name"]]
+ ):
+ user.last_name = (
+ entry[USER_LDAP_MAPPING_ATTRIBUTES["last_name"]].value[0]
+ if (isinstance(entry[USER_LDAP_MAPPING_ATTRIBUTES["last_name"]].value, list))
+ else entry[USER_LDAP_MAPPING_ATTRIBUTES["last_name"]].value
)
- else ""
- )
user.save()
owner.affiliation = (
entry[USER_LDAP_MAPPING_ATTRIBUTES["primaryAffiliation"]].value
diff --git a/pod/authentication/rest_views.py b/pod/authentication/rest_views.py
index c117d2cb3b..356d7523a9 100644
--- a/pod/authentication/rest_views.py
+++ b/pod/authentication/rest_views.py
@@ -56,6 +56,7 @@ class Meta:
"email",
"groups",
)
+ filter_fields = ("id", "username", "email")
class GroupSerializer(serializers.HyperlinkedModelSerializer):
@@ -87,6 +88,7 @@ class OwnerViewSet(viewsets.ModelViewSet):
class UserViewSet(viewsets.ModelViewSet):
queryset = User.objects.all().order_by("-date_joined")
serializer_class = UserSerializer
+ filter_fields = ("id", "username", "email")
class GroupViewSet(viewsets.ModelViewSet):
diff --git a/pod/custom/settings_local.py.example b/pod/custom/settings_local.py.example
index b59d992ae6..20e957190b 100644
--- a/pod/custom/settings_local.py.example
+++ b/pod/custom/settings_local.py.example
@@ -996,6 +996,11 @@ CREATE_GROUP_FROM_GROUPS = False
"""
AFFILIATION_STAFF = ('faculty', 'employee', 'staff')
+"""
+# Groupes ou affiliations des personnes autorisées à créer un évènement
+"""
+AFFILIATION_EVENT = ['faculty', 'employee', 'staff']
+
"""
# Valeurs possibles pour l'Affiliation du compte
"""
@@ -1170,11 +1175,6 @@ DS_PARAM = {
}
}
-"""
-# La liste des utilisateurs regardant le direct sera réservée au staff
-"""
-VIEWERS_ONLY_FOR_STAFF = False
-
"""
# Temps (en seconde) entre deux envois d'un signal au serveur,
# pour signaler la présence sur un live
@@ -1361,3 +1361,52 @@ COOKIE_LEARN_MORE = ""
# 'TRACKING_TEMPLATE': 'custom/tracking.html',
"""
USE_VIDEO_EVENT_TRACKING = False
+
+"""
+# Affiche ou non les prochains évènements sur la page d'accueil
+"""
+SHOW_EVENTS_ON_HOMEPAGE = False
+
+"""
+# Chemin racine du répertoire où sont déposés temporairement les
+# enregistrements des évènements éffectués depuis POD pour
+# converstion en ressource vidéo (VOD)
+"""
+DEFAULT_EVENT_PATH = ""
+
+"""
+# Types de logiciel de serveur de streaming utilisés.
+# Actuellement disponible Wowza.
+# Si vous utilisez une autre logiciel, il faut développer une interface dans pod/live/pilotingInterface.py
+"""
+BROADCASTER_PILOTING_SOFTWARE = ['Wowza',]
+
+"""
+# Image par défaut affichée comme poster ou vignette,
+# utilisée pour présenter l'évènement'.
+# Cette image doit se situer dans le répertoire static.
+"""
+DEFAULT_EVENT_THUMBNAIL = "/img/default-event.svg"
+
+"""
+# Type par défaut affecté à un évènement direct
+# (en général, le type ayant pour identifiant '1' est 'Other')
+"""
+DEFAULT_EVENT_TYPE_ID = 1
+
+
+"""
+# Si True, un courriel est envoyé aux managers
+# et à l'auteur (si DEBUG est à False) à la création/modification d'un event
+"""
+EMAIL_ON_EVENT_SCHEDULING = True
+
+"""
+# Si True, un courriel est également envoyé à l'admin (si DEBUG est à False)
+# à la création/modification d'un event
+"""
+EMAIL_ADMIN_ON_EVENT_SCHEDULING = True
+"""
+# Durée (en nombre de jours) sur laquelle on souhaite compter le nombre de vues récentes
+"""
+VIDEO_RECENT_VIEWCOUNT = 180
\ No newline at end of file
diff --git a/pod/custom/tenants/check_obsolete_videos.sh b/pod/custom/tenants/check_obsolete_videos.sh
deleted file mode 100644
index 70cd0d67e7..0000000000
--- a/pod/custom/tenants/check_obsolete_videos.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-# Main
-cd /usr/local/django_projects/podv2 && /home/pod/.virtualenvs/django_pod/bin/python manage.py check_obsolete_videos >> /usr/local/django_projects/podv2/pod/log/cron_obsolete.log 2>&1
\ No newline at end of file
diff --git a/pod/custom/tenants/clearsessions.sh b/pod/custom/tenants/clearsessions.sh
deleted file mode 100644
index 4260a68d73..0000000000
--- a/pod/custom/tenants/clearsessions.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-# main
-cd /usr/local/django_projects/podv2 && /home/pod/.virtualenvs/django_pod/bin/python manage.py clearsessions &>> /usr/local/django_projects/podv2/pod/log/cron_clearsessions.log 2>&1
\ No newline at end of file
diff --git a/pod/custom/tenants/create_tenant.sh b/pod/custom/tenants/create_tenant.sh
index ed77b241c9..9da2138d83 100644
--- a/pod/custom/tenants/create_tenant.sh
+++ b/pod/custom/tenants/create_tenant.sh
@@ -73,19 +73,23 @@ echo "(django_pod) pod@pod:/usr/local/django_projects/podv2$ python manage.py cr
echo "--"
echo "crontab"
echo "clear session"
-echo "# $ID_SITE $NAME " >> $BASEDIR/clearsessions.sh
+echo "" >> $BASEDIR/sh_tenants/clearsessions.sh
+echo "# $ID_SITE $NAME " >> $BASEDIR/sh_tenants/clearsessions.sh
echo "cd /usr/local/django_projects/podv2 && /home/pod/.virtualenvs/django_pod/bin/python manage.py clearsessions --settings=pod.custom.tenants.$NAME."$NAME"_settings &>> /usr/local/django_projects/podv2/pod/log/cron_clearsessions_$NAME.log 2>&1" >> $BASEDIR/clearsessions.sh
echo "index videos"
-echo "# $ID_SITE $NAME " >> $BASEDIR/index_videos.sh
+echo "" >> $BASEDIR/sh_tenants/index_videos.sh
+echo "# $ID_SITE $NAME " >> $BASEDIR/sh_tenants/index_videos.sh
echo "cd /usr/local/django_projects/podv2 && /home/pod/.virtualenvs/django_pod/bin/python manage.py index_videos --all --settings=pod.custom.tenants.$NAME."$NAME"_settings &>> /usr/local/django_projects/podv2/pod/log/cron_index_$NAME.log 2>&1" >> $BASEDIR/index_videos.sh
echo "check_obsolete_videos"
-echo "# $ID_SITE $NAME " >> $BASEDIR/check_obsolete_videos.sh
+echo "" >> $BASEDIR/sh_tenants/check_obsolete_videos.sh
+echo "# $ID_SITE $NAME " >> $BASEDIR/sh_tenants/check_obsolete_videos.sh
echo "cd /usr/local/django_projects/podv2 && /home/pod/.virtualenvs/django_pod/bin/python manage.py check_obsolete_videos --settings=pod.custom.tenants.$NAME."$NAME"_settings &>> /usr/local/django_projects/podv2/pod/log/cron_obsolete_$NAME.log 2>&1" >> $BASEDIR/check_obsolete_videos.sh
echo "live_viewcounter"
-echo "# $ID_SITE $NAME " >> $BASEDIR/live_viewcounter.sh
+echo "" >> $BASEDIR/sh_tenants/live_viewcounter.sh
+echo "# $ID_SITE $NAME " >> $BASEDIR/sh_tenants/live_viewcounter.sh
echo "cd /usr/local/django_projects/podv2 && /home/pod/.virtualenvs/django_pod/bin/python manage.py live_viewcounter --settings=pod.custom.tenants.$NAME."$NAME"_settings &>> /usr/local/django_projects/podv2/pod/log/cron_viewcounter_$NAME.log 2>&1" >> $BASEDIR/live_viewcounter.sh
echo "FIN"
diff --git a/pod/custom/tenants/index_videos.sh b/pod/custom/tenants/index_videos.sh
deleted file mode 100644
index 066e10e80a..0000000000
--- a/pod/custom/tenants/index_videos.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-# main
-cd /usr/local/django_projects/podv2 && /home/pod/.virtualenvs/django_pod/bin/python manage.py index_videos --all &>> /usr/local/django_projects/podv2/pod/log/cron_index.log 2>&1
\ No newline at end of file
diff --git a/pod/custom/tenants/live_viewcounter.sh b/pod/custom/tenants/live_viewcounter.sh
deleted file mode 100644
index a3c798c22a..0000000000
--- a/pod/custom/tenants/live_viewcounter.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-# Main
-cd /usr/local/django_projects/podv2 && /home/pod/.virtualenvs/django_pod/bin/python manage.py live_viewcounter >> /usr/local/django_projects/podv2/pod/log/cron_viewcounter.log 2>&1
diff --git a/pod/custom/tenants/source/tenant_settings.py b/pod/custom/tenants/source/tenant_settings.py
index 509afced03..479eff22c3 100644
--- a/pod/custom/tenants/source/tenant_settings.py
+++ b/pod/custom/tenants/source/tenant_settings.py
@@ -44,3 +44,9 @@
DEFAULT_DC_RIGHTS = "BY-NC-SA"
CELERY_BROKER_URL = CELERY_BROKER_URL + "-__NAME__" # Define a broker
+
+
+########################################################## A LAISSER EN DERNIER !!!!!!!!!!!!!
+the_update_settings = update_settings(locals())
+for variable in the_update_settings:
+ locals()[variable] = the_update_settings[variable]
diff --git a/pod/custom/tenants/source_enc/tenant_enc_settings.py b/pod/custom/tenants/source_enc/tenant_enc_settings.py
index bac9727254..1660130d4b 100644
--- a/pod/custom/tenants/source_enc/tenant_enc_settings.py
+++ b/pod/custom/tenants/source_enc/tenant_enc_settings.py
@@ -21,3 +21,8 @@
CELERY_TO_ENCODE = True # Active encode
CELERY_BROKER_URL = CELERY_BROKER_URL + "-__NAME__" # Define a broker
+
+########################################################## A LAISSER EN DERNIER !!!!!!!!!!!!!
+the_update_settings = update_settings(locals())
+for variable in the_update_settings:
+ locals()[variable] = the_update_settings[variable]
diff --git a/pod/live/admin.py b/pod/live/admin.py
index c7220681d1..a23c13e663 100644
--- a/pod/live/admin.py
+++ b/pod/live/admin.py
@@ -1,16 +1,26 @@
+from django.conf import settings
from django.contrib import admin
-
-from .models import Building
-from .models import Broadcaster
-from .models import HeartBeat
from django.contrib.sites.models import Site
-from pod.live.forms import BuildingAdminForm
-from .forms import BroadcasterAdminForm
from django.contrib.sites.shortcuts import get_current_site
-from pod.video.models import Video
+from django.forms import Textarea
+from django.utils.html import format_html
+from django.utils.translation import ugettext_lazy as _
+from js_asset import static
+from sorl.thumbnail import get_thumbnail
+
+from pod.live.forms import BuildingAdminForm, EventAdminForm, BroadcasterAdminForm
+from pod.live.models import Building, Event, Broadcaster, HeartBeat, Video
+
+DEFAULT_EVENT_THUMBNAIL = getattr(
+ settings, "DEFAULT_EVENT_THUMBNAIL", "img/default-event.svg"
+)
# Register your models here.
+FILEPICKER = False
+if getattr(settings, "USE_PODFILE", False):
+ FILEPICKER = True
+
class HeartBeatAdmin(admin.ModelAdmin):
list_display = ("viewkey", "user", "broadcaster", "last_heartbeat")
@@ -64,10 +74,22 @@ class BroadcasterAdmin(admin.ModelAdmin):
"building",
"url",
"status",
+ "is_recording_admin",
"is_restricted",
+ "piloting_conf",
)
readonly_fields = ["slug"]
+ def get_form(self, request, obj=None, **kwargs):
+ kwargs["widgets"] = {
+ "piloting_conf": Textarea(
+ attrs={
+ "placeholder": "{\n 'server_url':'...',\n 'application':'...',\n 'livestream':'...',\n}"
+ }
+ )
+ }
+ return super().get_form(request, obj, **kwargs)
+
def get_queryset(self, request):
qs = super().get_queryset(request)
if not request.user.is_superuser:
@@ -97,6 +119,142 @@ class Media:
)
+class PasswordFilter(admin.SimpleListFilter):
+ title = _("password")
+ parameter_name = "password"
+
+ def lookups(self, request, model_admin):
+ return (
+ ("Yes", _("Yes")),
+ ("No", _("No")),
+ )
+
+ def queryset(self, request, queryset):
+ value = self.value()
+ if value == "No":
+ queryset = queryset.exclude(
+ pk__in=[event.id for event in queryset if event.password]
+ )
+ elif value == "Yes":
+ queryset = queryset.exclude(
+ pk__in=[event.id for event in queryset if not event.password]
+ )
+ return queryset
+
+
+class EventAdmin(admin.ModelAdmin):
+ def get_form(self, request, obj=None, **kwargs):
+ ModelForm = super(EventAdmin, self).get_form(request, obj, **kwargs)
+
+ class ModelFormMetaClass(ModelForm):
+ def __new__(cls, *args, **kwargs):
+ kwargs["request"] = request
+ return ModelForm(*args, **kwargs)
+
+ return ModelFormMetaClass
+
+ def get_broadcaster_admin(self, instance):
+ return instance.broadcaster.name
+
+ get_broadcaster_admin.short_description = _("Broadcaster")
+
+ def is_auto_start_admin(self, instance):
+ return instance.is_auto_start
+
+ is_auto_start_admin.short_description = _("Auto start admin")
+ is_auto_start_admin.boolean = True
+
+ def get_thumbnail_admin(self, instance):
+ if instance.thumbnail and instance.thumbnail.file_exist():
+ im = get_thumbnail(
+ instance.thumbnail.file, "100x100", crop="center", quality=72
+ )
+ thumbnail_url = im.url
+ else:
+ thumbnail_url = static(DEFAULT_EVENT_THUMBNAIL)
+ return format_html(
+ '
')
+ else:
+ return format_html('
')
+ except Exception:
+ return format_html('
')
+
+ is_recording_admin.short_description = _("Is recording ?")
+
class HeartBeat(models.Model):
user = models.ForeignKey(User, null=True, verbose_name=_("Viewer"))
@@ -182,3 +256,269 @@ class Meta:
verbose_name = _("Heartbeat")
verbose_name_plural = _("Heartbeats")
ordering = ["broadcaster"]
+
+
+def current_time():
+ return datetime.now().replace(second=0, microsecond=0)
+
+
+def one_hour_hence():
+ return current_time() + timezone.timedelta(hours=1)
+
+
+def get_default_event_type():
+ return DEFAULT_EVENT_TYPE_ID
+
+
+def present_or_future_date(value):
+ if value < date.today():
+ raise ValidationError(_("An event cannot be planned in the past"))
+ return value
+
+
+def select_event_owner():
+ return (
+ lambda q: (Q(first_name__icontains=q) | Q(last_name__icontains=q))
+ & Q(owner__sites=Site.objects.get_current())
+ & Q(owner__accessgroups__code_name__in=AFFILIATION_EVENT)
+ )
+
+
+class Event(models.Model):
+ slug = models.SlugField(
+ _("Slug"),
+ unique=True,
+ max_length=255,
+ editable=False,
+ )
+
+ title = models.CharField(
+ _("Title"),
+ max_length=250,
+ help_text=_(
+ "Please choose a title as short and accurate as "
+ "possible, reflecting the main subject / context "
+ "of the content. (max length: 250 characters)"
+ ),
+ )
+
+ description = RichTextField(
+ _("Description"),
+ config_name="complete",
+ blank=True,
+ help_text=_(
+ "In this field you can describe your content, "
+ "add all needed related information, and "
+ "format the result using the toolbar."
+ ),
+ )
+
+ owner = select2_fields.ForeignKey(
+ User,
+ ajax=True,
+ verbose_name=_("Owner"),
+ search_field=select_event_owner(),
+ on_delete=models.CASCADE,
+ )
+
+ additional_owners = select2_fields.ManyToManyField(
+ User,
+ blank=True,
+ ajax=True,
+ js_options={"width": "off"},
+ verbose_name=_("Additional owners"),
+ search_field=select_event_owner(),
+ related_name="owners_events",
+ help_text=_(
+ "You can add additional owners to the event. They "
+ "will have the same rights as you except that they "
+ "can't delete this event."
+ ),
+ )
+
+ start_date = models.DateField(
+ _("Date of event"),
+ default=date.today,
+ help_text=_("Start date of the live."),
+ validators=[present_or_future_date],
+ )
+ start_time = models.TimeField(
+ _("Start time"),
+ default=current_time,
+ help_text=_("Start time of the live event."),
+ )
+ end_time = models.TimeField(
+ _("End time"),
+ default=one_hour_hence,
+ help_text=_("End time of the live event."),
+ )
+
+ broadcaster = models.ForeignKey(
+ Broadcaster,
+ verbose_name=_("Broadcaster"),
+ help_text=_("Broadcaster name."),
+ )
+
+ type = models.ForeignKey(Type, default=DEFAULT_EVENT_TYPE_ID, verbose_name=_("Type"))
+
+ iframe_url = models.URLField(
+ _("Embedded Site URL"),
+ help_text=_("Url of the embedded site to display"),
+ null=True,
+ blank=True,
+ )
+ iframe_height = models.IntegerField(
+ _("Embedded Site Height"),
+ null=True,
+ blank=True,
+ help_text=_("Height of the embedded site (in pixels)"),
+ )
+ aside_iframe_url = models.URLField(
+ _("Embedded aside Site URL"),
+ help_text=_("Url of the embedded site to display on aside"),
+ null=True,
+ blank=True,
+ )
+
+ is_draft = models.BooleanField(
+ verbose_name=_("Draft"),
+ help_text=_(
+ "If this box is checked, the event will be visible "
+ "only by you and the additional owners "
+ "but accessible to anyone having the url link."
+ ),
+ default=True,
+ )
+ is_restricted = models.BooleanField(
+ verbose_name=_("Restricted access"),
+ help_text=_(
+ "If this box is checked, "
+ "the event will only be accessible to authenticated users."
+ ),
+ default=False,
+ )
+
+ restrict_access_to_groups = select2_fields.ManyToManyField(
+ AccessGroup,
+ blank=True,
+ verbose_name=_("Groups"),
+ help_text=_("Select one or more groups who can access to this event"),
+ )
+
+ is_auto_start = models.BooleanField(
+ verbose_name=_("Auto start"),
+ help_text=_("If this box is checked, " "the record will start automatically."),
+ default=False,
+ )
+
+ thumbnail = models.ForeignKey(
+ CustomImageModel,
+ models.SET_NULL,
+ blank=True,
+ null=True,
+ verbose_name=_("Thumbnails"),
+ )
+
+ password = models.CharField(
+ _("password"),
+ help_text=_("Viewing this event will not be possible without this password."),
+ max_length=50,
+ blank=True,
+ null=True,
+ )
+
+ videos = models.ManyToManyField(
+ Video,
+ editable=False,
+ )
+
+ class Meta:
+ verbose_name = _("Event")
+ verbose_name_plural = _("Events")
+ ordering = ["start_date", "start_time"]
+
+ def save(self, *args, **kwargs):
+ if not self.id:
+ try:
+ new_id = get_nextautoincrement(Event)
+ except Exception:
+ try:
+ new_id = Event.objects.latest("id").id
+ new_id += 1
+ except Exception:
+ new_id = 1
+ else:
+ new_id = self.id
+ new_id = "%04d" % new_id
+ self.slug = "%s-%s" % (new_id, slugify(self.title))
+ super(Event, self).save(*args, **kwargs)
+
+ def __str__(self):
+ if self.id:
+ return "%s - %s" % ("%04d" % self.id, self.title)
+ else:
+ return "None"
+
+ def get_absolute_url(self):
+ return reverse("live:event", args=[str(self.slug)])
+
+ def get_full_url(self, request=None):
+ """Get the video full URL."""
+ full_url = "".join(
+ ["//", get_current_site(request).domain, self.get_absolute_url()]
+ )
+ return full_url
+
+ def get_hashkey(self):
+ return hashlib.sha256(
+ ("%s-%s" % (SECRET_KEY, self.id)).encode("utf-8")
+ ).hexdigest()
+
+ def get_thumbnail_url(self):
+ """Get a thumbnail url for the event."""
+ request = None
+ if self.thumbnail and self.thumbnail.file_exist():
+ thumbnail_url = "".join(
+ [
+ "//",
+ get_current_site(request).domain,
+ self.thumbnail.file.url,
+ ]
+ )
+ else:
+ thumbnail_url = static(DEFAULT_EVENT_THUMBNAIL)
+ return thumbnail_url
+
+ def get_thumbnail_card(self):
+ """Return thumbnail image card of current event."""
+ if self.thumbnail and self.thumbnail.file_exist():
+ im = get_thumbnail(self.thumbnail.file, "x170", crop="center", quality=72)
+ thumbnail_url = im.url
+ else:
+ thumbnail_url = static(DEFAULT_EVENT_THUMBNAIL)
+ return (
+ '{{ broadcaster.description|safe }}
- {% if broadcaster.iframe_url != "" and broadcaster.iframe_url != None %} - - {% endif %} - {% if USE_BBB and USE_BBB_LIVE and display_chat %} -- {%if otherbroadcaster.status %}{%if otherbroadcaster.password%}{%else%}{%endif%} {{otherbroadcaster.name}} + {%if otherbroadcaster.status %} {{otherbroadcaster.name}} {%else%} {{otherbroadcaster.name}} ({% trans "no broadcast in progress" %}){%endif%}
{% endif %} diff --git a/pod/live/templates/live/building.html b/pod/live/templates/live/directs.html similarity index 77% rename from pod/live/templates/live/building.html rename to pod/live/templates/live/directs.html index ebe740ca0b..14f309bd38 100644 --- a/pod/live/templates/live/building.html +++ b/pod/live/templates/live/directs.html @@ -8,7 +8,7 @@ {% block breadcrumbs %} {{ block.super }} -+ src="{% url 'live:direct' slug=broadcaster.slug %}?is_iframe=true">
-- {%if broadcaster.status %}{%if broadcaster.password%}{%else%}{%endif%} {{broadcaster.name}} + {%if broadcaster.status %} {{broadcaster.name}} {%else%} {{broadcaster.name}} ({% trans "no broadcast in progress" %}){%endif%}
{% empty %}{% trans "Sorry, no lives found" %}.
diff --git a/pod/live/templates/live/event-all-info.html b/pod/live/templates/live/event-all-info.html new file mode 100644 index 0000000000..04979473b5 --- /dev/null +++ b/pod/live/templates/live/event-all-info.html @@ -0,0 +1,41 @@ +{% load i18n %} +{% load tagging_tags %} +{% trans 'This live is protected by password, please fill in and click send.' %}
-