Merge branch 'TUM-Dev:dev' into fr-player-control-next

TUM-Dev · Dec 18, 2023 · 5fbbdd4 · 5fbbdd4
2 parents 0377105 + eff714b
commit 5fbbdd4
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/web/assets/css/main.css b/web/assets/css/main.css
@@ -185,6 +185,11 @@ label:has(~ .tl-input), label:has(~.tl-textarea) {
     background-color: #3070b3 !important;
 }
 
+/* Ensure that the mouse pointing time is displayed above the playback progress */
+.video-js .vjs-mouse-display {
+    z-index: 2 !important;
+}
+
 .video-js .vjs-big-play-button {
     @apply absolute top-0 left-0 bottom-0 right-0 m-auto;
 }

diff --git a/web/template/watch.gohtml b/web/template/watch.gohtml
@@ -76,7 +76,7 @@
     <div id="bookmarks-mobile" x-cloak="" x-show="sidebar === watch.SidebarState.Bookmarks"
          class="md:hidden flex absolute top-0 h-screen w-screen z-50 backdrop-brightness-50">
         <div @click.outside="sidebar = watch.SidebarState.Hidden"
-             class="m-auto w-3/4 h-96 bg-white dark:bg-secondary-light border dark:border-gray-800 rounded-lg">
+             class="m-auto w-3/4 h-16/9 bg-white dark:bg-secondary-light border dark:border-gray-800 rounded-lg">
             {{template "bookmarks-modal" $stream.ID}}
         </div>
     </div>
@@ -401,8 +401,8 @@
             <div x-show="sidebar === watch.SidebarState.Chat"
                  :class="sidebar === watch.SidebarState.Chat ? 'lg:basis-1/4' : 'lg:basis-0'"
                  class="z-20 basis-full order-5
-                        md:px-2 md:pt-2
-                        lg:h-16/6 h-96 lg:order-none">
+                        md:px-2
+                        lg:h-16/6 h-16/9 lg:order-none">
                 <div class="border dark:border-gray-800 rounded-lg h-full">
                     {{template "chat-component" .ChatData}}
                 </div>
@@ -413,7 +413,7 @@
         {{if .IndexData.TUMLiveContext.User}}
             <div id="bookmarks-desktop" x-cloak="" x-show="sidebar === watch.SidebarState.Bookmarks"
                  :class="sidebar === watch.SidebarState.Bookmarks ? 'lg:basis-1/4' : 'lg:basis-0'"
-                 class="hidden md:block basis-full h-96 lg:h-16/6 px-5 md:px-2 md:pt-2 lg:order-none order-4">
+                 class="hidden md:block basis-full h-16/9 lg:h-16/6 px-5 md:px-2 lg:order-none order-4">
                 {{template "bookmarks-modal" $stream.ID}}
             </div>
         {{end}}
@@ -422,7 +422,7 @@
         {{if .IndexData.TUMLiveContext.User}}
             <div id="streams-box" x-cloak="" x-show="sidebar === watch.SidebarState.Streams"
                  :class="sidebar === watch.SidebarState.Streams ? 'lg:basis-1/4' : 'lg:basis-0'"
-                 class="order-4 z-20 basis-full px-5 md:px-2 md:pt-2 lg:order-none lg:h-16/6 h-96">
+                 class="order-4 z-20 basis-full px-5 md:px-2 lg:order-none lg:h-16/6 h-16/9">
                 {{template "playlist" $stream.ID}}
             </div>
         {{end}}

diff --git a/web/ts/components/popup.ts b/web/ts/components/popup.ts
@@ -5,7 +5,11 @@ import { SocketConnections } from "../api/chat-ws";
 export function popupContext(streamId: number): AlpineComponent {
     return {
         init() {
+            // subscription?
             SocketConnections.ws = new RealtimeFacade("chat/" + streamId);
+            // ws needs to subscribe, so that pop-out chat can work
+            const handler = (data) => {};
+            SocketConnections.ws.subscribe(handler);
         },
     } as AlpineComponent;
 }
diff --git a/web/ts/edit-course.ts b/web/ts/edit-course.ts
@@ -280,7 +280,9 @@ export function lectureEditor(lecture: Lecture): AlpineComponent {
         },
 
         deleteLecture() {
-            DataStore.adminLectureList.delete(this.lectureData.courseId, [this.lectureData.lectureId]);
+            if (confirm("Do you really want to delete this lecture? This includes any recordings.")) {
+                DataStore.adminLectureList.delete(this.lectureData.courseId, [this.lectureData.lectureId]);
+            }
         },
 
         deleteLectureSeries() {