Skip to content

NMC-552 Move filename/size out of the download button #28643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skjnldsv merged 6 commits into from
Sep 2, 2021
Merged

NMC-552 Move filename/size out of the download button #28643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ce8a8c0
Guest view download button seperated for video
TSI-sangramdesai Aug 30, 2021
2254a40
Guest view download button seperated for image
TSI-sangramdesai Aug 30, 2021
4d7b780
mimetype condition merged
TSI-sangramdesai Sep 1, 2021
0d18228
space above the downloadFile element added
TSI-sangramdesai Sep 1, 2021
8655887
unwanted class removed
TSI-sangramdesai Sep 1, 2021
bc6b496
Duplicate code removed
TSI-sangramdesai Sep 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/files_sharing/css/public.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ thead {
display: inline-block;
margin-left: auto;
margin-right: auto;
margin-top: 16px;
}

.download-size {
Expand Down
16 changes: 15 additions & 1 deletion apps/files_sharing/templates/public.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,26 @@
<?php else: ?>
<!-- Preview frame is filled via JS to support SVG images for modern browsers -->
<div id="imgframe"></div>
<?php if (isset($_['mimetype']) && strpos($_['mimetype'], 'image') === 0) { ?>
<div class="directDownload">
<div>
<?php p($l->t('%s', [$_['filename']]))?> (<?php p($_['fileSize']) ?>)
</div>
<a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button">
<span class="icon icon-download"></span>
<?php p($l->t('Download'))?>
</a>
</div>
<?php } ?>
<?php endif; ?>
<?php if ($_['previewURL'] === $_['downloadURL'] && !$_['hideDownload']): ?>
<div class="directDownload">
<div>
<?php p($l->t('%s', [$_['filename']]))?> (<?php p($_['fileSize']) ?>)
</div>
<a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button">
<span class="icon icon-download"></span>
<?php p($l->t('Download %s', [$_['filename']]))?> (<?php p($_['fileSize']) ?>)
<?php p($l->t('Download'))?>
</a>
</div>
<?php endif; ?>
Expand Down