content; ?>
diff --git a/libraries/src/Document/Renderer/Html/ModulesRenderer.php b/libraries/src/Document/Renderer/Html/ModulesRenderer.php
index 70629c347e1..90f277bc080 100644
--- a/libraries/src/Document/Renderer/Html/ModulesRenderer.php
+++ b/libraries/src/Document/Renderer/Html/ModulesRenderer.php
@@ -40,7 +40,7 @@ public function render($position, $params = array(), $content = null)
$app = Factory::getApplication();
$user = Factory::getUser();
- $frontediting = ($app->isClient('site') && $app->get('frontediting', 1) && !$user->guest);
+ $frontediting = ($app->isClient('site') && $app->get('frontediting', 1) && !$user->guest && !$app->input->get('pm'));
$menusEditing = ($app->get('frontediting', 1) == 2) && $user->authorise('core.edit', 'com_menus');
foreach (ModuleHelper::getModules($position) as $mod)
diff --git a/libraries/src/Helper/ModuleHelper.php b/libraries/src/Helper/ModuleHelper.php
index b955e276469..1efad8f7bae 100644
--- a/libraries/src/Helper/ModuleHelper.php
+++ b/libraries/src/Helper/ModuleHelper.php
@@ -15,6 +15,7 @@
use Joomla\CMS\Component\ComponentHelper;
use Joomla\CMS\Factory;
use Joomla\CMS\Filter\InputFilter;
+use Joomla\CMS\Helper\ContentHelper;
use Joomla\CMS\Language\LanguageHelper;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Layout\LayoutHelper;
@@ -100,7 +101,7 @@ public static function &getModules($position)
if (\count($result) === 0)
{
- if ($input->getBool('tp') && ComponentHelper::getParams('com_templates')->get('template_positions_display'))
+ if ($input->getBool('pm') || ($input->getBool('tp') && ComponentHelper::getParams('com_templates')->get('template_positions_display')))
{
$result[0] = static::createDummyModule();
$result[0]->title = $position;
@@ -208,7 +209,7 @@ public static function renderModule($module, $attribs = array())
}
// Dynamically add outline style
- if ($app->input->getBool('tp') && ComponentHelper::getParams('com_templates')->get('template_positions_display'))
+ if (($app->input->getBool('tp') && ComponentHelper::getParams('com_templates')->get('template_positions_display')) || ($app->input->getBool('pm') && ContentHelper::getActions('com_modules')->get('core.create')))
{
$attribs['style'] .= ' outline';
}
diff --git a/plugins/system/addmodulebutton/addmodulebutton.php b/plugins/system/addmodulebutton/addmodulebutton.php
new file mode 100644
index 00000000000..eeb3e1c942e
--- /dev/null
+++ b/plugins/system/addmodulebutton/addmodulebutton.php
@@ -0,0 +1,88 @@
+
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ * @since __DEPLOY_VERSION__
+ */
+
+defined('_JEXEC') or die;
+use Joomla\CMS\Helper\ContentHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\CMS\WebAsset\WebAssetManager;
+/**
+ * Displays the Add Module button for Frontend Placement.
+ *
+ * @since __DEPLOY_VERSION__
+ */
+class PlgSystemAddModuleButton extends CMSPlugin
+{
+ /**
+ * Load plugin language files automatically
+ *
+ * @var boolean
+ * @since 3.9.0
+ */
+ protected $autoloadLanguage = true;
+
+ /**
+ * Application object
+ *
+ * @var \Joomla\CMS\Application\CMSApplication
+ * @since 3.2
+ */
+ protected $app;
+
+ /**
+ * Listener for the `onBeforeRender` event
+ *
+ * @return void
+ *
+ * @since 1.0
+ */
+ public function onBeforeRender()
+ {
+
+ if ($this->app->isClient('administrator'))
+ {
+ return;
+ }
+
+ // Frontend Module Placement Variables
+ $canCreateModules = ContentHelper::getActions('com_modules')->get('core.create');
+ $canEditModules = ContentHelper::getActions('com_modules')->get('core.edit');
+ $placeModules = $this->app->input->getBool('pm');
+ $editPosition = $this->app->input->getBool('edit');
+ $showAddModuleBtn = $canCreateModules && !$this->app->input->getBool('tp') && !$placeModules;
+
+ // Display Warning message when user is not logged in or does not have permissions
+ if ($placeModules)
+ {
+ if ($editPosition && !$canEditModules)
+ {
+ $this->app->enqueueMessage(Text::sprintf('PLG_SYSTEM_ADD_MODULE_BUTTON_EDIT_MODULE_PERMISSIONS_WARNING'), 'warning');
+
+ return;
+ }
+ elseif (!$canCreateModules)
+ {
+ $this->app->enqueueMessage(Text::sprintf('PLG_SYSTEM_ADD_MODULE_BUTTON_CREATE_MODULE_PERMISSIONS_WARNING'), 'warning');
+
+ return;
+ }
+ }
+
+ // Display the Add Module Button
+ if ($showAddModuleBtn)
+ {
+ // Add Script Options to pass the Button label Language Constant
+ $this->app->getDocument()->addScriptOptions('js-addModuleBtn', Text::_('PLG_SYSTEM_ADD_MODULE_BUTTON_LABEL'));
+
+ // Script for appending the Add Module Button
+ $this->app->getDocument()->getWebAssetManager()
+ ->registerAndUseScript('plg_system_addmodulebutton_js', 'media/plg_system_addmodulebutton/js/addmodulebutton.js', [], ['defer' => true]);
+ }
+ }
+}
diff --git a/plugins/system/addmodulebutton/addmodulebutton.xml b/plugins/system/addmodulebutton/addmodulebutton.xml
new file mode 100644
index 00000000000..e0a44a2c51f
--- /dev/null
+++ b/plugins/system/addmodulebutton/addmodulebutton.xml
@@ -0,0 +1,22 @@
+
+
+ plg_system_addmodulebutton
+ Joomla! Project
+ June 2021
+ (C) 2021 Open Source Matters, Inc.
+ GNU General Public License version 2 or later; see LICENSE.txt
+ admin@joomla.org
+ www.joomla.org
+ __DEPLOY_VERSION__
+ PLG_ADD_MODULE_BUTTON_XML_DESCRIPTION
+
+ addmodulebutton.php
+
+
+ language/en-GB/en-GB.plg_system_addmodulebutton.ini
+ language/en-GB/en-GB.plg_system_addmodulebutton.sys.ini
+
+
+ js
+
+
diff --git a/templates/cassiopeia/index.php b/templates/cassiopeia/index.php
index 517fc465b0e..43eae6fb284 100644
--- a/templates/cassiopeia/index.php
+++ b/templates/cassiopeia/index.php
@@ -10,6 +10,7 @@
defined('_JEXEC') or die;
use Joomla\CMS\Factory;
+use Joomla\CMS\Helper\ContentHelper;
use Joomla\CMS\HTML\HTMLHelper;
use Joomla\CMS\Language\Text;
use Joomla\CMS\Uri\Uri;
@@ -34,6 +35,10 @@
$menu = $app->getMenu()->getActive();
$pageclass = $menu !== null ? $menu->getParams()->get('pageclass_sfx', '') : '';
+// Display inactive positions for Place Module View
+$modulesPermissions = ContentHelper::getActions('com_modules');
+$showAllPositions = $app->input->getBool('pm') && ($modulesPermissions->get('core.edit') || $modulesPermissions->get('core.create'));
+
// Template path
$templatePath = 'templates/' . $this->template;
@@ -79,12 +84,12 @@
$hasClass = '';
-if ($this->countModules('sidebar-left', true))
+if ($this->countModules('sidebar-left', true) || $showAllPositions)
{
$hasClass .= ' has-sidebar-left';
}
-if ($this->countModules('sidebar-right', true))
+if ($this->countModules('sidebar-right', true) || $showAllPositions)
{
$hasClass .= ' has-sidebar-right';
}
@@ -119,19 +124,19 @@
?>">