diff --git a/CRM/Admin/Form/Preferences/Campaign.php b/CRM/Admin/Form/Preferences/Campaign.php
deleted file mode 100644
index 3e372da4c94f5b2ca5e49b5ce62b1088f4bf0fef..0000000000000000000000000000000000000000
--- a/CRM/Admin/Form/Preferences/Campaign.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | CiviCRM version 5 |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019 |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM. |
- | |
- | CiviCRM is free software; you can copy, modify, and distribute it |
- | under the terms of the GNU Affero General Public License |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception. |
- | |
- | CiviCRM is distributed in the hope that it will be useful, but |
- | WITHOUT ANY WARRANTY; without even the implied warranty of |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
- | See the GNU Affero General Public License for more details. |
- | |
- | You should have received a copy of the GNU Affero General Public |
- | License and the CiviCRM Licensing Exception along |
- | with this program; if not, contact CiviCRM LLC |
- | at info[AT]civicrm[DOT]org. If you have questions about the |
- | GNU Affero General Public License or the licensing of CiviCRM, |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing |
- +--------------------------------------------------------------------+
- */
-
-/**
- *
- * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2019
- */
-
-/**
- * This class displays campaign preferences.
- */
-class CRM_Admin_Form_Preferences_Campaign extends CRM_Admin_Form_Preferences {
-
- protected $_settings = [
- 'tag_unconfirmed' => CRM_Core_BAO_Setting::CAMPAIGN_PREFERENCES_NAME,
- 'petition_contacts' => CRM_Core_BAO_Setting::CAMPAIGN_PREFERENCES_NAME,
- ];
-
-}
diff --git a/CRM/Admin/Form/Preferences/Multisite.php b/CRM/Admin/Form/Preferences/Multisite.php
deleted file mode 100644
index e5616922686f93aa616d5e470fa2232689c17bdc..0000000000000000000000000000000000000000
--- a/CRM/Admin/Form/Preferences/Multisite.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | CiviCRM version 5 |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019 |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM. |
- | |
- | CiviCRM is free software; you can copy, modify, and distribute it |
- | under the terms of the GNU Affero General Public License |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception. |
- | |
- | CiviCRM is distributed in the hope that it will be useful, but |
- | WITHOUT ANY WARRANTY; without even the implied warranty of |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
- | See the GNU Affero General Public License for more details. |
- | |
- | You should have received a copy of the GNU Affero General Public |
- | License and the CiviCRM Licensing Exception along |
- | with this program; if not, contact CiviCRM LLC |
- | at info[AT]civicrm[DOT]org. If you have questions about the |
- | GNU Affero General Public License or the licensing of CiviCRM, |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing |
- +--------------------------------------------------------------------+
- */
-
-/**
- *
- * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2019
- */
-
-/**
- * This class generates form components for multi site preferences.
- */
-class CRM_Admin_Form_Preferences_Multisite extends CRM_Admin_Form_Preferences {
-
- protected $_settings = [
- 'is_enabled' => CRM_Core_BAO_Setting::MULTISITE_PREFERENCES_NAME,
- 'domain_group_id' => CRM_Core_BAO_Setting::MULTISITE_PREFERENCES_NAME,
- ];
-
-}
diff --git a/CRM/Campaign/xml/Menu/Campaign.xml b/CRM/Campaign/xml/Menu/Campaign.xml
index a5c673f24eb848ec580e55473ac51400032657b8..555eb1f2843bffb3a57e9c664303e15726e178bb 100644
--- a/CRM/Campaign/xml/Menu/Campaign.xml
+++ b/CRM/Campaign/xml/Menu/Campaign.xml
@@ -72,7 +72,7 @@
<item>
<path>civicrm/admin/setting/preferences/campaign</path>
<title>CiviCampaign Component Settings</title>
- <page_callback>CRM_Admin_Form_Preferences_Campaign</page_callback>
+ <page_callback>CRM_Admin_Form_Generic</page_callback>
<desc>Configure global CiviCampaign behaviors.</desc>
<adminGroup>CiviCampaign</adminGroup>
<weight>10</weight>
diff --git a/CRM/Core/xml/Menu/Admin.xml b/CRM/Core/xml/Menu/Admin.xml
index d23a10910bee29594132d9f217f38e0b89fa99da..34228dc51df8f512c7461e2c4f9ec1c86fdac041 100644
--- a/CRM/Core/xml/Menu/Admin.xml
+++ b/CRM/Core/xml/Menu/Admin.xml
@@ -550,7 +550,7 @@
<item>
<path>civicrm/admin/setting/preferences/multisite</path>
<title>Multi Site Settings</title>
- <page_callback>CRM_Admin_Form_Preferences_Multisite</page_callback>
+ <page_callback>CRM_Admin_Form_Generic</page_callback>
<adminGroup>System Settings</adminGroup>
<icon>admin/small/36.png</icon>
<weight>130</weight>
@@ -558,7 +558,7 @@
<item>
<path>civicrm/admin/setting/preferences/campaign</path>
<title>CiviCampaign Component Settings</title>
- <page_callback>CRM_Admin_Form_Preferences_Campaign</page_callback>
+ <page_callback>CRM_Admin_Form_Generic</page_callback>
</item>
<item>
<path>civicrm/admin/setting/preferences/event</path>
diff --git a/settings/Campaign.setting.php b/settings/Campaign.setting.php
index a17b25007c25a38420e312e87df643cd7e3f2b58..7f6aaf2c470d84c16a70c927d4ce96a087468605 100644
--- a/settings/Campaign.setting.php
+++ b/settings/Campaign.setting.php
@@ -49,6 +49,7 @@ return [
'is_contact' => 0,
'description' => ts('If set, new contacts that are created when signing a petition are assigned a tag of this name.'),
'help_text' => '',
+ 'settings_pages' => ['campaign' => ['weight' => 10]],
],
'petition_contacts' => [
'group_name' => 'Campaign Preferences',
@@ -63,6 +64,7 @@ return [
'is_contact' => 0,
'description' => ts('All contacts that have signed a CiviCampaign petition will be added to this group. The group will be created if it does not exist (it is required for email verification).'),
'help_text' => '',
+ 'settings_pages' => ['campaign' => ['weight' => 20]],
],
];
diff --git a/settings/Multisite.setting.php b/settings/Multisite.setting.php
index f82304b9103960f36c1c2b5316f40c270baea797..669dede5a3301e6e20ffe461882dd038e5a38c28 100644
--- a/settings/Multisite.setting.php
+++ b/settings/Multisite.setting.php
@@ -50,6 +50,7 @@ return [
'description' => ts('Make CiviCRM aware of multiple domains. You should configure a domain group if enabled'),
'documentation_link' => ['page' => 'Multi Site Installation', 'resource' => 'wiki'],
'help_text' => NULL,
+ 'settings_pages' => ['multisite' => ['weight' => 10]],
],
'domain_group_id' => [
'group_name' => 'Multi Site Preferences',
@@ -65,6 +66,7 @@ return [
'is_contact' => 0,
'description' => ts('Contacts created on this site are added to this group'),
'help_text' => NULL,
+ 'settings_pages' => ['multisite' => ['weight' => 20]],
],
'event_price_set_domain_id' => [
'group_name' => 'Multi Site Preferences',
diff --git a/templates/CRM/Admin/Form/Preferences/Campaign.tpl b/templates/CRM/Admin/Form/Preferences/Campaign.tpl
deleted file mode 100644
index def983c50a9b0dac5ae41afdb7fece533f1edd1e..0000000000000000000000000000000000000000
--- a/templates/CRM/Admin/Form/Preferences/Campaign.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-{*
- +--------------------------------------------------------------------+
- | CiviCRM version 5 |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019 |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM. |
- | |
- | CiviCRM is free software; you can copy, modify, and distribute it |
- | under the terms of the GNU Affero General Public License |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception. |
- | |
- | CiviCRM is distributed in the hope that it will be useful, but |
- | WITHOUT ANY WARRANTY; without even the implied warranty of |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
- | See the GNU Affero General Public License for more details. |
- | |
- | You should have received a copy of the GNU Affero General Public |
- | License and the CiviCRM Licensing Exception along |
- | with this program; if not, contact CiviCRM LLC |
- | at info[AT]civicrm[DOT]org. If you have questions about the |
- | GNU Affero General Public License or the licensing of CiviCRM, |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing |
- +--------------------------------------------------------------------+
-*}
-{include file="CRM/Form/basicForm.tpl"}
diff --git a/templates/CRM/Admin/Form/Preferences/Multisite.tpl b/templates/CRM/Admin/Form/Preferences/Multisite.tpl
deleted file mode 100644
index def983c50a9b0dac5ae41afdb7fece533f1edd1e..0000000000000000000000000000000000000000
--- a/templates/CRM/Admin/Form/Preferences/Multisite.tpl
+++ /dev/null
@@ -1,26 +0,0 @@
-{*
- +--------------------------------------------------------------------+
- | CiviCRM version 5 |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2019 |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM. |
- | |
- | CiviCRM is free software; you can copy, modify, and distribute it |
- | under the terms of the GNU Affero General Public License |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception. |
- | |
- | CiviCRM is distributed in the hope that it will be useful, but |
- | WITHOUT ANY WARRANTY; without even the implied warranty of |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
- | See the GNU Affero General Public License for more details. |
- | |
- | You should have received a copy of the GNU Affero General Public |
- | License and the CiviCRM Licensing Exception along |
- | with this program; if not, contact CiviCRM LLC |
- | at info[AT]civicrm[DOT]org. If you have questions about the |
- | GNU Affero General Public License or the licensing of CiviCRM, |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing |
- +--------------------------------------------------------------------+
-*}
-{include file="CRM/Form/basicForm.tpl"}