diff options
| -rw-r--r-- | apps/files_sharing/lib/Controller/ShareController.php | 2 | ||||
| -rw-r--r-- | apps/files_sharing/templates/public.php | 16 |
2 files changed, 11 insertions, 7 deletions
diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php index 7c1a297d354..99685f671d3 100644 --- a/apps/files_sharing/lib/Controller/ShareController.php +++ b/apps/files_sharing/lib/Controller/ShareController.php @@ -361,6 +361,7 @@ class ShareController extends AuthPublicShareController { $folder->assign('isPublic', true); $folder->assign('hideFileList', $hideFileList); $folder->assign('publicUploadEnabled', 'no'); + // default to list view $folder->assign('showgridview', false); $folder->assign('uploadMaxFilesize', $maxUploadFilesize); $folder->assign('uploadMaxHumanFilesize', \OCP\Util::humanFileSize($maxUploadFilesize)); @@ -372,6 +373,7 @@ class ShareController extends AuthPublicShareController { $shareIsFolder = false; } + // default to list view $shareTmpl['showgridview'] = false; $shareTmpl['hideFileList'] = $hideFileList; diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index eccdc49bc31..792b4d23804 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -46,14 +46,16 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size); </div> <?php endif; ?> -<?php if ($_['showgridview'] && empty($_['dir']) === false) { ?> - <input type="checkbox" class="hidden-visually" id="showgridview" - <?php if($_['showgridview']) { ?>checked="checked" <?php } ?>/> - <label id="view-toggle" for="showgridview" class="button <?php p($_['showgridview'] ? 'icon-toggle-filelist' : 'icon-toggle-pictures') ?>" - title="<?php p($l->t('Toggle grid view'))?>"></label> -<?php } ?> - <?php if (!isset($_['hideFileList']) || (isset($_['hideFileList']) && $_['hideFileList'] === false)) { ?> + <!-- ONLY if this is a folder, we show the grid toggle button --> + <?php if (empty($_['dir']) === false) { ?> + <input type="checkbox" class="hidden-visually" id="showgridview" + <?php if($_['showgridview']) { ?>checked="checked" <?php } ?>/> + <label id="view-toggle" for="showgridview" class="button <?php p($_['showgridview'] ? 'icon-toggle-filelist' : 'icon-toggle-pictures') ?>" + title="<?php p($l->t('Toggle grid view'))?>"></label> + <?php } ?> + + <!-- files listing --> <div id="files-public-content"> <div id="preview"> <?php if (isset($_['folder'])): ?> |