Rename afform_gui -> afform_admin
authorColeman Watts <coleman@civicrm.org>
Wed, 6 Jan 2021 17:02:37 +0000 (12:02 -0500)
committerColeman Watts <coleman@civicrm.org>
Mon, 11 Jan 2021 14:49:06 +0000 (09:49 -0500)
55 files changed:
ext/afform/admin/CRM/AfformAdmin/Upgrader.php [moved from ext/afform/gui/CRM/AfformGui/Upgrader.php with 85% similarity]
ext/afform/admin/CRM/AfformAdmin/Upgrader/Base.php [moved from ext/afform/gui/CRM/AfformGui/Upgrader/Base.php with 96% similarity]
ext/afform/admin/LICENSE.txt [moved from ext/afform/gui/LICENSE.txt with 99% similarity]
ext/afform/admin/README.md [moved from ext/afform/gui/README.md with 81% similarity]
ext/afform/admin/afformEntities/Activity.php [moved from ext/afform/gui/afformEntities/Activity.php with 100% similarity]
ext/afform/admin/afformEntities/Household.php [moved from ext/afform/gui/afformEntities/Household.php with 100% similarity]
ext/afform/admin/afformEntities/Individual.php [moved from ext/afform/gui/afformEntities/Individual.php with 100% similarity]
ext/afform/admin/afformEntities/Organization.php [moved from ext/afform/gui/afformEntities/Organization.php with 100% similarity]
ext/afform/admin/afform_admin.civix.php [moved from ext/afform/gui/afform_gui.civix.php with 78% similarity]
ext/afform/admin/afform_admin.php [moved from ext/afform/gui/afform_gui.php with 82% similarity]
ext/afform/admin/ang/afGuiAdmin.aff.html [moved from ext/afform/gui/ang/afGuiAdmin.aff.html with 100% similarity]
ext/afform/admin/ang/afGuiAdmin.aff.json [moved from ext/afform/gui/ang/afGuiAdmin.aff.json with 100% similarity]
ext/afform/admin/ang/afGuiEditor.ang.php [moved from ext/afform/gui/ang/afGuiEditor.ang.php with 100% similarity]
ext/afform/admin/ang/afGuiEditor.css [moved from ext/afform/gui/ang/afGuiEditor.css with 100% similarity]
ext/afform/admin/ang/afGuiEditor.js [moved from ext/afform/gui/ang/afGuiEditor.js with 100% similarity]
ext/afform/admin/ang/afGuiEditor/button-menu.html [moved from ext/afform/gui/ang/afGuiEditor/button-menu.html with 100% similarity]
ext/afform/admin/ang/afGuiEditor/button.html [moved from ext/afform/gui/ang/afGuiEditor/button.html with 100% similarity]
ext/afform/admin/ang/afGuiEditor/canvas.html [moved from ext/afform/gui/ang/afGuiEditor/canvas.html with 100% similarity]
ext/afform/admin/ang/afGuiEditor/config-form.html [moved from ext/afform/gui/ang/afGuiEditor/config-form.html with 100% similarity]
ext/afform/admin/ang/afGuiEditor/container-menu.html [moved from ext/afform/gui/ang/afGuiEditor/container-menu.html with 100% similarity]
ext/afform/admin/ang/afGuiEditor/container.html [moved from ext/afform/gui/ang/afGuiEditor/container.html with 100% similarity]
ext/afform/admin/ang/afGuiEditor/editOptions.html [moved from ext/afform/gui/ang/afGuiEditor/editOptions.html with 100% similarity]
ext/afform/admin/ang/afGuiEditor/entity.html [moved from ext/afform/gui/ang/afGuiEditor/entity.html with 100% similarity]
ext/afform/admin/ang/afGuiEditor/entityConfig/Activity.html [moved from ext/afform/gui/ang/afGuiEditor/entityConfig/Activity.html with 100% similarity]
ext/afform/admin/ang/afGuiEditor/entityConfig/Contact.html [moved from ext/afform/gui/ang/afGuiEditor/entityConfig/Contact.html with 100% similarity]
ext/afform/admin/ang/afGuiEditor/entityConfig/Generic.html [moved from ext/afform/gui/ang/afGuiEditor/entityConfig/Generic.html with 100% similarity]
ext/afform/admin/ang/afGuiEditor/entityDefaults/Activity.json [moved from ext/afform/gui/ang/afGuiEditor/entityDefaults/Activity.json with 100% similarity]
ext/afform/admin/ang/afGuiEditor/entityDefaults/Contact.json [moved from ext/afform/gui/ang/afGuiEditor/entityDefaults/Contact.json with 100% similarity]
ext/afform/admin/ang/afGuiEditor/field-menu.html [moved from ext/afform/gui/ang/afGuiEditor/field-menu.html with 100% similarity]
ext/afform/admin/ang/afGuiEditor/field.html [moved from ext/afform/gui/ang/afGuiEditor/field.html with 100% similarity]
ext/afform/admin/ang/afGuiEditor/inputType/ChainSelect.html [moved from ext/afform/gui/ang/afGuiEditor/inputType/ChainSelect.html with 100% similarity]
ext/afform/admin/ang/afGuiEditor/inputType/CheckBox.html [moved from ext/afform/gui/ang/afGuiEditor/inputType/CheckBox.html with 100% similarity]
ext/afform/admin/ang/afGuiEditor/inputType/Date.html [moved from ext/afform/gui/ang/afGuiEditor/inputType/Date.html with 100% similarity]
ext/afform/admin/ang/afGuiEditor/inputType/Number.html [moved from ext/afform/gui/ang/afGuiEditor/inputType/Number.html with 100% similarity]
ext/afform/admin/ang/afGuiEditor/inputType/Radio.html [moved from ext/afform/gui/ang/afGuiEditor/inputType/Radio.html with 100% similarity]
ext/afform/admin/ang/afGuiEditor/inputType/RichTextEditor.html [moved from ext/afform/gui/ang/afGuiEditor/inputType/RichTextEditor.html with 100% similarity]
ext/afform/admin/ang/afGuiEditor/inputType/Select.html [moved from ext/afform/gui/ang/afGuiEditor/inputType/Select.html with 100% similarity]
ext/afform/admin/ang/afGuiEditor/inputType/Text.html [moved from ext/afform/gui/ang/afGuiEditor/inputType/Text.html with 100% similarity]
ext/afform/admin/ang/afGuiEditor/inputType/TextArea.html [moved from ext/afform/gui/ang/afGuiEditor/inputType/TextArea.html with 100% similarity]
ext/afform/admin/ang/afGuiEditor/main.html [moved from ext/afform/gui/ang/afGuiEditor/main.html with 100% similarity]
ext/afform/admin/ang/afGuiEditor/markup-menu.html [moved from ext/afform/gui/ang/afGuiEditor/markup-menu.html with 100% similarity]
ext/afform/admin/ang/afGuiEditor/markup.html [moved from ext/afform/gui/ang/afGuiEditor/markup.html with 100% similarity]
ext/afform/admin/ang/afGuiEditor/menu-item-background.html [moved from ext/afform/gui/ang/afGuiEditor/menu-item-background.html with 100% similarity]
ext/afform/admin/ang/afGuiEditor/menu-item-border.html [moved from ext/afform/gui/ang/afGuiEditor/menu-item-border.html with 100% similarity]
ext/afform/admin/ang/afGuiEditor/palette.html [moved from ext/afform/gui/ang/afGuiEditor/palette.html with 100% similarity]
ext/afform/admin/ang/afGuiEditor/saveBlock.html [moved from ext/afform/gui/ang/afGuiEditor/saveBlock.html with 100% similarity]
ext/afform/admin/ang/afGuiEditor/text-menu.html [moved from ext/afform/gui/ang/afGuiEditor/text-menu.html with 100% similarity]
ext/afform/admin/ang/afGuiEditor/text.html [moved from ext/afform/gui/ang/afGuiEditor/text.html with 100% similarity]
ext/afform/admin/ang/afGuiList.aff.html [moved from ext/afform/gui/ang/afGuiList.aff.html with 100% similarity]
ext/afform/admin/images/icons.png [moved from ext/afform/gui/images/icons.png with 100% similarity]
ext/afform/admin/images/number.png [moved from ext/afform/gui/images/number.png with 100% similarity]
ext/afform/admin/info.xml [moved from ext/afform/gui/info.xml with 77% similarity]
ext/afform/admin/templates/CRM/AfformAdmin/afformBuilder.hlp [moved from ext/afform/gui/templates/CRM/AfformGui/afformBuilder.hlp with 100% similarity]
ext/afform/admin/templates/CRM/AfformAdmin/afformList.hlp [moved from ext/afform/gui/templates/CRM/AfformGui/afformList.hlp with 100% similarity]
extension-compatibility.json

similarity index 85%
rename from ext/afform/gui/CRM/AfformGui/Upgrader.php
rename to ext/afform/admin/CRM/AfformAdmin/Upgrader.php
index 6b6871c9526a160bbcfa1428c700c972d18d7c86..6463310ed88535e13eebeca6e2b3f11acd8aeffa 100644 (file)
@@ -1,10 +1,10 @@
 <?php
-use CRM_AfformGui_ExtensionUtil as E;
+use CRM_AfformAdmin_ExtensionUtil as E;
 
 /**
  * Collection of upgrade steps.
  */
-class CRM_AfformGui_Upgrader extends CRM_AfformGui_Upgrader_Base {
+class CRM_AfformAdmin_Upgrader extends CRM_AfformAdmin_Upgrader_Base {
 
   // By convention, functions that look like "function upgrade_NNNN()" are
   // upgrade tasks. They are executed in order (like Drupal's hook_update_N).
@@ -12,7 +12,7 @@ class CRM_AfformGui_Upgrader extends CRM_AfformGui_Upgrader_Base {
   /**
    * Setup navigation item on new installs.
    *
-   * Note: this path is not in the menu.xml because it is handled by afform
+   * Note: this path is not in the menu.xml because routing is handled by afform
    */
   public function install() {
     try {
similarity index 96%
rename from ext/afform/gui/CRM/AfformGui/Upgrader/Base.php
rename to ext/afform/admin/CRM/AfformAdmin/Upgrader/Base.php
index d9632679d7a5c48abc0d55de9985a9f2379f3cde..0e582fabb2bf325ca1319c9f3a0c0604b596a0a8 100644 (file)
@@ -1,15 +1,15 @@
 <?php
 
 // AUTO-GENERATED FILE -- Civix may overwrite any changes made to this file
-use CRM_AfformGui_ExtensionUtil as E;
+use CRM_AfformAdmin_ExtensionUtil as E;
 
 /**
  * Base class which provides helpers to execute upgrade logic
  */
-class CRM_AfformGui_Upgrader_Base {
+class CRM_AfformAdmin_Upgrader_Base {
 
   /**
-   * @var CRM_AfformGui_Upgrader_Base
+   * @var CRM_AfformAdmin_Upgrader_Base
    */
   public static $instance;
 
@@ -48,8 +48,8 @@ class CRM_AfformGui_Upgrader_Base {
   public static function instance() {
     if (!self::$instance) {
       // FIXME auto-generate
-      self::$instance = new CRM_AfformGui_Upgrader(
-        'org.civicrm.afform-gui',
+      self::$instance = new CRM_AfformAdmin_Upgrader(
+        'org.civicrm.afform_admin',
         realpath(__DIR__ . '/../../../')
       );
     }
@@ -63,7 +63,7 @@ class CRM_AfformGui_Upgrader_Base {
    * task-context; otherwise, this will be non-reentrant.
    *
    * ```
-   * CRM_AfformGui_Upgrader_Base::_queueAdapter($ctx, 'methodName', 'arg1', 'arg2');
+   * CRM_AfformAdmin_Upgrader_Base::_queueAdapter($ctx, 'methodName', 'arg1', 'arg2');
    * ```
    */
   public static function _queueAdapter() {
@@ -76,7 +76,7 @@ class CRM_AfformGui_Upgrader_Base {
   }
 
   /**
-   * CRM_AfformGui_Upgrader_Base constructor.
+   * CRM_AfformAdmin_Upgrader_Base constructor.
    *
    * @param $extensionName
    * @param $extensionDir
similarity index 99%
rename from ext/afform/gui/LICENSE.txt
rename to ext/afform/admin/LICENSE.txt
index 5d5da2f23320b9eefff57857e0526c2d24765f08..39651c9328b5eeea0d01dce373c635747ae8d423 100644 (file)
@@ -1,4 +1,4 @@
-Package: org.civicrm.afform-gui
+Package: org.civicrm.afform_admin
 Copyright (C) 2019, Tim Otten <totten@civicrm.org>
 Licensed under the GNU Affero Public License 3.0 (below).
 
similarity index 81%
rename from ext/afform/gui/README.md
rename to ext/afform/admin/README.md
index c1682405df662640ffd6d3860ec92d41a4763e1a..c26bdcca88e49fba66a8ca3075d13daee5d79e35 100644 (file)
@@ -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 <extension-dir>
-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
similarity index 78%
rename from ext/afform/gui/afform_gui.civix.php
rename to ext/afform/admin/afform_admin.civix.php
index b384f42b276ce31c6760cec925d1ccb4e5d65afb..9db46b2caab539d6d0a53773d953166c6631cd73 100644 (file)
@@ -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, []);
 }
similarity index 82%
rename from ext/afform/gui/afform_gui.php
rename to ext/afform/admin/afform_admin.php
index 4a10bf342b4afd7ebf9dc502858d2c81162671de..fc8c068ba42dbb07936ecc84b92c7a8d0eb89eb1 100644 (file)
@@ -1,15 +1,15 @@
 <?php
 
-require_once 'afform_gui.civix.php';
-use CRM_AfformGui_ExtensionUtil as E;
+require_once 'afform_admin.civix.php';
+use CRM_AfformAdmin_ExtensionUtil as E;
 
 /**
  * Implements hook_civicrm_config().
  *
  * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_config
  */
-function afform_gui_civicrm_config(&$config) {
-  _afform_gui_civix_civicrm_config($config);
+function afform_admin_civicrm_config(&$config) {
+  _afform_admin_civix_civicrm_config($config);
 }
 
 /**
@@ -17,8 +17,8 @@ function afform_gui_civicrm_config(&$config) {
  *
  * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_xmlMenu
  */
-function afform_gui_civicrm_xmlMenu(&$files) {
-  _afform_gui_civix_civicrm_xmlMenu($files);
+function afform_admin_civicrm_xmlMenu(&$files) {
+  _afform_admin_civix_civicrm_xmlMenu($files);
 }
 
 /**
@@ -26,8 +26,8 @@ function afform_gui_civicrm_xmlMenu(&$files) {
  *
  * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_install
  */
-function afform_gui_civicrm_install() {
-  _afform_gui_civix_civicrm_install();
+function afform_admin_civicrm_install() {
+  _afform_admin_civix_civicrm_install();
 }
 
 /**
@@ -35,8 +35,8 @@ function afform_gui_civicrm_install() {
  *
  * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_postInstall
  */
-function afform_gui_civicrm_postInstall() {
-  _afform_gui_civix_civicrm_postInstall();
+function afform_admin_civicrm_postInstall() {
+  _afform_admin_civix_civicrm_postInstall();
 }
 
 /**
@@ -44,8 +44,8 @@ function afform_gui_civicrm_postInstall() {
  *
  * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_uninstall
  */
-function afform_gui_civicrm_uninstall() {
-  _afform_gui_civix_civicrm_uninstall();
+function afform_admin_civicrm_uninstall() {
+  _afform_admin_civix_civicrm_uninstall();
 }
 
 /**
@@ -53,8 +53,8 @@ function afform_gui_civicrm_uninstall() {
  *
  * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_enable
  */
-function afform_gui_civicrm_enable() {
-  _afform_gui_civix_civicrm_enable();
+function afform_admin_civicrm_enable() {
+  _afform_admin_civix_civicrm_enable();
 }
 
 /**
@@ -62,8 +62,8 @@ function afform_gui_civicrm_enable() {
  *
  * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_disable
  */
-function afform_gui_civicrm_disable() {
-  _afform_gui_civix_civicrm_disable();
+function afform_admin_civicrm_disable() {
+  _afform_admin_civix_civicrm_disable();
 }
 
 /**
@@ -71,8 +71,8 @@ function afform_gui_civicrm_disable() {
  *
  * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_upgrade
  */
-function afform_gui_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
-  return _afform_gui_civix_civicrm_upgrade($op, $queue);
+function afform_admin_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
+  return _afform_admin_civix_civicrm_upgrade($op, $queue);
 }
 
 /**
@@ -83,8 +83,8 @@ function afform_gui_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
  *
  * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_managed
  */
-function afform_gui_civicrm_managed(&$entities) {
-  _afform_gui_civix_civicrm_managed($entities);
+function afform_admin_civicrm_managed(&$entities) {
+  _afform_admin_civix_civicrm_managed($entities);
 }
 
 /**
@@ -96,8 +96,8 @@ function afform_gui_civicrm_managed(&$entities) {
  *
  * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_caseTypes
  */
-function afform_gui_civicrm_caseTypes(&$caseTypes) {
-  _afform_gui_civix_civicrm_caseTypes($caseTypes);
+function afform_admin_civicrm_caseTypes(&$caseTypes) {
+  _afform_admin_civix_civicrm_caseTypes($caseTypes);
 }
 
 /**
@@ -110,8 +110,8 @@ function afform_gui_civicrm_caseTypes(&$caseTypes) {
  *
  * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_angularModules
  */
-function afform_gui_civicrm_angularModules(&$angularModules) {
-  _afform_gui_civix_civicrm_angularModules($angularModules);
+function afform_admin_civicrm_angularModules(&$angularModules) {
+  _afform_admin_civix_civicrm_angularModules($angularModules);
 }
 
 /**
@@ -119,8 +119,8 @@ function afform_gui_civicrm_angularModules(&$angularModules) {
  *
  * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_alterSettingsFolders
  */
-function afform_gui_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
-  _afform_gui_civix_civicrm_alterSettingsFolders($metaDataFolders);
+function afform_admin_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
+  _afform_admin_civix_civicrm_alterSettingsFolders($metaDataFolders);
 }
 
 /**
@@ -130,21 +130,21 @@ function afform_gui_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
  *
  * @link http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_entityTypes
  */
-function afform_gui_civicrm_entityTypes(&$entityTypes) {
-  _afform_gui_civix_civicrm_entityTypes($entityTypes);
+function afform_admin_civicrm_entityTypes(&$entityTypes) {
+  _afform_admin_civix_civicrm_entityTypes($entityTypes);
 }
 
 /**
  * Implements hook_civicrm_themes().
  */
-function afform_gui_civicrm_themes(&$themes) {
-  _afform_gui_civix_civicrm_themes($themes);
+function afform_admin_civicrm_themes(&$themes) {
+  _afform_admin_civix_civicrm_themes($themes);
 }
 
 /**
  * Implements hook_civicrm_pageRun().
  */
-function afform_gui_civicrm_pageRun(&$page) {
+function afform_admin_civicrm_pageRun(&$page) {
   if (get_class($page) == 'CRM_Afform_Page_AfformBase' && $page->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;
   }
similarity index 77%
rename from ext/afform/gui/info.xml
rename to ext/afform/admin/info.xml
index b03aca593ef88ea8d332e805af12abf66b1bf29b..17a4f7101acf7537145d415c875e9d27a39fbbf4 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<extension key="org.civicrm.afform-gui" type="module">
-  <file>afform_gui</file>
+<extension key="org.civicrm.afform_admin" type="module">
+  <file>afform_admin</file>
   <name>Afform: Form Builder</name>
   <description>GUI for designing forms</description>
   <license>AGPL-3.0</license>
   <compatibility>
     <ver>5.23</ver>
   </compatibility>
-  <comments>Drag-n-drop form builder for CiviCRM Afforms.</comments>
+  <comments>Administer, edit and compose CiviCRM Afforms.</comments>
   <requires>
     <ext>org.civicrm.afform</ext>
-    <ext>org.civicrm.api4</ext>
   </requires>
   <civix>
-    <namespace>CRM/AfformGui</namespace>
+    <namespace>CRM/AfformAdmin</namespace>
   </civix>
 </extension>
index 2424792ee3ee8bb083bc16d926bea830d284b4a6..be6cfe2653665dd92a1994c1c09cbc7f1fff6f45 100644 (file)
@@ -1,4 +1,8 @@
 {
+  "org.civicrm.afform-gui": {
+    "obsolete": "5.35",
+    "force-uninstall": true
+  },
   "com.civibridge.quickmenu": {
     "obsolete": "5.24",
     "disable": true,