Use PublicTemplateResponse for files_sharing

Signed-off-by: Julius Härtl <jus@bitgrid.net>

1 files changed, 37 insertions, 92 deletions

diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 3c2bbe5fb59..698febd4c17 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -7,10 +7,6 @@
 	<link rel="image_src" href="<?php p($_['previewImage']); ?>" />
 <?php endif; ?>
 
-<div id="notification-container">
-	<div id="notification" style="display: none;"></div>
-</div>
-
 <input type="hidden" id="sharingUserId" value="<?php p($_['owner']) ?>">
 <input type="hidden" id="filesApp" name="filesApp" value="1">
 <input type="hidden" id="isPublic" name="isPublic" value="1">
@@ -33,61 +29,9 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
 	<input type="hidden" name="filesize" value="<?php p($_['nonHumanFileSize']); ?>" id="filesize">
 <?php endif; ?>
 <input type="hidden" name="maxSizeAnimateGif" value="<?php p($_['maxSizeAnimateGif']); ?>" id="maxSizeAnimateGif">
-
-
-<header><div id="header" class="<?php p((isset($_['folder']) ? 'share-folder' : 'share-file')) ?>">
-		<div class="header-left">
-			<span id="nextcloud">
-				<div class="logo logo-icon svg"></div>
-				<h1 class="header-appname">
-					<?php p($_['filename']); ?>
-				</h1>
-				<div class="header-shared-by">
-					<?php echo p($l->t('shared by %s', [$_['displayName']])); ?>
-				</div>
-			</span>
-		</div>
-
-		<div class="header-right">
-			<?php if (!isset($_['hideFileList']) || (isset($_['hideFileList']) && $_['hideFileList'] === false)) { ?>
-			<a id="share-menutoggle" class="menutoggle icon-more-white"><span class="share-menutoggle-text"><?php p($l->t('Download')) ?></span></a>
-			<div id="share-menu" class="popovermenu menu">
-				<ul>
-					<li>
-						<a href="<?php p($_['downloadURL']); ?>" id="download">
-							<span class="icon icon-download"></span>
-							<?php p($l->t('Download'))?>&nbsp;<span class="download-size">(<?php p($_['fileSize']) ?>)</span>
-						</a>
-					</li>
-					<li>
-						<a id="directLink-container">
-							<span class="icon icon-public"></span>
-							<label for="directLink"><?php p($l->t('Direct link')) ?></label>
-							<input id="directLink" type="text" readonly value="<?php p($_['previewURL']); ?>">
-						</a>
-					</li>
-					<?php if ($_['server2serversharing']) { ?>
-					<li>
-						<a id="save" data-protected="<?php p($_['protected']) ?>"
-							  data-owner-display-name="<?php p($_['displayName']) ?>" data-owner="<?php p($_['owner']) ?>" data-name="<?php p($_['filename']) ?>">
-							<span class="icon icon-external"></span>
-							<span id="save-button"><?php p($l->t('Add to your Nextcloud')) ?></span>
-							<form class="save-form hidden" action="#">
-								<input type="text" id="remote_address" placeholder="user@yourNextcloud.org"/>
-								<button id="save-button-confirm" class="icon-confirm svg" disabled></button>
-							</form>
-						</a>
-					</li>
-					<?php } ?>
-				</ul>
-			</div>
-			<?php } ?>
-		</div>
-	</div></header>
-<div id="content-wrapper">
-	<?php if (!isset($_['hideFileList']) || (isset($_['hideFileList']) && $_['hideFileList'] === false)) { ?>
+<?php if (!isset($_['hideFileList']) || (isset($_['hideFileList']) && $_['hideFileList'] === false)) { ?>
 	<div id="content">
-	<div id="preview">
+		<div id="preview">
 			<?php if (isset($_['folder'])): ?>
 				<?php print_unescaped($_['folder']); ?>
 			<?php else: ?>
@@ -102,46 +46,47 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
 					<div id="imgframe"></div>
 				<?php endif; ?>
 				<?php if ($_['previewURL'] === $_['downloadURL']): ?>
-				<div class="directDownload">
-					<a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button">
-						<span class="icon icon-download"></span>
-						<?php p($l->t('Download %s', array($_['filename'])))?> (<?php p($_['fileSize']) ?>)
-					</a>
-				</div>
+					<div class="directDownload">
+						<a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button">
+							<span class="icon icon-download"></span>
+							<?php p($l->t('Download %s', array($_['filename'])))?> (<?php p($_['fileSize']) ?>)
+						</a>
+					</div>
 				<?php endif; ?>
 			<?php endif; ?>
 		</div>
+	</div>
+<?php } else { ?>
+	<input type="hidden" id="upload-only-interface" value="1"/>
+	<div id="public-upload">
+		<div id="emptycontent" class="<?php if (!empty($_['disclaimer'])) { ?>has-disclaimer<?php } ?>">
+			<div id="displayavatar"><div class="avatardiv"></div></div>
+			<h2><?php p($l->t('Upload files to %s', [$_['shareOwner']])) ?></h2>
+			<p><span class="icon-folder"></span> <?php p($_['filename']) ?></p>
+			<?php if (!empty($_['disclaimer'])) { ?>
+				<p class="disclaimer"><?php p($_['disclaimer']); ?></p>
+			<?php } ?>
+			<input type="file" name="files[]" class="hidden" multiple>
+
+			<a href="#" class="button icon-upload"><?php p($l->t('Select or drop files')) ?></a>
+			<div id="drop-upload-progress-indicator" style="padding-top: 25px;" class="hidden"><?php p($l->t('Uploading files…')) ?></div>
+			<div id="drop-upload-done-indicator" style="padding-top: 25px;" class="hidden"><?php p($l->t('Uploaded files:')) ?></div>
+			<ul>
+			</ul>
 		</div>
-		<?php } else { ?>
-		<input type="hidden" id="upload-only-interface" value="1"/>
-			<div id="public-upload">
-				<div id="emptycontent" class="<?php if (!empty($_['disclaimer'])) { ?>has-disclaimer<?php } ?>">
-					<div id="displayavatar"><div class="avatardiv"></div></div>
-					<h2><?php p($l->t('Upload files to %s', [$_['shareOwner']])) ?></h2>
-					<p><span class="icon-folder"></span> <?php p($_['filename']) ?></p>
-					<?php if (!empty($_['disclaimer'])) { ?>
-					<p class="disclaimer"><?php p($_['disclaimer']); ?></p>
-					<?php } ?>
-					<input type="file" name="files[]" class="hidden" multiple>
+	</div>
+<?php } ?>
 
-					<a href="#" class="button icon-upload"><?php p($l->t('Select or drop files')) ?></a>
-					<div id="drop-upload-progress-indicator" style="padding-top: 25px;" class="hidden"><?php p($l->t('Uploading files…')) ?></div>
-					<div id="drop-upload-done-indicator" style="padding-top: 25px;" class="hidden"><?php p($l->t('Uploaded files:')) ?></div>
-					<ul>
-					</ul>
-				</div>
-			</div>
-		<?php } ?>
 <?php if (!isset($_['hideFileList']) || (isset($_['hideFileList']) && $_['hideFileList'] !== true)): ?>
 	<input type="hidden" name="dir" id="dir" value="" />
 	<div class="hiddenuploadfield">
-	<input type="file" id="file_upload_start" class="hiddenuploadfield" name="files[]"
-		data-url="<?php p(OCP\Util::linkTo('files', 'ajax/upload.php')); ?>" />
+		<input type="file" id="file_upload_start" class="hiddenuploadfield" name="files[]"
+			   data-url="<?php p(OCP\Util::linkTo('files', 'ajax/upload.php')); ?>" />
 	</div>
-	<?php endif; ?>
-	<footer>
-		<p class="info">
-			<?php print_unescaped($theme->getLongFooter()); ?>
-		</p>
-	</footer>
-</div>
+<?php endif; ?>
+
+<footer>
+	<p class="info">
+		<?php print_unescaped($theme->getLongFooter()); ?>
+	</p>
+</footer>