diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2016-06-09 18:12:58 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2016-06-09 18:12:58 +0200 |
| commit | e878e786e04b4c4dcf30e9355003f07592bd9b51 (patch) | |
| tree | 433fea5d9bb1e4a6ca212eb8d1cc8517ad795ee6 /apps | |
| parent | 6e99b0f59d3b0278c45d42dcec01ff554a89d979 (diff) | |
| download | nextcloud-server-e878e786e04b4c4dcf30e9355003f07592bd9b51.tar.gz nextcloud-server-e878e786e04b4c4dcf30e9355003f07592bd9b51.zip | |
Fix public upload for normal shares
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_sharing/css/public.css | 2 | ||||
| -rw-r--r-- | apps/files_sharing/js/public.js | 5 | ||||
| -rw-r--r-- | apps/files_sharing/templates/public.php | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css index a644b850556..628fd45f242 100644 --- a/apps/files_sharing/css/public.css +++ b/apps/files_sharing/css/public.css @@ -159,8 +159,6 @@ thead { cursor: pointer; } - - #public-upload .avatardiv { margin: 0 auto; } diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index bf06b2cd55b..f207eff7909 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -302,7 +302,9 @@ OCA.Sharing.PublicApp = { $('#save-button-confirm') .removeClass("icon-loading-small") .addClass("icon-confirm"); - } else { + + } + else { $('#save-button-confirm') .removeClass("icon-confirm") .addClass("icon-loading-small"); @@ -312,6 +314,7 @@ OCA.Sharing.PublicApp = { toggleLoading(); var location = window.location.protocol + '//' + window.location.host + OC.webroot; + if(remote.substr(-1) !== '/') { remote += '/' }; diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index f4c954c76d5..ef9e4bfa574 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -90,9 +90,10 @@ OCP\Util::addscript('files', 'keyboardshortcuts'); </span> </div> </div></header> -<div id="content-wrapper" <?php if(isset($_['hideFileList']) && $_['hideFileList'] === true){ print_unescaped(" class=\"content-wrapper-upload\"");} ?>> +<div id="content-wrapper"> <?php if (!isset($_['hideFileList']) || (isset($_['hideFileList']) && $_['hideFileList'] === false)) { ?> - <div id="preview"> + <div id="content"> + <div id="preview"> <?php if (isset($_['folder'])): ?> <?php print_unescaped($_['folder']); ?> <?php else: ?> |