From dc2dcaf1829d577e9fb68bb1f1a02fe089995e97 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Thu, 6 Mar 2025 10:13:04 -0500
Subject: [PATCH] feat: move category sidebar to ACP partial, add sidebar to
 category-federation

---
 .../admin/manage/category-federation.tpl      |  7 +--
 src/views/admin/manage/category.tpl           | 43 +------------------
 src/views/admin/partials/category/sidebar.tpl | 42 ++++++++++++++++++
 3 files changed, 47 insertions(+), 45 deletions(-)
 create mode 100644 src/views/admin/partials/category/sidebar.tpl

diff --git a/src/views/admin/manage/category-federation.tpl b/src/views/admin/manage/category-federation.tpl
index 1f2652b68b..adf64b624b 100644
--- a/src/views/admin/manage/category-federation.tpl
+++ b/src/views/admin/manage/category-federation.tpl
@@ -1,6 +1,5 @@
 
-<div class="px-lg-4">
-
+<div class="acp-page-container">
 	<div class="row border-bottom py-2 m-0 mb-3 sticky-top acp-page-main-header align-items-center">
 		<div class="col-12 px-0 mb-1 mb-md-0 d-flex justify-content-between align-items-center">
 			<h4 class="fw-bold tracking-tight mb-0">[[admin/manage/categories:federation.title, {name}]]</h4>
@@ -15,7 +14,7 @@
 	</div>
 	{{{ else }}}
 	<div class="row settings m-0">
-		<div class="col-12 px-0 mb-4" tabindex="0">
+		<div class="col-12 col-md-8 px-0 mb-4" tabindex="0">
 			<div id="site-settings" class="mb-4">
 				<form role="form">
 					<h5 class="fw-bold settings-header">[[admin/manage/categories:federation.syncing-header]]</h5>
@@ -95,6 +94,8 @@
 				</form>
 			</div>
 		</div>
+
+		<!-- IMPORT admin/partials/category/sidebar.tpl -->
 	</div>
 	{{{ end }}}
 </div>
\ No newline at end of file
diff --git a/src/views/admin/manage/category.tpl b/src/views/admin/manage/category.tpl
index 74fad5201c..f57c6ab463 100644
--- a/src/views/admin/manage/category.tpl
+++ b/src/views/admin/manage/category.tpl
@@ -174,48 +174,7 @@
 			</div>
 		</div>
 
-		<div class="col-12 col-md-4 px-0 px-md-3 options acp-sidebar">
-			<div class="p-2 d-flex flex-column text-bg-light border rounded-1 gap-1">
-				<a href="{config.relative_path}/admin/manage/categories" class="btn btn-ghost btn-sm d-flex gap-2 align-items-center"><i class="fa fa-fw fa-chevron-left text-primary"></i> [[admin/manage/categories:back-to-categories]]</a>
-
-				<hr class="my-1"/>
-
-				<button class="btn btn-ghost btn-sm d-flex gap-2 align-items-center copy-settings">
-					<i class="fa fa-fw fa-files-o text-primary"></i> [[admin/manage/categories:copy-settings]]
-				</button>
-
-				<a class="btn btn-ghost btn-sm d-flex gap-2 align-items-center" href="{config.relative_path}/admin/manage/categories/{category.cid}/analytics"><i class="fa fa-fw fa-chart-simple text-primary"></i> [[admin/manage/categories:analytics]]</a>
-
-				<a href="{config.relative_path}/admin/manage/privileges/{category.cid}" class="btn btn-ghost btn-sm d-flex gap-2 align-items-center">
-					<i class="fa fa-fw fa-lock text-primary"></i> [[admin/manage/categories:privileges]]
-				</a>
-
-				<a class="btn btn-ghost btn-sm d-flex gap-2 align-items-center" href="{config.relative_path}/admin/manage/categories/{category.cid}/federation">
-					<i class="fa fa-fw fa-globe text-primary"></i> [[admin/manage/categories:federation]]
-				</a>
-
-				<a href="{config.relative_path}/category/{category.cid}" class="btn btn-ghost btn-sm d-flex gap-2 align-items-center">
-					<i class="fa fa-fw fa-eye text-primary"></i> [[admin/manage/categories:view-category]]
-				</a>
-
-				<hr class="my-1"/>
-
-				<button data-action="toggle" data-disabled="{category.disabled}" class="btn btn-ghost btn-sm d-flex gap-2 align-items-center">
-					{{{ if category.disabled }}}
-					<i class="fa fa-fw fa-check text-success"></i>
-					<span class="label">[[admin/manage/categories:enable]]</span>
-					{{{ else }}}
-					<i class="fa fa-fw fa-ban text-danger"></i>
-					<span class="label">[[admin/manage/categories:disable]]</span>
-					{{{ end }}}
-				</button>
-
-				<button class="btn btn-ghost btn-sm d-flex gap-2 align-items-center purge">
-					<i class="fa fa-fw fa-trash text-danger"></i> [[admin/manage/categories:purge]]
-				</button>
-
-			</div>
-		</div>
+		<!-- IMPORT admin/partials/category/sidebar.tpl -->
 	</div>
 </div>
 
diff --git a/src/views/admin/partials/category/sidebar.tpl b/src/views/admin/partials/category/sidebar.tpl
new file mode 100644
index 0000000000..2d806a22f1
--- /dev/null
+++ b/src/views/admin/partials/category/sidebar.tpl
@@ -0,0 +1,42 @@
+<div class="col-12 col-md-4 px-0 px-md-3 options acp-sidebar">
+	<div class="p-2 d-flex flex-column text-bg-light border rounded-1 gap-1">
+		<a href="{config.relative_path}/admin/manage/categories" class="btn btn-ghost btn-sm d-flex gap-2 align-items-center"><i class="fa fa-fw fa-chevron-left text-primary"></i> [[admin/manage/categories:back-to-categories]]</a>
+
+		<hr class="my-1"/>
+
+		<button class="btn btn-ghost btn-sm d-flex gap-2 align-items-center copy-settings">
+			<i class="fa fa-fw fa-files-o text-primary"></i> [[admin/manage/categories:copy-settings]]
+		</button>
+
+		<a class="btn btn-ghost btn-sm d-flex gap-2 align-items-center" href="{config.relative_path}/admin/manage/categories/{(cid || category.cid)}/analytics"><i class="fa fa-fw fa-chart-simple text-primary"></i> [[admin/manage/categories:analytics]]</a>
+
+		<a href="{config.relative_path}/admin/manage/privileges/{(cid || category.cid)}" class="btn btn-ghost btn-sm d-flex gap-2 align-items-center">
+			<i class="fa fa-fw fa-lock text-primary"></i> [[admin/manage/categories:privileges]]
+		</a>
+
+		<a class="btn btn-ghost btn-sm d-flex gap-2 align-items-center" href="{config.relative_path}/admin/manage/categories/{(cid || category.cid)}/federation">
+			<i class="fa fa-fw fa-globe text-primary"></i> [[admin/manage/categories:federation]]
+		</a>
+
+		<a href="{config.relative_path}/category/{(cid || category.cid)}" class="btn btn-ghost btn-sm d-flex gap-2 align-items-center">
+			<i class="fa fa-fw fa-eye text-primary"></i> [[admin/manage/categories:view-category]]
+		</a>
+
+		<hr class="my-1"/>
+
+		<button data-action="toggle" data-disabled="{(disabled || category.disabled)}" class="btn btn-ghost btn-sm d-flex gap-2 align-items-center">
+			{{{ if (disabled || category.disabled) }}}
+			<i class="fa fa-fw fa-check text-success"></i>
+			<span class="label">[[admin/manage/categories:enable]]</span>
+			{{{ else }}}
+			<i class="fa fa-fw fa-ban text-danger"></i>
+			<span class="label">[[admin/manage/categories:disable]]</span>
+			{{{ end }}}
+		</button>
+
+		<button class="btn btn-ghost btn-sm d-flex gap-2 align-items-center purge">
+			<i class="fa fa-fw fa-trash text-danger"></i> [[admin/manage/categories:purge]]
+		</button>
+
+	</div>
+</div>
\ No newline at end of file