From 5e4accea71656b59aca6006695c64e3cbd78e937 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Wed, 6 Jan 2021 12:02:37 -0500 Subject: [PATCH] Rename afform_gui -> afform_admin --- .../CRM/AfformAdmin}/Upgrader.php | 6 +- .../CRM/AfformAdmin}/Upgrader/Base.php | 14 +-- ext/afform/{gui => admin}/LICENSE.txt | 2 +- ext/afform/{gui => admin}/README.md | 8 +- .../afformEntities/Activity.php | 0 .../afformEntities/Household.php | 0 .../afformEntities/Individual.php | 0 .../afformEntities/Organization.php | 0 .../afform_admin.civix.php} | 100 +++++++++--------- .../afform_gui.php => admin/afform_admin.php} | 64 +++++------ .../{gui => admin}/ang/afGuiAdmin.aff.html | 0 .../{gui => admin}/ang/afGuiAdmin.aff.json | 0 .../{gui => admin}/ang/afGuiEditor.ang.php | 0 ext/afform/{gui => admin}/ang/afGuiEditor.css | 0 ext/afform/{gui => admin}/ang/afGuiEditor.js | 0 .../ang/afGuiEditor/button-menu.html | 0 .../ang/afGuiEditor/button.html | 0 .../ang/afGuiEditor/canvas.html | 0 .../ang/afGuiEditor/config-form.html | 0 .../ang/afGuiEditor/container-menu.html | 0 .../ang/afGuiEditor/container.html | 0 .../ang/afGuiEditor/editOptions.html | 0 .../ang/afGuiEditor/entity.html | 0 .../afGuiEditor/entityConfig/Activity.html | 0 .../ang/afGuiEditor/entityConfig/Contact.html | 0 .../ang/afGuiEditor/entityConfig/Generic.html | 0 .../afGuiEditor/entityDefaults/Activity.json | 0 .../afGuiEditor/entityDefaults/Contact.json | 0 .../ang/afGuiEditor/field-menu.html | 0 .../{gui => admin}/ang/afGuiEditor/field.html | 0 .../afGuiEditor/inputType/ChainSelect.html | 0 .../ang/afGuiEditor/inputType/CheckBox.html | 0 .../ang/afGuiEditor/inputType/Date.html | 0 .../ang/afGuiEditor/inputType/Number.html | 0 .../ang/afGuiEditor/inputType/Radio.html | 0 .../afGuiEditor/inputType/RichTextEditor.html | 0 .../ang/afGuiEditor/inputType/Select.html | 0 .../ang/afGuiEditor/inputType/Text.html | 0 .../ang/afGuiEditor/inputType/TextArea.html | 0 .../{gui => admin}/ang/afGuiEditor/main.html | 0 .../ang/afGuiEditor/markup-menu.html | 0 .../ang/afGuiEditor/markup.html | 0 .../ang/afGuiEditor/menu-item-background.html | 0 .../ang/afGuiEditor/menu-item-border.html | 0 .../ang/afGuiEditor/palette.html | 0 .../ang/afGuiEditor/saveBlock.html | 0 .../ang/afGuiEditor/text-menu.html | 0 .../{gui => admin}/ang/afGuiEditor/text.html | 0 .../{gui => admin}/ang/afGuiList.aff.html | 0 ext/afform/{gui => admin}/images/icons.png | Bin ext/afform/{gui => admin}/images/number.png | Bin ext/afform/{gui => admin}/info.xml | 9 +- .../CRM/AfformAdmin}/afformBuilder.hlp | 0 .../templates/CRM/AfformAdmin}/afformList.hlp | 0 extension-compatibility.json | 4 + 55 files changed, 105 insertions(+), 102 deletions(-) rename ext/afform/{gui/CRM/AfformGui => admin/CRM/AfformAdmin}/Upgrader.php (85%) rename ext/afform/{gui/CRM/AfformGui => admin/CRM/AfformAdmin}/Upgrader/Base.php (96%) rename ext/afform/{gui => admin}/LICENSE.txt (99%) rename ext/afform/{gui => admin}/README.md (81%) rename ext/afform/{gui => admin}/afformEntities/Activity.php (100%) rename ext/afform/{gui => admin}/afformEntities/Household.php (100%) rename ext/afform/{gui => admin}/afformEntities/Individual.php (100%) rename ext/afform/{gui => admin}/afformEntities/Organization.php (100%) rename ext/afform/{gui/afform_gui.civix.php => admin/afform_admin.civix.php} (78%) rename ext/afform/{gui/afform_gui.php => admin/afform_admin.php} (82%) rename ext/afform/{gui => admin}/ang/afGuiAdmin.aff.html (100%) rename ext/afform/{gui => admin}/ang/afGuiAdmin.aff.json (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor.ang.php (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor.css (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor.js (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/button-menu.html (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/button.html (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/canvas.html (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/config-form.html (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/container-menu.html (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/container.html (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/editOptions.html (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/entity.html (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/entityConfig/Activity.html (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/entityConfig/Contact.html (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/entityConfig/Generic.html (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/entityDefaults/Activity.json (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/entityDefaults/Contact.json (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/field-menu.html (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/field.html (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/inputType/ChainSelect.html (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/inputType/CheckBox.html (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/inputType/Date.html (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/inputType/Number.html (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/inputType/Radio.html (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/inputType/RichTextEditor.html (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/inputType/Select.html (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/inputType/Text.html (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/inputType/TextArea.html (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/main.html (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/markup-menu.html (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/markup.html (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/menu-item-background.html (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/menu-item-border.html (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/palette.html (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/saveBlock.html (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/text-menu.html (100%) rename ext/afform/{gui => admin}/ang/afGuiEditor/text.html (100%) rename ext/afform/{gui => admin}/ang/afGuiList.aff.html (100%) rename ext/afform/{gui => admin}/images/icons.png (100%) rename ext/afform/{gui => admin}/images/number.png (100%) rename ext/afform/{gui => admin}/info.xml (77%) rename ext/afform/{gui/templates/CRM/AfformGui => admin/templates/CRM/AfformAdmin}/afformBuilder.hlp (100%) rename ext/afform/{gui/templates/CRM/AfformGui => admin/templates/CRM/AfformAdmin}/afformList.hlp (100%) diff --git a/ext/afform/gui/CRM/AfformGui/Upgrader.php b/ext/afform/admin/CRM/AfformAdmin/Upgrader.php similarity index 85% rename from ext/afform/gui/CRM/AfformGui/Upgrader.php rename to ext/afform/admin/CRM/AfformAdmin/Upgrader.php index 6b6871c952..6463310ed8 100644 --- a/ext/afform/gui/CRM/AfformGui/Upgrader.php +++ b/ext/afform/admin/CRM/AfformAdmin/Upgrader.php @@ -1,10 +1,10 @@ Licensed under the GNU Affero Public License 3.0 (below). diff --git a/ext/afform/gui/README.md b/ext/afform/admin/README.md similarity index 81% rename from ext/afform/gui/README.md rename to ext/afform/admin/README.md index c1682405df..c26bdcca88 100644 --- a/ext/afform/gui/README.md +++ b/ext/afform/admin/README.md @@ -1,4 +1,4 @@ -# org.civicrm.afform-gui +# org.civicrm.afform_admin ![Screenshot](/images/screenshot.png) @@ -22,7 +22,7 @@ install it with the command-line tool [cv](https://github.com/civicrm/cv). ```bash cd -cv dl org.civicrm.afform-gui@https://github.com/FIXME/org.civicrm.afform-gui/archive/master.zip +cv dl org.civicrm.afform_admin@https://github.com/FIXME/org.civicrm.afform_admin/archive/master.zip ``` ## Installation (CLI, Git) @@ -31,8 +31,8 @@ Sysadmins and developers may clone the [Git](https://en.wikipedia.org/wiki/Git) install it with the command-line tool [cv](https://github.com/civicrm/cv). ```bash -git clone https://github.com/FIXME/org.civicrm.afform-gui.git -cv en afform_gui +git clone https://github.com/FIXME/org.civicrm.afform_admin.git +cv en afform_admin ``` ## Usage diff --git a/ext/afform/gui/afformEntities/Activity.php b/ext/afform/admin/afformEntities/Activity.php similarity index 100% rename from ext/afform/gui/afformEntities/Activity.php rename to ext/afform/admin/afformEntities/Activity.php diff --git a/ext/afform/gui/afformEntities/Household.php b/ext/afform/admin/afformEntities/Household.php similarity index 100% rename from ext/afform/gui/afformEntities/Household.php rename to ext/afform/admin/afformEntities/Household.php diff --git a/ext/afform/gui/afformEntities/Individual.php b/ext/afform/admin/afformEntities/Individual.php similarity index 100% rename from ext/afform/gui/afformEntities/Individual.php rename to ext/afform/admin/afformEntities/Individual.php diff --git a/ext/afform/gui/afformEntities/Organization.php b/ext/afform/admin/afformEntities/Organization.php similarity index 100% rename from ext/afform/gui/afformEntities/Organization.php rename to ext/afform/admin/afformEntities/Organization.php diff --git a/ext/afform/gui/afform_gui.civix.php b/ext/afform/admin/afform_admin.civix.php similarity index 78% rename from ext/afform/gui/afform_gui.civix.php rename to ext/afform/admin/afform_admin.civix.php index b384f42b27..9db46b2caa 100644 --- a/ext/afform/gui/afform_gui.civix.php +++ b/ext/afform/admin/afform_admin.civix.php @@ -6,10 +6,10 @@ * The ExtensionUtil class provides small stubs for accessing resources of this * extension. */ -class CRM_AfformGui_ExtensionUtil { - const SHORT_NAME = "afform_gui"; - const LONG_NAME = "org.civicrm.afform-gui"; - const CLASS_PREFIX = "CRM_AfformGui"; +class CRM_AfformAdmin_ExtensionUtil { + const SHORT_NAME = "afform_admin"; + const LONG_NAME = "org.civicrm.afform_admin"; + const CLASS_PREFIX = "CRM_AfformAdmin"; /** * Translate a string using the extension's domain. @@ -77,14 +77,14 @@ class CRM_AfformGui_ExtensionUtil { } -use CRM_AfformGui_ExtensionUtil as E; +use CRM_AfformAdmin_ExtensionUtil as E; /** * (Delegated) Implements hook_civicrm_config(). * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_config */ -function _afform_gui_civix_civicrm_config(&$config = NULL) { +function _afform_admin_civix_civicrm_config(&$config = NULL) { static $configured = FALSE; if ($configured) { return; @@ -114,8 +114,8 @@ function _afform_gui_civix_civicrm_config(&$config = NULL) { * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_xmlMenu */ -function _afform_gui_civix_civicrm_xmlMenu(&$files) { - foreach (_afform_gui_civix_glob(__DIR__ . '/xml/Menu/*.xml') as $file) { +function _afform_admin_civix_civicrm_xmlMenu(&$files) { + foreach (_afform_admin_civix_glob(__DIR__ . '/xml/Menu/*.xml') as $file) { $files[] = $file; } } @@ -125,9 +125,9 @@ function _afform_gui_civix_civicrm_xmlMenu(&$files) { * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_install */ -function _afform_gui_civix_civicrm_install() { - _afform_gui_civix_civicrm_config(); - if ($upgrader = _afform_gui_civix_upgrader()) { +function _afform_admin_civix_civicrm_install() { + _afform_admin_civix_civicrm_config(); + if ($upgrader = _afform_admin_civix_upgrader()) { $upgrader->onInstall(); } } @@ -137,9 +137,9 @@ function _afform_gui_civix_civicrm_install() { * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_postInstall */ -function _afform_gui_civix_civicrm_postInstall() { - _afform_gui_civix_civicrm_config(); - if ($upgrader = _afform_gui_civix_upgrader()) { +function _afform_admin_civix_civicrm_postInstall() { + _afform_admin_civix_civicrm_config(); + if ($upgrader = _afform_admin_civix_upgrader()) { if (is_callable([$upgrader, 'onPostInstall'])) { $upgrader->onPostInstall(); } @@ -151,9 +151,9 @@ function _afform_gui_civix_civicrm_postInstall() { * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_uninstall */ -function _afform_gui_civix_civicrm_uninstall() { - _afform_gui_civix_civicrm_config(); - if ($upgrader = _afform_gui_civix_upgrader()) { +function _afform_admin_civix_civicrm_uninstall() { + _afform_admin_civix_civicrm_config(); + if ($upgrader = _afform_admin_civix_upgrader()) { $upgrader->onUninstall(); } } @@ -163,9 +163,9 @@ function _afform_gui_civix_civicrm_uninstall() { * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_enable */ -function _afform_gui_civix_civicrm_enable() { - _afform_gui_civix_civicrm_config(); - if ($upgrader = _afform_gui_civix_upgrader()) { +function _afform_admin_civix_civicrm_enable() { + _afform_admin_civix_civicrm_config(); + if ($upgrader = _afform_admin_civix_upgrader()) { if (is_callable([$upgrader, 'onEnable'])) { $upgrader->onEnable(); } @@ -178,9 +178,9 @@ function _afform_gui_civix_civicrm_enable() { * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_disable * @return mixed */ -function _afform_gui_civix_civicrm_disable() { - _afform_gui_civix_civicrm_config(); - if ($upgrader = _afform_gui_civix_upgrader()) { +function _afform_admin_civix_civicrm_disable() { + _afform_admin_civix_civicrm_config(); + if ($upgrader = _afform_admin_civix_upgrader()) { if (is_callable([$upgrader, 'onDisable'])) { $upgrader->onDisable(); } @@ -199,21 +199,21 @@ function _afform_gui_civix_civicrm_disable() { * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_upgrade */ -function _afform_gui_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) { - if ($upgrader = _afform_gui_civix_upgrader()) { +function _afform_admin_civix_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) { + if ($upgrader = _afform_admin_civix_upgrader()) { return $upgrader->onUpgrade($op, $queue); } } /** - * @return CRM_AfformGui_Upgrader + * @return CRM_AfformAdmin_Upgrader */ -function _afform_gui_civix_upgrader() { - if (!file_exists(__DIR__ . '/CRM/AfformGui/Upgrader.php')) { +function _afform_admin_civix_upgrader() { + if (!file_exists(__DIR__ . '/CRM/AfformAdmin/Upgrader.php')) { return NULL; } else { - return CRM_AfformGui_Upgrader_Base::instance(); + return CRM_AfformAdmin_Upgrader_Base::instance(); } } @@ -228,7 +228,7 @@ function _afform_gui_civix_upgrader() { * * @return array */ -function _afform_gui_civix_find_files($dir, $pattern) { +function _afform_admin_civix_find_files($dir, $pattern) { if (is_callable(['CRM_Utils_File', 'findFiles'])) { return CRM_Utils_File::findFiles($dir, $pattern); } @@ -237,7 +237,7 @@ function _afform_gui_civix_find_files($dir, $pattern) { $result = []; while (!empty($todos)) { $subdir = array_shift($todos); - foreach (_afform_gui_civix_glob("$subdir/$pattern") as $match) { + foreach (_afform_admin_civix_glob("$subdir/$pattern") as $match) { if (!is_dir($match)) { $result[] = $match; } @@ -264,8 +264,8 @@ function _afform_gui_civix_find_files($dir, $pattern) { * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_managed */ -function _afform_gui_civix_civicrm_managed(&$entities) { - $mgdFiles = _afform_gui_civix_find_files(__DIR__, '*.mgd.php'); +function _afform_admin_civix_civicrm_managed(&$entities) { + $mgdFiles = _afform_admin_civix_find_files(__DIR__, '*.mgd.php'); sort($mgdFiles); foreach ($mgdFiles as $file) { $es = include $file; @@ -290,12 +290,12 @@ function _afform_gui_civix_civicrm_managed(&$entities) { * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_caseTypes */ -function _afform_gui_civix_civicrm_caseTypes(&$caseTypes) { +function _afform_admin_civix_civicrm_caseTypes(&$caseTypes) { if (!is_dir(__DIR__ . '/xml/case')) { return; } - foreach (_afform_gui_civix_glob(__DIR__ . '/xml/case/*.xml') as $file) { + foreach (_afform_admin_civix_glob(__DIR__ . '/xml/case/*.xml') as $file) { $name = preg_replace('/\.xml$/', '', basename($file)); if ($name != CRM_Case_XMLProcessor::mungeCaseType($name)) { $errorMessage = sprintf("Case-type file name is malformed (%s vs %s)", $name, CRM_Case_XMLProcessor::mungeCaseType($name)); @@ -318,12 +318,12 @@ function _afform_gui_civix_civicrm_caseTypes(&$caseTypes) { * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_angularModules */ -function _afform_gui_civix_civicrm_angularModules(&$angularModules) { +function _afform_admin_civix_civicrm_angularModules(&$angularModules) { if (!is_dir(__DIR__ . '/ang')) { return; } - $files = _afform_gui_civix_glob(__DIR__ . '/ang/*.ang.php'); + $files = _afform_admin_civix_glob(__DIR__ . '/ang/*.ang.php'); foreach ($files as $file) { $name = preg_replace(':\.ang\.php$:', '', basename($file)); $module = include $file; @@ -339,8 +339,8 @@ function _afform_gui_civix_civicrm_angularModules(&$angularModules) { * * Find any and return any files matching "*.theme.php" */ -function _afform_gui_civix_civicrm_themes(&$themes) { - $files = _afform_gui_civix_glob(__DIR__ . '/*.theme.php'); +function _afform_admin_civix_civicrm_themes(&$themes) { + $files = _afform_admin_civix_glob(__DIR__ . '/*.theme.php'); foreach ($files as $file) { $themeMeta = include $file; if (empty($themeMeta['name'])) { @@ -366,7 +366,7 @@ function _afform_gui_civix_civicrm_themes(&$themes) { * * @return array */ -function _afform_gui_civix_glob($pattern) { +function _afform_admin_civix_glob($pattern) { $result = glob($pattern); return is_array($result) ? $result : []; } @@ -382,7 +382,7 @@ function _afform_gui_civix_glob($pattern) { * * @return bool */ -function _afform_gui_civix_insert_navigation_menu(&$menu, $path, $item) { +function _afform_admin_civix_insert_navigation_menu(&$menu, $path, $item) { // If we are done going down the path, insert menu if (empty($path)) { $menu[] = [ @@ -403,7 +403,7 @@ function _afform_gui_civix_insert_navigation_menu(&$menu, $path, $item) { if (!isset($entry['child'])) { $entry['child'] = []; } - $found = _afform_gui_civix_insert_navigation_menu($entry['child'], implode('/', $path), $item); + $found = _afform_admin_civix_insert_navigation_menu($entry['child'], implode('/', $path), $item); } } return $found; @@ -413,9 +413,9 @@ function _afform_gui_civix_insert_navigation_menu(&$menu, $path, $item) { /** * (Delegated) Implements hook_civicrm_navigationMenu(). */ -function _afform_gui_civix_navigationMenu(&$nodes) { +function _afform_admin_civix_navigationMenu(&$nodes) { if (!is_callable(['CRM_Core_BAO_Navigation', 'fixNavigationMenu'])) { - _afform_gui_civix_fixNavigationMenu($nodes); + _afform_admin_civix_fixNavigationMenu($nodes); } } @@ -423,17 +423,17 @@ function _afform_gui_civix_navigationMenu(&$nodes) { * Given a navigation menu, generate navIDs for any items which are * missing them. */ -function _afform_gui_civix_fixNavigationMenu(&$nodes) { +function _afform_admin_civix_fixNavigationMenu(&$nodes) { $maxNavID = 1; array_walk_recursive($nodes, function($item, $key) use (&$maxNavID) { if ($key === 'navID') { $maxNavID = max($maxNavID, $item); } }); - _afform_gui_civix_fixNavigationMenuItems($nodes, $maxNavID, NULL); + _afform_admin_civix_fixNavigationMenuItems($nodes, $maxNavID, NULL); } -function _afform_gui_civix_fixNavigationMenuItems(&$nodes, &$maxNavID, $parentID) { +function _afform_admin_civix_fixNavigationMenuItems(&$nodes, &$maxNavID, $parentID) { $origKeys = array_keys($nodes); foreach ($origKeys as $origKey) { if (!isset($nodes[$origKey]['attributes']['parentID']) && $parentID !== NULL) { @@ -448,7 +448,7 @@ function _afform_gui_civix_fixNavigationMenuItems(&$nodes, &$maxNavID, $parentID $origKey = $newKey; } if (isset($nodes[$origKey]['child']) && is_array($nodes[$origKey]['child'])) { - _afform_gui_civix_fixNavigationMenuItems($nodes[$origKey]['child'], $maxNavID, $nodes[$origKey]['attributes']['navID']); + _afform_admin_civix_fixNavigationMenuItems($nodes[$origKey]['child'], $maxNavID, $nodes[$origKey]['attributes']['navID']); } } } @@ -458,7 +458,7 @@ function _afform_gui_civix_fixNavigationMenuItems(&$nodes, &$maxNavID, $parentID * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_alterSettingsFolders */ -function _afform_gui_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) { +function _afform_admin_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) { $settingsDir = __DIR__ . DIRECTORY_SEPARATOR . 'settings'; if (!in_array($settingsDir, $metaDataFolders) && is_dir($settingsDir)) { $metaDataFolders[] = $settingsDir; @@ -472,6 +472,6 @@ function _afform_gui_civix_civicrm_alterSettingsFolders(&$metaDataFolders = NULL * * @link https://docs.civicrm.org/dev/en/latest/hooks/hook_civicrm_entityTypes */ -function _afform_gui_civix_civicrm_entityTypes(&$entityTypes) { +function _afform_admin_civix_civicrm_entityTypes(&$entityTypes) { $entityTypes = array_merge($entityTypes, []); } diff --git a/ext/afform/gui/afform_gui.php b/ext/afform/admin/afform_admin.php similarity index 82% rename from ext/afform/gui/afform_gui.php rename to ext/afform/admin/afform_admin.php index 4a10bf342b..fc8c068ba4 100644 --- a/ext/afform/gui/afform_gui.php +++ b/ext/afform/admin/afform_admin.php @@ -1,15 +1,15 @@ get('afModule') == 'afGuiAdmin') { Civi::resources()->addScriptUrl(Civi::service('asset_builder')->getUrl('af-gui-vars.js')); } @@ -157,7 +157,7 @@ function afform_gui_civicrm_pageRun(&$page) { * * FIXME: This is a prototype and should get broken out into separate callbacks with hooks, events, etc. */ -function afform_gui_civicrm_buildAsset($asset, $params, &$mimeType, &$content) { +function afform_admin_civicrm_buildAsset($asset, $params, &$mimeType, &$content) { if ($asset !== 'af-gui-vars.js') { return; } diff --git a/ext/afform/gui/ang/afGuiAdmin.aff.html b/ext/afform/admin/ang/afGuiAdmin.aff.html similarity index 100% rename from ext/afform/gui/ang/afGuiAdmin.aff.html rename to ext/afform/admin/ang/afGuiAdmin.aff.html diff --git a/ext/afform/gui/ang/afGuiAdmin.aff.json b/ext/afform/admin/ang/afGuiAdmin.aff.json similarity index 100% rename from ext/afform/gui/ang/afGuiAdmin.aff.json rename to ext/afform/admin/ang/afGuiAdmin.aff.json diff --git a/ext/afform/gui/ang/afGuiEditor.ang.php b/ext/afform/admin/ang/afGuiEditor.ang.php similarity index 100% rename from ext/afform/gui/ang/afGuiEditor.ang.php rename to ext/afform/admin/ang/afGuiEditor.ang.php diff --git a/ext/afform/gui/ang/afGuiEditor.css b/ext/afform/admin/ang/afGuiEditor.css similarity index 100% rename from ext/afform/gui/ang/afGuiEditor.css rename to ext/afform/admin/ang/afGuiEditor.css diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/admin/ang/afGuiEditor.js similarity index 100% rename from ext/afform/gui/ang/afGuiEditor.js rename to ext/afform/admin/ang/afGuiEditor.js diff --git a/ext/afform/gui/ang/afGuiEditor/button-menu.html b/ext/afform/admin/ang/afGuiEditor/button-menu.html similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/button-menu.html rename to ext/afform/admin/ang/afGuiEditor/button-menu.html diff --git a/ext/afform/gui/ang/afGuiEditor/button.html b/ext/afform/admin/ang/afGuiEditor/button.html similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/button.html rename to ext/afform/admin/ang/afGuiEditor/button.html diff --git a/ext/afform/gui/ang/afGuiEditor/canvas.html b/ext/afform/admin/ang/afGuiEditor/canvas.html similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/canvas.html rename to ext/afform/admin/ang/afGuiEditor/canvas.html diff --git a/ext/afform/gui/ang/afGuiEditor/config-form.html b/ext/afform/admin/ang/afGuiEditor/config-form.html similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/config-form.html rename to ext/afform/admin/ang/afGuiEditor/config-form.html diff --git a/ext/afform/gui/ang/afGuiEditor/container-menu.html b/ext/afform/admin/ang/afGuiEditor/container-menu.html similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/container-menu.html rename to ext/afform/admin/ang/afGuiEditor/container-menu.html diff --git a/ext/afform/gui/ang/afGuiEditor/container.html b/ext/afform/admin/ang/afGuiEditor/container.html similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/container.html rename to ext/afform/admin/ang/afGuiEditor/container.html diff --git a/ext/afform/gui/ang/afGuiEditor/editOptions.html b/ext/afform/admin/ang/afGuiEditor/editOptions.html similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/editOptions.html rename to ext/afform/admin/ang/afGuiEditor/editOptions.html diff --git a/ext/afform/gui/ang/afGuiEditor/entity.html b/ext/afform/admin/ang/afGuiEditor/entity.html similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/entity.html rename to ext/afform/admin/ang/afGuiEditor/entity.html diff --git a/ext/afform/gui/ang/afGuiEditor/entityConfig/Activity.html b/ext/afform/admin/ang/afGuiEditor/entityConfig/Activity.html similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/entityConfig/Activity.html rename to ext/afform/admin/ang/afGuiEditor/entityConfig/Activity.html diff --git a/ext/afform/gui/ang/afGuiEditor/entityConfig/Contact.html b/ext/afform/admin/ang/afGuiEditor/entityConfig/Contact.html similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/entityConfig/Contact.html rename to ext/afform/admin/ang/afGuiEditor/entityConfig/Contact.html diff --git a/ext/afform/gui/ang/afGuiEditor/entityConfig/Generic.html b/ext/afform/admin/ang/afGuiEditor/entityConfig/Generic.html similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/entityConfig/Generic.html rename to ext/afform/admin/ang/afGuiEditor/entityConfig/Generic.html diff --git a/ext/afform/gui/ang/afGuiEditor/entityDefaults/Activity.json b/ext/afform/admin/ang/afGuiEditor/entityDefaults/Activity.json similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/entityDefaults/Activity.json rename to ext/afform/admin/ang/afGuiEditor/entityDefaults/Activity.json diff --git a/ext/afform/gui/ang/afGuiEditor/entityDefaults/Contact.json b/ext/afform/admin/ang/afGuiEditor/entityDefaults/Contact.json similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/entityDefaults/Contact.json rename to ext/afform/admin/ang/afGuiEditor/entityDefaults/Contact.json diff --git a/ext/afform/gui/ang/afGuiEditor/field-menu.html b/ext/afform/admin/ang/afGuiEditor/field-menu.html similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/field-menu.html rename to ext/afform/admin/ang/afGuiEditor/field-menu.html diff --git a/ext/afform/gui/ang/afGuiEditor/field.html b/ext/afform/admin/ang/afGuiEditor/field.html similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/field.html rename to ext/afform/admin/ang/afGuiEditor/field.html diff --git a/ext/afform/gui/ang/afGuiEditor/inputType/ChainSelect.html b/ext/afform/admin/ang/afGuiEditor/inputType/ChainSelect.html similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/inputType/ChainSelect.html rename to ext/afform/admin/ang/afGuiEditor/inputType/ChainSelect.html diff --git a/ext/afform/gui/ang/afGuiEditor/inputType/CheckBox.html b/ext/afform/admin/ang/afGuiEditor/inputType/CheckBox.html similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/inputType/CheckBox.html rename to ext/afform/admin/ang/afGuiEditor/inputType/CheckBox.html diff --git a/ext/afform/gui/ang/afGuiEditor/inputType/Date.html b/ext/afform/admin/ang/afGuiEditor/inputType/Date.html similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/inputType/Date.html rename to ext/afform/admin/ang/afGuiEditor/inputType/Date.html diff --git a/ext/afform/gui/ang/afGuiEditor/inputType/Number.html b/ext/afform/admin/ang/afGuiEditor/inputType/Number.html similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/inputType/Number.html rename to ext/afform/admin/ang/afGuiEditor/inputType/Number.html diff --git a/ext/afform/gui/ang/afGuiEditor/inputType/Radio.html b/ext/afform/admin/ang/afGuiEditor/inputType/Radio.html similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/inputType/Radio.html rename to ext/afform/admin/ang/afGuiEditor/inputType/Radio.html diff --git a/ext/afform/gui/ang/afGuiEditor/inputType/RichTextEditor.html b/ext/afform/admin/ang/afGuiEditor/inputType/RichTextEditor.html similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/inputType/RichTextEditor.html rename to ext/afform/admin/ang/afGuiEditor/inputType/RichTextEditor.html diff --git a/ext/afform/gui/ang/afGuiEditor/inputType/Select.html b/ext/afform/admin/ang/afGuiEditor/inputType/Select.html similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/inputType/Select.html rename to ext/afform/admin/ang/afGuiEditor/inputType/Select.html diff --git a/ext/afform/gui/ang/afGuiEditor/inputType/Text.html b/ext/afform/admin/ang/afGuiEditor/inputType/Text.html similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/inputType/Text.html rename to ext/afform/admin/ang/afGuiEditor/inputType/Text.html diff --git a/ext/afform/gui/ang/afGuiEditor/inputType/TextArea.html b/ext/afform/admin/ang/afGuiEditor/inputType/TextArea.html similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/inputType/TextArea.html rename to ext/afform/admin/ang/afGuiEditor/inputType/TextArea.html diff --git a/ext/afform/gui/ang/afGuiEditor/main.html b/ext/afform/admin/ang/afGuiEditor/main.html similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/main.html rename to ext/afform/admin/ang/afGuiEditor/main.html diff --git a/ext/afform/gui/ang/afGuiEditor/markup-menu.html b/ext/afform/admin/ang/afGuiEditor/markup-menu.html similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/markup-menu.html rename to ext/afform/admin/ang/afGuiEditor/markup-menu.html diff --git a/ext/afform/gui/ang/afGuiEditor/markup.html b/ext/afform/admin/ang/afGuiEditor/markup.html similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/markup.html rename to ext/afform/admin/ang/afGuiEditor/markup.html diff --git a/ext/afform/gui/ang/afGuiEditor/menu-item-background.html b/ext/afform/admin/ang/afGuiEditor/menu-item-background.html similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/menu-item-background.html rename to ext/afform/admin/ang/afGuiEditor/menu-item-background.html diff --git a/ext/afform/gui/ang/afGuiEditor/menu-item-border.html b/ext/afform/admin/ang/afGuiEditor/menu-item-border.html similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/menu-item-border.html rename to ext/afform/admin/ang/afGuiEditor/menu-item-border.html diff --git a/ext/afform/gui/ang/afGuiEditor/palette.html b/ext/afform/admin/ang/afGuiEditor/palette.html similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/palette.html rename to ext/afform/admin/ang/afGuiEditor/palette.html diff --git a/ext/afform/gui/ang/afGuiEditor/saveBlock.html b/ext/afform/admin/ang/afGuiEditor/saveBlock.html similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/saveBlock.html rename to ext/afform/admin/ang/afGuiEditor/saveBlock.html diff --git a/ext/afform/gui/ang/afGuiEditor/text-menu.html b/ext/afform/admin/ang/afGuiEditor/text-menu.html similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/text-menu.html rename to ext/afform/admin/ang/afGuiEditor/text-menu.html diff --git a/ext/afform/gui/ang/afGuiEditor/text.html b/ext/afform/admin/ang/afGuiEditor/text.html similarity index 100% rename from ext/afform/gui/ang/afGuiEditor/text.html rename to ext/afform/admin/ang/afGuiEditor/text.html diff --git a/ext/afform/gui/ang/afGuiList.aff.html b/ext/afform/admin/ang/afGuiList.aff.html similarity index 100% rename from ext/afform/gui/ang/afGuiList.aff.html rename to ext/afform/admin/ang/afGuiList.aff.html diff --git a/ext/afform/gui/images/icons.png b/ext/afform/admin/images/icons.png similarity index 100% rename from ext/afform/gui/images/icons.png rename to ext/afform/admin/images/icons.png diff --git a/ext/afform/gui/images/number.png b/ext/afform/admin/images/number.png similarity index 100% rename from ext/afform/gui/images/number.png rename to ext/afform/admin/images/number.png diff --git a/ext/afform/gui/info.xml b/ext/afform/admin/info.xml similarity index 77% rename from ext/afform/gui/info.xml rename to ext/afform/admin/info.xml index b03aca593e..17a4f7101a 100644 --- a/ext/afform/gui/info.xml +++ b/ext/afform/admin/info.xml @@ -1,6 +1,6 @@ - - afform_gui + + afform_admin Afform: Form Builder GUI for designing forms AGPL-3.0 @@ -20,12 +20,11 @@ 5.23 - Drag-n-drop form builder for CiviCRM Afforms. + Administer, edit and compose CiviCRM Afforms. org.civicrm.afform - org.civicrm.api4 - CRM/AfformGui + CRM/AfformAdmin diff --git a/ext/afform/gui/templates/CRM/AfformGui/afformBuilder.hlp b/ext/afform/admin/templates/CRM/AfformAdmin/afformBuilder.hlp similarity index 100% rename from ext/afform/gui/templates/CRM/AfformGui/afformBuilder.hlp rename to ext/afform/admin/templates/CRM/AfformAdmin/afformBuilder.hlp diff --git a/ext/afform/gui/templates/CRM/AfformGui/afformList.hlp b/ext/afform/admin/templates/CRM/AfformAdmin/afformList.hlp similarity index 100% rename from ext/afform/gui/templates/CRM/AfformGui/afformList.hlp rename to ext/afform/admin/templates/CRM/AfformAdmin/afformList.hlp diff --git a/extension-compatibility.json b/extension-compatibility.json index 2424792ee3..be6cfe2653 100644 --- a/extension-compatibility.json +++ b/extension-compatibility.json @@ -1,4 +1,8 @@ { + "org.civicrm.afform-gui": { + "obsolete": "5.35", + "force-uninstall": true + }, "com.civibridge.quickmenu": { "obsolete": "5.24", "disable": true, -- 2.25.1