Merge pull request #8400 from owncloud/download-button-public-folder

reintroduce download button on public shares

4 files changed, 21 insertions, 18 deletions

diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index efd8d4950d8..67d84701946 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -86,9 +86,6 @@ thead {
 	margin-left: auto;
 	margin-right: auto;
 }
-.directDownload .button img {
-	vertical-align: text-bottom;
-}
 
 .directLink label {
 	font-weight: normal;
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 3abcbf291ff..e17ffc48036 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -165,12 +165,13 @@ if (isset($path)) {
 			$folder->assign('disableSharing', true);
 			$folder->assign('trash', false);
 			$tmpl->assign('folder', $folder->fetchPage());
-			$maxInputFileSize = OCP\Config::getSystemValue('maxZipInputSize', OCP\Util::computerFileSize('800 MB'));
 			$allowZip = OCP\Config::getSystemValue('allowZipDownload', true);
 			$tmpl->assign('allowZipDownload', intval($allowZip));
+			$tmpl->assign('showDownloadButton', intval($allowZip));
 			$tmpl->assign('downloadURL',
 				OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=' . urlencode($getPath));
 		} else {
+			$tmpl->assign('showDownloadButton', true);
 			$tmpl->assign('dir', $dir);
 
 			// Show file preview if viewer is available
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index fc8d59e1e89..f3c75134a5f 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -1,3 +1,4 @@
+<?php /** @var $l OC_L10N */ ?>
 <div id="notification-container">
 	<div id="notification" style="display: none;"></div>
 </div>
@@ -14,7 +15,12 @@
 		                                                                                          src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="<?php p($theme->getName()); ?>" /></a>
 		<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
 		<div class="header-right">
-			<span id="details"><?php p($l->t('shared by %s', array($_['displayName']))) ?></span>
+			<?php if ($_['showDownloadButton']): ?>
+			<a href="<?php p($_['downloadURL']); ?>" id="download" class="button">
+				<img class="svg" alt="" src="<?php print_unescaped(OCP\image_path("core", "actions/download.svg")); ?>"/>
+				<?php p($l->t('Download'))?>
+			</a>
+			<?php endif ?>
 		</div>
 </div></header>
 <div id="content">
@@ -24,7 +30,7 @@
 		<?php else: ?>
 			<?php if (substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'image'): ?>
 				<div id="imgframe">
-					<img src="<?php p($_['downloadURL']); ?>" />
+					<img src="<?php p($_['downloadURL']); ?>" alt="" />
 				</div>
 			<?php elseif (substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'video'): ?>
 				<div id="imgframe">
@@ -35,7 +41,10 @@
 			<?php else: ?>
 				<div id="imgframe">
 					<?php $size = \OC\Preview::isMimeSupported($_['mimetype']) ? 500 : 128 ?>
-					<img src="<?php p(OCP\Util::linkToRoute( 'core_ajax_public_preview', array('x' => $size, 'y' => $size, 'file' => $_['directory_path'], 't' => $_['dirToken']))); ?>" class="publicpreview"/>
+					<img
+						src="<?php p(OCP\Util::linkToRoute( 'core_ajax_public_preview', array('x' => $size, 'y' => $size, 'file' => $_['directory_path'], 't' => $_['dirToken']))); ?>"
+						class="publicpreview"
+						alt="" />
 				</div>
 			<?php endif; ?>
 			<div class="directDownload">
diff --git a/core/css/styles.css b/core/css/styles.css
index 9f74ab7deaf..be70fe3cce4 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -62,22 +62,12 @@ body {
 .header-right {
 	position: absolute;
 	right: 0;
-	padding-right: 10px;
+	padding: 7px 5px;
 	color: #fff;
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
-	filter: alpha(opacity=50);
-	opacity: .5;
 	height: 100%;
 	max-width: 40%;
 	white-space: nowrap;
 }
-.header-right #details {
-	display: inline-block;
-	margin-top: 6px;
-	width: 100%;
-	text-overflow: ellipsis;
-	overflow: hidden;
-}
 
 /* Profile picture in header */
 #header .avatardiv {
@@ -202,6 +192,12 @@ input[type="time"] {
 	height: 31px;
 	-moz-box-sizing: border-box; box-sizing: border-box;
 }
+
+/* correctly align images inside of buttons */
+input img, button img, .button img {
+	vertical-align: text-bottom;
+}
+
 #quota {
 	cursor: default;
 	margin: 30px;