[4.1] Child templates 2/2 [clean] #35998

dgrammatiko · 2021-11-09T15:12:04Z

Pull Request for Issue # .

Summary of Changes

Added functionality for the creation of a child template (for templates that support it). The name convention for the child template is [parent template]_[child template name] (eg for cassiopeia's child named temp the actual name will be cassiopeia_temp
Tweaked the language inclusions so children templates of the core get a correct translation (templates that have the language folder were already covered)
Tweaked the functionality for the preview thumb and preview images. Also added a fallback image if there's not an image in the template...
Tweaked the file editor so that folders could be created/deleted/renamed both on the template folder or the media folder
Tweaked the file editor so that files could be edited/created/deleted/renamed/uploaded/extracted both on the template folder or the media folder

Testing Instructions

Git fetch this PR, run npm
Try every functionality in the com_templates for both core templates
Install https://github.com/joomla/joomla-cms/files/7235154/cassy_1.0.0.zip (cassiopeia with a different name)
Try every functionality in the com_templates for the installed template
Also check (with tinymce as the editor) when editing an article that the editor.css (or .min.css if not in debug mode) is loaded from the /css folder of the template, if such file exists. (the path can be /templates/templateName/css/editor.[min.]CSS for existing templates or media/templates/site/templateName/css/editor.[min.]CSS for templates supporting children).

Actual result BEFORE applying this Pull Request

Expected result AFTER applying this Pull Request

Documentation Changes Required

Yes, this is the UI for the codename child template or whatever the project ends up naming the inheritable/extendable/... templates

administrator/components/com_templates/src/Service/HTML/Templates.php

build/media_source/system/images/template_thumb.svg

libraries/src/Installer/Installer.php

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

dgrammatiko · 2021-11-13T22:55:18Z

@brianteeman do you know if the aria-setsize, aria-posinset and aria-level are fully supported/correctly calculated on all evergreen browsers? Ref: https://w3c.github.io/aria-practices/examples/treeview/treeview-1/treeview-1b.html

brianteeman · 2021-11-13T22:58:46Z

Sorry I don't know. I will do some research tomorrow. Caveat a lot of the examples on that site are not very good

dgrammatiko · 2021-11-13T23:00:05Z

Do you have a solid example for tree view? I use some of the links from w3c/aria#1311

brianteeman · 2021-11-13T23:09:46Z

Not at my pc but the link I shared the other day in the media manager pr looked good

dgrammatiko · 2021-11-13T23:22:45Z

Not at my pc but the link I shared the other day in the media manager pr looked good

It's sharing the same code as https://w3c.github.io/aria-practices/examples/treeview/treeview-1/treeview-1b.html
Anyways I will code something and we can improve/iterate...

richard67 · 2021-11-28T20:52:53Z

@dgrammatiko Looks ok to me. But can it be that more than one template style for a child template is not supported?

When I make the template style of the child template be the default, I get no CSS from the parent loaded.

Backend template styles:

dgrammatiko · 2021-11-28T21:02:02Z

The names for your child templates are off, should be cassy_child* instead of cassy_cassy* Althought this shouldn't be the problem.

But can it be that more than one template style for a child template is not supported?

No, styles are just the JSON blob from the db so there shouldn't be a limit on the copies...

When I make the template style of the child template be the default, I get no CSS from the parent loaded.

Does the folders media/templates/site/cassy/... exist? This is weird...

richard67 · 2021-11-28T21:08:30Z

Does the folders media/templates/site/cassy/... exist? This is weird...

@dgrammatiko Yes, it exists. I've created another child with a more suitable name but that did not help.

Another thing I have noticed is that I can created new child templates, but I cannot delete them. Is that by design or will the delete come later with another PR?

richard67 · 2021-11-28T21:13:39Z

@dgrammatiko It seems it loads the template css files from the media/templates/site/cassy/css folder, but stuff from sub-folders "global", "system" and "vendor" is not included.

richard67 · 2021-11-28T21:14:15Z

@dgrammatiko It seems it loads the template css files from the media/templates/site/cassy/css folder, but stuff from sub-folders "global", "system" and "vendor" is not included.

P.S. Could that be an issue of the Cassy template?

dgrammatiko · 2021-11-28T21:15:27Z

Another thing I have noticed is that I can created new child templates, but I cannot delete them. Is that by design or will the delete come later with another PR?

Actually, you can already, got to System->Extentions, select templates in the filters and then delete any child template (probably not the most intuitive workflow)...

By the way, can you remove all the preexisted templates and try again your tests, something seems awfully wrong but I can't pinpoint what it is...

richard67 · 2021-11-28T21:27:27Z

@dgrammatiko I've tried again from scratch with a new installation of this branch. This time only one language, no template style copies, nothing special. I only installed the Cassy template and made it's template style the default. That worked, i.e. frontend looked ok. Then I have created a child template named "Child_1", so the generated name at the end was "Cassy_cild_1"- That worked. But then I make the template style of this child be the default, the frontpage looks like in my screenshot, i.e. some but not all CSS seems not to be loaded.

richard67 · 2021-11-28T21:30:24Z

@dgrammatiko Is it possible to test with both PRs #35874 and this here together? Or do they conflict somehow?

dgrammatiko · 2021-11-28T21:36:58Z

ut then I make the template style of this child be the default, the frontpage looks like in my screenshot, i.e. some but not all CSS seems not to be loaded.

Yeah there was something off in the cassy template, try this Cassy_new.zip

Is it possible to test with both PRs #35874 and this here together? Or do they conflict somehow?

I think there is nothing that conflicts, so they could be tested together. Remember to apply the db changes...

richard67 · 2021-11-28T21:38:09Z

@dgrammatiko I have just tested now with the both PR's merged together in a branch. I don't have the problem when creating a child template of the (now inheritable) Cassiopeia and then make the template style of that child be the default.

So it either is an issue with Cassy or it needs both PR's together.

richard67 · 2021-11-28T22:02:06Z

I have tested this item ✅ successfully on 7a95857

Template manager works well with inheritable and not inheritable templates and with child templates of inheritable templates.

The right editor.css is included when editing with TinyMCE in backend, regardless if the default template style is one of an inheritable or a not inheritable template or the child template of an inheritable template.

I've tested this PR alone with the core templates being not inheritable and the inheritable Cassy template installed (fixed version), and I also have texted it in combination with PR #35874 so the core templates were inheritable.

Both worked.

If there are minor glitches which I've missed in my tests, I think they can be fixed later.

_{This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/35998.}

chmst · 2021-11-28T22:13:03Z

I have tested this item ✅ successfully on 7a95857

Did all what I can imagine for child template and using templates and template styles - all went well.

_{This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/35998.}

richard67 · 2021-11-28T22:15:31Z

RTC

_{This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/35998.}

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

…olders.php Co-authored-by: Quy <[email protected]>

richard67 · 2021-11-29T09:47:14Z

I've added back the previous test results in the issue tracker since the last commit was just the removal of an obsolete "use" statement.

Quy · 2021-11-29T22:29:05Z

plugins/editors/tinymce/tinymce.php

-				// Issue warning notice if the file is not found (but pass name to $content_css anyway to avoid TinyMCE error
-				if (!file_exists($templates_path . '/' . $template . '/css/' . $content_css_custom))
-				{
-					$msg = sprintf(Text::_('PLG_TINY_ERR_CUSTOMCSSFILENOTPRESENT'), $content_css_custom);


Remove language string?

bembelimen · 2021-11-30T01:53:41Z

Thank you!

dgrammatiko added 3 commits November 9, 2021 16:10

Fix the missing installer info

26a0958

Fix the template thumb images

cf33965

Fix missing language on style view

a9be7b5

dgrammatiko requested review from rdeutz, wilsonge and zero-24 as code owners November 9, 2021 15:12

joomla-cms-bot added NPM Resource Changed This Pull Request can't be tested by Patchtester PR-4.1-dev labels Nov 9, 2021

dgrammatiko mentioned this pull request Nov 9, 2021

4.1 Child templates 1/2 #35874

Merged

brianteeman reviewed Nov 9, 2021

View reviewed changes

administrator/components/com_templates/src/Service/HTML/Templates.php Outdated Show resolved Hide resolved

brianteeman suggested changes Nov 9, 2021

View reviewed changes

build/media_source/system/images/template_thumb.svg Outdated Show resolved Hide resolved

build/media_source/system/images/template_thumb.svg Outdated Show resolved Hide resolved

libraries/src/Installer/Installer.php Outdated Show resolved Hide resolved

dgrammatiko and others added 5 commits November 9, 2021 18:13

Update Templates.php

5e04958

Update libraries/src/Installer/Installer.php

51aa358

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

Update build/media_source/system/images/template_thumb.svg

c582169

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

Update build/media_source/system/images/template_thumb.svg

2bda307

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

Fix the thumb logic

1ed0770

dgrammatiko force-pushed the 4.1-dev-com_templates_clean branch from 0a1f1a9 to 1ed0770 Compare November 9, 2021 19:09

dgrammatiko mentioned this pull request Nov 13, 2021

[4.0] Redo the com_templates #32896

Closed

editor #1

3b1e4d4

joomla-cms-bot added the Language Change This is for Translators label Nov 17, 2021

dgrammatiko added 2 commits November 17, 2021 16:54

CS

102001c

CS

c946da7

dgrammatiko changed the title ~~[4.1][WIP] Child templates 2/2 [clean]~~ [4.1] Child templates 2/2 [clean] Nov 17, 2021

dgrammatiko added 2 commits November 18, 2021 12:51

CS + fix logic

e06e5f2

Ensure the isMedia flag is correcly propageted

2724385

Merge branch '4.1-dev' into 4.1-dev-com_templates_clean

c1de0cd

joomla-cms-bot removed this from the Joomla 4.1 milestone Nov 28, 2021

joomla-cms-bot added the RTC This Pull Request is Ready To Commit label Nov 28, 2021

richard67 added this to the Joomla 4.1 milestone Nov 28, 2021

Merge branch '4.1-dev' into 4.1-dev-com_templates_clean

83268a2

Quy reviewed Nov 29, 2021

View reviewed changes

administrator/components/com_templates/tmpl/template/default_folders.php Outdated Show resolved Hide resolved

Update administrator/components/com_templates/tmpl/template/default_f…

be16a9f

…olders.php Co-authored-by: Quy <[email protected]>

Quy reviewed Nov 29, 2021

View reviewed changes

bembelimen merged commit 3ff973c into joomla:4.1-dev Nov 30, 2021

joomla-cms-bot removed the RTC This Pull Request is Ready To Commit label Nov 30, 2021

dgrammatiko deleted the 4.1-dev-com_templates_clean branch November 30, 2021 10:24

jgerman-bot mentioned this pull request Nov 30, 2021

[4.1] Child templates 2/2 [clean] joomlagerman/joomla#2142

Closed

joomlapl-bot mentioned this pull request Nov 30, 2021

[4.1] Child templates 2/2 [clean] JoomlaPolska/jezyk-J4#76

Closed

heelc29 mentioned this pull request Jul 10, 2023

[4.3] check of invalid json 'joomla.asset.json' #41135

Merged

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[4.1] Child templates 2/2 [clean] #35998

[4.1] Child templates 2/2 [clean] #35998

dgrammatiko commented Nov 9, 2021 •

edited

Loading

dgrammatiko commented Nov 13, 2021 •

edited

Loading

brianteeman commented Nov 13, 2021

dgrammatiko commented Nov 13, 2021

brianteeman commented Nov 13, 2021

dgrammatiko commented Nov 13, 2021

richard67 commented Nov 28, 2021

dgrammatiko commented Nov 28, 2021

richard67 commented Nov 28, 2021

richard67 commented Nov 28, 2021

richard67 commented Nov 28, 2021

dgrammatiko commented Nov 28, 2021

richard67 commented Nov 28, 2021

richard67 commented Nov 28, 2021

dgrammatiko commented Nov 28, 2021

richard67 commented Nov 28, 2021 •

edited

Loading

richard67 commented Nov 28, 2021

chmst commented Nov 28, 2021

richard67 commented Nov 28, 2021

richard67 commented Nov 29, 2021

Quy Nov 29, 2021

bembelimen commented Nov 30, 2021

[4.1] Child templates 2/2 [clean] #35998

[4.1] Child templates 2/2 [clean] #35998

Conversation

dgrammatiko commented Nov 9, 2021 • edited Loading

Summary of Changes

Testing Instructions

Actual result BEFORE applying this Pull Request

Expected result AFTER applying this Pull Request

Documentation Changes Required

dgrammatiko commented Nov 13, 2021 • edited Loading

brianteeman commented Nov 13, 2021

dgrammatiko commented Nov 13, 2021

brianteeman commented Nov 13, 2021

dgrammatiko commented Nov 13, 2021

richard67 commented Nov 28, 2021

dgrammatiko commented Nov 28, 2021

richard67 commented Nov 28, 2021

richard67 commented Nov 28, 2021

richard67 commented Nov 28, 2021

dgrammatiko commented Nov 28, 2021

richard67 commented Nov 28, 2021

richard67 commented Nov 28, 2021

dgrammatiko commented Nov 28, 2021

richard67 commented Nov 28, 2021 • edited Loading

richard67 commented Nov 28, 2021

chmst commented Nov 28, 2021

richard67 commented Nov 28, 2021

richard67 commented Nov 29, 2021

Quy Nov 29, 2021

Choose a reason for hiding this comment

bembelimen commented Nov 30, 2021

dgrammatiko commented Nov 9, 2021 •

edited

Loading

dgrammatiko commented Nov 13, 2021 •

edited

Loading

richard67 commented Nov 28, 2021 •

edited

Loading