|
- id, false, 'cid', 'cb', $item->title); ?>
+ ' . Text::_('JSELECT')
+ . ' ' . htmlspecialchars($item->title, ENT_COMPAT, 'UTF-8') . ''
+ . '';
+ ?>
|
diff --git a/administrator/components/com_templates/tmpl/template/default_folders.php b/administrator/components/com_templates/tmpl/template/default_folders.php
index 22df22bae8544..3fa00a3236880 100644
--- a/administrator/components/com_templates/tmpl/template/default_folders.php
+++ b/administrator/components/com_templates/tmpl/template/default_folders.php
@@ -10,16 +10,17 @@
defined('_JEXEC') or die;
ksort($this->files, SORT_STRING);
?>
-
files as $key => $value) : ?>
-
-
-
- escape(end($explodeArray)); ?>
-
- folderTree($value); ?>
+
+
+
+ escape(end($explodeArray)); ?>
+
+ folderTree($value); ?>
+
diff --git a/administrator/components/com_templates/tmpl/template/default_tree.php b/administrator/components/com_templates/tmpl/template/default_tree.php
index 1365e2d6fab4e..e3ee55182d581 100644
--- a/administrator/components/com_templates/tmpl/template/default_tree.php
+++ b/administrator/components/com_templates/tmpl/template/default_tree.php
@@ -12,6 +12,11 @@
use Joomla\CMS\Router\Route;
ksort($this->files, SORT_NATURAL);
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->document->getWebAssetManager();
+$wa->addInlineStyle('.CodeMirror { height: 100%}');
+
?>
@@ -50,15 +55,15 @@
?>
-
-
- escape(end($explodeArray)); ?>
-
- directoryTree($value); ?>
+
+ escape(end($explodeArray)); ?>
+ directoryTree($value); ?>
+
-
- id . '&file=' . $value->id); ?>'>
+ id . '&file=' . $value->id); ?>' style="background:transparent; border:0; color: var(--atum-link-color)">
escape($value->name); ?>
diff --git a/administrator/language/en-GB/com_templates.ini b/administrator/language/en-GB/com_templates.ini
index e02904615c159..a6610152b88de 100644
--- a/administrator/language/en-GB/com_templates.ini
+++ b/administrator/language/en-GB/com_templates.ini
@@ -35,6 +35,8 @@ COM_TEMPLATES_CONFIG_SOURCE_LABEL="Valid Source Formats"
COM_TEMPLATES_CONFIG_UPLOAD_LABEL="Max. Upload Size (MB)"
COM_TEMPLATES_CONFIGURATION="Template: Options"
COM_TEMPLATES_COPY_SUCCESS="New template called %s was installed."
+JTOOLBAR_CREATE_CHILD="Duplicate as Child"
+JTOOLBAR_OVERRIDE_CHILD="Manage Overrides"
COM_TEMPLATES_CROP_AREA_ERROR="Crop area not selected."
COM_TEMPLATES_DIRECTORY_NOT_WRITABLE="The template folder is not writable. Some features may not work."
COM_TEMPLATES_ERR_XML="Template XML data not available"
diff --git a/build/media_source/com_templates/js/admin-styles-default.es6.js b/build/media_source/com_templates/js/admin-styles-default.es6.js
new file mode 100644
index 0000000000000..766660d2a974f
--- /dev/null
+++ b/build/media_source/com_templates/js/admin-styles-default.es6.js
@@ -0,0 +1,53 @@
+/**
+ * @copyright Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+(() => {
+ 'use strict';
+
+ // Shortcuts
+ const $ = document.querySelector.bind(document);
+ const $$ = document.querySelectorAll.bind(document);
+
+ // Get a reference of all the elements needed
+ const defaultButton = $('#style-default');
+ const createChildButton = $('#create-child');
+ const overrideChildButton = $('#override-child');
+
+ const duplicateButton = $('#toolbar-copy > button');
+ const deleteButton = $('#toolbar-delete > button');
+ const stylesElements = [].slice.call($$('input[name="cid[]"]'));
+
+ if (!defaultButton || !createChildButton || !overrideChildButton || !duplicateButton || !deleteButton || stylesElements.count) {
+ throw new Error('Some elements are missing, bailing out');
+ }
+
+ const manageButtons = (event) => {
+ const element = event.currentTarget;
+
+ // Enable Default button
+ if (element.dataset.isHome !== 'true') {
+ defaultButton.removeAttribute('disabled');
+ } else {
+ defaultButton.setAttribute('disabled', '');
+ }
+
+ // Enable Duplicate as chid button
+ if (element.dataset.isParent === 'true') {
+ createChildButton.removeAttribute('disabled');
+ } else {
+ createChildButton.setAttribute('disabled', '');
+ }
+
+ // Enable Manage child overrides button
+ if (element.dataset.isChild === 'true') {
+ overrideChildButton.removeAttribute('disabled');
+ } else {
+ overrideChildButton.setAttribute('disabled', '');
+ }
+ };
+
+ stylesElements.forEach((element) => {
+ element.addEventListener('click', manageButtons);
+ });
+})();
diff --git a/libraries/src/Installer/Adapter/TemplateAdapter.php b/libraries/src/Installer/Adapter/TemplateAdapter.php
index 0fb2a7071e920..d77e7b4e144fb 100644
--- a/libraries/src/Installer/Adapter/TemplateAdapter.php
+++ b/libraries/src/Installer/Adapter/TemplateAdapter.php
@@ -476,24 +476,51 @@ protected function setupUninstall()
// Deny remove default template
$db = $this->parent->getDbo();
$query = $db->getQuery(true)
- ->select('COUNT(*)')
+ ->select('*')
->from($db->quoteName('#__template_styles'))
->where(
[
- $db->quoteName('home') . ' = ' . $db->quote('1'),
$db->quoteName('template') . ' = :template',
$db->quoteName('client_id') . ' = :client_id',
]
)
+ ->orWhere(
+ [
+ $db->quoteName('parent') . ' = :template',
+ $db->quoteName('client_id') . ' = :client_id',
+ ]
+ )
->bind(':template', $name)
->bind(':client_id', $clientId);
$db->setQuery($query);
+ $results = $db->loadObjectList();
+
+ $isHome = false;
+ $hasChild = false;
+
+ foreach ($results as $k => $v)
+ {
+ if ((int) $v->home === 1)
+ {
+ $isHome = true;
+ }
+
+ if ($v->parent !== '')
+ {
+ $hasChild = true;
+ }
+ }
- if ($db->loadResult() != 0)
+ if ($isHome)
{
throw new \RuntimeException(Text::_('JLIB_INSTALLER_ERROR_TPL_UNINSTALL_TEMPLATE_DEFAULT'));
}
+ if ($hasChild)
+ {
+ throw new \RuntimeException(Text::_('JLIB_INSTALLER_ERROR_TPL_UNINSTALL_TEMPLATE_PARENT'));
+ }
+
// Get the template root path
$client = ApplicationHelper::getClientInfo($clientId);
|