Merge branch 'master' into css_do_over_2

Author: tykling

src/program/forms.py

@@ -268,6 +268,7 @@ class Meta:
             "title",
             "abstract",
             "allow_video_recording",
+            "allow_video_streaming",
             "duration",
             "tags",
             "slides_url",
@@ -313,8 +314,9 @@ def __init__(self, camp, event_type=None, matrix=None, *args, **kwargs):
         self.fields["track"].empty_label = None
         self.fields["track"].queryset = EventTrack.objects.filter(camp=camp)
 
-        # make sure video_recording checkbox defaults to checked
+        # make sure video_recording and streaming checkbox defaults to checked
         self.fields["allow_video_recording"].initial = True
+        self.fields["allow_video_streaming"].initial = True
 
         if event_type.name not in [TALK, LIGHTNING_TALK]:
             # Only talk or lightning talk should show the slides_url field
@@ -374,6 +376,7 @@ def __init__(self, camp, event_type=None, matrix=None, *args, **kwargs):
 
             # no video recording for music acts
             del self.fields["allow_video_recording"]
+            del self.fields["allow_video_streaming"]
 
         elif event_type.name == RECREATIONAL_EVENT:
             # fix label and help_text for the title field
@@ -394,6 +397,7 @@ def __init__(self, camp, event_type=None, matrix=None, *args, **kwargs):
 
             # no video recording for music acts
             del self.fields["allow_video_recording"]
+            del self.fields["allow_video_streaming"]
 
         elif event_type.name in [TALK, LIGHTNING_TALK]:
             # fix label and help_text for the title field
@@ -439,6 +443,7 @@ def __init__(self, camp, event_type=None, matrix=None, *args, **kwargs):
 
             # no video recording for workshops
             del self.fields["allow_video_recording"]
+            del self.fields["allow_video_streaming"]
 
         elif event_type.name == RECREATIONAL_EVENT:
             # fix label and help_text for the title field
@@ -459,6 +464,7 @@ def __init__(self, camp, event_type=None, matrix=None, *args, **kwargs):
 
             # no video recording for recreational events
             del self.fields["allow_video_recording"]
+            del self.fields["allow_video_streaming"]
 
         elif event_type.name == MEETUP:
             # fix label and help_text for the title field
@@ -479,6 +485,7 @@ def __init__(self, camp, event_type=None, matrix=None, *args, **kwargs):
 
             # no video recording for meetups
             del self.fields["allow_video_recording"]
+            del self.fields["allow_video_streaming"]
 
         else:
             raise ImproperlyConfigured(

src/program/migrations/0106_event_video_streaming_and_more.py

@@ -0,0 +1,34 @@
+# Generated by Django 4.2.20 on 2025-04-21 17:36
+
+from django.db import migrations, models
+
+def update_streaming(apps, schema_editor):
+    # We can't import the models directly as it may be a newer
+    # version than this migration expects. We use the historical version.
+    Event = apps.get_model("program", "Event")
+    EventProposal = apps.get_model("program", "EventProposal")
+
+    Event.objects.filter(video_recording=True).update(video_streaming=True)
+    Event.objects.filter(video_recording=False).update(video_streaming=False)
+    EventProposal.objects.filter(allow_video_recording=False).update(allow_video_streaming=False)
+    EventProposal.objects.filter(allow_video_recording=True).update(allow_video_streaming=True)
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('program', '0105_cascade_delete_event_urls'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='event',
+            name='video_streaming',
+            field=models.BooleanField(default=True, help_text='Do we intend to stream video of this event?'),
+        ),
+        migrations.AddField(
+            model_name='eventproposal',
+            name='allow_video_streaming',
+            field=models.BooleanField(default=False, help_text='Uncheck if you do not want the event live streamed.'),
+        ),
+        migrations.RunPython(update_streaming),
+    ]

src/program/models.py

@@ -544,6 +544,11 @@ class EventProposal(ExportModelOperationsMixin("event_proposal"), UserSubmittedM
         help_text="Recordings are made available under the <b>CC BY-SA 4.0</b> license. Uncheck if you do not want the event recorded, or if you cannot accept the license.",
     )
 
+    allow_video_streaming = models.BooleanField(
+        default=False,
+        help_text="Uncheck if you do not want the event live streamed.",
+    )
+
     duration = models.IntegerField(
         blank=True,
         help_text="How much time (in minutes) should we set aside for this event?",
@@ -609,6 +614,7 @@ def mark_as_approved(self, request=None):
         event.event_type = self.event_type
         event.proposal = self
         event.video_recording = self.allow_video_recording
+        event.video_streaming = self.allow_video_streaming
         event.save()
         # loop through the speaker_proposals linked to this event_proposal and associate any related speaker objects with this event
         for sp in self.speakers.all():
@@ -1207,10 +1213,12 @@ def get_ics_event(self):
         domain = Site.objects.get_current().domain
         speakers = ", ".join(self.event.speakers.all().values_list("name", flat=True))
         recorded = "Yes" if self.event.video_recording else "No"
+        streamed = "Yes" if self.event.video_streaming else "No"
         ievent["description"] = (
             f"URL: https://{domain}{self.event.get_absolute_url()}\n\n"
             f"Speaker(s): {speakers}\n\n"
             f"Recorded: {recorded}\n\n"
+            f"Streamed: {streamed}\n\n"
             f"{self.event.abstract}"
         )
         ievent["dtstart"] = icalendar.vDatetime(self.when.lower).to_ical()
@@ -1308,6 +1316,11 @@ class Event(ExportModelOperationsMixin("event"), CampRelatedModel):
         help_text="Do we intend to record video of this event?",
     )
 
+    video_streaming = models.BooleanField(
+        default=True,
+        help_text="Do we intend to stream video of this event?",
+    )
+
     proposal = models.OneToOneField(
         "program.EventProposal",
         null=True,
@@ -1378,10 +1391,14 @@ def serialize(self):
             "event_type": self.event_type.name,
         }
 
-        if self.video_recording:
-            video_state = "to-be-recorded"
+        if self.video_recording and self.video_streaming:
+            video_state = "to-be-streamed-to-be-recorded"
+        elif self.video_recording:
+            video_state = "to-be-recorded-not-to-be-streamed"
+        elif self.video_streaming:
+            video_state = "to-be-streamed-not-to-be-recorded"
         else:
-            video_state = "not-to-be-recorded"
+            video_state = "not-to-be-recorded-not-to-be-streamed"
 
         data["video_state"] = video_state
 
@@ -1513,10 +1530,14 @@ def serialize(self, user=None):
             "timeslots": self.timeslots,
         }
 
-        if self.event.video_recording:
-            video_state = "to-be-recorded"
+        if self.event.video_recording and self.event.video_streaming:
+            video_state = "to-be-recorded-to-be-streamed"
+        elif self.event.video_recording:
+            video_state = "to-be-recorded-not-to-be-streamed"
+        elif self.event.video_streaming:
+            video_state = "to-be-streamed-not-to-be-recorded"
         else:
-            video_state = "not-to-be-recorded"
+            video_state = "not-to-be-recorded-not-to-be-streamed"
 
         data["video_state"] = video_state
 

src/program/templates/event_detail.html

@@ -41,14 +41,25 @@ <h4>
       <h4>Metadata for <i>{{ event.title }}</i></h4>
       <strong>To be recorded</strong>:
       <span class="fa-stack">
-        <i class="fas fa-video fa-stack-1x"></i>
         {% if event.video_recording %}
-          <i class="far fa-circle fa-stack-2x"></i>
+          <i class="fas fa-floppy-disk fa-stack-1x"></i>
         {% else %}
+          <i class="fas fa-floppy-disk fa-stack-1x"></i>
           <i class="fas fa-ban fa-stack-2x text-danger"></i>
         {% endif %}
       </span>
       {{ event.video_recording|yesno:"Yes,No" }}
+      <br>
+      <strong>To be streamed</strong>:
+      <span class="fa-stack">
+        {% if event.video_streaming %}
+          <i class="far fa-broadcast-tower fa-stack-1x"></i>
+        {% else %}
+          <i class="fas fa-broadcast-tower fa-stack-1x"></i>
+          <i class="fas fa-ban fa-stack-2x text-danger"></i>
+        {% endif %}
+      </span>
+      {{ event.video_streaming|yesno:"Yes,No" }}
       <hr>
 
       <h4>URLs for <i>{{ event.title }}</i></h4>

src/program/templates/includes/event_list_table.html

@@ -8,7 +8,9 @@
       <th data-priority="2">Event Type</th>
       <th data-priority="100" class="text-center">Tags</th>
       <th data-priority="3">Speakers</th>
-      <th data-priority="100"><i class="fas fa-video"></i></th>
+      <th data-priority="100"><i class="fas fa-video" title="Recording" alt="Recording"></i></th>
+      <th data-priority="100"><i class="fas fa-floppy-disk" title="Recording" alt="Recording"></i></th>
+      <th data-priority="100"><i class="fas fa-broadcast-tower" title="Streaming" alt="Streaming"></i></th>
       <th data-priority="1">Scheduled</th>
     </tr>
   </thead>
@@ -37,15 +39,17 @@
               N/A
             {% endfor %}
           </td>
-          <td class="text-center"><span class="hidden">{{ event.video_recording }}</span>{{ event.video_recording|truefalseicon }}</td>
-          <td data-order="{{ event.event_slots.all.0.when.lower|date:"YmdHis" }}">
-            {% for slot in event.event_slots.all %}
-              {{ slot.event_location.icon_html }} {{ slot.event_location.name }} at {{ slot.when.lower }}<br>
-            {% empty %}
-              <i>Not scheduled yet</i>
-            {% endfor %}
-          </td>
-        </tr>
+          <td class="text-center"><span class="hidden">{% if event.video_recording or event.video_streaming %}True</span>{{ True|truefalseicon }}{% else %}False</span>{{ False|truefalseicon }}{% endif %}</td>
+            <td class="text-center" title="Recording: {{ event.video_recording|yesno }}"><span class="hidden">{{ event.video_recording }}</span>{{ event.video_recording|truefalseicon }}</td>
+            <td class="text-center" title="Streaming: {{ event.video_streaming|yesno }}"><span class="hidden">{{ event.video_streaming }}</span>{{ event.video_streaming|truefalseicon }}</td>
+            <td data-order="{{ event.event_slots.all.0.when.lower|date:"YmdHis" }}">
+              {% for slot in event.event_slots.all %}
+                {{ slot.event_location.icon_html }} {{ slot.event_location.name }} at {{ slot.when.lower }}<br>
+              {% empty %}
+                <i>Not scheduled yet</i>
+              {% endfor %}
+            </td>
+          </tr>
       {% endif %}
     {% endfor %}
   </tbody>

src/utils/management/commands/bootstrap_devsite.py

@@ -229,6 +229,7 @@ class Meta:
     title = factory.Faker("sentence")
     abstract = output_fake_md_description()
     allow_video_recording = factory.Iterator([True, True, True, False])
+    allow_video_streaming = factory.Iterator([True, True, True, False])
     submission_notes = factory.Iterator(["", output_fake_description()])
     use_provided_speaker_laptop = factory.Iterator([True, False])