diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-08 13:01:01 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-08 13:01:01 +0200 |
| commit | e5bbec79a603d4580d263ce51b9a89321627a248 (patch) | |
| tree | 26d60264863dddfa5b98d3736f09b5c6818e3794 /apps/files_sharing | |
| parent | 33cf1c3c92f6d9b4fcf2375a894e2922b948c6e3 (diff) | |
| parent | ccfd052e81545099fe7d3527c5f906a56e4f7542 (diff) | |
| download | nextcloud-server-e5bbec79a603d4580d263ce51b9a89321627a248.tar.gz nextcloud-server-e5bbec79a603d4580d263ce51b9a89321627a248.zip | |
Merge pull request #19611 from owncloud/fix-public-scroll
Fix scrollbars in public template
Diffstat (limited to 'apps/files_sharing')
| -rw-r--r-- | apps/files_sharing/css/public.css | 8 | ||||
| -rw-r--r-- | apps/files_sharing/templates/public.php | 63 |
2 files changed, 38 insertions, 33 deletions
diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css index 2b7e84c987d..bd8e98e966d 100644 --- a/apps/files_sharing/css/public.css +++ b/apps/files_sharing/css/public.css @@ -1,8 +1,12 @@ +#content { + height: initial; + min-height: calc(100vh - 120px); + overflow: hidden; +} + #preview { background: #fff; text-align: center; - margin: 45px auto 0; - min-height: 200px; } #preview .notCreatable { diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 06d797c3c6f..b5dd653d718 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -86,38 +86,39 @@ $thumbSize = 1024; </a> </span> </div> - </div></header> -<div id="content"> - <div id="preview"> - <?php if (isset($_['folder'])): ?> - <?php print_unescaped($_['folder']); ?> - <?php else: ?> - <?php if ($_['previewEnabled'] && substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'video'): ?> - <div id="imgframe"> - <video tabindex="0" controls="" preload="none"> - <source src="<?php p($_['downloadURL']); ?>" type="<?php p($_['mimetype']); ?>" /> - </video> - </div> +</div></header> +<div id="content-wrapper"> + <div id="content"> + <div id="preview"> + <?php if (isset($_['folder'])): ?> + <?php print_unescaped($_['folder']); ?> <?php else: ?> - <!-- Preview frame is filled via JS to support SVG images for modern browsers --> - <div id="imgframe"></div> + <?php if ($_['previewEnabled'] && substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'video'): ?> + <div id="imgframe"> + <video tabindex="0" controls="" preload="none"> + <source src="<?php p($_['downloadURL']); ?>" type="<?php p($_['mimetype']); ?>" /> + </video> + </div> + <?php else: ?> + <!-- Preview frame is filled via JS to support SVG images for modern browsers --> + <div id="imgframe"></div> + <?php endif; ?> + <div class="directDownload"> + <a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button"> + <img class="svg" alt="" src="<?php print_unescaped(OCP\image_path("core", "actions/download.svg")); ?>"/> + <?php p($l->t('Download %s', array($_['filename'])))?> (<?php p($_['fileSize']) ?>) + </a> + </div> + <div class="directLink"> + <label for="directLink"><?php p($l->t('Direct link')) ?></label> + <input id="directLink" type="text" readonly value="<?php p($_['downloadURL']); ?>"> + </div> <?php endif; ?> - <div class="directDownload"> - <a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button"> - <img class="svg" alt="" src="<?php print_unescaped(OCP\image_path("core", "actions/download.svg")); ?>"/> - <?php p($l->t('Download %s', array($_['filename'])))?> (<?php p($_['fileSize']) ?>) - </a> - </div> - <div class="directLink"> - <label for="directLink"><?php p($l->t('Direct link')) ?></label> - <input id="directLink" type="text" readonly value="<?php p($_['downloadURL']); ?>"> - </div> - <?php endif; ?> + </div> </div> - + <footer> + <p class="info"> + <?php print_unescaped($theme->getLongFooter()); ?> + </p> + </footer> </div> -<footer> - <p class="info"> - <?php print_unescaped($theme->getLongFooter()); ?> - </p> -</footer> |