UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-29 01:33:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update presenters, fix content warning layout

Browse source
This commit is contained in:
Daniel Supernault 2021-07-08 22:23:55 -06:00
parent 9607243ff7
commit fc56acb835
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
2 changed files with 58 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
resources/assets/js/components/presenter/PhotoPresenter.vue
View file

@ -54,12 +54,14 @@
border-top-left-radius: 0 !important; border-top-left-radius: 0 !important;
border-top-right-radius: 0 !important; border-top-right-radius: 0 !important;
} }
.content-label-wrapper {
position: relative;
}
.content-label { .content-label {
margin: 0; margin: 0;
position: absolute; position: absolute;
top:50%; top:50%;
left:50%; left:50%;
z-index: 2;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
display: flex; display: flex;
flex-direction: column; flex-direction: column;

65
resources/assets/js/components/presenter/VideoPresenter.vue
View file

@ -1,16 +1,25 @@
<template> <template>
<div v-if="status.sensitive == true"> <div v-if="status.sensitive == true" class="content-label-wrapper">
<details class="details-animated"> <div class="text-light content-label">
<summary> <p class="text-center">
<p class="mb-0 lead font-weight-bold">{{ status.spoiler_text ? status.spoiler_text : 'CW / NSFW / Hidden Media'}}</p> <i class="far fa-eye-slash fa-2x"></i>
<p class="font-weight-light">(click to show)</p> </p>
</summary> <p class="h4 font-weight-bold text-center">
<div class="embed-responsive embed-responsive-1by1"> Sensitive Content
<video class="video" preload="none" loop :poster="status.media_attachments[0].preview_url":data-id="status.id" @click="playOrPause($event)"> </p>
<source :src="status.media_attachments[0].url" :type="status.media_attachments[0].mime"> <p class="text-center py-2">
</video> {{ status.spoiler_text ? status.spoiler_text : 'This post may contain sensitive content.'}}
</p>
<p class="mb-0">
<button @click="toggleContentWarning()" class="btn btn-outline-light btn-block btn-sm font-weight-bold">See Post</button>
</p>
</div> </div>
</details> <blur-hash-image
width="32"
height="32"
:punch="1"
:hash="status.media_attachments[0].blurhash"
:alt="altText(status)"/>
</div> </div>
<div v-else class="embed-responsive embed-responsive-16by9"> <div v-else class="embed-responsive embed-responsive-16by9">
<video class="video" controls preload="metadata" loop :poster="status.media_attachments[0].preview_url" :data-id="status.id"> <video class="video" controls preload="metadata" loop :poster="status.media_attachments[0].preview_url" :data-id="status.id">
@ -19,11 +28,41 @@
</div> </div>
</template> </template>
<style type="text/css" scoped>
.content-label-wrapper {
position: relative;
}
.content-label {
margin: 0;
position: absolute;
top:50%;
left:50%;
transform: translate(-50%, -50%);
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
width: 100%;
height: 100%;
z-index: 2;
background: rgba(0, 0, 0, 0.2)
}
</style>
<script type="text/javascript"> <script type="text/javascript">
export default { export default {
props: ['status'], props: ['status'],
methods: { methods: {
altText(status) {
let desc = status.media_attachments[0].description;
if(desc) {
return desc;
}
return 'Video was not tagged with any alt text.';
},
playOrPause(e) { playOrPause(e) {
let el = e.target; let el = e.target;
if(el.getAttribute('playing') == 1) { if(el.getAttribute('playing') == 1) {
@ -33,6 +72,10 @@
el.setAttribute('playing', 1); el.setAttribute('playing', 1);
el.play(); el.play();
} }
},
toggleContentWarning(status) {
this.$emit('togglecw');
} }
} }
} }