From ce8a8c0c83eaf9ab6a57b73bfcd76522c82ca1e3 Mon Sep 17 00:00:00 2001
From: Sangramsinh Desai <sangramsinh.desai@t-systems.com>
Date: Mon, 30 Aug 2021 10:29:21 +0530
Subject: [PATCH 1/6] Guest view download button seperated for video

Signed-off-by: Sangramsinh Desai <sangramsinh.desai@t-systems.com>
Signed-off-by: sangramsinh.desai@t-systems.com <sangramsinh.desai@t-systems.com>
---
 apps/files_sharing/templates/public.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index b2d72a3c3371b..27621a0340ffc 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -75,9 +75,12 @@
 				<?php endif; ?>
 				<?php if ($_['previewURL'] === $_['downloadURL'] && !$_['hideDownload']): ?>
 					<div class="directDownload">
+						<div>
+							<?php p($l->t('%s', [$_['filename']]))?> (<?php p($_['fileSize']) ?>)
+						</div>
 						<a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button">
 							<span class="icon icon-download"></span>
-							<?php p($l->t('Download %s', [$_['filename']]))?> (<?php p($_['fileSize']) ?>)
+							<?php p($l->t('Download'))?>
 						</a>
 					</div>
 				<?php endif; ?>

From 2254a40f61e104501e75615a7ee0e3b38563bcab Mon Sep 17 00:00:00 2001
From: Sangramsinh Desai <sangramsinh.desai@t-systems.com>
Date: Mon, 30 Aug 2021 10:30:17 +0530
Subject: [PATCH 2/6] Guest view download button seperated for image

Signed-off-by: Sangramsinh Desai <sangramsinh.desai@t-systems.com>
Signed-off-by: sangramsinh.desai@t-systems.com <sangramsinh.desai@t-systems.com>
---
 apps/files_sharing/templates/public.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 27621a0340ffc..799e18c955b09 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -72,6 +72,19 @@
 				<?php else: ?>
 					<!-- Preview frame is filled via JS to support SVG images for modern browsers -->
 					<div id="imgframe"></div>
+					<?php if(isset($_['mimetype'])){ ?>
+						 <?php	if (strpos($_['mimetype'], 'image') === 0) { ?>
+							<div class="directDownload">
+								<div class="video-file-details">
+									<?php p($l->t('%s', [$_['filename']]))?> (<?php p($_['fileSize']) ?>)
+								</div>
+								<a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button">
+									<span class="icon icon-download"></span>
+									<?php p($l->t('Download'))?>
+								</a>
+							</div>							
+						 <?php 	} ?>						
+					<?php } ?>					
 				<?php endif; ?>
 				<?php if ($_['previewURL'] === $_['downloadURL'] && !$_['hideDownload']): ?>
 					<div class="directDownload">

From 4d7b780c737c48ca267233cc9fca131ccb5f708e Mon Sep 17 00:00:00 2001
From: "sangramsinh.desai@t-systems.com" <sangramsinh.desai@t-systems.com>
Date: Wed, 1 Sep 2021 18:42:45 +0530
Subject: [PATCH 3/6] mimetype condition merged

Signed-off-by: Sangramsinh Desai <sangramsinh.desai@t-systems.com>
Signed-off-by: sangramsinh.desai@t-systems.com <sangramsinh.desai@t-systems.com>
---
 apps/files_sharing/templates/public.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 799e18c955b09..9c33ca57d4df5 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -72,6 +72,17 @@
 				<?php else: ?>
 					<!-- Preview frame is filled via JS to support SVG images for modern browsers -->
 					<div id="imgframe"></div>
+						<?php if (isset($_['mimetype']) && strpos($_['mimetype'], 'image') === 0) { ?>
+							<div class="directDownload">
+								<div class="video-file-details">
+									<?php p($l->t('%s', [$_['filename']]))?> (<?php p($_['fileSize']) ?>)
+								</div>
+								<a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button">
+									<span class="icon icon-download"></span>
+									<?php p($l->t('Download'))?>
+								</a>
+							</div>							
+						<?php } ?>					
 					<?php if(isset($_['mimetype'])){ ?>
 						 <?php	if (strpos($_['mimetype'], 'image') === 0) { ?>
 							<div class="directDownload">

From 0d18228eb9504742ad6b60d841ad638b2e9b31bc Mon Sep 17 00:00:00 2001
From: "sangramsinh.desai@t-systems.com" <sangramsinh.desai@t-systems.com>
Date: Wed, 1 Sep 2021 18:44:27 +0530
Subject: [PATCH 4/6] space above the downloadFile element added

Signed-off-by: Sangramsinh Desai <sangramsinh.desai@t-systems.com>
Signed-off-by: sangramsinh.desai@t-systems.com <sangramsinh.desai@t-systems.com>
---
 apps/files_sharing/css/public.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/files_sharing/css/public.scss b/apps/files_sharing/css/public.scss
index 3b53b1ce2a740..aadf7d4103734 100644
--- a/apps/files_sharing/css/public.scss
+++ b/apps/files_sharing/css/public.scss
@@ -71,6 +71,7 @@ thead {
 	display: inline-block;
 	margin-left: auto;
 	margin-right: auto;
+	margin-top: 16px;
 }
 
 .download-size {

From 86558878e4c5de384024d543b6ff239425a87cd4 Mon Sep 17 00:00:00 2001
From: "sangramsinh.desai@t-systems.com" <sangramsinh.desai@t-systems.com>
Date: Wed, 1 Sep 2021 18:46:18 +0530
Subject: [PATCH 5/6] unwanted class removed

Signed-off-by: Sangramsinh Desai <sangramsinh.desai@t-systems.com>
Signed-off-by: sangramsinh.desai@t-systems.com <sangramsinh.desai@t-systems.com>
---
 apps/files_sharing/templates/public.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 9c33ca57d4df5..279a4cb87e92c 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -74,7 +74,7 @@
 					<div id="imgframe"></div>
 						<?php if (isset($_['mimetype']) && strpos($_['mimetype'], 'image') === 0) { ?>
 							<div class="directDownload">
-								<div class="video-file-details">
+								<div>
 									<?php p($l->t('%s', [$_['filename']]))?> (<?php p($_['fileSize']) ?>)
 								</div>
 								<a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button">
@@ -86,7 +86,7 @@
 					<?php if(isset($_['mimetype'])){ ?>
 						 <?php	if (strpos($_['mimetype'], 'image') === 0) { ?>
 							<div class="directDownload">
-								<div class="video-file-details">
+								<div>
 									<?php p($l->t('%s', [$_['filename']]))?> (<?php p($_['fileSize']) ?>)
 								</div>
 								<a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button">

From bc6b496f4cfee10b00b073cfac03ffc0244fc6d1 Mon Sep 17 00:00:00 2001
From: "sangramsinh.desai@t-systems.com" <sangramsinh.desai@t-systems.com>
Date: Wed, 1 Sep 2021 18:52:06 +0530
Subject: [PATCH 6/6] Duplicate code removed

Signed-off-by: Sangramsinh Desai <sangramsinh.desai@t-systems.com>
Signed-off-by: sangramsinh.desai@t-systems.com <sangramsinh.desai@t-systems.com>
---
 apps/files_sharing/templates/public.php | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 279a4cb87e92c..e301b41c31994 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -82,20 +82,7 @@
 									<?php p($l->t('Download'))?>
 								</a>
 							</div>							
-						<?php } ?>					
-					<?php if(isset($_['mimetype'])){ ?>
-						 <?php	if (strpos($_['mimetype'], 'image') === 0) { ?>
-							<div class="directDownload">
-								<div>
-									<?php p($l->t('%s', [$_['filename']]))?> (<?php p($_['fileSize']) ?>)
-								</div>
-								<a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button">
-									<span class="icon icon-download"></span>
-									<?php p($l->t('Download'))?>
-								</a>
-							</div>							
-						 <?php 	} ?>						
-					<?php } ?>					
+						<?php } ?>									
 				<?php endif; ?>
 				<?php if ($_['previewURL'] === $_['downloadURL'] && !$_['hideDownload']): ?>
 					<div class="directDownload">