Add fancy layout

Author: LukasReschke

apps/files_sharing/css/public.css

@@ -158,3 +158,36 @@ thead {
 	opacity: 1;
 	cursor: pointer;
 }
+
+#body-public #emptycontent h2 {
+	margin: 10px 0 5px 0;
+}
+
+#body-public #emptycontent h2+p {
+	margin-bottom: 30px;
+}
+
+#body-public #emptycontent .icon-folder {
+	height: 16px;
+	width: 16px;
+	background-size: 16px;
+	display: inline-block;
+	vertical-align: text-top;
+	margin-bottom: 0;
+}
+
+#body-public #emptycontent .button {
+	background-size: 32px;
+	height: 32px;
+	width: 32px;
+	background-position: 16px; 
+	opacity: .7;
+	font-size: 20px;
+	margin: 20px;
+	padding: 10px 20px;
+	padding-left: 64px;
+}
+
+#body-public .avatardiv {
+	margin: 0 auto;
+}

apps/files_sharing/js/public.js

@@ -347,6 +347,10 @@ OCA.Sharing.PublicApp = {
 };
 
 $(document).ready(function () {
+	var $uploadValue = $('#uploadOnlyInterface').val();
+	if($uploadValue === "1") {
+		$('.avatardiv').avatar($('#sharingUserId').val(), 128, true);
+	}
 	// FIXME: replace with OC.Plugins.register()
 	if (window.TESTING) {
 		return;

apps/files_sharing/templates/public.php

@@ -30,6 +30,7 @@
 	<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">
 <input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir">
@@ -115,10 +116,30 @@
 			<?php endif; ?>
 		</div>
 		<?php } else { ?>
+			<input type="hidden" id="uploadOnlyInterface" value="1"/>
 			<div id="emptycontent" class="">
-			<div class="icon-upload"></div>
-			<h2><?php p($l->t('Upload files to %s', [$_['shareOwner']])) ?></h2>
-			<a href="#" class="inlineblock button">Select</a>
+				<?php
+				$avatar = \OC::$server->getAvatarManager();
+				$hasAvatar = false;
+				try {
+					$avatar = $avatar->getAvatar($_['owner']);
+					if($avatar->get(128) !== false) {
+						$hasAvatar = true;
+					}
+				} catch (\Exception $e) {
+					$hasAvatar = false;
+				}
+				?>
+				<?php if($hasAvatar === true): ?>
+					<img class="avatar" style="height: 128px;" src="<?php p(\OC::$server->getURLGenerator()->linkToRouteAbsolute('core.avatar.getAvatar', ['userId' => $_['owner'], 'size' => 256])) ?>">
+				<?php else: ?>
+					<div id="displayavatar">
+					<div class="avatardiv"></div>
+					</div>
+				<?php endif; ?>
+				<h2><?php p($l->t('Upload files to %s', [$_['shareOwner']])) ?></h2>
+				<p><span class="icon-folder"></span> <?php p($_['filename']) ?></p>
+				<a href="#" class="button icon-upload"><?php p($l->t('Select')) ?></a>
 			</div>
 		<?php } ?>
 </div>

core/Controller/AvatarController.php

@@ -85,7 +85,7 @@ public function __construct($appName,
 								IL10N $l10n,
 								IUserManager $userManager,
 								IUserSession $userSession,
-								Folder $userFolder,
+								Folder $userFolder = null,
 								ILogger $logger) {
 		parent::__construct($appName, $request);
 
@@ -101,6 +101,7 @@ public function __construct($appName,
 	/**
 	 * @NoAdminRequired
 	 * @NoCSRFRequired
+	 * @PublicPage
 	 *
 	 * @param string $userId
 	 * @param int $size

core/js/share.js

@@ -442,7 +442,6 @@ OC.Share = _.extend(OC.Share || {}, {
 });
 
 $(document).ready(function() {
-
 	if(typeof monthNames != 'undefined'){
 		// min date should always be the next day
 		var minDate = new Date();