From 71c946c71f97f325c30950974d3f5e1fe8deb36f Mon Sep 17 00:00:00 2001
From: srahn <srahn@uni-osnabrueck.de>
Date: Wed, 6 Sep 2023 12:39:58 +0200
Subject: [PATCH 01/10] Actually trigger a download on media download

---
 .../Videos/Actions/VideoDownload.vue          | 34 +++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/vueapp/components/Videos/Actions/VideoDownload.vue b/vueapp/components/Videos/Actions/VideoDownload.vue
index 98a146de4..7ddfca2ae 100644
--- a/vueapp/components/Videos/Actions/VideoDownload.vue
+++ b/vueapp/components/Videos/Actions/VideoDownload.vue
@@ -12,9 +12,8 @@
                     <h2>
                         ReferentIn
                     </h2>
-                    <a v-for="(media, index) in presenters" :key="index"
-                            :href="media['url']" target="_blank">
-                        <StudipButton>
+                    <a v-for="(media, index) in presenters" :key="index">
+                        <StudipButton @click.prevent="downloadFile(media)">
                             {{ getMediaText(media) }}
                         </StudipButton>
                     </a>
@@ -23,9 +22,8 @@
                     <h2>
                         Bildschirm
                     </h2>
-                    <a v-for="(media, index) in presentations" :key="index"
-                            :href="media['url']" target="_blank">
-                        <StudipButton>
+                    <a v-for="(media, index) in presentations" :key="index">
+                        <StudipButton @click.prevent="downloadFile(media)">
                             {{ getMediaText(media) }}
                         </StudipButton>
                     </a>
@@ -39,6 +37,8 @@
 import StudipDialog from '@studip/StudipDialog'
 import StudipButton from '@studip/StudipButton'
 
+import axios from "@/common/axios.service";
+
 export default {
     name: 'VideoDownload',
 
@@ -57,6 +57,28 @@ export default {
     },
 
     methods: {
+        async downloadFile(media) {
+            axios.get(media.url, {
+                crossDomain: true,
+                withCredentials: true,
+                responseType: 'blob'
+            }).then(response => {
+                const blob = new Blob([response.data]);
+                const link = document.createElement('a');
+                link.href = URL.createObjectURL(blob);
+                link.download = this.getFileName(media);
+                link.click();
+                URL.revokeObjectURL(link.href);
+            }).catch(console.error);
+        },
+
+        getFileName(media) {
+            let res = media.info;
+            res = res.replace(' * ', ' x ').replace(/\s+/g, '');
+            let ext = media.url.split(".").pop();
+            return this.event.title + ' (' + res + ').' + ext;
+        },
+
         getMediaText(media) {
             var text = media?.info || '';
             text = text.replace(' * ', ' x ');

From bde286371d008ce466f5fb650c27a825c6462a17 Mon Sep 17 00:00:00 2001
From: srahn <srahn@uni-osnabrueck.de>
Date: Wed, 6 Sep 2023 13:17:17 +0200
Subject: [PATCH 02/10] PlaylistAddToCourseDialog rename Element

---
 vueapp/components/Playlists/PlaylistAddToCourseDialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vueapp/components/Playlists/PlaylistAddToCourseDialog.vue b/vueapp/components/Playlists/PlaylistAddToCourseDialog.vue
index f256679bd..de1672a38 100644
--- a/vueapp/components/Playlists/PlaylistAddToCourseDialog.vue
+++ b/vueapp/components/Playlists/PlaylistAddToCourseDialog.vue
@@ -15,7 +15,7 @@
                     <thead>
                         <tr>
                             <th>
-                                {{ $gettext('Veranstaltung') }}
+                                {{ $gettext('Verknüpfte Veranstaltungen') }}
                             </th>
                             <th></th>
                         </tr>

From 7be6362aa02d13cd02382b73371017b9bd3ce470 Mon Sep 17 00:00:00 2001
From: srahn <srahn@uni-osnabrueck.de>
Date: Wed, 6 Sep 2023 13:34:05 +0200
Subject: [PATCH 03/10] Fix MessageBox closable

---
 vueapp/components/MessageBox.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vueapp/components/MessageBox.vue b/vueapp/components/MessageBox.vue
index 89f4092ec..deb7bf027 100644
--- a/vueapp/components/MessageBox.vue
+++ b/vueapp/components/MessageBox.vue
@@ -2,7 +2,7 @@
     <div class="messagebox"
         :class="`messagebox_` + type">
         <div class="messagebox_buttons">
-            <a class="close" title="Nachrichtenbox schliessen" @click.stop="hide">
+            <a class="close" href="#" title="Nachrichtenbox schliessen">
                 <span>Nachrichtenbox schliessen</span>
             </a>
         </div>

From e64a966c7c6a6ef2ba1a00a2b4c985cae2c37ccb Mon Sep 17 00:00:00 2001
From: srahn <srahn@uni-osnabrueck.de>
Date: Wed, 6 Sep 2023 14:16:58 +0200
Subject: [PATCH 04/10] Make the 'mark for deletion' action more clearly

---
 lib/Providers/OpencastConstants.php            |  3 ++-
 .../components/Videos/Actions/VideoDelete.vue  | 18 +++++++++++++++---
 vueapp/components/Videos/VideoCard.vue         |  2 +-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/lib/Providers/OpencastConstants.php b/lib/Providers/OpencastConstants.php
index 26b96f222..ea23eac61 100644
--- a/lib/Providers/OpencastConstants.php
+++ b/lib/Providers/OpencastConstants.php
@@ -44,7 +44,8 @@ public function register(\Pimple\Container $container)
                 'OPENCAST_RESOURCE_PROPERTY_ID',
                 'OPENCAST_SUPPORT_EMAIL',
                 'OPENCAST_API_TOKEN',
-                'OPENCAST_DEFAULT_SERVER'
+                'OPENCAST_DEFAULT_SERVER',
+                'OPENCAST_CLEAR_RECYCLE_BIN_INTERVAL'
             ]
         ];
     }
diff --git a/vueapp/components/Videos/Actions/VideoDelete.vue b/vueapp/components/Videos/Actions/VideoDelete.vue
index 1b1a1f221..306d8450f 100644
--- a/vueapp/components/Videos/Actions/VideoDelete.vue
+++ b/vueapp/components/Videos/Actions/VideoDelete.vue
@@ -1,23 +1,29 @@
 <template>
     <div>
         <StudipDialog
-            :title="$gettext('Aufzeichnung entfernen')"
+            :title="$gettext('Aufzeichnung zum Löschen markieren')"
             :confirmText="$gettext('Akzeptieren')"
             :confirmClass="'accept'"
             :closeText="$gettext('Abbrechen')"
             :closeClass="'cancel'"
-            height="175"
+            height="275"
             @close="decline"
             @confirm="removeVideo"
         >
             <template v-slot:dialogContent>
-                <translate>Möchten Sie die Aufzeichnung wirklich entfernen?</translate>
+                <translate>
+                    Möchten Sie die Aufzeichnung wirklich zum Löschen markieren?<br/><br/>
+                    Die Aufzeichnung wird damit in den "Gelöschte Videos" Bereich Ihres Arbeitsplatzes verschoben und wird nach {{simple_config_list.settings.OPENCAST_CLEAR_RECYCLE_BIN_INTERVAL}} Tagen automatisch gelöscht. 
+                    Bis zu diesem Zeitpunkt können Sie die Aufzeichnung wiederherstellen."
+                </translate>
             </template>
         </StudipDialog>
     </div>
 </template>
 
 <script>
+import { mapGetters } from "vuex";
+
 import StudipDialog from '@studip/StudipDialog'
 
 export default {
@@ -31,6 +37,12 @@ export default {
 
     emits: ['done', 'cancel'],
 
+    computed: {
+        ...mapGetters([
+            'simple_config_list'
+        ]),
+    },
+
     methods: {
         async removeVideo() {
             await this.$store.dispatch('deleteVideo', this.event.token)
diff --git a/vueapp/components/Videos/VideoCard.vue b/vueapp/components/Videos/VideoCard.vue
index 27704fc23..20e5a215e 100644
--- a/vueapp/components/Videos/VideoCard.vue
+++ b/vueapp/components/Videos/VideoCard.vue
@@ -328,7 +328,7 @@ export default {
 
                     menuItems.push({
                         id: 8,
-                        label: this.$gettext('Entfernen'),
+                        label: this.$gettext('Zum Löschen markieren'),
                         icon: 'trash',
                         emit: 'performAction',
                         emitArguments: 'VideoDelete'

From 312bf9580fdea7eaa3f2624cc6ac4604d5f17bc0 Mon Sep 17 00:00:00 2001
From: srahn <srahn@uni-osnabrueck.de>
Date: Wed, 6 Sep 2023 15:30:40 +0200
Subject: [PATCH 05/10] Limit input length in PlaylistAddDialog

---
 vueapp/components/Playlists/PlaylistAddCard.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vueapp/components/Playlists/PlaylistAddCard.vue b/vueapp/components/Playlists/PlaylistAddCard.vue
index 3d075c245..c14e80dc7 100644
--- a/vueapp/components/Playlists/PlaylistAddCard.vue
+++ b/vueapp/components/Playlists/PlaylistAddCard.vue
@@ -16,6 +16,7 @@
                     <label>
                         <span class="required">Titel</span>
                         <input type="text"
+                            maxlength="255"
                             :placeholder="$gettext('Titel der Wiedergabeliste')"
                             v-model="playlist.title"
                         >

From 3bc9d076ab05a349fb65ddfa955c100e2f3fe2bb Mon Sep 17 00:00:00 2001
From: srahn <srahn@uni-osnabrueck.de>
Date: Wed, 6 Sep 2023 16:50:11 +0200
Subject: [PATCH 06/10] Improve subtitleDialog

---
 .../Videos/Actions/CaptionUpload.vue          | 122 ++++++++++--------
 1 file changed, 68 insertions(+), 54 deletions(-)

diff --git a/vueapp/components/Videos/Actions/CaptionUpload.vue b/vueapp/components/Videos/Actions/CaptionUpload.vue
index a7fb5eb4f..dcfc276a9 100644
--- a/vueapp/components/Videos/Actions/CaptionUpload.vue
+++ b/vueapp/components/Videos/Actions/CaptionUpload.vue
@@ -14,10 +14,10 @@
         >
             <template v-slot:dialogContent ref="upload-dialog">
                 <form class="default" style="max-width: 50em;" ref="upload-form">
-                    <label v-if="config && config['server'] && config['server'].length > 1">
-                        <span class="required">
+                    <fieldset v-if="this.config?.server && Object.keys(this.config.server).length > 1">
+                        <legend>
                             {{ $gettext('Server auswählen:') }}
-                        </span>
+                        </legend>
 
                         <select v-model="selectedServer" required>
                             <option v-for="server in config['server']"
@@ -28,58 +28,68 @@
                             </option>
 
                         </select>
-                    </label>
-
-                    <div v-for="language in languages">
-                        <div v-if="!uploadProgress">
-                            <h4 class="oc--file-type">
-                                {{
-                                    $gettext('Untertitel für %{ lang }', {
-                                        lang: language.lang
-                                    })
-                                }}
-                            </h4>
-
-                            <div class="oc--file-preview" v-if="files[language.flavor] && files[language.flavor].size">
-                                <span class="oc--file-name">
-                                    <b>{{ $gettext('Name:') }}</b> {{ files[language.flavor].name }}
-                                </span>
-
-                                <span class="oc--file-size" v-if="files[language.flavor].size">
-                                    <b>{{ $gettext('Größe:') }}</b> {{files[language.flavor].size }}
-                                </span>
-                            </div>
-
-                            <div class="oc--button-bar">
-                                <label v-if="files[language.flavor] && files[language.flavor].url">
-                                    <a :href="files[language.flavor].url">
-                                        <button class='button download' type=button>
-                                            {{ $gettext('Herunterladen') }}
-                                        </button>
-                                    </a>
-                                </label>
-
-                                <label v-if="files[language.flavor]">
-                                    <StudipButton icon="trash" @click.prevent="removeCaption(language.flavor)">
-                                        {{ $gettext('Löschen') }}
-                                    </StudipButton>
-                                </label>
-
-                                <label class="oc--file-upload">
-                                    <StudipButton icon="accept" @click.prevent="chooseFiles('oc-file-' + language.lang)">
-                                        {{ $gettext('Untertiteldatei auswählen') }}
-                                    </StudipButton>
-                                    <input
-                                        type="file" class="caption_upload" :data-flavor="language.flavor"
-                                        @change="previewFiles" :ref="'oc-file-' + language.lang"
-                                        accept=".vtt"
-                                    >
-                                </label>
-                            </div>
+                    </fieldset>
+
+                    <fieldset>
+                        <legend >
+                                {{ $gettext('Datei(en)') }}
+                        </legend>
+
+                        <p class="help" v-translate>
+                            Unterstützt wird das WebVTT Format mit der Endung .vtt
+                        </p>
+
+                        <div v-for="language in languages">
+                            <fieldset v-if="!uploadProgress">
+                                <legend class="oc--file-type">
+                                    {{
+                                        $gettext('Untertitel für %{ lang }', {
+                                            lang: language.lang
+                                        })
+                                    }}
+                                </legend>
+
+                                <div class="oc--file-preview" v-if="files[language.flavor] && files[language.flavor].size">
+                                    <span class="oc--file-name">
+                                        <b>{{ $gettext('Name:') }}</b> {{ files[language.flavor].name }}
+                                    </span>
+
+                                    <span class="oc--file-size" v-if="files[language.flavor].size">
+                                        <b>{{ $gettext('Größe:') }}</b> {{files[language.flavor].size }}
+                                    </span>
+                                </div>
+
+                                <div class="oc--button-bar">
+                                    <label v-if="files[language.flavor] && files[language.flavor].url">
+                                        <a :href="files[language.flavor].url">
+                                            <button class='button download' type=button>
+                                                {{ $gettext('Herunterladen') }}
+                                            </button>
+                                        </a>
+                                    </label>
+
+                                    <label v-if="files[language.flavor]">
+                                        <StudipButton icon="trash" @click.prevent="removeCaption(language.flavor)">
+                                            {{ $gettext('Löschen') }}
+                                        </StudipButton>
+                                    </label>
+
+                                    <label class="oc--file-upload">
+                                        <StudipButton icon="accept" @click.prevent="chooseFiles('oc-file-' + language.lang)">
+                                            {{ $gettext('Untertiteldatei auswählen') }}
+                                        </StudipButton>
+                                        <input
+                                            type="file" class="caption_upload" :data-flavor="language.flavor"
+                                            @change="previewFiles" :ref="'oc-file-' + language.lang"
+                                            accept=".vtt"
+                                        >
+                                    </label>
+                                </div>
+                            </fieldset>
+
+                            <ProgressBar v-if="uploadProgress && uploadProgress.flavor == language.flavor" :progress="uploadProgress.progress" />
                         </div>
-
-                        <ProgressBar v-if="uploadProgress && uploadProgress.flavor == language.flavor" :progress="uploadProgress.progress" />
-                    </div>
+                    </fieldset>
 
                     <Error :float="true" />
 
@@ -239,6 +249,10 @@ export default {
                         }
                     },
                     uploadDone: () => {
+                        this.$store.dispatch('addMessage', {
+                            type: 'success',
+                            text: this.$gettext('Die Datei wurde erfolgreich hochgeladen.')
+                        });
                         view.$emit('done');
                     }
                 }

From 6d92a2e1033a7fed4ff302667e28c0d6ccd99d87 Mon Sep 17 00:00:00 2001
From: srahn <srahn@uni-osnabrueck.de>
Date: Wed, 6 Sep 2023 17:01:09 +0200
Subject: [PATCH 07/10] Rephrase Server delete dialog

---
 vueapp/components/Config/EditServer.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vueapp/components/Config/EditServer.vue b/vueapp/components/Config/EditServer.vue
index 7f089f0d0..778ff99f0 100644
--- a/vueapp/components/Config/EditServer.vue
+++ b/vueapp/components/Config/EditServer.vue
@@ -192,7 +192,7 @@ export default {
         },
 
         deleteConfig() {
-            if (confirm(this.$gettext('Sind sie, dass sie diese Serverkonfiguration löschen möchten? Es werden auch alle Videos aus Stud.IP rausgelöscht, die zu diesem Server gehören!'))) {
+            if (confirm(this.$gettext('Sind Sie sicher, dass Sie die Serverkonfiguration löschen möchten? Die damit verbundenen Videos werden danach nicht mehr in Stud.IP zur Verfügung stehen!'))) {
                 if (this.id == 'new') {
                     this.currentConfig = {}
                 } else {

From 36f4fe699aa7fb8155fca10c46b1767949ea6fce Mon Sep 17 00:00:00 2001
From: srahn <srahn@uni-osnabrueck.de>
Date: Wed, 6 Sep 2023 17:23:12 +0200
Subject: [PATCH 08/10] Make sure the server id is a Number in globalOptions

---
 vueapp/components/Config/GlobalOptions.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vueapp/components/Config/GlobalOptions.vue b/vueapp/components/Config/GlobalOptions.vue
index c430532ad..857b2dac2 100644
--- a/vueapp/components/Config/GlobalOptions.vue
+++ b/vueapp/components/Config/GlobalOptions.vue
@@ -107,7 +107,7 @@ export default {
 
             this.config_list.server.forEach(server => {
                 options.push({
-                    value: server.id,
+                    value: Number(server.id),
                     description: '[#' + server.id + '] ' + server.service_url + ''
                 })
             });

From fdbc70dc061a33facbef09e040a866909f3fab6a Mon Sep 17 00:00:00 2001
From: srahn <srahn@uni-osnabrueck.de>
Date: Mon, 11 Sep 2023 10:32:01 +0200
Subject: [PATCH 09/10] fix typo

---
 vueapp/components/Videos/Actions/VideoDelete.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vueapp/components/Videos/Actions/VideoDelete.vue b/vueapp/components/Videos/Actions/VideoDelete.vue
index 306d8450f..2be157fc6 100644
--- a/vueapp/components/Videos/Actions/VideoDelete.vue
+++ b/vueapp/components/Videos/Actions/VideoDelete.vue
@@ -14,7 +14,7 @@
                 <translate>
                     Möchten Sie die Aufzeichnung wirklich zum Löschen markieren?<br/><br/>
                     Die Aufzeichnung wird damit in den "Gelöschte Videos" Bereich Ihres Arbeitsplatzes verschoben und wird nach {{simple_config_list.settings.OPENCAST_CLEAR_RECYCLE_BIN_INTERVAL}} Tagen automatisch gelöscht. 
-                    Bis zu diesem Zeitpunkt können Sie die Aufzeichnung wiederherstellen."
+                    Bis zu diesem Zeitpunkt können Sie die Aufzeichnung wiederherstellen.
                 </translate>
             </template>
         </StudipDialog>

From 05d153c1d3abbe21c866cb81bab8a661aafa39fa Mon Sep 17 00:00:00 2001
From: srahn <srahn@uni-osnabrueck.de>
Date: Mon, 11 Sep 2023 11:50:50 +0200
Subject: [PATCH 10/10] Remove server selection from caption dialog

---
 .../components/Videos/Actions/CaptionUpload.vue  | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/vueapp/components/Videos/Actions/CaptionUpload.vue b/vueapp/components/Videos/Actions/CaptionUpload.vue
index dcfc276a9..511df549e 100644
--- a/vueapp/components/Videos/Actions/CaptionUpload.vue
+++ b/vueapp/components/Videos/Actions/CaptionUpload.vue
@@ -14,22 +14,6 @@
         >
             <template v-slot:dialogContent ref="upload-dialog">
                 <form class="default" style="max-width: 50em;" ref="upload-form">
-                    <fieldset v-if="this.config?.server && Object.keys(this.config.server).length > 1">
-                        <legend>
-                            {{ $gettext('Server auswählen:') }}
-                        </legend>
-
-                        <select v-model="selectedServer" required>
-                            <option v-for="server in config['server']"
-                                :key="server.id"
-                                :value="server"
-                            >
-                                #{{ server.id }} - {{ server.name }} (Opencast V {{ server.version }}.X)
-                            </option>
-
-                        </select>
-                    </fieldset>
-
                     <fieldset>
                         <legend >
                                 {{ $gettext('Datei(en)') }}