4.1 com_templates, child templates 2/2 by dgrammatiko · Pull Request #35879 · joomla/joomla-cms

dgrammatiko · 2021-10-23T12:08:57Z

Pull Request for Issue # .

Summary of Changes

Will be updated once the code is ready for review

Testing Instructions

Actual result BEFORE applying this Pull Request

Expected result AFTER applying this Pull Request

Documentation Changes Required

…tes-mod-1 [CMS PR 35874] Update deleted files and folders

…tes-mod-2 [CMS PR 35874] Move custom files in core templates to media folder on update

…tes-mod-3 [CMS PR 35874] Add stuff from system templates to deleted files and folders and files for preview images to the move to media folder

…tes-mod-4 [CMS PR 35874] Revert special handling for core template preview images

richard67 · 2021-10-23T12:16:03Z

@dgrammatiko Is it by purpose that this PR includes also the changes from the other PR #35874 ? Am just asking to be sure.

dgrammatiko · 2021-10-23T13:58:33Z

Is it by purpose that this PR includes also the changes from the other PR #35874 ? Am just asking to be sure.

As this one atm is a draft is easier for me to have the changes from the other PR also here. Once all the required changes are in place I will either clean this with only the com_templates changes or as Brian suggested merge the 2 PRs in one (current approach). It's up to the maintainers/testers to decide if it's easier to go with one or couple PRs

richard67 · 2021-10-23T15:33:33Z

@dgrammatiko As I can see the other PR is ready for testing, except that it maybe needs a bit more testing instructions. So one way to go would be we test the other PR so it gets merged soon, and then when this one is updated (with solving conflicts) to the latest 4.1-dev it will be sorted out.

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

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

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

….php Co-authored-by: Brian Teeman <brian@teeman.net>

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

….php Co-authored-by: Brian Teeman <brian@teeman.net>

…odal_child_footer.php Co-authored-by: Brian Teeman <brian@teeman.net>

…odal_child_body.php Co-authored-by: Brian Teeman <brian@teeman.net>

…tes.php Co-authored-by: Brian Teeman <brian@teeman.net>

brianteeman · 2021-11-02T15:47:52Z

administrator/language/en-GB/com_templates.ini

+COM_TEMPLATES_BUTTON_CHILD_TEMPLATE="Child Template"
+COM_TEMPLATES_TEMPLATE_CHILD="Child Template"
+COM_TEMPLATES_TEMPLATE_CHILD_NAME_LABEL="Name of the child template"
+COM_TEMPLATES_TEMPLATE_CHILD_NAME_DESC="Name of the child template"


lets not add a description that is identical to the label please

That isn't my intention, I'm just adding the keys here and then sort them and probably ping you for the correct text

From joomla#35879

dgrammatiko · 2021-11-18T14:18:46Z

Replaced by #35998

@bembelimen

* Fix the missing installer info * Fix the template thumb images * Fix missing language on style view * Update Templates.php * Update libraries/src/Installer/Installer.php Co-authored-by: Brian Teeman <brian@teeman.net> * Update build/media_source/system/images/template_thumb.svg Co-authored-by: Brian Teeman <brian@teeman.net> * Update build/media_source/system/images/template_thumb.svg Co-authored-by: Brian Teeman <brian@teeman.net> * Fix the thumb logic * editor #1 * CS * CS * CS + fix logic * Ensure the isMedia flag is correcly propageted * Ooops, forgot the child creation functionality From #35879 * CS * Update administrator/components/com_templates/tmpl/template/default_modal_child_body.php Co-authored-by: Brian Teeman <brian@teeman.net> * Update administrator/components/com_templates/tmpl/template/default_modal_child_footer.php Co-authored-by: Brian Teeman <brian@teeman.net> * Fix the description for the child name * Update administrator/components/com_templates/tmpl/template/default_media_folders.php Co-authored-by: Brian Teeman <brian@teeman.net> * Update administrator/components/com_templates/tmpl/template/default_tree_media.php Co-authored-by: Brian Teeman <brian@teeman.net> * Fix copy/pasting doc blocks * Child tmpl name === parentTmplName_childName * Update administrator/components/com_templates/src/Model/TemplateModel.php Co-authored-by: Brian Teeman <brian@teeman.net> * Update administrator/components/com_templates/src/Model/TemplateModel.php Co-authored-by: Brian Teeman <brian@teeman.net> * Update administrator/components/com_templates/src/Model/TemplateModel.php Co-authored-by: Brian Teeman <brian@teeman.net> * Update administrator/components/com_templates/src/View/Template/HtmlView.php Co-authored-by: Brian Teeman <brian@teeman.net> * CS * Update administrator/components/com_templates/src/Service/HTML/Templates.php Co-authored-by: Quy <quy@fluxbb.org> * Update administrator/components/com_templates/src/Controller/TemplateController.php Co-authored-by: Benjamin Trenkle <bembelimen@users.noreply.github.com> * Bailout Early * CS * Don't throw warnings * better conditianal * More notices * Fix the thumb paths * Fix Fat FS lookups * Fix the missing media folder for the child template * don't echo the first slash on win OS * .html is not in the allowed list. WOW * Update administrator/components/com_templates/src/Model/TemplateModel.php Co-authored-by: Phil E. Taylor <phil@phil-taylor.com> * Update administrator/components/com_templates/src/Controller/TemplateController.php Co-authored-by: Phil E. Taylor <phil@phil-taylor.com> * Update administrator/components/com_templates/tmpl/template/default_modal_folder_body.php Co-authored-by: Phil E. Taylor <phil@phil-taylor.com> * Update administrator/components/com_templates/tmpl/template/default_media_folders.php Co-authored-by: Phil E. Taylor <phil@phil-taylor.com> * Update administrator/components/com_templates/tmpl/template/default.php Co-authored-by: Phil E. Taylor <phil@phil-taylor.com> * Update administrator/components/com_templates/src/View/Template/HtmlView.php Co-authored-by: Phil E. Taylor <phil@phil-taylor.com> * Update administrator/components/com_templates/src/Model/TemplateModel.php Co-authored-by: Phil E. Taylor <phil@phil-taylor.com> * Update administrator/components/com_templates/src/Controller/TemplateController.php Co-authored-by: Phil E. Taylor <phil@phil-taylor.com> * Update administrator/components/com_templates/src/Model/TemplateModel.php Co-authored-by: Phil E. Taylor <phil@phil-taylor.com> * Update administrator/components/com_templates/src/Model/TemplateModel.php Co-authored-by: Phil E. Taylor <phil@phil-taylor.com> * CS, proper media folder logic * CS * Meh * Paths... * better tree entry names * Use current user name, current date for child * Bug, file delete * Fix upload * Add a visual cue for parent/child * Add buttons to switch between list views @bembelimen's idea * Wrong comments * Clean up the child method * PHP notice, use entry dir as the starting point * Correct icon * Undefined $isMedia Pfff * Update administrator/components/com_templates/src/Controller/TemplateController.php Co-authored-by: Richard Fath <richard67@users.noreply.github.com> * Update administrator/components/com_templates/src/Controller/TemplateController.php Co-authored-by: Richard Fath <richard67@users.noreply.github.com> * Merge #36011 * Remove a debug line * Windows use / instead of \ * Winows double // * Update administrator/language/en-GB/com_templates.ini Co-authored-by: Brian Teeman <brian@teeman.net> * double // * b->strong * rename modatl tittle // * Update administrator/components/com_templates/tmpl/template/default_tree_media.php Co-authored-by: Quy <quy@fluxbb.org> * Update plugins/editors/tinymce/tinymce.php Co-authored-by: Quy <quy@fluxbb.org> * Switch the fallback icon This has a Creative Commons Zero v1.0 Universal (CC0) license and it was copied from: https://iconduck.com/search?query=xcode * Update administrator/components/com_templates/src/View/Styles/HtmlView.php Co-authored-by: Quy <quy@fluxbb.org> * Update administrator/language/en-GB/com_templates.ini Co-authored-by: Quy <quy@fluxbb.org> * Update plugins/editors/tinymce/tinymce.php Co-authored-by: Quy <quy@fluxbb.org> * Update administrator/language/en-GB/com_templates.ini Co-authored-by: Quy <quy@fluxbb.org> * tabs * Lang failsafe * Update administrator/components/com_templates/tmpl/template/default_folders.php Co-authored-by: Quy <quy@fluxbb.org> Co-authored-by: Brian Teeman <brian@teeman.net> Co-authored-by: Quy <quy@fluxbb.org> Co-authored-by: Benjamin Trenkle <bembelimen@users.noreply.github.com> Co-authored-by: Phil E. Taylor <phil@phil-taylor.com> Co-authored-by: Richard Fath <richard67@users.noreply.github.com>

dgrammatiko and others added 20 commits October 22, 2021 13:10

New mode for cassiopeia and atum

ed0a641

DB Changes

ed0fa0a

Fix wrong import paths

d29cd20

SQL for updates

108250f

Deleted files and folder for changing core templates to inheritable

843a3b4

Better version comments

60476dd

Merge pull request #4 from richard67/4.1-dev-dgrammatiko-child-templa…

4b3c5f0

…tes-mod-1 [CMS PR 35874] Update deleted files and folders

Move custom files in core templates to media folder on update

cac4933

Better English in the comment

6de4fc4

Merge pull request #5 from richard67/4.1-dev-dgrammatiko-child-templa…

06edcdc

…tes-mod-2 [CMS PR 35874] Move custom files in core templates to media folder on update

Fix some paths

dca3ac9

System templates

00e431b

Deleted files and folders for system templates

8680438

Move template preview files, too

09b4d89

Create parent folders if necessary at target path

9faa291

Don't delete template previews

1562dff

Merge pull request #6 from richard67/4.1-dev-dgrammatiko-child-templa…

aa87408

…tes-mod-3 [CMS PR 35874] Add stuff from system templates to deleted files and folders and files for preview images to the move to media folder

Revert special handling for core template preview images

d8a1d8b

Merge pull request #7 from richard67/4.1-dev-dgrammatiko-child-templa…

d59f121

…tes-mod-4 [CMS PR 35874] Revert special handling for core template preview images

move images to the correct folder

40f24d9

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

Fix the thumb/preview paths

d08883b

dgrammatiko added 2 commits October 23, 2021 14:28

xmldata not always in the template object

8502440

CS

cef1870

dgrammatiko added 2 commits October 23, 2021 18:24

Child Creation logic

4ded3d7

Create a media folder

2725303

dgrammatiko added 5 commits November 2, 2021 12:48

Lang, child tmpls name convention: parent_child

e9ebc5d

Fix the img paths

bbbf42b

Fix roboto path

132b236

CS

5c68f5c

CS

bc2914a

brianteeman reviewed Nov 2, 2021

View reviewed changes

administrator/components/com_templates/src/Model/TemplateModel.php Outdated Show resolved Hide resolved

brianteeman reviewed Nov 2, 2021

View reviewed changes

administrator/components/com_templates/src/Model/TemplateModel.php Outdated Show resolved Hide resolved

brianteeman reviewed Nov 2, 2021

View reviewed changes

administrator/components/com_templates/src/Model/TemplateModel.php Outdated Show resolved Hide resolved

brianteeman reviewed Nov 2, 2021

View reviewed changes

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

brianteeman reviewed Nov 2, 2021

View reviewed changes

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

brianteeman reviewed Nov 2, 2021

View reviewed changes

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

dgrammatiko and others added 2 commits November 2, 2021 15:47

Update administrator/components/com_templates/src/Model/TemplateModel…

10ce4d4

….php Co-authored-by: Brian Teeman <brian@teeman.net>

Update administrator/components/com_templates/src/Model/TemplateModel…

083fee5

….php Co-authored-by: Brian Teeman <brian@teeman.net>

brianteeman reviewed Nov 2, 2021

View reviewed changes

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

dgrammatiko and others added 5 commits November 2, 2021 15:47

Update administrator/components/com_templates/src/Model/TemplateModel…

b3c3a56

….php Co-authored-by: Brian Teeman <brian@teeman.net>

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

3c2b599

…odal_child_footer.php Co-authored-by: Brian Teeman <brian@teeman.net>

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

d6d1650

…odal_child_body.php Co-authored-by: Brian Teeman <brian@teeman.net>

Update administrator/components/com_templates/src/Service/HTML/Templa…

d330cf8

…tes.php Co-authored-by: Brian Teeman <brian@teeman.net>

Update administrator/components/com_templates/src/Service/HTML/Templa…

1e33423

…tes.php Co-authored-by: Brian Teeman <brian@teeman.net>

brianteeman reviewed Nov 2, 2021

View reviewed changes

dgrammatiko added 4 commits November 2, 2021 17:02

CS

ba76d9c

beatify the tree (still not a11y compliant)

0f61e00

meh

36a2d55

prevent default

071e0a2

dgrammatiko mentioned this pull request Nov 9, 2021

4.1 Child templates 1/2 #35874

Merged

dgrammatiko added a commit to dgrammatiko/joomla-cms that referenced this pull request Nov 18, 2021

Ooops, forgot the child creation functionality

c1c85f4

From joomla#35879

dgrammatiko closed this Nov 18, 2021

dgrammatiko deleted the 4.1-dev-system-templates branch April 18, 2022 09:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

4.1 com_templates, child templates 2/2 #35879

4.1 com_templates, child templates 2/2 #35879
dgrammatiko wants to merge 45 commits intojoomla:4.1-devfrom
dgrammatiko:4.1-dev-system-templates

dgrammatiko commented Oct 23, 2021

Uh oh!

richard67 commented Oct 23, 2021

Uh oh!

dgrammatiko commented Oct 23, 2021

Uh oh!

richard67 commented Oct 23, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

brianteeman Nov 2, 2021

Uh oh!

dgrammatiko Nov 2, 2021

Uh oh!

dgrammatiko commented Nov 18, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

dgrammatiko commented Oct 23, 2021

Summary of Changes

Testing Instructions

Actual result BEFORE applying this Pull Request

Expected result AFTER applying this Pull Request

Documentation Changes Required

Uh oh!

richard67 commented Oct 23, 2021

Uh oh!

dgrammatiko commented Oct 23, 2021

Uh oh!

richard67 commented Oct 23, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

brianteeman Nov 2, 2021

Choose a reason for hiding this comment

Uh oh!

dgrammatiko Nov 2, 2021

Choose a reason for hiding this comment

Uh oh!

dgrammatiko commented Nov 18, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants