misc: improve alt text handling
This commit is contained in:
1 parent
3874160ce5
commit
ed0236a5f6
4 files changed
+214
-199
No files matched your search
@@ -1,213 +1,198 @@
|
||||
<script lang="ts">
|
||||
import CommunityLink from "$lib/components/lemmy/community/CommunityLink.svelte";
|
||||
import Avatar from "$lib/components/ui/Avatar.svelte";
|
||||
import { Badge } from "mono-svelte";
|
||||
import UserLink from "$lib/components/lemmy/user/UserLink.svelte";
|
||||
import RelativeDate from "$lib/components/util/RelativeDate.svelte";
|
||||
import type { Community, Person, SubscribedType } from "lemmy-js-client";
|
||||
import {
|
||||
Bookmark,
|
||||
Check,
|
||||
ExclamationTriangle,
|
||||
Icon,
|
||||
LockClosed,
|
||||
Megaphone,
|
||||
Plus,
|
||||
Trash,
|
||||
} from "svelte-hero-icons";
|
||||
import { getInstance } from "$lib/lemmy.js";
|
||||
import { profile } from "$lib/auth.js";
|
||||
import Subscribe from "../../../../routes/communities/Subscribe.svelte";
|
||||
import ShieldIcon from "../moderation/ShieldIcon.svelte";
|
||||
import { userSettings } from "$lib/settings";
|
||||
import Markdown from "$lib/components/markdown/Markdown.svelte";
|
||||
import { t } from "$lib/translations";
|
||||
import CommunityLink from '$lib/components/lemmy/community/CommunityLink.svelte'
|
||||
import Avatar from '$lib/components/ui/Avatar.svelte'
|
||||
import { Badge } from 'mono-svelte'
|
||||
import UserLink from '$lib/components/lemmy/user/UserLink.svelte'
|
||||
import RelativeDate from '$lib/components/util/RelativeDate.svelte'
|
||||
import type { Community, Person, SubscribedType } from 'lemmy-js-client'
|
||||
import {
|
||||
Bookmark,
|
||||
Check,
|
||||
ExclamationTriangle,
|
||||
Icon,
|
||||
LockClosed,
|
||||
Megaphone,
|
||||
Plus,
|
||||
Trash,
|
||||
} from 'svelte-hero-icons'
|
||||
import { getInstance } from '$lib/lemmy.js'
|
||||
import { profile } from '$lib/auth.js'
|
||||
import Subscribe from '../../../../routes/communities/Subscribe.svelte'
|
||||
import ShieldIcon from '../moderation/ShieldIcon.svelte'
|
||||
import { userSettings } from '$lib/settings'
|
||||
import Markdown from '$lib/components/markdown/Markdown.svelte'
|
||||
import { t } from '$lib/translations'
|
||||
|
||||
export let community: Community | undefined = undefined;
|
||||
export let subscribed: SubscribedType | undefined = undefined;
|
||||
export let community: Community | undefined = undefined
|
||||
export let subscribed: SubscribedType | undefined = undefined
|
||||
|
||||
export let user: Person | undefined = undefined;
|
||||
export let published: Date | undefined = undefined;
|
||||
export let title: string | undefined = undefined;
|
||||
export let id: number | undefined = undefined;
|
||||
export let read: boolean = false;
|
||||
export let user: Person | undefined = undefined
|
||||
export let published: Date | undefined = undefined
|
||||
export let title: string | undefined = undefined
|
||||
export let id: number | undefined = undefined
|
||||
export let read: boolean = false
|
||||
|
||||
// Badges
|
||||
export let badges = {
|
||||
nsfw: false,
|
||||
saved: false,
|
||||
featured: false,
|
||||
deleted: false,
|
||||
removed: false,
|
||||
locked: false,
|
||||
moderator: false,
|
||||
admin: false,
|
||||
};
|
||||
// Badges
|
||||
export let badges = {
|
||||
nsfw: false,
|
||||
saved: false,
|
||||
featured: false,
|
||||
deleted: false,
|
||||
removed: false,
|
||||
locked: false,
|
||||
moderator: false,
|
||||
admin: false,
|
||||
}
|
||||
</script>
|
||||
|
||||
<div
|
||||
class="grid w-full meta {community
|
||||
? 'grid-rows-2'
|
||||
: 'grid-rows-1'} text-xs min-w-0 max-w-full"
|
||||
style={$$props.style ?? ""}
|
||||
class="grid w-full meta {community
|
||||
? 'grid-rows-2'
|
||||
: 'grid-rows-1'} text-xs min-w-0 max-w-full"
|
||||
style={$$props.style ?? ''}
|
||||
>
|
||||
{#if community}
|
||||
<Subscribe let:subscribe let:subscribing>
|
||||
<button
|
||||
on:click={async () => {
|
||||
if (!community) return;
|
||||
await subscribe(community.id, subscribed);
|
||||
subscribed =
|
||||
subscribed == "NotSubscribed"
|
||||
? "Subscribed"
|
||||
: "NotSubscribed";
|
||||
}}
|
||||
class="relative cursor-pointer pr-2 row-span-2 flex-shrink-0"
|
||||
>
|
||||
<Avatar
|
||||
url={community.icon}
|
||||
width={28}
|
||||
alt={community.name}
|
||||
style="grid-area: avatar; height: 100%;"
|
||||
class="flex-shrink-0"
|
||||
/>
|
||||
{#if subscribed != undefined && $profile?.jwt}
|
||||
<div
|
||||
class="absolute w-3.5 h-3.5 {subscribed ==
|
||||
'NotSubscribed'
|
||||
? 'bg-primary-900 dark:bg-primary-100 text-white dark:text-black'
|
||||
: 'bg-primary-100 dark:bg-primary-900 text-black dark:text-white'} rounded-full ring-2 box-border
|
||||
{#if community}
|
||||
<Subscribe let:subscribe let:subscribing>
|
||||
<button
|
||||
on:click={async () => {
|
||||
if (!community) return
|
||||
await subscribe(community.id, subscribed)
|
||||
subscribed =
|
||||
subscribed == 'NotSubscribed' ? 'Subscribed' : 'NotSubscribed'
|
||||
}}
|
||||
class="relative cursor-pointer pr-2 row-span-2 flex-shrink-0"
|
||||
>
|
||||
<Avatar
|
||||
url={community.icon}
|
||||
width={28}
|
||||
alt={community.name}
|
||||
style="grid-area: avatar; height: 100%;"
|
||||
class="flex-shrink-0"
|
||||
/>
|
||||
{#if subscribed != undefined && $profile?.jwt}
|
||||
<div
|
||||
class="absolute w-3.5 h-3.5 {subscribed == 'NotSubscribed'
|
||||
? 'bg-primary-900 dark:bg-primary-100 text-white dark:text-black'
|
||||
: 'bg-primary-100 dark:bg-primary-900 text-black dark:text-white'} rounded-full ring-2 box-border
|
||||
ring-slate-50 dark:ring-zinc-950
|
||||
-bottom-1 right-1 grid place-items-center transition-all"
|
||||
>
|
||||
<Icon
|
||||
src={subscribed == "NotSubscribed" ? Plus : Check}
|
||||
mini
|
||||
size="12"
|
||||
/>
|
||||
</div>
|
||||
{/if}
|
||||
</button>
|
||||
</Subscribe>
|
||||
>
|
||||
<Icon
|
||||
src={subscribed == 'NotSubscribed' ? Plus : Check}
|
||||
mini
|
||||
size="12"
|
||||
/>
|
||||
</div>
|
||||
{/if}
|
||||
</button>
|
||||
</Subscribe>
|
||||
{/if}
|
||||
{#if community}
|
||||
<CommunityLink
|
||||
{community}
|
||||
style="grid-area: community;"
|
||||
class="flex-shrink"
|
||||
/>
|
||||
{/if}
|
||||
<span
|
||||
class="text-slate-600 dark:text-zinc-400 flex flex-row gap-2 items-center"
|
||||
style="grid-area: stats;"
|
||||
>
|
||||
{#if user}
|
||||
<UserLink avatarSize={20} {user} avatar={!community}>
|
||||
<svelte:fragment slot="badges">
|
||||
{#if badges.moderator}
|
||||
<ShieldIcon filled width={14} class="text-green-500" />
|
||||
{/if}
|
||||
{#if badges.admin}
|
||||
<ShieldIcon filled width={14} class="text-red-500" />
|
||||
{/if}
|
||||
</svelte:fragment>
|
||||
</UserLink>
|
||||
{/if}
|
||||
{#if community}
|
||||
<CommunityLink
|
||||
{community}
|
||||
style="grid-area: community;"
|
||||
class="flex-shrink"
|
||||
/>
|
||||
{#if published}
|
||||
<RelativeDate date={published} class="flex-shrink-0" />
|
||||
{/if}
|
||||
<span
|
||||
class="text-slate-600 dark:text-zinc-400 flex flex-row gap-2 items-center"
|
||||
style="grid-area: stats;"
|
||||
>
|
||||
{#if user}
|
||||
<UserLink avatarSize={20} {user} avatar={!community}>
|
||||
<svelte:fragment slot="badges">
|
||||
{#if badges.moderator}
|
||||
<ShieldIcon filled width={14} class="text-green-500" />
|
||||
{/if}
|
||||
{#if badges.admin}
|
||||
<ShieldIcon filled width={14} class="text-red-500" />
|
||||
{/if}
|
||||
</svelte:fragment>
|
||||
</UserLink>
|
||||
{/if}
|
||||
{#if published}
|
||||
<RelativeDate date={published} class="flex-shrink-0" />
|
||||
{/if}
|
||||
</span>
|
||||
<div
|
||||
class="flex flex-row items-center self-center flex-wrap gap-2 [&>*]:flex-shrink-0 badges"
|
||||
style="grid-area: badges;"
|
||||
>
|
||||
{#if badges.nsfw}
|
||||
<Badge
|
||||
label={$t("post.badges.nsfw")}
|
||||
color="red-subtle"
|
||||
allowIconOnly
|
||||
>
|
||||
<Icon src={ExclamationTriangle} size="14" micro slot="icon" />
|
||||
{$t("post.badges.nsfw")}
|
||||
</Badge>
|
||||
{/if}
|
||||
{#if badges.saved}
|
||||
<Badge
|
||||
label={$t("post.badges.saved")}
|
||||
color="yellow-subtle"
|
||||
allowIconOnly
|
||||
>
|
||||
<Icon src={Bookmark} micro size="14" slot="icon" />
|
||||
{$t("post.badges.saved")}
|
||||
</Badge>
|
||||
{/if}
|
||||
{#if badges.locked}
|
||||
<Badge
|
||||
label={$t("post.badges.locked")}
|
||||
color="yellow-subtle"
|
||||
allowIconOnly
|
||||
>
|
||||
<Icon src={LockClosed} micro size="14" slot="icon" />
|
||||
<span class="max-md:hidden">{$t("post.badges.locked")}</span>
|
||||
</Badge>
|
||||
{/if}
|
||||
{#if badges.removed}
|
||||
<Badge
|
||||
label={$t("post.badges.removed")}
|
||||
color="red-subtle"
|
||||
allowIconOnly
|
||||
>
|
||||
<Icon src={Trash} micro size="14" slot="icon" />
|
||||
<span class="max-md:hidden">{$t("post.badges.removed")}</span>
|
||||
</Badge>
|
||||
{/if}
|
||||
{#if badges.deleted}
|
||||
<Badge
|
||||
label={$t("post.badges.deleted")}
|
||||
color="red-subtle"
|
||||
allowIconOnly
|
||||
>
|
||||
<Icon src={Trash} micro size="14" slot="icon" />
|
||||
<span class="max-md:hidden">{$t("post.badges.deleted")}</span>
|
||||
</Badge>
|
||||
{/if}
|
||||
{#if badges.featured}
|
||||
<Badge
|
||||
label={$t("post.badges.featured")}
|
||||
color="green-subtle"
|
||||
allowIconOnly
|
||||
>
|
||||
<Icon src={Megaphone} micro size="14" slot="icon" />
|
||||
<span class="max-md:hidden">{$t("post.badges.featured")}</span>
|
||||
</Badge>
|
||||
{/if}
|
||||
<slot name="badges" />
|
||||
</div>
|
||||
</span>
|
||||
<div
|
||||
class="flex flex-row items-center self-center flex-wrap gap-2 [&>*]:flex-shrink-0 badges"
|
||||
style="grid-area: badges;"
|
||||
>
|
||||
{#if badges.nsfw}
|
||||
<Badge label={$t('post.badges.nsfw')} color="red-subtle" allowIconOnly>
|
||||
<Icon src={ExclamationTriangle} size="14" micro slot="icon" />
|
||||
{$t('post.badges.nsfw')}
|
||||
</Badge>
|
||||
{/if}
|
||||
{#if badges.saved}
|
||||
<Badge
|
||||
label={$t('post.badges.saved')}
|
||||
color="yellow-subtle"
|
||||
allowIconOnly
|
||||
>
|
||||
<Icon src={Bookmark} micro size="14" slot="icon" />
|
||||
{$t('post.badges.saved')}
|
||||
</Badge>
|
||||
{/if}
|
||||
{#if badges.locked}
|
||||
<Badge
|
||||
label={$t('post.badges.locked')}
|
||||
color="yellow-subtle"
|
||||
allowIconOnly
|
||||
>
|
||||
<Icon src={LockClosed} micro size="14" slot="icon" />
|
||||
<span class="max-md:hidden">{$t('post.badges.locked')}</span>
|
||||
</Badge>
|
||||
{/if}
|
||||
{#if badges.removed}
|
||||
<Badge label={$t('post.badges.removed')} color="red-subtle" allowIconOnly>
|
||||
<Icon src={Trash} micro size="14" slot="icon" />
|
||||
<span class="max-md:hidden">{$t('post.badges.removed')}</span>
|
||||
</Badge>
|
||||
{/if}
|
||||
{#if badges.deleted}
|
||||
<Badge label={$t('post.badges.deleted')} color="red-subtle" allowIconOnly>
|
||||
<Icon src={Trash} micro size="14" slot="icon" />
|
||||
<span class="max-md:hidden">{$t('post.badges.deleted')}</span>
|
||||
</Badge>
|
||||
{/if}
|
||||
{#if badges.featured}
|
||||
<Badge
|
||||
label={$t('post.badges.featured')}
|
||||
color="green-subtle"
|
||||
allowIconOnly
|
||||
>
|
||||
<Icon src={Megaphone} micro size="14" slot="icon" />
|
||||
<span class="max-md:hidden">{$t('post.badges.featured')}</span>
|
||||
</Badge>
|
||||
{/if}
|
||||
<slot name="badges" />
|
||||
</div>
|
||||
</div>
|
||||
{#if title && id}
|
||||
<a
|
||||
href="/post/{getInstance()}/{id}"
|
||||
class="inline text-lg hover:underline
|
||||
<a
|
||||
href="/post/{getInstance()}/{id}"
|
||||
class="inline text-lg hover:underline
|
||||
hover:text-primary-900 hover:dark:text-primary-100 transition-colors
|
||||
{$userSettings.font == 'satoshi/nunito'
|
||||
? 'font-display font-semibold'
|
||||
: 'font-medium'}"
|
||||
class:text-slate-600={$userSettings.markReadPosts && read}
|
||||
class:dark:text-zinc-400={$userSettings.markReadPosts && read}
|
||||
style="grid-area: title;"
|
||||
>
|
||||
<Markdown source={title} inline noStyle class="leading-6"></Markdown>
|
||||
</a>
|
||||
? 'font-display font-semibold'
|
||||
: 'font-medium'}"
|
||||
class:text-slate-600={$userSettings.markReadPosts && read}
|
||||
class:dark:text-zinc-400={$userSettings.markReadPosts && read}
|
||||
style="grid-area: title;"
|
||||
>
|
||||
<Markdown source={title} inline noStyle class="leading-[1.3]"></Markdown>
|
||||
</a>
|
||||
{/if}
|
||||
|
||||
<style>
|
||||
.meta {
|
||||
display: grid;
|
||||
grid-template-areas:
|
||||
"avatar community badges"
|
||||
"avatar stats badges";
|
||||
gap: 0;
|
||||
grid-template-rows: auto auto;
|
||||
grid-template-columns: auto 1fr;
|
||||
}
|
||||
.meta {
|
||||
display: grid;
|
||||
grid-template-areas:
|
||||
'avatar community badges'
|
||||
'avatar stats badges';
|
||||
gap: 0;
|
||||
grid-template-rows: auto auto;
|
||||
grid-template-columns: auto 1fr auto;
|
||||
}
|
||||
</style>
|
||||
@@ -13,11 +13,14 @@
|
||||
import { userSettings } from '$lib/settings.js'
|
||||
import type { Post } from 'lemmy-js-client'
|
||||
import PostIframe from './PostIframe.svelte'
|
||||
import { Button, Material } from 'mono-svelte'
|
||||
|
||||
export let view: 'card' | 'cozy' | 'list' | 'compact' = 'cozy'
|
||||
export let post: Post
|
||||
export let type: MediaType = 'none'
|
||||
export let opened: boolean | undefined = undefined
|
||||
|
||||
let showAltText = false
|
||||
</script>
|
||||
|
||||
{#if type == 'image'}
|
||||
@@ -70,12 +73,22 @@
|
||||
/>
|
||||
</picture>
|
||||
{#if post.alt_text}
|
||||
<button
|
||||
class="absolute bottom-0 left-0 text-sm m-2 bg-white dark:bg-zinc-900 px-3 py-1.5
|
||||
rounded-full border border-slate-200 dark:border-zinc-800 shadow-lg text-left"
|
||||
<Button
|
||||
on:click={(e) => {
|
||||
e.stopPropagation()
|
||||
showAltText = !showAltText
|
||||
}}
|
||||
class="absolute bottom-0 left-0 text-sm m-2 text-left"
|
||||
size="sm"
|
||||
rounding="pill"
|
||||
alignment="left"
|
||||
>
|
||||
{post.alt_text}
|
||||
</button>
|
||||
{#if showAltText}
|
||||
{post.alt_text}
|
||||
{:else}
|
||||
<span class="font-bold">ALT</span>
|
||||
{/if}
|
||||
</Button>
|
||||
{/if}
|
||||
</svelte:element>
|
||||
{/if}
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
import { userSettings } from '$lib/settings.js'
|
||||
import { isImage } from '$lib/ui/image'
|
||||
import type { Post } from 'lemmy-js-client'
|
||||
import { Material, Popover } from 'mono-svelte'
|
||||
import { DocumentText, Icon, Link, VideoCamera } from 'svelte-hero-icons'
|
||||
|
||||
export let view: 'card' | 'cozy' | 'list' | 'compact' = 'cozy'
|
||||
@@ -18,9 +19,25 @@
|
||||
|
||||
{#if view == 'compact' || (view == 'list' && (!post.embed_title || type == 'iframe') && type != 'none')}
|
||||
<div
|
||||
class="w-24 sm:w-32 h-24 group/media {$$props.class ?? ''}"
|
||||
class="w-24 sm:w-32 h-24 relative group/media {$$props.class ?? ''}"
|
||||
style={$$props.style ?? ''}
|
||||
>
|
||||
{#if post.alt_text}
|
||||
<Popover openOnHover placement="bottom-end">
|
||||
<Material
|
||||
slot="target"
|
||||
padding="none"
|
||||
rounding="full"
|
||||
elevation="high"
|
||||
class="w-max absolute bottom-0 left-0 py-0.5 px-1.5 m-1 font-bold"
|
||||
>
|
||||
ALT
|
||||
</Material>
|
||||
<div class="max-w-sm">
|
||||
{post.alt_text}
|
||||
</div>
|
||||
</Popover>
|
||||
{/if}
|
||||
<svelte:element
|
||||
this={!$userSettings.expandImages || type != 'image' ? 'a' : 'button'}
|
||||
href={postLink(post)}
|
||||
|
||||
Reference in new issue
Block a user