a

locales/en-US.yml

@@ -27,6 +27,7 @@ otherSettings: "Other Settings"
 openInWindow: "Open in window"
 profile: "Profile"
 timeline: "Timeline"
+timelines: "Timelines"
 noAccountDescription: "This user has not written their bio yet."
 login: "Sign In"
 loggingIn: "Signing In"
@@ -87,6 +88,7 @@ lists: "Lists"
 listsDesc: "Lists let you create timelines with specified users. They can be accessed from the timelines page."
 noLists: "You don't have any lists"
 note: "Post"
+characterLimit: "Character limit"
 notes: "Posts"
 following: "Following"
 followers: "Followers"
@@ -1687,8 +1689,8 @@ _instanceCharts:
 _timelines:
   home: "Home"
   local: "Local"
-  recommended: "Recommended"
   social: "Social"
+  recommended: "Recommended"
   global: "Global"
 _pages:
   newPage: "Create a new Page"

packages/client/src/components/form/link.vue

@@ -1,6 +1,13 @@
 <template>
-	<div class="ffcbddfc" :class="{ inline, naked }">
+	<div class="ffcbddfc linkBoxed" :class="{ inline, naked }">
-		<a v-if="external" class="main _button" :href="to" target="_blank">
+		<span v-if="!to" class="main">
+			<span class="icon"><slot name="icon"></slot></span>
+			<span class="text"><slot></slot></span>
+			<span class="right">
+				<span class="text"><slot name="suffix"></slot></span>
+			</span>
+		</span>
+		<a v-else-if="external" class="main _button" :href="to" target="_blank">
 			<span class="icon"><slot name="icon"></slot></span>
 			<span class="text"><slot></slot></span>
 			<span class="right">
@@ -29,7 +36,7 @@
 import {} from "vue";
 
 const props = defineProps<{
-	to: string;
+	to?: string;
 	active?: boolean;
 	external?: boolean;
 	behavior?: null | "window" | "browser" | "modalWindow";
@@ -57,7 +64,7 @@ const props = defineProps<{
 		font-size: 0.9em;
 		transition: background .2s;
 
-		&:hover {
+		&._button:hover {
 			text-decoration: none;
 			background: var(--buttonHoverBg);
 		}

packages/client/src/pages/admin/settings.vue

@@ -33,6 +33,7 @@
 							<FormInput
 								v-model="maintainerName"
 								class="_formBlock"
+								:placeholder="'@user'"
 							>
 								<template #label>{{
 									i18n.ts.maintainerName

packages/client/src/style.scss

@@ -481,7 +481,7 @@ hr {
 	display: flex;
 	flex-wrap: wrap;
 	gap: 12px;
-	> ._button {
+	> ._button, > .linkBoxed {
 		flex-basis: 34%;
 		flex-grow: 1;
 		min-width: max-content !important;

packages/client/src/ui/visitor/kanban.vue

@@ -123,14 +123,14 @@
 						</FormLink>
 					</FormSection>
 	
-					<FormSection>
+					<FormSection v-if="meta.maintainerName || meta.maintainerEmail">
 						<div class="_formLinksGrid">
-							<MkKeyValue :text="meta.maintainerName">
+							<MkKeyValue v-if="meta.maintainerName" :text="meta.maintainerName">
 								<template #key>{{
 									i18n.ts.administrator
 								}}</template>
 							</MkKeyValue>
-							<MkKeyValue>
+							<MkKeyValue v-if="meta.maintainerEmail">
 								<template #key>{{
 									i18n.ts.contact
 								}}</template>
@@ -143,15 +143,16 @@
 						</div>
 					</FormSection>
 	
-					<FormSection>
+					<FormSection v-if="meta.tosUrl">
 						<div class="_formLinksGrid">
-							<FormLink v-if="meta?.tosUrl" :to="meta.tosUrl"
+							<FormLink v-if="meta.tosUrl" :to="meta.tosUrl"
 								><template #icon
 									><i
 										class="ph-scroll ph-bold ph-lg"
 									></i></template
 								>{{ i18n.ts.tos }}
 							</FormLink>
+							<!-- TODO: Blocked servers list -->
 							<!-- <FormLink v-if="meta?.tosUrl" :to="meta.tosUrl"
 								><template #icon
 									><i
@@ -161,33 +162,35 @@
 							</FormLink> -->
 						</div>
 					</FormSection>
-				</footer>
+					<FormSection>
-				<!-- <FormSection class="announcements">
+						<div class="_formLinksGridFlex">
-					<h4>{{ i18n.ts.announcements }}</h4>
+							<FormLink>
-					<MkPagination
+								{{ i18n.ts.timelines }}
-						v-slot="{ items }"
+								<template #suffix>
-						:pagination="announcements"
+									{{
-						class="list"
+										`${ i18n.ts._timelines.home },` +
-					>
+										meta.disableLocalTimeline ? null : `${ i18n.ts._timelines.local },` +
-						<article
+										meta.disableLocalTimeline ? null : `${ i18n.ts._timelines.social },` +
-							v-for="announcement in items"
+										meta.disableRecommendedTimeline ? null : `${ i18n.ts._timelines.recommended },` +
-							:key="announcement.id"
+										meta.disableGlobalTimeline ? null : `${ i18n.ts._timelines.global }`
-							class="item _card"
+									}}
-						>
+								</template>
-							<h4 class="_title">
+							</FormLink>
-								{{ announcement.title }}
+							<FormLink>
-							</h4>
+								{{ i18n.ts.driveCapacityPerLocalAccount }}
-							<div class="_content">
+								<template #suffix>
-								<Mfm :text="announcement.text" />
+									{{ meta.driveCapacityPerLocalUserMb }}MB
-								<img
+								</template>
-									v-if="announcement.imageUrl"
+							</FormLink>
-									:src="announcement.imageUrl"
+							<FormLink>
-									alt="announcement image"
+								{{ i18n.ts.characterLimit }}
-								/>
+								<template #suffix>
+									{{ i18n.t("_cw.chars", { count: meta.maxNoteTextLength }) }}
+								</template>
+							</FormLink>
 						</div>
-						</article>
+					</FormSection>
-					</MkPagination>
+				</footer>
-				</FormSection> -->
 			</div>
 		</header>
 	</div>