From 0802b662be298fac5787576007233f8ce456581c Mon Sep 17 00:00:00 2001
From: Myles McNamara <myles@hostt.net>
Date: Fri, 10 Jan 2014 12:20:31 -0500
Subject: [PATCH 1/5] fix upload button layout

---
 apps/files_sharing/templates/public.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 1d527dca8e..a427e3d8f2 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -24,9 +24,10 @@
 
 
 			<?php if (!isset($_['folder']) || $_['allowZipDownload']): ?>
-				<a href="<?php p($_['downloadURL']); ?>" class="button" id="download"><img
-						class="svg" alt="Download" src="<?php print_unescaped(OCP\image_path("core", "actions/download.svg")); ?>"
-						/><span><?php p($l->t('Download'))?></span></a>
+				<a href="<?php p($_['downloadURL']); ?>" class="button" id="download">
+					<img class="svg" alt="Download" src="<?php print_unescaped(OCP\image_path("core", "actions/download.svg")); ?>" />
+					<span><?php p($l->t('Download'))?></span>
+				</a>
 			<?php endif; ?>
 
 			<?php if ($_['allowPublicUploadEnabled']):?>
@@ -43,9 +44,10 @@
 			<?php endif;?>
 
 
-			<div id="data-upload-form" class="button" title="<?php p($l->t('Upload') . ' max. '.$_['uploadMaxHumanFilesize']) ?>">
+			<div id="data-upload-form" title="<?php p($l->t('Upload') . ' max. '.$_['uploadMaxHumanFilesize']) ?>">
 				<input id="file_upload_start" type="file" name="files[]" data-url="<?php print_unescaped(OCP\Util::linkTo('files', 'ajax/upload.php')); ?>" multiple>
-				<a href="#" id="publicUploadButtonMock" class="svg">
+				<a href="#" id="public_upload" class="button">
+					<img class="svg" alt="Upload" src="<?php print_unescaped(OCP\image_path("core", "actions/upload.svg")); ?>" />
 					<span><?php p($l->t('Upload'))?></span>
 				</a>
 			</div>

From 9ebffd663532bb74075e6858559eb6506004a7c5 Mon Sep 17 00:00:00 2001
From: Myles McNamara <myles@hostt.net>
Date: Fri, 10 Jan 2014 14:03:55 -0500
Subject: [PATCH 2/5] remove extra upload controls

---
 apps/files_sharing/templates/public.php | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index a427e3d8f2..8b5e097641 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -53,20 +53,8 @@
 			</div>
 
 		</div>
-
-		<div id="additional_controls" style="display:none">
-			<div id="uploadprogresswrapper">
-				<div id="uploadprogressbar"></div>
-				<input id="cancel_upload_button" type="button" class="stop" style="display:none"
-				       value="<?php p($l->t('Cancel upload'));?>"
-					/>
-			</div>
-
-
-
-
+		<div>
 			<?php endif; ?>
-
 		</div>
 	</div></header>
 <div id="content">

From 97be32e2e8291f3c5412bc9cbbdeda38552bbb81 Mon Sep 17 00:00:00 2001
From: Myles McNamara <myles@hostt.net>
Date: Fri, 10 Jan 2014 14:07:20 -0500
Subject: [PATCH 3/5] modify js to move upload wrapper, modify css to match
 core values

---
 apps/files_sharing/css/public.css | 17 ++++++++++-------
 apps/files_sharing/js/public.js   |  3 ++-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index 060d4dfedc..be53a7d8a8 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -141,10 +141,13 @@ thead{
 .directLink {
 	margin-bottom: 20px;
 }
-	.directLink label {
-		font-weight: normal;
-	}
-	.directLink input {
-		margin-left: 10px;
-		width: 300px;
-	}
+.directLink label {
+	font-weight: normal;
+}
+.directLink input {
+	margin-left: 10px;
+	width: 300px;
+}
+.public_actions {
+	padding: 0.3em;
+}
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index eacd4096ed..88dbac9c88 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -59,7 +59,8 @@ $(document).ready(function() {
 	});
 
 	// Add Uploadprogress Wrapper to controls bar
-	$('#controls').append($('#additional_controls div#uploadprogresswrapper'));
+	$('#controls').append($('#controls .actions div#uploadprogresswrapper'));
+	$('#uploadprogresswrapper').addClass('public_actions');
 
 	// Cancel upload trigger
 	$('#cancel_upload_button').click(function() {

From 62040fe2d2cacafb3b534ff7de2cded7ca64daf4 Mon Sep 17 00:00:00 2001
From: Myles McNamara <myles@hostt.net>
Date: Wed, 15 Jan 2014 17:06:48 -0500
Subject: [PATCH 4/5] change em to px

---
 apps/files_sharing/css/public.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index be53a7d8a8..f4121430b9 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -149,5 +149,5 @@ thead{
 	width: 300px;
 }
 .public_actions {
-	padding: 0.3em;
+	padding: 4px;
 }

From 955530556550d2e753675142486ee91d5a9ce6fa Mon Sep 17 00:00:00 2001
From: Myles McNamara <myles@smyl.es>
Date: Mon, 20 Jan 2014 11:58:01 -0500
Subject: [PATCH 5/5] change publicUploadButtonMock to public_upload

Changed jQuery selector for public preview to public_upload to correctly show preview
---
 apps/files/js/files.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index fdaa3aa334..12e870f141 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -717,7 +717,7 @@ Files.lazyLoadPreview = function(path, mime, ready, width, height, etag) {
 			console.warn('Files.lazyLoadPreview(): missing etag argument');
 		}
 
-		if ( $('#publicUploadButtonMock').length ) {
+		if ( $('#public_upload').length ) {
 			urlSpec.t = $('#dirToken').val();
 			previewURL = OC.Router.generate('core_ajax_public_preview', urlSpec);
 		} else {