Release of v5.1.1-alpha3

Add edit and create options to the ModalSelect Field (in Joomla 5).

CHANGELOG.md

@@ -1,10 +1,6 @@
-# v5.1.1-alpha2
+# v5.1.1-alpha3
 
-- Adds the ModalSelect fieldtype to Joomla Component Builder - J5
+- Add edit and create options to the ModalSelect Field (in Joomla 5)
-- Adds the Data Import Function to the Demo Component.
-- Adds new country related tables and fields to the Demo Component.
-- Resolves the Database Updating issue in the compiler. #1212,#1209
-- Adds the Component Commands Plugin to the CLI for Import of spreadsheet data-sets.
 
 # v5.1.1-alpha
 
@@ -13,6 +9,11 @@
 - Adds import item example to demo component.
 - Updates the Superpower class with the GetRemote class in the plugin.
 - Ensures the super power autoloader triggers the correct repositories.
+- Adds the ModalSelect fieldtype to Joomla Component Builder - J5
+- Adds the Data Import Function to the Demo Component.
+- Adds new country related tables and fields to the Demo Component.
+- Resolves the Database Updating issue in the compiler. #1212,#1209
+- Adds the Component Commands Plugin to the CLI for Import of spreadsheet data-sets.
 
 # v5.1.0
 

ComponentbuilderInstallerScript.php

@@ -3292,7 +3292,7 @@ class Com_ComponentbuilderInstallerScript implements InstallerScriptInterface
 			echo '<div style="background-color: #fff;" class="alert alert-info"><a target="_blank" href="https://dev.vdm.io" title="Component Builder">
 				<img src="components/com_componentbuilder/assets/images/vdm-component.jpg"/>
 				</a>
-				<h3>Upgrade to Version 5.1.1-alpha2 Was Successful! Let us know if anything is not working as expected.</h3></div>';
+				<h3>Upgrade to Version 5.1.1-alpha3 Was Successful! Let us know if anything is not working as expected.</h3></div>';
 
 			// Add/Update component in the action logs extensions table.
 			$this->setActionLogsExtensions();

README.md

@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (5.1.1-alpha2) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (5.1.1-alpha3) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -144,13 +144,13 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 28th March, 2025
++ *Last Build*: 30th March, 2025
-+ *Version*: 5.1.1-alpha2
++ *Version*: 5.1.1-alpha3
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **975213**
++ *Line count*: **978935**
 + *Field count*: **2098**
-+ *File count*: **6574**
++ *File count*: **6625**
 + *Folder count*: **645**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com).

admin/README.txt

@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will save you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (5.1.1-alpha2) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [gitea](https://git.vdm.dev/joomla/Component-Builder/tags) is the latest release (5.1.1-alpha3) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -144,13 +144,13 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](https://git.vdm.dev/joomla/Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 28th March, 2025
++ *Last Build*: 30th March, 2025
-+ *Version*: 5.1.1-alpha2
++ *Version*: 5.1.1-alpha3
 + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **975213**
++ *Line count*: **978935**
 + *Field count*: **2098**
-+ *File count*: **6574**
++ *File count*: **6625**
 + *Folder count*: **645**
 
 > This **component** was build with a [Joomla](https://extensions.joomla.org/extension/component-builder/) [Automated Component Builder](https://www.joomlacomponentbuilder.com).

admin/compiler/joomla_4/ADMIN_VIEW_CONTROLLER.php

@@ -212,6 +212,15 @@ class ###View###Controller extends FormController
 					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
+		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
 		}###JCONTROLLERFORM_AFTERCANCEL###
 		return $cancel;
 	}
@@ -294,6 +303,15 @@ class ###View###Controller extends FormController
 	 * @since   11.1
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
-	{###POSTSAVEHOOK###
+	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('###view###.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}###POSTSAVEHOOK###
 	}
 }

admin/compiler/joomla_4/ADMIN_VIEW_MODAL_RETURN.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    4th September 2022
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this JCB template file (EVER)
+defined('_JCB_TEMPLATE') or die;
+?>
+###BOM###
+
+use Joomla\CMS\Router\Route;
+
+// No direct access to this file
+defined('_JEXEC') or die;###LICENSE_LOCKED_DEFINED###
+
+/** @var \###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Administrator\View\###View###\HtmlView $this */
+
+$icon = 'icon-check';
+$title_key = $this->item->###SQL_TITLE_KEY### ?? '';
+$title_column = $this->item->###SQL_TITLE_COLUMN### ?? '';
+$data = [
+	'contentType' => 'com_###component###.###view###',
+	'id' => $title_key,
+	'title' => $title_column,
+	'uri' => Route::_('index.php?option=com_###component###&layout=modal&tmpl=component&id='. (int) ($this->item->id ?? 0))
+];
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $title_column; ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $title_column; ?>
+        </p>
+    </div>
+</div>

admin/compiler/joomla_4/SITE_ADMIN_VIEW_MODAL.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    4th September 2022
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this JCB template file (EVER)
+defined('_JCB_TEMPLATE') or die;
+?>
+###BOM###
+
+// No direct access to this file
+defined('_JEXEC') or die;###LICENSE_LOCKED_DEFINED###
+
+/** @var \###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Site\View\###View###\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>

admin/compiler/joomla_4/SITE_ADMIN_VIEW_MODAL_RETURN.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    4th September 2022
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access to this JCB template file (EVER)
+defined('_JCB_TEMPLATE') or die;
+?>
+###BOM###
+
+use Joomla\CMS\Router\Route;
+
+// No direct access to this file
+defined('_JEXEC') or die;###LICENSE_LOCKED_DEFINED###
+
+/** @var \###NAMESPACEPREFIX###\Component\###ComponentNamespace###\Site\View\###View###\HtmlView $this */
+
+$icon = 'icon-check';
+$title_key = $this->item->###SQL_TITLE_KEY### ?? '';
+$title_column = $this->item->###SQL_TITLE_COLUMN### ?? '';
+$data = [
+	'contentType' => 'com_###component###.###view###',
+	'id' => $title_key,
+	'title' => $title_column,
+	'uri' => Route::_('index.php?option=com_###component###&layout=modal&tmpl=component&id='. (int) ($this->item->id ?? 0))
+];
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $title_column; ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $title_column; ?>
+        </p>
+    </div>
+</div>

admin/compiler/joomla_4/settings.json

@@ -328,12 +328,6 @@
 					"newName": "default.php",
 					"type": "single"
 				},
-				"ADMIN_VIEW_MODAL.php": {
-					"path": "c0mp0n3nt/admin/tmpl/[[[name]]]",
-					"rename": "new",
-					"newName": "modal.php",
-					"type": "single"
-				},
 				"ADMIN_VIEW_MODEL.php": {
 					"path": "c0mp0n3nt/admin/src/Model",
 					"rename": "new",
@@ -392,12 +386,6 @@
 					"newName": "default.php",
 					"type": "list"
 				},
-				"ADMIN_VIEWS_MODAL.php": {
-					"path": "c0mp0n3nt/admin/tmpl/[[[name]]]",
-					"rename": "new",
-					"newName": "modal.php",
-					"type": "list"
-				},
 				"ADMIN_VIEWS_EMPTYSTATE.php": {
 					"path": "c0mp0n3nt/admin/tmpl/[[[name]]]",
 					"rename": "new",
@@ -482,6 +470,24 @@
 					"newName": "ModalSelectField.php",
 					"type": "fieldmodalselect_override"
 				},
+				"ADMIN_VIEWS_MODAL.php": {
+					"path": "c0mp0n3nt/admin/tmpl/[[[name]]]",
+					"rename": "new",
+					"newName": "modal.php",
+					"type": "list_modal"
+				},
+				"ADMIN_VIEW_MODAL.php": {
+					"path": "c0mp0n3nt/admin/tmpl/[[[name]]]",
+					"rename": "new",
+					"newName": "modal.php",
+					"type": "single_modal"
+				},
+				"ADMIN_VIEW_MODAL_RETURN.php": {
+					"path": "c0mp0n3nt/admin/tmpl/[[[name]]]",
+					"rename": "new",
+					"newName": "modalreturn.php",
+					"type": "single_modal"
+				},
 				"FORM_LIST_FIELD.php": {
 					"path": "c0mp0n3nt/admin/src/Field",
 					"rename": "new",
@@ -750,6 +756,18 @@
 					"newName": "HtmlView.php",
 					"type": "edit"
 				},
+				"SITE_ADMIN_VIEW_MODAL.php": {
+					"path": "c0mp0n3nt/site/tmpl/[[[name]]]",
+					"rename": "new",
+					"newName": "modal.php",
+					"type": "edit_modal"
+				},
+				"SITE_ADMIN_VIEW_MODAL_RETURN.php": {
+					"path": "c0mp0n3nt/site/tmpl/[[[name]]]",
+					"rename": "new",
+					"newName": "modalreturn.php",
+					"type": "edit_modal"
+				},
 				"view_site_edit.css": {
 					"path": "c0mp0n3nt/site/assets/css",
 					"rename": "view_site_edit",

admin/forms/admin_fields.xml

@@ -129,13 +129,16 @@
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD_LABEL"
 					sql_title_table="#__componentbuilder_field"
 					sql_title_column="name"
+					data-key-name="guid"
 					sql_title_key="guid"
 					urlSelect="index.php?option=com_componentbuilder&view=fields&layout=modal&tmpl=component&titleKey=guid"
+					urlNew="index.php?option=com_componentbuilder&task=field.add&layout=modal&tmpl=component"
+					urlEdit="index.php?option=com_componentbuilder&task=field.edit&guid={id}&layout=modal&tmpl=component&titleKey=guid"
 					titleSelect="COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD_TITLESELECT"
 					iconSelect="icon-lamp"
 					select="true"
-					new="false"
+					new="true"
-					edit="false"
+					edit="true"
 					clear="true"
 					required="true"
 					class="input-large"

admin/forms/admin_view.xml

@@ -712,13 +712,16 @@
 					label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_LABEL"
 					sql_title_table="#__componentbuilder_admin_view"
 					sql_title_column="system_name"
+					data-key-name="guid"
 					sql_title_key="guid"
 					urlSelect="index.php?option=com_componentbuilder&view=admin_views&layout=modal&tmpl=component&titleKey=guid"
+					urlNew="index.php?option=com_componentbuilder&task=admin_view.add&layout=modal&tmpl=component"
+					urlEdit="index.php?option=com_componentbuilder&task=admin_view.edit&guid={id}&layout=modal&tmpl=component&titleKey=guid"
 					titleSelect="COM_COMPONENTBUILDER_ADMIN_VIEW_ADMINVIEW_TITLESELECT"
 					iconSelect="icon-stack"
 					select="true"
-					new="false"
+					new="true"
-					edit="false"
+					edit="true"
 					clear="true"
 					required="true"
 					class="input-large"

admin/forms/component_admin_views.xml

@@ -142,13 +142,16 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADMINVIEW_LABEL"
 					sql_title_table="#__componentbuilder_admin_view"
 					sql_title_column="system_name"
+					data-key-name="guid"
 					sql_title_key="guid"
 					urlSelect="index.php?option=com_componentbuilder&view=admin_views&layout=modal&tmpl=component&titleKey=guid"
+					urlNew="index.php?option=com_componentbuilder&task=admin_view.add&layout=modal&tmpl=component"
+					urlEdit="index.php?option=com_componentbuilder&task=admin_view.edit&guid={id}&layout=modal&tmpl=component&titleKey=guid"
 					titleSelect="COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_ADMINVIEW_TITLESELECT"
 					iconSelect="icon-stack"
 					select="true"
-					new="false"
+					new="true"
-					edit="false"
+					edit="true"
 					clear="true"
 					required="true"
 					class="input-large"

admin/forms/component_config.xml

@@ -141,13 +141,16 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_FIELD_LABEL"
 					sql_title_table="#__componentbuilder_field"
 					sql_title_column="name"
+					data-key-name="guid"
 					sql_title_key="guid"
 					urlSelect="index.php?option=com_componentbuilder&view=fields&layout=modal&tmpl=component&titleKey=guid"
+					urlNew="index.php?option=com_componentbuilder&task=field.add&layout=modal&tmpl=component"
+					urlEdit="index.php?option=com_componentbuilder&task=field.edit&guid={id}&layout=modal&tmpl=component&titleKey=guid"
 					titleSelect="COM_COMPONENTBUILDER_COMPONENT_CONFIG_FIELD_TITLESELECT"
 					iconSelect="icon-lamp"
 					select="true"
-					new="false"
+					new="true"
-					edit="false"
+					edit="true"
 					clear="true"
 					required="true"
 					class="input-large"

admin/forms/component_custom_admin_views.xml

@@ -140,13 +140,16 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_CUSTOMADMINVIEW_LABEL"
 					sql_title_table="#__componentbuilder_custom_admin_view"
 					sql_title_column="system_name"
+					data-key-name="guid"
 					sql_title_key="guid"
 					urlSelect="index.php?option=com_componentbuilder&view=custom_admin_views&layout=modal&tmpl=component&titleKey=guid"
+					urlNew="index.php?option=com_componentbuilder&task=custom_admin_view.add&layout=modal&tmpl=component"
+					urlEdit="index.php?option=com_componentbuilder&task=custom_admin_view.edit&guid={id}&layout=modal&tmpl=component&titleKey=guid"
 					titleSelect="COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_CUSTOMADMINVIEW_TITLESELECT"
 					iconSelect="icon-screen"
 					select="true"
-					new="false"
+					new="true"
-					edit="false"
+					edit="true"
 					clear="true"
 					required="true"
 					class="input-large"

admin/forms/component_site_views.xml

@@ -141,13 +141,16 @@
 					label="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_SITEVIEW_LABEL"
 					sql_title_table="#__componentbuilder_site_view"
 					sql_title_column="system_name"
+					data-key-name="guid"
 					sql_title_key="guid"
 					urlSelect="index.php?option=com_componentbuilder&view=site_views&layout=modal&tmpl=component&titleKey=guid"
+					urlNew="index.php?option=com_componentbuilder&task=site_view.add&layout=modal&tmpl=component"
+					urlEdit="index.php?option=com_componentbuilder&task=site_view.edit&guid={id}&layout=modal&tmpl=component&titleKey=guid"
 					titleSelect="COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_SITEVIEW_TITLESELECT"
 					iconSelect="icon-palette"
 					select="true"
-					new="false"
+					new="true"
-					edit="false"
+					edit="true"
 					clear="true"
 					required="true"
 					class="input-large"

admin/forms/joomla_module.xml

@@ -742,13 +742,16 @@
 							label="COM_COMPONENTBUILDER_JOOMLA_MODULE_FIELD_LABEL"
 							sql_title_table="#__componentbuilder_field"
 							sql_title_column="name"
+							data-key-name="guid"
 							sql_title_key="guid"
 							urlSelect="index.php?option=com_componentbuilder&view=fields&layout=modal&tmpl=component&titleKey=guid"
+							urlNew="index.php?option=com_componentbuilder&task=field.add&layout=modal&tmpl=component"
+							urlEdit="index.php?option=com_componentbuilder&task=field.edit&guid={id}&layout=modal&tmpl=component&titleKey=guid"
 							titleSelect="COM_COMPONENTBUILDER_JOOMLA_MODULE_FIELD_TITLESELECT"
 							iconSelect="icon-lamp"
 							select="true"
-							new="false"
+							new="true"
-							edit="false"
+							edit="true"
 							clear="true"
 							required="true"
 							class="input-large"

admin/forms/joomla_plugin.xml

@@ -617,13 +617,16 @@
 							label="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELD_LABEL"
 							sql_title_table="#__componentbuilder_field"
 							sql_title_column="name"
+							data-key-name="guid"
 							sql_title_key="guid"
 							urlSelect="index.php?option=com_componentbuilder&view=fields&layout=modal&tmpl=component&titleKey=guid"
+							urlNew="index.php?option=com_componentbuilder&task=field.add&layout=modal&tmpl=component"
+							urlEdit="index.php?option=com_componentbuilder&task=field.edit&guid={id}&layout=modal&tmpl=component&titleKey=guid"
 							titleSelect="COM_COMPONENTBUILDER_JOOMLA_PLUGIN_FIELD_TITLESELECT"
 							iconSelect="icon-lamp"
 							select="true"
-							new="false"
+							new="true"
-							edit="false"
+							edit="true"
 							clear="true"
 							required="true"
 							class="input-large"

admin/forms/library_config.xml

@@ -128,13 +128,16 @@
 					label="COM_COMPONENTBUILDER_LIBRARY_CONFIG_FIELD_LABEL"
 					sql_title_table="#__componentbuilder_field"
 					sql_title_column="name"
+					data-key-name="guid"
 					sql_title_key="guid"
 					urlSelect="index.php?option=com_componentbuilder&view=fields&layout=modal&tmpl=component&titleKey=guid"
+					urlNew="index.php?option=com_componentbuilder&task=field.add&layout=modal&tmpl=component"
+					urlEdit="index.php?option=com_componentbuilder&task=field.edit&guid={id}&layout=modal&tmpl=component&titleKey=guid"
 					titleSelect="COM_COMPONENTBUILDER_LIBRARY_CONFIG_FIELD_TITLESELECT"
 					iconSelect="icon-lamp"
 					select="true"
-					new="false"
+					new="true"
-					edit="false"
+					edit="true"
 					clear="true"
 					required="true"
 					class="input-large"

admin/forms/power.xml

@@ -184,13 +184,16 @@
 					label="COM_COMPONENTBUILDER_POWER_LOAD_LABEL"
 					sql_title_table="#__componentbuilder_power"
 					sql_title_column="system_name"
+					data-key-name="guid"
 					sql_title_key="guid"
 					urlSelect="index.php?option=com_componentbuilder&view=powers&layout=modal&tmpl=component&titleKey=guid"
+					urlNew="index.php?option=com_componentbuilder&task=power.add&layout=modal&tmpl=component"
+					urlEdit="index.php?option=com_componentbuilder&task=power.edit&guid={id}&layout=modal&tmpl=component&titleKey=guid"
 					titleSelect="COM_COMPONENTBUILDER_POWER_LOAD_TITLESELECT"
 					iconSelect="icon-flash"
 					select="true"
-					new="false"
+					new="true"
-					edit="false"
+					edit="true"
 					clear="true"
 					required="true"
 					class="input-large"
@@ -508,13 +511,15 @@
 					label="COM_COMPONENTBUILDER_POWER_USE_LABEL"
 					sql_title_table="#__componentbuilder_power"
 					sql_title_column="system_name"
+					data-key-name="guid"
 					sql_title_key="guid"
 					urlSelect="index.php?option=com_componentbuilder&view=powers&layout=modal&tmpl=component&titleKey=guid"
+					urlNew="index.php?option=com_componentbuilder&task=power.add&layout=modal&tmpl=component"
 					urlEdit="index.php?option=com_componentbuilder&task=power.edit&guid={id}&layout=modal&tmpl=component&titleKey=guid"
 					titleSelect="COM_COMPONENTBUILDER_POWER_USE_TITLESELECT"
 					iconSelect="icon-flash"
 					select="true"
-					new="false"
+					new="true"
 					edit="true"
 					clear="true"
 					required="true"

admin/src/Controller/Admin_custom_tabsController.php

@@ -281,6 +281,15 @@ class Admin_custom_tabsController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class Admin_custom_tabsController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('admin_custom_tabs.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/Admin_fieldsController.php

@@ -281,6 +281,15 @@ class Admin_fieldsController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class Admin_fieldsController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('admin_fields.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/Admin_fields_conditionsController.php

@@ -281,6 +281,15 @@ class Admin_fields_conditionsController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class Admin_fields_conditionsController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('admin_fields_conditions.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/Admin_fields_relationsController.php

@@ -281,6 +281,15 @@ class Admin_fields_relationsController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class Admin_fields_relationsController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('admin_fields_relations.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/Admin_viewController.php

@@ -24,8 +24,8 @@ use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
-use VDM\Joomla\Data\Factory as DataFactory;
 use VDM\Joomla\Utilities\GuidHelper;
+use VDM\Joomla\Data\Factory as DataFactory;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -80,6 +80,51 @@ class Admin_viewController extends FormController
 	 */
 	protected int $refid;
 
+
+	/**
+	 * Method to edit an existing record.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key
+	 *                           (sometimes required to avoid router collisions).
+	 *
+	 * @return  boolean  True if access level check and checkout passes, false otherwise.
+	 *
+	 * @since   1.6
+	 */
+	public function edit($key = null, $urlVar = null)
+	{
+		// for modal title key selection (unique key to do mapping)
+		$titleKey = $this->input->get('titleKey', 'id', 'word');
+		$guid = null;
+		$value = null;
+
+ 		// Determine the name of the primary key for the data.
+		if (empty($key))
+		{
+			$model = $this->getModel();
+			$table = $model->getTable();
+			$key = $table->getKeyName();
+		}
+
+		if ($titleKey === 'guid')
+		{
+			$guid = $this->input->get('guid', null, 'string');
+		}
+
+		if ($guid !== null && GuidHelper::valid($guid))
+		{
+			$value = GuidHelper::item($guid, 'admin_view', 'a.' . $key, 'componentbuilder');
+		}
+
+		if ($value !== null)
+		{
+			$this->input->set($key, $value);
+		}
+
+		return parent::edit($key, $urlVar);
+	}
+
 	/**
 	 * Method override to check if you can add a new record.
 	 *
@@ -283,6 +328,15 @@ class Admin_viewController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -365,6 +419,15 @@ class Admin_viewController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('admin_view.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		// linked tables to update
 		$_tables_array = [
 			'admin_fields' => 'admin_view',

admin/src/Controller/Class_extendsController.php

@@ -281,6 +281,15 @@ class Class_extendsController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class Class_extendsController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('class_extends.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/Class_methodController.php

@@ -281,6 +281,15 @@ class Class_methodController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class Class_methodController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('class_method.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/Class_propertyController.php

@@ -281,6 +281,15 @@ class Class_propertyController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class Class_propertyController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('class_property.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/Component_admin_viewsController.php

@@ -281,6 +281,15 @@ class Component_admin_viewsController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class Component_admin_viewsController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('component_admin_views.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/Component_configController.php

@@ -281,6 +281,15 @@ class Component_configController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class Component_configController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('component_config.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/Component_custom_admin_menusController.php

@@ -281,6 +281,15 @@ class Component_custom_admin_menusController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class Component_custom_admin_menusController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('component_custom_admin_menus.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/Component_custom_admin_viewsController.php

@@ -281,6 +281,15 @@ class Component_custom_admin_viewsController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class Component_custom_admin_viewsController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('component_custom_admin_views.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/Component_dashboardController.php

@@ -281,6 +281,15 @@ class Component_dashboardController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class Component_dashboardController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('component_dashboard.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/Component_files_foldersController.php

@@ -281,6 +281,15 @@ class Component_files_foldersController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class Component_files_foldersController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('component_files_folders.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/Component_modulesController.php

@@ -281,6 +281,15 @@ class Component_modulesController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class Component_modulesController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('component_modules.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/Component_mysql_tweaksController.php

@@ -281,6 +281,15 @@ class Component_mysql_tweaksController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class Component_mysql_tweaksController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('component_mysql_tweaks.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/Component_placeholdersController.php

@@ -281,6 +281,15 @@ class Component_placeholdersController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class Component_placeholdersController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('component_placeholders.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/Component_pluginsController.php

@@ -281,6 +281,15 @@ class Component_pluginsController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class Component_pluginsController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('component_plugins.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/Component_routerController.php

@@ -281,6 +281,15 @@ class Component_routerController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class Component_routerController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('component_router.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/Component_site_viewsController.php

@@ -281,6 +281,15 @@ class Component_site_viewsController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class Component_site_viewsController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('component_site_views.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/Component_updatesController.php

@@ -285,6 +285,15 @@ class Component_updatesController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -367,6 +376,15 @@ class Component_updatesController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('component_updates.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		// update the component version to match the updated last version
 		if (isset($validData['joomla_component']) && GuidHelper::valid($validData['joomla_component']))
 		{

admin/src/Controller/Custom_admin_viewController.php

@@ -24,6 +24,7 @@ use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use VDM\Joomla\Utilities\GuidHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -78,6 +79,51 @@ class Custom_admin_viewController extends FormController
 	 */
 	protected int $refid;
 
+
+	/**
+	 * Method to edit an existing record.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key
+	 *                           (sometimes required to avoid router collisions).
+	 *
+	 * @return  boolean  True if access level check and checkout passes, false otherwise.
+	 *
+	 * @since   1.6
+	 */
+	public function edit($key = null, $urlVar = null)
+	{
+		// for modal title key selection (unique key to do mapping)
+		$titleKey = $this->input->get('titleKey', 'id', 'word');
+		$guid = null;
+		$value = null;
+
+ 		// Determine the name of the primary key for the data.
+		if (empty($key))
+		{
+			$model = $this->getModel();
+			$table = $model->getTable();
+			$key = $table->getKeyName();
+		}
+
+		if ($titleKey === 'guid')
+		{
+			$guid = $this->input->get('guid', null, 'string');
+		}
+
+		if ($guid !== null && GuidHelper::valid($guid))
+		{
+			$value = GuidHelper::item($guid, 'custom_admin_view', 'a.' . $key, 'componentbuilder');
+		}
+
+		if ($value !== null)
+		{
+			$this->input->set($key, $value);
+		}
+
+		return parent::edit($key, $urlVar);
+	}
+
 	/**
 	 * Method override to check if you can add a new record.
 	 *
@@ -281,6 +327,15 @@ class Custom_admin_viewController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +418,15 @@ class Custom_admin_viewController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('custom_admin_view.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/Custom_codeController.php

@@ -281,6 +281,15 @@ class Custom_codeController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class Custom_codeController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('custom_code.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/Dynamic_getController.php

@@ -281,6 +281,15 @@ class Dynamic_getController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class Dynamic_getController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('dynamic_get.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/FieldController.php

@@ -24,6 +24,7 @@ use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use VDM\Joomla\Utilities\GuidHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -78,6 +79,51 @@ class FieldController extends FormController
 	 */
 	protected int $refid;
 
+
+	/**
+	 * Method to edit an existing record.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key
+	 *                           (sometimes required to avoid router collisions).
+	 *
+	 * @return  boolean  True if access level check and checkout passes, false otherwise.
+	 *
+	 * @since   1.6
+	 */
+	public function edit($key = null, $urlVar = null)
+	{
+		// for modal title key selection (unique key to do mapping)
+		$titleKey = $this->input->get('titleKey', 'id', 'word');
+		$guid = null;
+		$value = null;
+
+ 		// Determine the name of the primary key for the data.
+		if (empty($key))
+		{
+			$model = $this->getModel();
+			$table = $model->getTable();
+			$key = $table->getKeyName();
+		}
+
+		if ($titleKey === 'guid')
+		{
+			$guid = $this->input->get('guid', null, 'string');
+		}
+
+		if ($guid !== null && GuidHelper::valid($guid))
+		{
+			$value = GuidHelper::item($guid, 'field', 'a.' . $key, 'componentbuilder');
+		}
+
+		if ($value !== null)
+		{
+			$this->input->set($key, $value);
+		}
+
+		return parent::edit($key, $urlVar);
+	}
+
 	/**
 	 * Method override to check if you can add a new record.
 	 *
@@ -280,6 +326,15 @@ class FieldController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -362,6 +417,15 @@ class FieldController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('field.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/FieldtypeController.php

@@ -432,6 +432,15 @@ class FieldtypeController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -514,6 +523,15 @@ class FieldtypeController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('fieldtype.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/Help_documentController.php

@@ -281,6 +281,15 @@ class Help_documentController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class Help_documentController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('help_document.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/Joomla_componentController.php

@@ -283,6 +283,15 @@ class Joomla_componentController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -365,6 +374,15 @@ class Joomla_componentController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('joomla_component.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		// linked tables to update
 		$_tables_array = [
 			'component_admin_views' => 'joomla_component',

admin/src/Controller/Joomla_moduleController.php

@@ -283,6 +283,15 @@ class Joomla_moduleController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -365,6 +374,15 @@ class Joomla_moduleController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('joomla_module.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		// linked tables to update
 		$_tables_array = [
 			'joomla_module_updates' => 'joomla_module',

admin/src/Controller/Joomla_module_files_folders_urlsController.php

@@ -281,6 +281,15 @@ class Joomla_module_files_folders_urlsController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class Joomla_module_files_folders_urlsController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('joomla_module_files_folders_urls.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/Joomla_module_updatesController.php

@@ -284,6 +284,15 @@ class Joomla_module_updatesController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -366,6 +375,15 @@ class Joomla_module_updatesController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('joomla_module_updates.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		// update the component version to match the updated last version
 		if (isset($validData['joomla_plugin']) && GuidHelper::valid($validData['joomla_plugin']))
 		{

admin/src/Controller/Joomla_pluginController.php

@@ -283,6 +283,15 @@ class Joomla_pluginController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -365,6 +374,15 @@ class Joomla_pluginController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('joomla_plugin.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		// linked tables to update
 		$_tables_array = [
 			'joomla_plugin_updates' => 'joomla_plugin',

admin/src/Controller/Joomla_plugin_files_folders_urlsController.php

@@ -281,6 +281,15 @@ class Joomla_plugin_files_folders_urlsController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class Joomla_plugin_files_folders_urlsController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('joomla_plugin_files_folders_urls.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/Joomla_plugin_groupController.php

@@ -274,6 +274,15 @@ class Joomla_plugin_groupController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -356,6 +365,15 @@ class Joomla_plugin_groupController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('joomla_plugin_group.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/Joomla_plugin_updatesController.php

@@ -283,6 +283,15 @@ class Joomla_plugin_updatesController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -365,6 +374,15 @@ class Joomla_plugin_updatesController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('joomla_plugin_updates.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		// update the component version to match the updated last version
 		if (isset($validData['joomla_plugin']) && is_numeric($validData['joomla_plugin']) && $validData['joomla_plugin'] > 0)
 		{

admin/src/Controller/Joomla_powerController.php

@@ -433,6 +433,15 @@ class Joomla_powerController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -515,6 +524,15 @@ class Joomla_powerController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('joomla_power.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/LanguageController.php

@@ -281,6 +281,15 @@ class LanguageController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class LanguageController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('language.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/Language_translationController.php

@@ -281,6 +281,15 @@ class Language_translationController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class Language_translationController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('language_translation.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/LayoutController.php

@@ -281,6 +281,15 @@ class LayoutController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class LayoutController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('layout.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/LibraryController.php

@@ -283,6 +283,15 @@ class LibraryController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -365,6 +374,15 @@ class LibraryController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('library.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		// linked tables to update
 		$_tables_array = [
 			'library_config' => 'library',

admin/src/Controller/Library_configController.php

@@ -281,6 +281,15 @@ class Library_configController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class Library_configController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('library_config.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/Library_files_folders_urlsController.php

@@ -281,6 +281,15 @@ class Library_files_folders_urlsController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class Library_files_folders_urlsController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('library_files_folders_urls.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/PlaceholderController.php

@@ -281,6 +281,15 @@ class PlaceholderController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class PlaceholderController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('placeholder.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/PowerController.php

@@ -478,6 +478,15 @@ class PowerController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -560,6 +569,15 @@ class PowerController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('power.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/RepositoryController.php

@@ -281,6 +281,15 @@ class RepositoryController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class RepositoryController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('repository.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/ServerController.php

@@ -281,6 +281,15 @@ class ServerController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class ServerController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('server.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/Site_viewController.php

@@ -24,6 +24,7 @@ use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
 use VDM\Component\Componentbuilder\Administrator\Helper\ComponentbuilderHelper;
+use VDM\Joomla\Utilities\GuidHelper;
 
 // No direct access to this file
 \defined('_JEXEC') or die;
@@ -78,6 +79,51 @@ class Site_viewController extends FormController
 	 */
 	protected int $refid;
 
+
+	/**
+	 * Method to edit an existing record.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key
+	 *                           (sometimes required to avoid router collisions).
+	 *
+	 * @return  boolean  True if access level check and checkout passes, false otherwise.
+	 *
+	 * @since   1.6
+	 */
+	public function edit($key = null, $urlVar = null)
+	{
+		// for modal title key selection (unique key to do mapping)
+		$titleKey = $this->input->get('titleKey', 'id', 'word');
+		$guid = null;
+		$value = null;
+
+ 		// Determine the name of the primary key for the data.
+		if (empty($key))
+		{
+			$model = $this->getModel();
+			$table = $model->getTable();
+			$key = $table->getKeyName();
+		}
+
+		if ($titleKey === 'guid')
+		{
+			$guid = $this->input->get('guid', null, 'string');
+		}
+
+		if ($guid !== null && GuidHelper::valid($guid))
+		{
+			$value = GuidHelper::item($guid, 'site_view', 'a.' . $key, 'componentbuilder');
+		}
+
+		if ($value !== null)
+		{
+			$this->input->set($key, $value);
+		}
+
+		return parent::edit($key, $urlVar);
+	}
+
 	/**
 	 * Method override to check if you can add a new record.
 	 *
@@ -281,6 +327,15 @@ class Site_viewController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +418,15 @@ class Site_viewController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('site_view.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/SnippetController.php

@@ -281,6 +281,15 @@ class SnippetController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class SnippetController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('snippet.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/Snippet_typeController.php

@@ -281,6 +281,15 @@ class Snippet_typeController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class Snippet_typeController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('snippet_type.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/TemplateController.php

@@ -281,6 +281,15 @@ class TemplateController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class TemplateController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('template.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/src/Controller/Validation_ruleController.php

@@ -281,6 +281,15 @@ class Validation_ruleController extends FormController
 				)
 			);
 		}
+		// When editing in modal then redirect to modalreturn layout
+		elseif ($cancel && $this->input->get('layout') === 'modal')
+		{
+			$id = $this->input->get('id');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=cancel';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return $cancel;
 	}
 
@@ -363,6 +372,15 @@ class Validation_ruleController extends FormController
 	 */
 	protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
 	{
+		if ($this->input->get('layout') === 'modal' && $this->task === 'save')
+		{
+			// When editing in modal then redirect to modalreturn layout
+			$id = $model->getState('validation_rule.id', '');
+			$return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+				. '&layout=modalreturn&from-task=save';
+
+			$this->setRedirect(Route::_($return, false));
+		}
 		return;
 	}
 }

admin/tmpl/admin_custom_tabs/modalreturn.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Router\Route;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Admin_custom_tabs\HtmlView $this */
+
+$icon = 'icon-check';
+$title_key = $this->item->id ?? '';
+$title_column = $this->item->name ?? '';
+$data = [
+	'contentType' => 'com_componentbuilder.admin_custom_tabs',
+	'id' => $title_key,
+	'title' => $title_column,
+	'uri' => Route::_('index.php?option=com_componentbuilder&layout=modal&tmpl=component&id='. (int) ($this->item->id ?? 0))
+];
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $title_column; ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $title_column; ?>
+        </p>
+    </div>
+</div>

admin/tmpl/admin_fields/modalreturn.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Router\Route;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Admin_fields\HtmlView $this */
+
+$icon = 'icon-check';
+$title_key = $this->item->id ?? '';
+$title_column = $this->item->name ?? '';
+$data = [
+	'contentType' => 'com_componentbuilder.admin_fields',
+	'id' => $title_key,
+	'title' => $title_column,
+	'uri' => Route::_('index.php?option=com_componentbuilder&layout=modal&tmpl=component&id='. (int) ($this->item->id ?? 0))
+];
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $title_column; ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $title_column; ?>
+        </p>
+    </div>
+</div>

admin/tmpl/admin_fields_conditions/modalreturn.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Router\Route;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Admin_fields_conditions\HtmlView $this */
+
+$icon = 'icon-check';
+$title_key = $this->item->id ?? '';
+$title_column = $this->item->name ?? '';
+$data = [
+	'contentType' => 'com_componentbuilder.admin_fields_conditions',
+	'id' => $title_key,
+	'title' => $title_column,
+	'uri' => Route::_('index.php?option=com_componentbuilder&layout=modal&tmpl=component&id='. (int) ($this->item->id ?? 0))
+];
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $title_column; ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $title_column; ?>
+        </p>
+    </div>
+</div>

admin/tmpl/admin_fields_relations/modalreturn.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Router\Route;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Admin_fields_relations\HtmlView $this */
+
+$icon = 'icon-check';
+$title_key = $this->item->id ?? '';
+$title_column = $this->item->name ?? '';
+$data = [
+	'contentType' => 'com_componentbuilder.admin_fields_relations',
+	'id' => $title_key,
+	'title' => $title_column,
+	'uri' => Route::_('index.php?option=com_componentbuilder&layout=modal&tmpl=component&id='. (int) ($this->item->id ?? 0))
+];
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $title_column; ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $title_column; ?>
+        </p>
+    </div>
+</div>

admin/tmpl/admin_view/modalreturn.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Router\Route;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Admin_view\HtmlView $this */
+
+$icon = 'icon-check';
+$title_key = $this->item->guid ?? '';
+$title_column = $this->item->system_name ?? '';
+$data = [
+	'contentType' => 'com_componentbuilder.admin_view',
+	'id' => $title_key,
+	'title' => $title_column,
+	'uri' => Route::_('index.php?option=com_componentbuilder&layout=modal&tmpl=component&id='. (int) ($this->item->id ?? 0))
+];
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $title_column; ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $title_column; ?>
+        </p>
+    </div>
+</div>

admin/tmpl/class_extends/modalreturn.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Router\Route;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Class_extends\HtmlView $this */
+
+$icon = 'icon-check';
+$title_key = $this->item->id ?? '';
+$title_column = $this->item->name ?? '';
+$data = [
+	'contentType' => 'com_componentbuilder.class_extends',
+	'id' => $title_key,
+	'title' => $title_column,
+	'uri' => Route::_('index.php?option=com_componentbuilder&layout=modal&tmpl=component&id='. (int) ($this->item->id ?? 0))
+];
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $title_column; ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $title_column; ?>
+        </p>
+    </div>
+</div>

admin/tmpl/class_method/modalreturn.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Router\Route;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Class_method\HtmlView $this */
+
+$icon = 'icon-check';
+$title_key = $this->item->id ?? '';
+$title_column = $this->item->name ?? '';
+$data = [
+	'contentType' => 'com_componentbuilder.class_method',
+	'id' => $title_key,
+	'title' => $title_column,
+	'uri' => Route::_('index.php?option=com_componentbuilder&layout=modal&tmpl=component&id='. (int) ($this->item->id ?? 0))
+];
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $title_column; ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $title_column; ?>
+        </p>
+    </div>
+</div>

admin/tmpl/class_property/modalreturn.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Router\Route;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Class_property\HtmlView $this */
+
+$icon = 'icon-check';
+$title_key = $this->item->id ?? '';
+$title_column = $this->item->name ?? '';
+$data = [
+	'contentType' => 'com_componentbuilder.class_property',
+	'id' => $title_key,
+	'title' => $title_column,
+	'uri' => Route::_('index.php?option=com_componentbuilder&layout=modal&tmpl=component&id='. (int) ($this->item->id ?? 0))
+];
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $title_column; ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $title_column; ?>
+        </p>
+    </div>
+</div>

admin/tmpl/component_admin_views/modalreturn.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Router\Route;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Component_admin_views\HtmlView $this */
+
+$icon = 'icon-check';
+$title_key = $this->item->id ?? '';
+$title_column = $this->item->name ?? '';
+$data = [
+	'contentType' => 'com_componentbuilder.component_admin_views',
+	'id' => $title_key,
+	'title' => $title_column,
+	'uri' => Route::_('index.php?option=com_componentbuilder&layout=modal&tmpl=component&id='. (int) ($this->item->id ?? 0))
+];
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $title_column; ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $title_column; ?>
+        </p>
+    </div>
+</div>

admin/tmpl/component_config/modalreturn.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Router\Route;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Component_config\HtmlView $this */
+
+$icon = 'icon-check';
+$title_key = $this->item->id ?? '';
+$title_column = $this->item->name ?? '';
+$data = [
+	'contentType' => 'com_componentbuilder.component_config',
+	'id' => $title_key,
+	'title' => $title_column,
+	'uri' => Route::_('index.php?option=com_componentbuilder&layout=modal&tmpl=component&id='. (int) ($this->item->id ?? 0))
+];
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $title_column; ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $title_column; ?>
+        </p>
+    </div>
+</div>

admin/tmpl/component_custom_admin_menus/modalreturn.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Router\Route;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Component_custom_admin_menus\HtmlView $this */
+
+$icon = 'icon-check';
+$title_key = $this->item->id ?? '';
+$title_column = $this->item->name ?? '';
+$data = [
+	'contentType' => 'com_componentbuilder.component_custom_admin_menus',
+	'id' => $title_key,
+	'title' => $title_column,
+	'uri' => Route::_('index.php?option=com_componentbuilder&layout=modal&tmpl=component&id='. (int) ($this->item->id ?? 0))
+];
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $title_column; ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $title_column; ?>
+        </p>
+    </div>
+</div>

admin/tmpl/component_custom_admin_views/modalreturn.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Router\Route;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Component_custom_admin_views\HtmlView $this */
+
+$icon = 'icon-check';
+$title_key = $this->item->id ?? '';
+$title_column = $this->item->name ?? '';
+$data = [
+	'contentType' => 'com_componentbuilder.component_custom_admin_views',
+	'id' => $title_key,
+	'title' => $title_column,
+	'uri' => Route::_('index.php?option=com_componentbuilder&layout=modal&tmpl=component&id='. (int) ($this->item->id ?? 0))
+];
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $title_column; ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $title_column; ?>
+        </p>
+    </div>
+</div>

admin/tmpl/component_dashboard/modalreturn.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Router\Route;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Component_dashboard\HtmlView $this */
+
+$icon = 'icon-check';
+$title_key = $this->item->id ?? '';
+$title_column = $this->item->name ?? '';
+$data = [
+	'contentType' => 'com_componentbuilder.component_dashboard',
+	'id' => $title_key,
+	'title' => $title_column,
+	'uri' => Route::_('index.php?option=com_componentbuilder&layout=modal&tmpl=component&id='. (int) ($this->item->id ?? 0))
+];
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $title_column; ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $title_column; ?>
+        </p>
+    </div>
+</div>

admin/tmpl/component_files_folders/modalreturn.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Router\Route;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Component_files_folders\HtmlView $this */
+
+$icon = 'icon-check';
+$title_key = $this->item->id ?? '';
+$title_column = $this->item->name ?? '';
+$data = [
+	'contentType' => 'com_componentbuilder.component_files_folders',
+	'id' => $title_key,
+	'title' => $title_column,
+	'uri' => Route::_('index.php?option=com_componentbuilder&layout=modal&tmpl=component&id='. (int) ($this->item->id ?? 0))
+];
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $title_column; ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $title_column; ?>
+        </p>
+    </div>
+</div>

admin/tmpl/component_modules/modalreturn.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Router\Route;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Component_modules\HtmlView $this */
+
+$icon = 'icon-check';
+$title_key = $this->item->id ?? '';
+$title_column = $this->item->name ?? '';
+$data = [
+	'contentType' => 'com_componentbuilder.component_modules',
+	'id' => $title_key,
+	'title' => $title_column,
+	'uri' => Route::_('index.php?option=com_componentbuilder&layout=modal&tmpl=component&id='. (int) ($this->item->id ?? 0))
+];
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $title_column; ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $title_column; ?>
+        </p>
+    </div>
+</div>

admin/tmpl/component_mysql_tweaks/modalreturn.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Router\Route;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Component_mysql_tweaks\HtmlView $this */
+
+$icon = 'icon-check';
+$title_key = $this->item->id ?? '';
+$title_column = $this->item->name ?? '';
+$data = [
+	'contentType' => 'com_componentbuilder.component_mysql_tweaks',
+	'id' => $title_key,
+	'title' => $title_column,
+	'uri' => Route::_('index.php?option=com_componentbuilder&layout=modal&tmpl=component&id='. (int) ($this->item->id ?? 0))
+];
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $title_column; ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $title_column; ?>
+        </p>
+    </div>
+</div>

admin/tmpl/component_placeholders/modalreturn.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Router\Route;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Component_placeholders\HtmlView $this */
+
+$icon = 'icon-check';
+$title_key = $this->item->id ?? '';
+$title_column = $this->item->name ?? '';
+$data = [
+	'contentType' => 'com_componentbuilder.component_placeholders',
+	'id' => $title_key,
+	'title' => $title_column,
+	'uri' => Route::_('index.php?option=com_componentbuilder&layout=modal&tmpl=component&id='. (int) ($this->item->id ?? 0))
+];
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $title_column; ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $title_column; ?>
+        </p>
+    </div>
+</div>

admin/tmpl/component_plugins/modalreturn.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Router\Route;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Component_plugins\HtmlView $this */
+
+$icon = 'icon-check';
+$title_key = $this->item->id ?? '';
+$title_column = $this->item->name ?? '';
+$data = [
+	'contentType' => 'com_componentbuilder.component_plugins',
+	'id' => $title_key,
+	'title' => $title_column,
+	'uri' => Route::_('index.php?option=com_componentbuilder&layout=modal&tmpl=component&id='. (int) ($this->item->id ?? 0))
+];
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $title_column; ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $title_column; ?>
+        </p>
+    </div>
+</div>

admin/tmpl/component_router/modalreturn.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Router\Route;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Component_router\HtmlView $this */
+
+$icon = 'icon-check';
+$title_key = $this->item->id ?? '';
+$title_column = $this->item->name ?? '';
+$data = [
+	'contentType' => 'com_componentbuilder.component_router',
+	'id' => $title_key,
+	'title' => $title_column,
+	'uri' => Route::_('index.php?option=com_componentbuilder&layout=modal&tmpl=component&id='. (int) ($this->item->id ?? 0))
+];
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $title_column; ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $title_column; ?>
+        </p>
+    </div>
+</div>

admin/tmpl/component_site_views/modalreturn.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Router\Route;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Component_site_views\HtmlView $this */
+
+$icon = 'icon-check';
+$title_key = $this->item->id ?? '';
+$title_column = $this->item->name ?? '';
+$data = [
+	'contentType' => 'com_componentbuilder.component_site_views',
+	'id' => $title_key,
+	'title' => $title_column,
+	'uri' => Route::_('index.php?option=com_componentbuilder&layout=modal&tmpl=component&id='. (int) ($this->item->id ?? 0))
+];
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $title_column; ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $title_column; ?>
+        </p>
+    </div>
+</div>

admin/tmpl/component_updates/modalreturn.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Router\Route;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Component_updates\HtmlView $this */
+
+$icon = 'icon-check';
+$title_key = $this->item->id ?? '';
+$title_column = $this->item->name ?? '';
+$data = [
+	'contentType' => 'com_componentbuilder.component_updates',
+	'id' => $title_key,
+	'title' => $title_column,
+	'uri' => Route::_('index.php?option=com_componentbuilder&layout=modal&tmpl=component&id='. (int) ($this->item->id ?? 0))
+];
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $title_column; ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $title_column; ?>
+        </p>
+    </div>
+</div>

admin/tmpl/custom_admin_view/modalreturn.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Router\Route;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Custom_admin_view\HtmlView $this */
+
+$icon = 'icon-check';
+$title_key = $this->item->guid ?? '';
+$title_column = $this->item->system_name ?? '';
+$data = [
+	'contentType' => 'com_componentbuilder.custom_admin_view',
+	'id' => $title_key,
+	'title' => $title_column,
+	'uri' => Route::_('index.php?option=com_componentbuilder&layout=modal&tmpl=component&id='. (int) ($this->item->id ?? 0))
+];
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $title_column; ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $title_column; ?>
+        </p>
+    </div>
+</div>

admin/tmpl/custom_code/modalreturn.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Router\Route;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Custom_code\HtmlView $this */
+
+$icon = 'icon-check';
+$title_key = $this->item->id ?? '';
+$title_column = $this->item->name ?? '';
+$data = [
+	'contentType' => 'com_componentbuilder.custom_code',
+	'id' => $title_key,
+	'title' => $title_column,
+	'uri' => Route::_('index.php?option=com_componentbuilder&layout=modal&tmpl=component&id='. (int) ($this->item->id ?? 0))
+];
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $title_column; ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $title_column; ?>
+        </p>
+    </div>
+</div>

admin/tmpl/dynamic_get/modalreturn.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Router\Route;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Dynamic_get\HtmlView $this */
+
+$icon = 'icon-check';
+$title_key = $this->item->id ?? '';
+$title_column = $this->item->name ?? '';
+$data = [
+	'contentType' => 'com_componentbuilder.dynamic_get',
+	'id' => $title_key,
+	'title' => $title_column,
+	'uri' => Route::_('index.php?option=com_componentbuilder&layout=modal&tmpl=component&id='. (int) ($this->item->id ?? 0))
+];
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $title_column; ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $title_column; ?>
+        </p>
+    </div>
+</div>

admin/tmpl/field/modalreturn.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Router\Route;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Field\HtmlView $this */
+
+$icon = 'icon-check';
+$title_key = $this->item->guid ?? '';
+$title_column = $this->item->name ?? '';
+$data = [
+	'contentType' => 'com_componentbuilder.field',
+	'id' => $title_key,
+	'title' => $title_column,
+	'uri' => Route::_('index.php?option=com_componentbuilder&layout=modal&tmpl=component&id='. (int) ($this->item->id ?? 0))
+];
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $title_column; ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $title_column; ?>
+        </p>
+    </div>
+</div>

admin/tmpl/fieldtype/modalreturn.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Router\Route;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Fieldtype\HtmlView $this */
+
+$icon = 'icon-check';
+$title_key = $this->item->id ?? '';
+$title_column = $this->item->name ?? '';
+$data = [
+	'contentType' => 'com_componentbuilder.fieldtype',
+	'id' => $title_key,
+	'title' => $title_column,
+	'uri' => Route::_('index.php?option=com_componentbuilder&layout=modal&tmpl=component&id='. (int) ($this->item->id ?? 0))
+];
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $title_column; ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $title_column; ?>
+        </p>
+    </div>
+</div>

admin/tmpl/help_document/modalreturn.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Router\Route;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Help_document\HtmlView $this */
+
+$icon = 'icon-check';
+$title_key = $this->item->id ?? '';
+$title_column = $this->item->name ?? '';
+$data = [
+	'contentType' => 'com_componentbuilder.help_document',
+	'id' => $title_key,
+	'title' => $title_column,
+	'uri' => Route::_('index.php?option=com_componentbuilder&layout=modal&tmpl=component&id='. (int) ($this->item->id ?? 0))
+];
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $title_column; ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $title_column; ?>
+        </p>
+    </div>
+</div>

admin/tmpl/joomla_component/modalreturn.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Router\Route;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Joomla_component\HtmlView $this */
+
+$icon = 'icon-check';
+$title_key = $this->item->id ?? '';
+$title_column = $this->item->name ?? '';
+$data = [
+	'contentType' => 'com_componentbuilder.joomla_component',
+	'id' => $title_key,
+	'title' => $title_column,
+	'uri' => Route::_('index.php?option=com_componentbuilder&layout=modal&tmpl=component&id='. (int) ($this->item->id ?? 0))
+];
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $title_column; ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $title_column; ?>
+        </p>
+    </div>
+</div>

admin/tmpl/joomla_module/modalreturn.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * @package    Joomla.Component.Builder
+ *
+ * @created    30th April, 2015
+ * @author     Llewellyn van der Merwe <https://dev.vdm.io>
+ * @git        Joomla Component Builder <https://git.vdm.dev/joomla/Component-Builder>
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Router\Route;
+
+// No direct access to this file
+defined('_JEXEC') or die;
+
+/** @var \VDM\Component\Componentbuilder\Administrator\View\Joomla_module\HtmlView $this */
+
+$icon = 'icon-check';
+$title_key = $this->item->id ?? '';
+$title_column = $this->item->name ?? '';
+$data = [
+	'contentType' => 'com_componentbuilder.joomla_module',
+	'id' => $title_key,
+	'title' => $title_column,
+	'uri' => Route::_('index.php?option=com_componentbuilder&layout=modal&tmpl=component&id='. (int) ($this->item->id ?? 0))
+];
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $title_column; ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $title_column; ?>
+        </p>
+    </div>
+</div>