Skip to content
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.

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

Fix placement of icon in public share page for audio files #16118

Merged

Conversation

danxuliu
Copy link
Member

@danxuliu danxuliu commented Jun 27, 2019

How to test

  • Upload an audio file
  • Add link share for that file
  • Open the public share page

Before:
Public-Share-Audio-Before

After:
Public-Share-Audio-After

Is this worth a backport? If yes, up to which version?

danxuliu added 2 commits June 27, 2019 12:21
The preview element in the public share page was always wrapped with a
link to download the file; now that link is included only if the "Hide
download" option of the share is not enabled.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
When the preview for audio files is used an HTML 5 audio element is
shown in the public share page. This element is added by the template,
so it is already there when the mimetype icon is added to the
"#imgframe" element. Instead of appended the icon is now prepended, so
it appears before the audio element (prepending instead of appending
should make no difference for other types of files, as in that case the
"#imgframe" element is empty). Besides that, the CSS was modified to
show the icon centered above the audio preview instead of next to it.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
@danxuliu danxuliu added bug design Design, UI, UX, etc. 3. to review Waiting for reviews labels Jun 27, 2019
@danxuliu danxuliu added this to the Nextcloud 17 milestone Jun 27, 2019
Copy link
Member

@jancborchardt jancborchardt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! Not sure if we need backport, I would leave it.

@skjnldsv skjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jun 27, 2019
@rullzer rullzer merged commit f7ea09a into master Jun 27, 2019
@delete-merged-branch delete-merged-branch bot deleted the fix-placement-of-icon-in-public-share-page-for-audio-files branch June 27, 2019 14:28
@danxuliu
Copy link
Member Author

danxuliu commented Jul 1, 2019

Argh, just for the record, the first commit should not have been part of this pull request, but #16114; I created the branch on top of #16114 instead of master 🤦‍♂️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish bug design Design, UI, UX, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants