From d178860ff6888eb3b8599a60c210731db721cb20 Mon Sep 17 00:00:00 2001
From: joshuaruesweg <ruesweg@woltlab.com>
Date: Mon, 22 Jun 2020 17:20:12 +0200
Subject: [PATCH] Improve layout for embedded videos in ugc Closes #3316

---
 .../templates/__videoAttachmentBBCode.tpl     | 22 +++++--------------
 .../system/bbcode/AttachmentBBCode.class.php  |  1 -
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/com.woltlab.wcf/templates/__videoAttachmentBBCode.tpl b/com.woltlab.wcf/templates/__videoAttachmentBBCode.tpl
index 41cc158f25..95930a7a5b 100644
--- a/com.woltlab.wcf/templates/__videoAttachmentBBCode.tpl
+++ b/com.woltlab.wcf/templates/__videoAttachmentBBCode.tpl
@@ -1,19 +1,7 @@
-<span id="attachmentVideo_{@$attachmentIdentifier}" class="videoContainer" style="display: none;">
+<span class="mediaBBCode">
 	<video src="{$attachment->getLink()}" controls></video>
-</span>
-
-<a id="attachmentVideoLink_{@$attachmentIdentifier}" href="{$attachment->getLink()}">{$attachment->filename}</a>
-
-<script data-relocate="true">
-	{* try to determine if browser might be able to play video *}
-	var video = elById('attachmentVideo_{@$attachmentIdentifier}');
-	var canPlayType = elCreate('video').canPlayType('{$attachment->fileType}');
 	
-	if (canPlayType === '') {
-		elRemove(video);
-	}
-	else {
-		elShow(video);
-		elRemove(elById('attachmentVideoLink_{@$attachmentIdentifier}'));
-	}
-</script>
+	<span class="mediaBBCodeCaption">
+		<a href="{$attachment->getLink()}">{$attachment->filename}</a>
+	</span>
+</span>
diff --git a/wcfsetup/install/files/lib/system/bbcode/AttachmentBBCode.class.php b/wcfsetup/install/files/lib/system/bbcode/AttachmentBBCode.class.php
index ebaa30128c..2b8e4cc732 100644
--- a/wcfsetup/install/files/lib/system/bbcode/AttachmentBBCode.class.php
+++ b/wcfsetup/install/files/lib/system/bbcode/AttachmentBBCode.class.php
@@ -160,7 +160,6 @@ class AttachmentBBCode extends AbstractBBCode {
 			else if (substr($attachment->fileType, 0, 6) === 'video/' && $parser->getOutputType() == 'text/html') {
 				return WCF::getTPL()->fetch('__videoAttachmentBBCode', 'wcf', [
 					'attachment' => $attachment,
-					'attachmentIdentifier' => StringUtil::getRandomID()
 				]);
 			}
 			else {
-- 
2.20.1