diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-11-05 22:48:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-05 22:48:24 +0100 |
| commit | cd31bea2b7abdd17995160fe279c3a6ae8b3105c (patch) | |
| tree | 34b44dc7dde6feb4812e4933b03bf8e0f3e06789 /apps | |
| parent | 6635bd63997405b5e520f95ed3086d1598040b97 (diff) | |
| parent | e0de0a122f477d1e445f4f36c85c7462c5c66eb1 (diff) | |
| download | nextcloud-server-cd31bea2b7abdd17995160fe279c3a6ae8b3105c.tar.gz nextcloud-server-cd31bea2b7abdd17995160fe279c3a6ae8b3105c.zip | |
Merge pull request #12289 from nextcloud/ie11-grid-disable
Disable grid for ie
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/list.php | 5 | ||||
| -rw-r--r-- | apps/files/templates/list.php | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/apps/files/list.php b/apps/files/list.php index f18dc5964b8..23b94d9be20 100644 --- a/apps/files/list.php +++ b/apps/files/list.php @@ -26,10 +26,13 @@ $userSession = \OC::$server->getUserSession(); // TODO: move this to the generated config.js $publicUploadEnabled = $config->getAppValue('core', 'shareapi_allow_public_upload', 'yes'); $showgridview = $config->getUserValue($userSession->getUser()->getUID(), 'files', 'show_grid', true); +$isIE = \OCP\Util::isIE(); // renders the controls and table headers template $tmpl = new OCP\Template('files', 'list', ''); $tmpl->assign('publicUploadEnabled', $publicUploadEnabled); -$tmpl->assign('showgridview', $showgridview); +// gridview not available for ie +$tmpl->assign('showgridview', $showgridview && !$isIE); +$tmpl->assign('isIE', $isIE); $tmpl->printPage(); diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php index 27403594368..2bc94ca7afb 100644 --- a/apps/files/templates/list.php +++ b/apps/files/templates/list.php @@ -24,10 +24,13 @@ <?php endif;?> <input type="hidden" class="max_human_file_size" value="(max <?php isset($_['uploadMaxHumanFilesize']) ? p($_['uploadMaxHumanFilesize']) : ''; ?>)"> + <!-- IF NOT IE, SHOW GRIDVIEW --> + <?php if (!$_['isIE']) { ?> <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 } ?> </div> <div id="emptycontent" class="hidden"> |