From ac81762eaa22dbdc61c6d11ae203b71bdfeaf53e Mon Sep 17 00:00:00 2001
From: onli <onli@paskuda.biz>
Date: Sun, 3 Nov 2019 21:30:51 +0100
Subject: [PATCH] Make use of the video tag for videos in the ML.

Cherry-picked from master branch.
---
 docs/NEWS                            |  2 ++
 templates/2k11/admin/media_items.tpl | 21 +++++++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/docs/NEWS b/docs/NEWS
index 58e492d3..a4ad2e2a 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -9,6 +9,8 @@ Version 2.3.3-beta1 ()
    * Updates mailer event plugin to support force sending mails on
      published blog entries and ability to prepend a mail body. 
      Also fixes missing "keep strip tags" configuration option
+   * Use the video tag for videos in the Medialibrary, also when
+     inserting such a video into an entry
 
    * Fix: Items in Medialibrary that are not images now get
           the correct link
diff --git a/templates/2k11/admin/media_items.tpl b/templates/2k11/admin/media_items.tpl
index dab34649..61e75b06 100644
--- a/templates/2k11/admin/media_items.tpl
+++ b/templates/2k11/admin/media_items.tpl
@@ -56,7 +56,6 @@
         {/if}
     {/if}
 
-
             <article id="media_{$file.id}" class="media_file {if $media.manage AND $media.multiperm}manage {/if}{cycle values="odd,even"}">
                 <header class="clearfix">
                     {if $media.manage AND $media.multiperm}
@@ -81,9 +80,23 @@
 
                 <div class="clearfix equal_heights media_file_wrap">
                     <div class="media_file_preview">
-                        <a {if $media.manage AND $media.multiperm}class="media_fullsize"{/if} href="{$link}" title="{$CONST.MEDIA_FULLSIZE}: {$file.realname}" data-pwidth="{$file.popupWidth}" data-pheight="{$file.popupHeight}">
-                            <img src="{$img_src}" title="{$img_title}" alt="{$img_alt}">
-                        </a>
+                        {if $file.mediatype == 'video'}
+                            <video src="{$file.imgsrc}" controls>
+                                <img src="{$img_src}" title="{$img_title}" alt="{$img_alt}">
+                            </video>
+                            <br />
+                            {if NOT $media.manage}
+                                {* we need a link to go to the next step when inserting into an entry *}
+                                <a {if $media.manage AND $media.multiperm}class="media_fullsize"{/if} href="{$link}" title="{$CONST.MEDIA_FULLSIZE}: {$file.realname}" data-pwidth="{$file.popupWidth}" data-pheight="{$file.popupHeight}">
+                                    {$CONST.VIDEO}
+                                </a>
+                            {/if}
+                        {else}
+                            <a {if $media.manage AND $media.multiperm}class="media_fullsize"{/if} href="{$link}" title="{$CONST.MEDIA_FULLSIZE}: {$file.realname}" data-pwidth="{$file.popupWidth}" data-pheight="{$file.popupHeight}">
+                                {* even files that are not images get aplaceholder image from the backend *}    
+                                <img src="{$img_src}" title="{$img_title}" alt="{$img_alt}">
+                            </a>
+                        {/if}
                         <footer id="media_file_meta_{$file.id}" class="media_file_meta additional_info">
                             <ul class="plainList">
                             {if $file.hotlink}