[6.1] Implement copy child template (#46278)

Co-authored-by: Brian Teeman <[email protected]>

Author: bembelimen

administrator/components/com_templates/src/Model/TemplateModel.php

@@ -824,6 +824,11 @@ protected function fixTemplateName()
         $oldName  = $template->element;
         $manifest = json_decode($template->manifest_cache);
 
+        // When copying a child template we need to prefix it with the parent template name
+        if (!empty($template->xmldata->parent)) {
+            $newName = $template->xmldata->parent . '_' . $newName;
+        }
+
         foreach ($files as $file) {
             $newFile = '/' . str_replace($oldName, $newName, basename($file));
 
@@ -2042,14 +2047,16 @@ public function child()
         $media->addChild('folder', 'images');
         $media->addChild('folder', 'scss');
 
-        $xml->name = $template->element . '_' . $newName;
+        $element = (!empty($template->xmldata->parent) ? $template->xmldata->parent : $template->element);
+
+        $xml->name = $element . '_' . $newName;
 
         if (isset($xml->namespace)) {
             $xml->namespace .= '_' . ucfirst($newName);
         }
 
         $xml->inheritable = 0;
-        $files            = $xml->addChild('parent', $template->element);
+        $files            = $xml->addChild('parent', $element);
 
         $dom                     = new \DOMDocument();
         $dom->preserveWhiteSpace = false;

administrator/components/com_templates/src/View/Template/HtmlView.php

@@ -275,9 +275,9 @@ protected function addToolbar()
                     // Add a copy/child template button
                     if (isset($this->template->xmldata->inheritable) && (string) $this->template->xmldata->inheritable === '1') {
                         ToolbarHelper::modal('childModal', 'icon-copy', 'COM_TEMPLATES_BUTTON_TEMPLATE_CHILD');
-                    } elseif (empty($this->template->xmldata->parent) && empty($this->template->xmldata->namespace)) {
-                        // We can't copy parent templates nor namespaced templates
-                        ToolbarHelper::modal('copyModal', 'icon-copy', 'COM_TEMPLATES_BUTTON_COPY_TEMPLATE');
+                    } elseif (empty($this->template->xmldata->namespace)) {
+                        // We can't copy namespaced templates
+                        ToolbarHelper::modal('copyModal', 'icon-copy', !empty($this->template->xmldata->parent) ? 'COM_TEMPLATES_BUTTON_COPY_CHILD_TEMPLATE' : 'COM_TEMPLATES_BUTTON_COPY_TEMPLATE');
                     }
 
                     break;

administrator/components/com_templates/tmpl/template/default.php

@@ -394,7 +394,7 @@
     $copyModalData = [
         'selector' => $taskName . 'Modal',
         'params'   => [
-            'title'  => Text::_('COM_TEMPLATES_TEMPLATE_' . strtoupper($taskName)),
+            'title'  => Text::_('COM_TEMPLATES_TEMPLATE_' . strtoupper($taskName) . (isset($this->template->xmldata->parent) && (string) $this->template->xmldata->parent !== '' ? '_CHILD' : '')),
             'footer' => $this->loadTemplate('modal_' . $taskName . '_footer')
         ],
         'body' => $this->loadTemplate('modal_' . $taskName . '_body')

administrator/components/com_templates/tmpl/template/default_modal_copy_footer.php

@@ -14,4 +14,4 @@
 
 ?>
 <button type="button" class="btn btn-secondary" data-bs-dismiss="modal"><?php echo Text::_('COM_TEMPLATES_TEMPLATE_CLOSE'); ?></button>
-<button type="submit" class="btn btn-primary"><?php echo Text::_('COM_TEMPLATES_TEMPLATE_COPY'); ?></button>
+<button type="submit" class="btn btn-primary"><?php echo Text::_('COM_TEMPLATES_TEMPLATE_COPY' . (isset($this->template->xmldata->parent) && (string) $this->template->xmldata->parent !== '' ? '_CHILD' : '')); ?></button>

administrator/language/en-GB/com_templates.ini

@@ -11,6 +11,7 @@ COM_TEMPLATES_BUTTON_CHECK="Check Overrides"
 COM_TEMPLATES_BUTTON_CHECK_LIST_ENTRY="Mark Checked"
 COM_TEMPLATES_BUTTON_CLOSE_FILE="Close"
 COM_TEMPLATES_BUTTON_COPY_FILE="Copy File"
+COM_TEMPLATES_BUTTON_COPY_CHILD_TEMPLATE="Copy Child Template"
 COM_TEMPLATES_BUTTON_COPY_TEMPLATE="Copy Template"
 COM_TEMPLATES_BUTTON_CREATE="Create"
 COM_TEMPLATES_BUTTON_CROP="Crop"
@@ -240,6 +241,7 @@ COM_TEMPLATES_TEMPLATE_CHILD_NAME_LABEL="Child Template Name"
 COM_TEMPLATES_TEMPLATE_CHILD_STYLE_LABEL="Additional Template Styles"
 COM_TEMPLATES_TEMPLATE_CLOSE="Close"
 COM_TEMPLATES_TEMPLATE_COPY="Copy Template"
+COM_TEMPLATES_TEMPLATE_COPY_CHILD="Copy Child Template"
 COM_TEMPLATES_TEMPLATE_CORE_FILENAME="Original file "%s"."
 COM_TEMPLATES_TEMPLATE_DESCRIPTION="Template description."
 COM_TEMPLATES_TEMPLATE_DETAILS="%s Details and Files"

templates/cassiopeia_extended/templateDetails.xml

@@ -19,6 +19,7 @@
 	</files>
 	<media destination="templates/site/cassiopeia_extended" folder="media">
 		<folder>css</folder>
+		<folder>images</folder>
 		<folder>scss</folder>
 	</media>
 	<positions>
@@ -42,10 +43,6 @@
 		<position>error-403</position>
 		<position>error-404</position>
 	</positions>
-	<languages folder="language">
-		<language tag="en-GB">en-GB/tpl_cassiopeia.ini</language>
-		<language tag="en-GB">en-GB/tpl_cassiopeia.sys.ini</language>
-	</languages>
 	<config>
 		<fields name="params">
 			<fieldset name="advanced">