From 2bdd014f83979d3a332775b39bb139c567c34e64 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 14 Jan 2014 22:14:06 +0100 Subject: [PATCH 01/29] first mobile style rules, hide extra columns in files view and scroll header --- apps/files_sharing/css/mobile.css | 18 ++++++++++++++++++ apps/files_sharing/public.php | 1 + 2 files changed, 19 insertions(+) create mode 100644 apps/files_sharing/css/mobile.css diff --git a/apps/files_sharing/css/mobile.css b/apps/files_sharing/css/mobile.css new file mode 100644 index 0000000000..55d244ff1e --- /dev/null +++ b/apps/files_sharing/css/mobile.css @@ -0,0 +1,18 @@ +@media only screen and (max-width: 600px) { + +/* make header and controls bar scroll up for more view of content on small screens */ +#header, +#controls { + position: absolute; +} + +/* hide size and date columns */ +table th#headerSize, +table td.filesize, +table th#headerDate, +table td.date { + display: none; +} + + +} diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index f4042f6524..ae0a62f103 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -136,6 +136,7 @@ if (isset($path)) { } else { OCP\Util::addScript('files', 'file-upload'); OCP\Util::addStyle('files_sharing', 'public'); + OCP\Util::addStyle('files_sharing', 'mobile'); OCP\Util::addScript('files_sharing', 'public'); OCP\Util::addScript('files', 'fileactions'); OCP\Util::addScript('files', 'jquery.iframe-transport'); From 072ef7f010ca9f48119bc2397a82fdd0aac76beb Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 14 Jan 2014 22:14:46 +0100 Subject: [PATCH 02/29] remove min-width rule to fix mobile views --- apps/files/css/files.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 2fc86ca537..74320aba32 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -65,9 +65,6 @@ top: 44px; width: 100%; } -#filestable, #controls { - min-width: 680px; -} #filestable tbody tr { background-color:#fff; height:2.5em; } #filestable tbody tr:hover, tbody tr:active { background-color: rgb(240,240,240); From 807b885a0e83841b51b694afbb4b377e39215b0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Wed, 15 Jan 2014 14:36:18 +0100 Subject: [PATCH 03/29] reuse file upload as used within files app - remove public upload button --- apps/files/templates/index.php | 8 +++- apps/files_sharing/public.php | 3 +- apps/files_sharing/templates/public.php | 54 +------------------------ 3 files changed, 10 insertions(+), 55 deletions(-) diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index 00ec109621..d7f479b504 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -18,6 +18,10 @@ + + + + @@ -26,7 +30,7 @@ - > + >
@@ -44,7 +48,7 @@
class="hidden">t('Nothing in here. Upload something!'))?>
- + diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index ae0a62f103..e3d6895543 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -225,7 +225,8 @@ if (isset($path)) { $folder->assign('fileList', $list->fetchPage()); $folder->assign('breadcrumb', $breadcrumbNav->fetchPage()); $folder->assign('dir', $getPath); - $folder->assign('isCreatable', false); + $folder->assign('isCreatable', $allowPublicUploadEnabled); + $folder->assign('dirToken', $linkItem['token']); $folder->assign('permissions', OCP\PERMISSION_READ); $folder->assign('isPublic',true); $folder->assign('publicUploadEnabled', 'no'); diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 1d527dca8e..d82e567182 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -14,57 +14,7 @@ src="" alt="getName()); ?>" />
- - t('%s shared the folder %s with you', - array($_['displayName'], $_['filename']))) ?> - - t('%s shared the file %s with you', - array($_['displayName'], $_['filename']))) ?> - - - - - Download" - />t('Download'))?> - - - - - - - - - - - = 0):?> - - - - - - -
- -
@@ -96,7 +46,7 @@ -
+
From 6c76b4ba1253a37316f7de964494b05099c66e21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Wed, 15 Jan 2014 15:07:24 +0100 Subject: [PATCH 04/29] fixing preview generation --- 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..d5e8450f41 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 ( $('#isPublic').length ) { urlSpec.t = $('#dirToken').val(); previewURL = OC.Router.generate('core_ajax_public_preview', urlSpec); } else { From ce231c406dfafdedbe97baa5a3c3612b4428b79d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Wed, 15 Jan 2014 15:07:52 +0100 Subject: [PATCH 05/29] no new menu on public upload --- apps/files/templates/index.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index d7f479b504..a69407805d 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -1,6 +1,7 @@
+
t('New'));?>
    @@ -12,6 +13,7 @@ data-type='web'>

    t('From link'));?>

+
= 0):?> From b3a668378484ad65c601964d84a0b70e7f93318e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Wed, 15 Jan 2014 15:22:40 +0100 Subject: [PATCH 06/29] remove unused js code and css rules --- apps/files_sharing/css/public.css | 49 ------------------------------- apps/files_sharing/js/public.js | 11 ------- 2 files changed, 60 deletions(-) diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css index 060d4dfedc..16d115f6e9 100644 --- a/apps/files_sharing/css/public.css +++ b/apps/files_sharing/css/public.css @@ -19,16 +19,6 @@ body { float: left; } -#public_upload, -#download { - font-weight:700; - margin: 0 0 0 .4em; - padding: 0 5px; - height: 32px; - float: left; - -} - .header-right #details { margin-right: 28px; } @@ -38,17 +28,6 @@ body { height: 32px; } -#public_upload { - margin-left: 0.3em; -} - -#public_upload img, -#download img { - padding-left:.1em; - padding-right:.3em; - vertical-align:text-bottom; -} - #controls { left: 0; } @@ -110,34 +89,6 @@ thead{ margin: 0; } -#file_upload_start { - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; - filter: alpha(opacity=0); - opacity: 0; - z-index: 20; - position: absolute !important; - top: 0; - left: 0; - width: 100% !important; -} - -#publicUploadButtonMock { - position:relative; - display:block; - width:100%; - height:32px; - cursor:pointer; - z-index:10; - background-image:url('%webroot%/core/img/actions/upload.svg'); - background-repeat:no-repeat; - background-position:7px 8px; -} - -#publicUploadButtonMock span { - margin: 0 5px 0 28px; - color: #555; -} - .directLink { margin-bottom: 20px; } diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index eacd4096ed..63e1ccaadf 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -9,8 +9,6 @@ function fileDownloadPath(dir, file) { $(document).ready(function() { - $('#data-upload-form').tipsy({gravity:'ne', fade:true}); - if (typeof FileActions !== 'undefined') { var mimetype = $('#mimetype').val(); // Show file preview if previewer is available, images are already handled by the template @@ -58,15 +56,6 @@ $(document).ready(function() { }; }); - // Add Uploadprogress Wrapper to controls bar - $('#controls').append($('#additional_controls div#uploadprogresswrapper')); - - // Cancel upload trigger - $('#cancel_upload_button').click(function() { - OC.Upload.cancelUploads(); - procesSelection(); - }); - $('#directLink').focus(); }); From 50ae2ab14c1ae852ff98cee9ae10a4b9218bd1db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Wed, 15 Jan 2014 15:31:27 +0100 Subject: [PATCH 07/29] add download button on single file share page --- apps/files_sharing/templates/public.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index d82e567182..e181e8a328 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -40,13 +40,19 @@ -
+
+ + Download"/> + t('Download %s', array($_['filename'])))?> + +
+
+ + +
From db837bf696951e3c866205a2d690bf3c014babeb Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 15 Jan 2014 14:45:10 +0100 Subject: [PATCH 08/29] improvements to public files mobile view --- apps/files/css/files.css | 2 +- apps/files_sharing/css/mobile.css | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 74320aba32..4beb01a4e6 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -234,7 +234,7 @@ table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; } #fileList tr td.filename a.name label { position: absolute; - width: 100%; + width: 80%; height: 50px; } diff --git a/apps/files_sharing/css/mobile.css b/apps/files_sharing/css/mobile.css index 55d244ff1e..3578aff17f 100644 --- a/apps/files_sharing/css/mobile.css +++ b/apps/files_sharing/css/mobile.css @@ -1,10 +1,5 @@ @media only screen and (max-width: 600px) { -/* make header and controls bar scroll up for more view of content on small screens */ -#header, -#controls { - position: absolute; -} /* hide size and date columns */ table th#headerSize, @@ -14,5 +9,15 @@ table td.date { display: none; } +/* restrict length of displayed filename to prevent overflow */ +table td.filename .nametext { + max-width: 80% !important; +} +/* and to make room for download button on hover */ +table tr:hover td.filename .nametext, +table tr:focus td.filename .nametext { + max-width: 60% !important; +} + } From 5f95356592b12c81b8c2e0f32c890cdbd069e82c Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 15 Jan 2014 14:49:41 +0100 Subject: [PATCH 09/29] remove unused log icon --- settings/img/log Icon License | 2 -- settings/img/log.png | Bin 342 -> 0 bytes settings/img/log.svg | 10 ---------- 3 files changed, 12 deletions(-) delete mode 100644 settings/img/log Icon License delete mode 100644 settings/img/log.png delete mode 100644 settings/img/log.svg diff --git a/settings/img/log Icon License b/settings/img/log Icon License deleted file mode 100644 index b5c3167d73..0000000000 --- a/settings/img/log Icon License +++ /dev/null @@ -1,2 +0,0 @@ -CC BY 3.0 -http://thenounproject.com/en-us/noun/printer/#icon-No109 \ No newline at end of file diff --git a/settings/img/log.png b/settings/img/log.png deleted file mode 100644 index b34a58f844cdcb1005b58cd488da2701802ca0b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=f!eQwFr$;k>5cfkM|jT^vI!PA4Zg zFxA!7d3PM-*})L!nRI1BD#NVL(*z%~Zjg$PzyH(W&T$5nf6O1{75=#?)o~wTKfuP| zJLjl_62nWzmrK_%D%e|ESZrW;nUy1 b%D`|k;$e?l%+6atA2N8l`njxgN@xNA=P-B4 diff --git a/settings/img/log.svg b/settings/img/log.svg deleted file mode 100644 index a3939b7309..0000000000 --- a/settings/img/log.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - From 3e7cf4110dc5bce2241830ed8ab0ddb57791442a Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 15 Jan 2014 15:34:14 +0100 Subject: [PATCH 10/29] tweak color and position of username in public share --- apps/files_sharing/css/public.css | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css index 16d115f6e9..54a25d0ce3 100644 --- a/apps/files_sharing/css/public.css +++ b/apps/files_sharing/css/public.css @@ -14,20 +14,19 @@ body { padding:7px; } -#details { - color:#fff; - float: left; -} - -.header-right #details { - margin-right: 28px; -} - .header-right { padding: 0; height: 32px; } +#details { + color:#fff; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; + filter: alpha(opacity=50); + opacity: .5; + padding-right: 5px; +} + #controls { left: 0; } From c0590676a005c0890e43b7a2b2950fee2758efef Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 16 Jan 2014 15:28:39 +0100 Subject: [PATCH 11/29] fix public share download button width --- apps/files_sharing/css/public.css | 9 ++++++++- apps/files_sharing/templates/public.php | 6 +++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css index 54a25d0ce3..d593d353dd 100644 --- a/apps/files_sharing/css/public.css +++ b/apps/files_sharing/css/public.css @@ -88,13 +88,20 @@ thead{ margin: 0; } +.directDownload, .directLink { margin-bottom: 20px; } + .directDownload .button img { + vertical-align: text-bottom; + } .directLink label { font-weight: normal; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; + filter: alpha(opacity=50); + opacity: .5; } .directLink input { - margin-left: 10px; + margin-left: 5px; width: 300px; } diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index e181e8a328..fb45401458 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -43,9 +43,9 @@ -
- - Download"/> +
+ + "/> t('Download %s', array($_['filename'])))?>
From 5cdab5fff3bcdbeb9107960f97c9006401a9168a Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 16 Jan 2014 15:32:23 +0100 Subject: [PATCH 12/29] show publicly shared image on full width, without margin --- apps/files_sharing/css/public.css | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css index d593d353dd..75c37f6a1c 100644 --- a/apps/files_sharing/css/public.css +++ b/apps/files_sharing/css/public.css @@ -60,11 +60,9 @@ p.info a { } #imgframe { - height:75%; - padding-bottom:2em; - padding-top:2em; - width:80%; - margin:0 auto; + width: 100%; + padding: 0; + margin-bottom: 35px; } #imgframe img { From d463edaf0943b82b2f3faeb0f134f9b88d28c32c Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 16 Jan 2014 15:56:18 +0100 Subject: [PATCH 13/29] on mobile, show single shared image at full width without margin --- apps/files_sharing/css/mobile.css | 7 +++++++ apps/files_sharing/css/public.css | 8 +++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/apps/files_sharing/css/mobile.css b/apps/files_sharing/css/mobile.css index 3578aff17f..2118cd31e4 100644 --- a/apps/files_sharing/css/mobile.css +++ b/apps/files_sharing/css/mobile.css @@ -19,5 +19,12 @@ table tr:focus td.filename .nametext { max-width: 60% !important; } +/* on mobile, show single shared image at full width without margin */ +#imgframe { + width: 100%; + padding: 0; + margin-bottom: 35px; +} + } diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css index 75c37f6a1c..d593d353dd 100644 --- a/apps/files_sharing/css/public.css +++ b/apps/files_sharing/css/public.css @@ -60,9 +60,11 @@ p.info a { } #imgframe { - width: 100%; - padding: 0; - margin-bottom: 35px; + height:75%; + padding-bottom:2em; + padding-top:2em; + width:80%; + margin:0 auto; } #imgframe img { From ccadab96a686e78e3c9d7234b5c8907b5ae8b47a Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Fri, 17 Jan 2014 12:51:13 +0100 Subject: [PATCH 14/29] add icons for file list and picture view toggles --- core/img/actions/toggle-filelist.png | Bin 0 -> 208 bytes core/img/actions/toggle-filelist.svg | 135 +++++++++++++++++++++++++++ core/img/actions/toggle-pictures.png | Bin 0 -> 207 bytes core/img/actions/toggle-pictures.svg | 117 +++++++++++++++++++++++ 4 files changed, 252 insertions(+) create mode 100644 core/img/actions/toggle-filelist.png create mode 100644 core/img/actions/toggle-filelist.svg create mode 100644 core/img/actions/toggle-pictures.png create mode 100644 core/img/actions/toggle-pictures.svg diff --git a/core/img/actions/toggle-filelist.png b/core/img/actions/toggle-filelist.png new file mode 100644 index 0000000000000000000000000000000000000000..464ff0fe12643beea9be9432f3ec33136f0da6cd GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR412s*bT?q$GojU3lKI>km!f2Inal6zjru0+UtM^~H wvVg5XGxc?=O7f>;!5@6*2%hiwFY%FWcWmKv$)w_&K!X`PUHx3vIVCg!01|>livR!s literal 0 HcmV?d00001 diff --git a/core/img/actions/toggle-filelist.svg b/core/img/actions/toggle-filelist.svg new file mode 100644 index 0000000000..0f75ad8e1c --- /dev/null +++ b/core/img/actions/toggle-filelist.svg @@ -0,0 +1,135 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/core/img/actions/toggle-pictures.png b/core/img/actions/toggle-pictures.png new file mode 100644 index 0000000000000000000000000000000000000000..a8e1bea1918f35c363bec8864c5a3ca1177d4415 GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4)%6LrrLwQ()PUxs!jgcV$VMR#6ix@heKZ4TZjW)!oc9^>gTe~DWM4fqNGFD literal 0 HcmV?d00001 diff --git a/core/img/actions/toggle-pictures.svg b/core/img/actions/toggle-pictures.svg new file mode 100644 index 0000000000..9d9077ea6f --- /dev/null +++ b/core/img/actions/toggle-pictures.svg @@ -0,0 +1,117 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + From 1d380a201191c12c7b860b2a80a5db12d6bf781d Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Fri, 17 Jan 2014 13:27:46 +0100 Subject: [PATCH 15/29] optimize size of toggle icons --- core/img/actions/toggle-filelist.png | Bin 208 -> 195 bytes core/img/actions/toggle-filelist.svg | 142 ++------------------------- core/img/actions/toggle-pictures.png | Bin 207 -> 193 bytes core/img/actions/toggle-pictures.svg | 122 ++--------------------- 4 files changed, 16 insertions(+), 248 deletions(-) diff --git a/core/img/actions/toggle-filelist.png b/core/img/actions/toggle-filelist.png index 464ff0fe12643beea9be9432f3ec33136f0da6cd..45d363f1934f7a40e6a43644be8a4bd2b3f73a17 100644 GIT binary patch delta 121 zcmcb>c$jg5gai{a0|P_ST=7ppin-XyGlYYKCJkL{v`jR%zXxGnm)S{4w^c3)GvJ2y-tPED&gXGsaH(tr?OY?zi?#%TY+Zk>sFQI mPsf5k_|6eL-|=7KBiruS!sn7n#W#UAF?hQAxvX - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - + + + + + + + + + diff --git a/core/img/actions/toggle-pictures.png b/core/img/actions/toggle-pictures.png index a8e1bea1918f35c363bec8864c5a3ca1177d4415..8068d17e30d95532ff0923c9848ebd5cc3c8d8ef 100644 GIT binary patch delta 119 zcmX@lc#v^|gai{a0|P_ST=7ppin-XyGlYYK+pJ7S7=$kGMWGY diff --git a/core/img/actions/toggle-pictures.svg b/core/img/actions/toggle-pictures.svg index 9d9077ea6f..5205c0226d 100644 --- a/core/img/actions/toggle-pictures.svg +++ b/core/img/actions/toggle-pictures.svg @@ -1,117 +1,9 @@ - - - - - image/svg+xml - - - - - - - - - - - - - - - - - + + + + + + + From 3e803b5e366563e384abde0d6e6cb6eb010bf914 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Fri, 17 Jan 2014 14:41:05 +0100 Subject: [PATCH 16/29] restrict zooming on mobile devices for the publicly accessible, optimized pages --- core/templates/layout.base.php | 2 +- core/templates/layout.guest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 8cd237deea..bae52a7323 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -11,7 +11,7 @@ getTitle()); ?> - + diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 47ca5903da..6a96b17b10 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -11,7 +11,7 @@ getTitle()); ?> - + From b291fb9cd7e94009aba6023e88c5e970a4aa4e96 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Fri, 17 Jan 2014 15:47:26 +0100 Subject: [PATCH 17/29] make sure there's enough room for the file actions --- apps/files/css/files.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 4beb01a4e6..eb009cf0a1 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -65,6 +65,14 @@ top: 44px; width: 100%; } +/* make sure there's enough room for the file actions */ +#body-user #filestable { + min-width: 750px; +} +#body-user #controls { + min-width: 600px; +} + #filestable tbody tr { background-color:#fff; height:2.5em; } #filestable tbody tr:hover, tbody tr:active { background-color: rgb(240,240,240); From f0a5007e9a2162d6f9d51ee4abf8791af8c0f886 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Fri, 17 Jan 2014 16:29:16 +0100 Subject: [PATCH 18/29] fix input element closing tag --- apps/files/templates/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index a69407805d..5188ca5628 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -32,7 +32,7 @@
- > + />
@@ -50,7 +50,7 @@
class="hidden">t('Nothing in here. Upload something!'))?>
- +
From 4ec6debe2b145b0df106c7e5a3f4ed0cf2885957 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 20 Jan 2014 17:27:03 +0100 Subject: [PATCH 19/29] remove unused variable --- apps/files_sharing/public.php | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index e3d6895543..490cea570b 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -159,7 +159,6 @@ if (isset($path)) { if ($linkItem['item_type'] !== 'folder') { $allowPublicUploadEnabled = false; } - $tmpl->assign('allowPublicUploadEnabled', $allowPublicUploadEnabled); $tmpl->assign('uploadMaxFilesize', $maxUploadFilesize); $tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize)); From ade726ad324efb16c65055ce2dd5683c3109c8d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Thu, 23 Jan 2014 01:08:42 +0100 Subject: [PATCH 20/29] focus link text only on click in the input field - closes #6817 --- apps/files_sharing/js/public.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index 31572f5ccf..d95f6348ac 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -56,6 +56,9 @@ $(document).ready(function() { }; }); - $('#directLink').focus(); + $(document).on('click', '#directLink', function() { + $(this).focus(); + $(this).select(); + }); }); From 4b7dfd34f8adb5db9b7e67206da384973ebdc767 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Thu, 23 Jan 2014 13:51:51 +0100 Subject: [PATCH 21/29] fix conflicts and add missing closing tag --- apps/files_sharing/css/public.css | 8 -------- apps/files_sharing/templates/public.php | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css index 7bcafd542c..a5762799ac 100644 --- a/apps/files_sharing/css/public.css +++ b/apps/files_sharing/css/public.css @@ -105,11 +105,3 @@ thead{ margin-left: 5px; width: 300px; } - -/*.directLink label {*/ - /*font-weight: normal;*/ -/*}*/ -/*.directLink input {*/ - /*margin-left: 10px;*/ - /*width: 300px;*/ -/*}*/ diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index fd0e0ad641..f8a31005cd 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -16,7 +16,7 @@
t('shared by %s', array($_['displayName']))) ?>
- +
From 799e744ad77c3f8ae7aac63125a3af17880bb9d5 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 23 Jan 2014 15:35:30 +0100 Subject: [PATCH 22/29] remove background and width from multiselect bar, fix Download button not showing on mobile --- apps/files/css/files.css | 1 - apps/files_sharing/css/public.css | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index eb009cf0a1..74e625f371 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -145,7 +145,6 @@ table.multiselect thead th { } table.multiselect #headerName { position: relative; - width: 100%; } table td.selection, table th.selection, table td.fileaction { width:2em; text-align:center; } table td.filename a.name { diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css index a5762799ac..a3bc36dcc7 100644 --- a/apps/files_sharing/css/public.css +++ b/apps/files_sharing/css/public.css @@ -72,9 +72,8 @@ p.info a { max-width:100%; } -thead{ - background-color: white; - padding-left:0 !important; /* fixes multiselect bar offset on shared page */ +thead { + padding-left: 0 !important; /* fixes multiselect bar offset on shared page */ } #data-upload-form { From 617aa3cf29955a23eed2ececc8e1876d77002223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Thu, 23 Jan 2014 20:15:10 +0100 Subject: [PATCH 23/29] Instead of 'No preview available for ...' we simple display the mieme-type icon --- apps/files_sharing/js/public.js | 9 +-------- apps/files_sharing/templates/public.php | 20 ++++++++------------ 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index d95f6348ac..730649c637 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -15,14 +15,7 @@ $(document).ready(function() { if (mimetype.substr(0, mimetype.indexOf('/')) != 'image' && $('.publicpreview').length === 0) { // Trigger default action if not download TODO var action = FileActions.getDefault(mimetype, 'file', OC.PERMISSION_READ); - if (typeof action === 'undefined') { - $('#noPreview').show(); - if (mimetype != 'httpd/unix-directory') { - // NOTE: Remove when a better file previewer solution exists - $('#content').remove(); - $('table').remove(); - } - } else { + if (typeof action !== 'undefined') { action($('#filename').val()); } } diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index f8a31005cd..652cd74eaf 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -32,16 +32,10 @@
- +
- -
    -
  • - t('No preview available for').' '.$_['filename']); ?>
    -
    • -
@@ -55,8 +49,10 @@
-
-

- getLongFooter()); ?> -

-
+ + +
+

+ getLongFooter()); ?> +

+
From c767ebcc03c604f3141af4c286ad099fdf64c561 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Fri, 24 Jan 2014 18:20:52 +0100 Subject: [PATCH 24/29] fix multiselect bar being too short on big displays --- apps/files/css/files.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 74e625f371..1c48d61c4e 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -103,7 +103,7 @@ table td { } table th#headerName { position: relative; - width: 100em; /* not really sure why this works better than 100% … table styling */ + width: 9999px; /* not really sure why this works better than 100% … table styling */ padding: 0; } #headerName-container { @@ -145,6 +145,7 @@ table.multiselect thead th { } table.multiselect #headerName { position: relative; + width: 9999px; /* when we use 100%, the styling breaks on mobile … table styling */ } table td.selection, table th.selection, table td.fileaction { width:2em; text-align:center; } table td.filename a.name { From 8f81f007cd8189af0b3920c0c5cdf5b7e705c930 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 29 Jan 2014 11:06:19 +0100 Subject: [PATCH 25/29] fix horizontal scrollbar appearing when footer is too long, footer wraps now --- apps/files_sharing/css/public.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css index c50624e20b..87e3ed78e1 100644 --- a/apps/files_sharing/css/public.css +++ b/apps/files_sharing/css/public.css @@ -49,9 +49,8 @@ footer { p.info { color: #777; text-align: center; - width: 352px; margin: 0 auto; - padding: 20px; + padding: 20px 0; } p.info a { From d310df505c0de1ed0ba4067a0c8304b8a675fa8c Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 29 Jan 2014 11:43:34 +0100 Subject: [PATCH 26/29] permanently show download action on mobile, only icon --- apps/files/js/fileactions.js | 4 ++-- apps/files_sharing/css/mobile.css | 23 +++++++++++++++++------ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index eb59e71a03..d0ef2491bd 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -103,9 +103,9 @@ var FileActions = { } var html = ''; if (img) { - html += ' '; + html += ''; } - html += t('files', name) + ''; + html += ' ' + t('files', name) + ''; var element = $(html); element.data('action', name); diff --git a/apps/files_sharing/css/mobile.css b/apps/files_sharing/css/mobile.css index 2118cd31e4..3c06d0650e 100644 --- a/apps/files_sharing/css/mobile.css +++ b/apps/files_sharing/css/mobile.css @@ -11,12 +11,7 @@ table td.date { /* restrict length of displayed filename to prevent overflow */ table td.filename .nametext { - max-width: 80% !important; -} -/* and to make room for download button on hover */ -table tr:hover td.filename .nametext, -table tr:focus td.filename .nametext { - max-width: 60% !important; + max-width: 75% !important; } /* on mobile, show single shared image at full width without margin */ @@ -26,5 +21,21 @@ table tr:focus td.filename .nametext { margin-bottom: 35px; } +/* always show actions on mobile */ +#fileList a.action { + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=20)" !important; + filter: alpha(opacity=20) !important; + opacity: .2 !important; + display: inline !important; +} +/* some padding for better clickability */ +#fileList a.action img { + padding: 0 6px 0 12px; +} +/* hide text of the actions on mobile */ +#fileList a.action span { + display: none; +} + } From 5a869732d1e3bff7e2c1afdb7b15c77c31b4b1cc Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 29 Jan 2014 15:28:57 +0100 Subject: [PATCH 27/29] adjust file type icon placement for when no preview can be generated --- apps/files_sharing/css/mobile.css | 4 ++++ apps/files_sharing/css/public.css | 5 +++++ apps/files_sharing/templates/public.php | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/apps/files_sharing/css/mobile.css b/apps/files_sharing/css/mobile.css index 3c06d0650e..3312983b64 100644 --- a/apps/files_sharing/css/mobile.css +++ b/apps/files_sharing/css/mobile.css @@ -20,6 +20,10 @@ table td.filename .nametext { padding: 0; margin-bottom: 35px; } +/* some margin for the file type icon */ +#imgframe .publicpreview { + margin-top: 32px; +} /* always show actions on mobile */ #fileList a.action { diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css index 87e3ed78e1..21f0c82b82 100644 --- a/apps/files_sharing/css/public.css +++ b/apps/files_sharing/css/public.css @@ -71,6 +71,11 @@ p.info a { max-width:100%; } +/* some margin for the file type icon */ +#imgframe .publicpreview { + margin-top: 10%; +} + thead { padding-left: 0 !important; /* fixes multiselect bar offset on shared page */ } diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 2f9c7246be..5804f606d9 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -34,7 +34,7 @@
- +
From 7655728ddf4edcb02eb2e997e0d16567ee238460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Wed, 29 Jan 2014 16:52:30 +0100 Subject: [PATCH 28/29] - adding class to header div: share-folder or share-file - for supported previews are shown with a size of 500px; icons with a size of 128px --- apps/files_sharing/templates/public.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 5804f606d9..3ddaf4446d 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -9,7 +9,7 @@ -