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.

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

Jump to bottom

fix: More logical tab order for podcasts #25287

Merged
merged 1 commit into from
Aug 10, 2022
Merged

fix: More logical tab order for podcasts #25287

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 21 additions & 22 deletions applications/app/views/fragments/audioBody.scala.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,6 @@
@fragments.headTonal(audio, page)

<div class="podcast gs-container">
<figure class="podcast__player podcast__section"
data-component="main audio"
id="audio-component-container"
data-media-id="@audio.elements.mainAudio.map(_.properties.id)"
data-source="@audio.downloadUrl"
data-download-url="@audio.downloadUrl.getOrElse("#")"
data-duration="@audio.duration"
>
</figure>

@for( series <- audio.tags.tags.find(_.properties.podcast.nonEmpty)
; podcast <- series.properties.podcast
; image <- podcast.image
Expand Down Expand Up @@ -124,12 +114,33 @@
@fragments.contentMeta(audio, page, false)
</div>

<div class="meta__social podcast__share podcast__section" data-component="share">
@fragments.social(audio.sharelinks.pageShares)
<div class="meta__numbers">
<div class="u-h meta__number js-sharecount">
</div>
<div class="u-h meta__number" data-discussion-id="@audio.content.discussionId" data-commentcount-format="content" data-discussion-closed="@{
!audio.trail.isCommentable
}">
</div>
</div>
</div>

@if(audio.fields.standfirst.isDefined) {
<div class="podcast__standfirst">
@fragments.standfirst(audio)
</div>
}

<figure class="podcast__player podcast__section"
data-component="main audio"
id="audio-component-container"
data-media-id="@audio.elements.mainAudio.map(_.properties.id)"
data-source="@audio.downloadUrl"
data-download-url="@audio.downloadUrl.getOrElse("#")"
data-duration="@audio.duration"
>
</figure>

<div class="from-content-api podcast__body">
@if(audio.fields.body.nonEmpty) {
Expand Down Expand Up @@ -161,18 +172,6 @@
</a>
</div>

<div class="meta__social podcast__share podcast__section" data-component="share">
@fragments.social(audio.sharelinks.pageShares)
<div class="meta__numbers">
<div class="u-h meta__number js-sharecount">
</div>
<div class="u-h meta__number" data-discussion-id="@audio.content.discussionId" data-commentcount-format="content" data-discussion-closed="@{
!audio.trail.isCommentable
}">
</div>
</div>
</div>

<div class="podcast__submeta podcast__section">
@fragments.submeta(audio)
</div>
Expand Down