From ed0236a5f6d00a6c82f7ca8b7ea9c0fa391130bc Mon Sep 17 00:00:00 2001 From: Xylight Date: Tue, 2 Jul 2024 10:09:24 -0700 Subject: [PATCH] misc: improve alt text handling --- bun.lockb | Bin 297774 -> 297774 bytes src/lib/components/lemmy/post/PostMeta.svelte | 371 +++++++++--------- .../lemmy/post/media/PostMedia.svelte | 23 +- .../lemmy/post/media/PostMediaCompact.svelte | 19 +- 4 files changed, 214 insertions(+), 199 deletions(-) diff --git a/bun.lockb b/bun.lockb index 08dbc96d2838032b462cf0afa338b6d11263da40..6592e57ead4119d60bd359a68afe322d46f16c0d 100755 GIT binary patch delta 31 ncmZ2CO=#UTp@tU5ElfB6urtOP=o#u6wm - 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, + }
- {#if community} - - - + > + +
+ {/if} + + + {/if} + {#if community} + + {/if} + + {#if user} + + + {#if badges.moderator} + + {/if} + {#if badges.admin} + + {/if} + + {/if} - {#if community} - + {#if published} + {/if} - - {#if user} - - - {#if badges.moderator} - - {/if} - {#if badges.admin} - - {/if} - - - {/if} - {#if published} - - {/if} - -
- {#if badges.nsfw} - - - {$t("post.badges.nsfw")} - - {/if} - {#if badges.saved} - - - {$t("post.badges.saved")} - - {/if} - {#if badges.locked} - - - {$t("post.badges.locked")} - - {/if} - {#if badges.removed} - - - {$t("post.badges.removed")} - - {/if} - {#if badges.deleted} - - - {$t("post.badges.deleted")} - - {/if} - {#if badges.featured} - - - {$t("post.badges.featured")} - - {/if} - -
+
+
+ {#if badges.nsfw} + + + {$t('post.badges.nsfw')} + + {/if} + {#if badges.saved} + + + {$t('post.badges.saved')} + + {/if} + {#if badges.locked} + + + {$t('post.badges.locked')} + + {/if} + {#if badges.removed} + + + {$t('post.badges.removed')} + + {/if} + {#if badges.deleted} + + + {$t('post.badges.deleted')} + + {/if} + {#if badges.featured} + + + {$t('post.badges.featured')} + + {/if} + +
{#if title && id} - - - + ? '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;" + > + + {/if} diff --git a/src/lib/components/lemmy/post/media/PostMedia.svelte b/src/lib/components/lemmy/post/media/PostMedia.svelte index df6489db..2c15a99e 100644 --- a/src/lib/components/lemmy/post/media/PostMedia.svelte +++ b/src/lib/components/lemmy/post/media/PostMedia.svelte @@ -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 {#if type == 'image'} @@ -70,12 +73,22 @@ /> {#if post.alt_text} - + {#if showAltText} + {post.alt_text} + {:else} + ALT + {/if} + {/if} {/if} diff --git a/src/lib/components/lemmy/post/media/PostMediaCompact.svelte b/src/lib/components/lemmy/post/media/PostMediaCompact.svelte index 349a790f..066799da 100644 --- a/src/lib/components/lemmy/post/media/PostMediaCompact.svelte +++ b/src/lib/components/lemmy/post/media/PostMediaCompact.svelte @@ -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')}
+ {#if post.alt_text} + + + ALT + +
+ {post.alt_text} +
+
+ {/if}