From b00425e9c065220f357cdfa14957cb3a8fbc811c Mon Sep 17 00:00:00 2001
From: DebaucheryLibrarian <DebaucheryLibrarian@unknown.name>
Date: Sun, 5 Jul 2026 05:18:38 +0200
Subject: [PATCH] Moved actor merge from bio to edit.

---
 components/actors/bio.vue   | 20 ++----------------
 pages/actors/edit/+Page.vue | 42 ++++++++++++++++++++++++++++++++-----
 pages/scene/edit/+Page.vue  |  1 +
 3 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/components/actors/bio.vue b/components/actors/bio.vue
index 15ed361..03b87da 100644
--- a/components/actors/bio.vue
+++ b/components/actors/bio.vue
@@ -374,29 +374,17 @@
 						:href="`/actor/edit/${actor.id}/${actor.slug}`"
 						target="_blank"
 						class="link"
-					>Edit bio</a>
+					>Edit</a>
 
 					<a
 						:href="`/actor/revs/${actor.id}/${actor.slug}`"
 						target="_blank"
 						class="link"
 					>Revisions</a>
-
-					<span
-						v-if="user && user.role !== 'user'"
-						class="link"
-						@click="showMergeDialog = true"
-					>Merge</span>
 				</div>
 			</li>
 		</ul>
 
-		<Merge
-			v-if="showMergeDialog"
-			:actors="[actor]"
-			@close="showMergeDialog = false"
-		/>
-
 		<div class="descriptions-container">
 			<div
 				v-if="descriptions.length > 0"
@@ -457,8 +445,6 @@ import formatTemplate from 'template-format';
 import getPath from '#/src/get-path.js';
 import { formatDate } from '#/utils/format.js';
 
-import Merge from '#/components/actors/merge.vue';
-
 const expanded = ref(false);
 
 const pageContext = inject('pageContext');
@@ -545,8 +531,6 @@ const aliases = Object
 	.toSorted(([, countA], [, countB]) => countB - countA)
 	.map(([alias]) => alias)
 	.filter((alias) => alias !== props.actor.name);
-
-const showMergeDialog = ref(false);
 </script>
 
 <style>
@@ -898,7 +882,7 @@ const showMergeDialog = ref(false);
 	display: none;
 	justify-content: center;
 	position: absolute;
-	z-index: 10;
+	z-index: 1;
 	bottom: -.25rem;
 }
 
diff --git a/pages/actors/edit/+Page.vue b/pages/actors/edit/+Page.vue
index 23b50ee..d41c804 100644
--- a/pages/actors/edit/+Page.vue
+++ b/pages/actors/edit/+Page.vue
@@ -55,11 +55,25 @@
 			>
 				<h2 class="heading ellipsis">Edit actor #{{ actor.id }} - {{ actor.name }}</h2>
 
-				<a
-					:href="`/actor/${actor.id}/${actor.slug}`"
-					target="_blank"
-					class="link noshrink"
-				>Go to actor</a>
+				<span class="header-actions">
+					<span
+						target="_blank"
+						class="link noshrink"
+						@click="showMergeDialog = true"
+					>Merge</span>
+
+					<Merge
+						v-if="showMergeDialog"
+						:actors="[actor]"
+						@close="showMergeDialog = false"
+					/>
+
+					<a
+						:href="`/actor/${actor.id}/${actor.slug}`"
+						target="_blank"
+						class="link noshrink"
+					>Go to actor</a>
+				</span>
 			</div>
 
 			<div
@@ -367,6 +381,7 @@ import EditPenis from '#/components/edit/penis.vue';
 import Avatar from '#/components/edit/avatar.vue';
 import Checkbox from '#/components/form/checkbox.vue';
 import Ellipsis from '#/components/loading/ellipsis.vue';
+import Merge from '#/components/actors/merge.vue';
 
 import {
 	// get,
@@ -591,6 +606,7 @@ const comment = ref(null);
 const apply = ref(user.role !== 'user');
 const submitting = ref(false);
 const submitted = ref(false);
+const showMergeDialog = ref(false);
 
 const sizeUnits = ref('metric');
 const figureUnits = ref('us');
@@ -703,9 +719,21 @@ async function submit() {
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
+		gap: 1rem;
 		padding: 1rem;
 	}
 
+	.header-actions {
+		display: flex;
+		flex-direction: row;
+		gap: 1rem;
+		align-items: center;
+
+		.link {
+			cursor: pointer;
+		}
+	}
+
 	.heading {
 		margin: 0;
 	}
@@ -946,5 +974,9 @@ async function submit() {
 			flex-grow: 1;
 		}
 	}
+
+	.editor-header {
+		flex-direction: column;
+	}
 }
 </style>
diff --git a/pages/scene/edit/+Page.vue b/pages/scene/edit/+Page.vue
index e8eac73..199c415 100644
--- a/pages/scene/edit/+Page.vue
+++ b/pages/scene/edit/+Page.vue
@@ -275,6 +275,7 @@ const fields = computed(() => [
 	},
 	{
 		key: 'url',
+		label: 'URL',
 		type: 'string',
 		value: scene.value.url,
 		enabled: verifyAbility(user, 'scene', 'update'),