Migrate contact form settings to grid view

com.woltlab.wcf/acpMenu.xml

@@ -71,12 +71,6 @@
 			<parent>wcf.acp.menu.link.other</parent>
 			<permissions>admin.user.canManageNotificationSettings</permissions>
 		</acpmenuitem>
-		<acpmenuitem name="wcf.acp.menu.link.contact.settings">
-			<controller>wcf\acp\page\ContactSettingsPage</controller>
-			<parent>wcf.acp.menu.link.other</parent>
-			<options>module_contact_form</options>
-			<permissions>admin.contact.canManageContactForm</permissions>
-		</acpmenuitem>
 		<acpmenuitem name="wcf.acp.menu.link.captcha.question.list">
 			<controller>wcf\acp\page\CaptchaQuestionListPage</controller>
 			<parent>wcf.acp.menu.link.other</parent>
@@ -786,4 +780,7 @@
 			<permissions>admin.management.canViewLog</permissions>
 		</acpmenuitem>
 	</import>
+	<delete>
+		<acpmenuitem name="wcf.acp.menu.link.contact.settings"/>
+	</delete>
 </data>

com.woltlab.wcf/acpTemplateDelete.xml

@@ -156,5 +156,6 @@
 		<template>__multilineItemListFormField</template>
 		<template>imageViewer</template>
 		<template>tagSetAsSynonyms</template>
+		<template>contactSettings</template>
 	</delete>
 </data>

wcfsetup/install/files/acp/templates/contactOptionAdd.tpl

@@ -9,7 +9,7 @@
 
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='ContactSettings'}{/link}" class="button">{icon name='list'} <span>{lang}wcf.acp.menu.link.contact.settings{/lang}</span></a></li>
+			<li><a href="{link controller='ContactOptionList'}{/link}" class="button">{icon name='list'} <span>{lang}wcf.acp.contact.option.list{/lang}</span></a></li>
 
 			{event name='contentHeaderNavigation'}
 		</ul>

wcfsetup/install/files/acp/templates/contactOptionList.tpl

@@ -0,0 +1,39 @@
+{include file='header' pageTitle='wcf.acp.menu.link.contact.options'}
+
+<header class="contentHeader">
+	<div class="contentHeaderTitle">
+		<h1 class="contentTitle">{lang}wcf.acp.menu.link.contact.options{/lang}</h1>
+	</div>
+
+	<nav class="contentHeaderNavigation">
+		<ul>
+            {if $gridView->countRows() > 1}
+				<li>
+					<button type="button" class="button jsChangeShowOrder">{icon name='up-down'} <span>{lang}wcf.global.changeShowOrder{/lang}</span></button>
+				</li>
+            {/if}
+			<li><a href="{link controller='ContactOptionAdd'}{/link}" class="button">{icon name='plus'} <span>{lang}wcf.acp.contact.option.add{/lang}</span></a></li>
+
+			{event name='contentHeaderNavigation'}
+		</ul>
+	</nav>
+</header>
+
+<div class="section">
+	{unsafe:$gridView->render()}
+</div>
+
+{if $gridView->countRows() > 1}
+	<script data-relocate="true">
+	  require(["WoltLabSuite/Core/Component/ChangeShowOrder"], ({ setup }) => {
+          {jsphrase name='wcf.global.changeShowOrder'}
+
+		setup(
+			document.querySelector('.jsChangeShowOrder'),
+			'core/contact/options/show-order',
+		);
+	  });
+	</script>
+{/if}
+
+{include file='footer'}

wcfsetup/install/files/acp/templates/contactRecipientAdd.tpl

@@ -7,7 +7,7 @@
 
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link controller='ContactSettings'}{/link}" class="button">{icon name='list'} <span>{lang}wcf.acp.menu.link.contact.settings{/lang}</span></a></li>
+			<li><a href="{link controller='ContactRecipientList'}{/link}" class="button">{icon name='list'} <span>{lang}wcf.acp.contact.recipient.list{/lang}</span></a></li>
 
 			{event name='contentHeaderNavigation'}
 		</ul>

wcfsetup/install/files/acp/templates/contactRecipientList.tpl

@@ -0,0 +1,39 @@
+{include file='header' pageTitle='wcf.acp.menu.link.contact.recipients'}
+
+<header class="contentHeader">
+	<div class="contentHeaderTitle">
+		<h1 class="contentTitle">{lang}wcf.acp.menu.link.contact.recipients{/lang}</h1>
+	</div>
+
+	<nav class="contentHeaderNavigation">
+		<ul>
+            {if $gridView->countRows() > 1}
+				<li>
+					<button type="button" class="button jsChangeShowOrder">{icon name='up-down'} <span>{lang}wcf.global.changeShowOrder{/lang}</span></button>
+				</li>
+            {/if}
+			<li><a href="{link controller='ContactRecipientAdd'}{/link}" class="button">{icon name='plus'} <span>{lang}wcf.acp.contact.recipient.add{/lang}</span></a></li>
+
+            {event name='contentHeaderNavigation'}
+		</ul>
+	</nav>
+</header>
+
+<div class="section">
+    {unsafe:$gridView->render()}
+</div>
+
+{if $gridView->countRows() > 1}
+	<script data-relocate="true">
+	  require(["WoltLabSuite/Core/Component/ChangeShowOrder"], ({ setup }) => {
+          {jsphrase name='wcf.global.changeShowOrder'}
+
+		setup(
+			document.querySelector('.jsChangeShowOrder'),
+			'core/contact/recipients/show-order',
+		);
+	  });
+	</script>
+{/if}
+
+{include file='footer'}

wcfsetup/install/files/lib/acp/form/ContactOptionAddForm.class.php

@@ -26,7 +26,7 @@ class ContactOptionAddForm extends AbstractFormOptionAddForm
     /**
      * @inheritDoc
      */
-    public $activeMenuItem = 'wcf.acp.menu.link.contact.settings';
+    public $activeMenuItem = 'wcf.acp.menu.link.contact.options.add';
 
     /**
      * @inheritDoc

wcfsetup/install/files/lib/acp/form/ContactOptionEditForm.class.php

@@ -17,6 +17,11 @@
  */
 class ContactOptionEditForm extends ContactOptionAddForm
 {
+    /**
+     * @inheritDoc
+     */
+    public $activeMenuItem = 'wcf.acp.menu.link.contact.options';
+
     /**
      * @inheritDoc
      */

wcfsetup/install/files/lib/acp/form/ContactRecipientAddForm.class.php

@@ -24,7 +24,7 @@ class ContactRecipientAddForm extends AbstractForm
     /**
      * @inheritDoc
      */
-    public $activeMenuItem = 'wcf.acp.menu.link.contact.settings';
+    public $activeMenuItem = 'wcf.acp.menu.link.contact.recipients.add';
 
     /**
      * @inheritDoc

wcfsetup/install/files/lib/acp/form/ContactRecipientEditForm.class.php

@@ -21,7 +21,7 @@ class ContactRecipientEditForm extends ContactRecipientAddForm
     /**
      * @inheritDoc
      */
-    public $activeMenuItem = 'wcf.acp.menu.link.contact.settings';
+    public $activeMenuItem = 'wcf.acp.menu.link.contact.recipients';
 
     /**
      * @inheritDoc

wcfsetup/install/files/lib/acp/page/ContactOptionListPage.class.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace wcf\acp\page;
+
+use wcf\page\AbstractGridViewPage;
+use wcf\system\gridView\admin\ContactOptionGridView;
+
+/**
+ * @author Olaf Braun
+ * @copyright 2001-2025 WoltLab GmbH
+ * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since 6.2
+ *
+ * @extends AbstractGridViewPage<ContactOptionGridView>
+ */
+final class ContactOptionListPage extends AbstractGridViewPage
+{
+    /**
+     * @inheritDoc
+     */
+    public $activeMenuItem = 'wcf.acp.menu.link.contact.options';
+
+    /**
+     * @inheritDoc
+     */
+    public $neededModules = ['MODULE_CONTACT_FORM'];
+
+    /**
+     * @inheritDoc
+     */
+    public $neededPermissions = ['admin.contact.canManageContactForm'];
+
+    #[\Override]
+    protected function createGridView(): ContactOptionGridView
+    {
+        return new ContactOptionGridView();
+    }
+}

wcfsetup/install/files/lib/acp/page/ContactRecipientListPage.class.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace wcf\acp\page;
+
+use wcf\page\AbstractGridViewPage;
+use wcf\system\gridView\admin\ContactRecipientGridView;
+
+/**
+ * @author Olaf Braun
+ * @copyright 2001-2025 WoltLab GmbH
+ * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since 6.2
+ *
+ * @extends AbstractGridViewPage<ContactRecipientGridView>
+ */
+final class ContactRecipientListPage extends AbstractGridViewPage
+{
+    /**
+     * @inheritDoc
+     */
+    public $activeMenuItem = 'wcf.acp.menu.link.contact.recipients';
+
+    /**
+     * @inheritDoc
+     */
+    public $neededModules = ['MODULE_CONTACT_FORM'];
+
+    /**
+     * @inheritDoc
+     */
+    public $neededPermissions = ['admin.contact.canManageContactForm'];
+
+    #[\Override]
+    protected function createGridView(): ContactRecipientGridView
+    {
+        return new ContactRecipientGridView();
+    }
+}