Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 96 commits into from
Nov 30, 2021
Merged
Show file tree
Hide file tree
Changes from 43 commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
26a0958
Fix the missing installer info
dgrammatiko Nov 9, 2021
cf33965
Fix the template thumb images
dgrammatiko Nov 9, 2021
a9be7b5
Fix missing language on style view
dgrammatiko Nov 9, 2021
5e04958
Update Templates.php
dgrammatiko Nov 9, 2021
51aa358
Update libraries/src/Installer/Installer.php
dgrammatiko Nov 9, 2021
c582169
Update build/media_source/system/images/template_thumb.svg
dgrammatiko Nov 9, 2021
2bda307
Update build/media_source/system/images/template_thumb.svg
dgrammatiko Nov 9, 2021
1ed0770
Fix the thumb logic
dgrammatiko Nov 9, 2021
3b1e4d4
editor #1
dgrammatiko Nov 17, 2021
102001c
CS
dgrammatiko Nov 17, 2021
c946da7
CS
dgrammatiko Nov 17, 2021
e06e5f2
CS + fix logic
dgrammatiko Nov 18, 2021
2724385
Ensure the isMedia flag is correcly propageted
dgrammatiko Nov 18, 2021
c1c85f4
Ooops, forgot the child creation functionality
dgrammatiko Nov 18, 2021
3176892
CS
dgrammatiko Nov 18, 2021
4765404
Update administrator/components/com_templates/tmpl/template/default_m…
dgrammatiko Nov 18, 2021
e3d8da2
Update administrator/components/com_templates/tmpl/template/default_m…
dgrammatiko Nov 18, 2021
e5a4b0b
Fix the description for the child name
dgrammatiko Nov 18, 2021
e1dad73
Update administrator/components/com_templates/tmpl/template/default_m…
dgrammatiko Nov 18, 2021
dba710b
Update administrator/components/com_templates/tmpl/template/default_t…
dgrammatiko Nov 18, 2021
d2bd17b
Fix copy/pasting doc blocks
dgrammatiko Nov 18, 2021
d256c42
Child tmpl name === parentTmplName_childName
dgrammatiko Nov 19, 2021
d0b62d4
Merge branch '4.1-dev' into 4.1-dev-com_templates_clean
dgrammatiko Nov 19, 2021
b29a352
Update administrator/components/com_templates/src/Model/TemplateModel…
dgrammatiko Nov 19, 2021
33d7185
Update administrator/components/com_templates/src/Model/TemplateModel…
dgrammatiko Nov 19, 2021
6ef68d0
Update administrator/components/com_templates/src/Model/TemplateModel…
dgrammatiko Nov 19, 2021
aaa4cd3
Update administrator/components/com_templates/src/View/Template/HtmlV…
dgrammatiko Nov 19, 2021
de0efb9
CS
dgrammatiko Nov 19, 2021
35ec2a5
Update administrator/components/com_templates/src/Service/HTML/Templa…
dgrammatiko Nov 19, 2021
7a95857
Merge branch '4.1-dev' into 4.1-dev-com_templates_clean
bembelimen Nov 21, 2021
31a39e1
Update administrator/components/com_templates/src/Controller/Template…
dgrammatiko Nov 21, 2021
e847241
Bailout Early
dgrammatiko Nov 21, 2021
b6b62bf
CS
dgrammatiko Nov 21, 2021
030520b
Merge branch '4.1-dev' into 4.1-dev-com_templates_clean
dgrammatiko Nov 22, 2021
7f392d5
Merge branch '4.1-dev' into 4.1-dev-com_templates_clean
dgrammatiko Nov 22, 2021
260d662
Don't throw warnings
dgrammatiko Nov 22, 2021
15016f5
better conditianal
dgrammatiko Nov 22, 2021
7508eec
More notices
dgrammatiko Nov 22, 2021
d5ae5c1
Fix the thumb paths
dgrammatiko Nov 22, 2021
411a9f5
Fix Fat FS lookups
dgrammatiko Nov 22, 2021
8578cf9
Fix the missing media folder for the child template
dgrammatiko Nov 22, 2021
e257ca2
don't echo the first slash on win OS
dgrammatiko Nov 22, 2021
4dc712e
.html is not in the allowed list. WOW
dgrammatiko Nov 22, 2021
64b4046
Update administrator/components/com_templates/src/Model/TemplateModel…
dgrammatiko Nov 23, 2021
54b76e5
Update administrator/components/com_templates/src/Controller/Template…
dgrammatiko Nov 23, 2021
263bd73
Update administrator/components/com_templates/tmpl/template/default_m…
dgrammatiko Nov 23, 2021
bae97ac
Update administrator/components/com_templates/tmpl/template/default_m…
dgrammatiko Nov 23, 2021
9e538e4
Update administrator/components/com_templates/tmpl/template/default.php
dgrammatiko Nov 23, 2021
6a2d0fd
Update administrator/components/com_templates/src/View/Template/HtmlV…
dgrammatiko Nov 23, 2021
9a74cd1
Update administrator/components/com_templates/src/Model/TemplateModel…
dgrammatiko Nov 23, 2021
5df2f25
Update administrator/components/com_templates/src/Controller/Template…
dgrammatiko Nov 23, 2021
f4eda88
Update administrator/components/com_templates/src/Model/TemplateModel…
dgrammatiko Nov 23, 2021
b2a0101
Update administrator/components/com_templates/src/Model/TemplateModel…
dgrammatiko Nov 23, 2021
6b24ef9
Merge branch '4.1-dev' into 4.1-dev-com_templates_clean
dgrammatiko Nov 23, 2021
3290555
CS, proper media folder logic
dgrammatiko Nov 23, 2021
3bdc0ea
CS
dgrammatiko Nov 23, 2021
9fa0883
Meh
dgrammatiko Nov 23, 2021
5da5d2b
Paths...
dgrammatiko Nov 23, 2021
5cd61ee
Merge branch '4.1-dev' into 4.1-dev-com_templates_clean
dgrammatiko Nov 24, 2021
b60bd4a
Merge branch '4.1-dev' into 4.1-dev-com_templates_clean
bembelimen Nov 25, 2021
ce878b9
better tree entry names
dgrammatiko Nov 25, 2021
2e6b1c0
Use current user name, current date for child
dgrammatiko Nov 25, 2021
7c947b6
Bug, file delete
dgrammatiko Nov 25, 2021
55a31dc
Fix upload
dgrammatiko Nov 25, 2021
dd47470
Add a visual cue for parent/child
dgrammatiko Nov 26, 2021
1b27bf3
Merge branch '4.1-dev' into 4.1-dev-com_templates_clean
dgrammatiko Nov 26, 2021
081ff5e
Add buttons to switch between list views
dgrammatiko Nov 26, 2021
78cd20f
Wrong comments
dgrammatiko Nov 26, 2021
9f30a26
Clean up the child method
dgrammatiko Nov 26, 2021
15181b8
Merge branch '4.1-dev' into 4.1-dev-com_templates_clean
dgrammatiko Nov 26, 2021
0f35de4
PHP notice, use entry dir as the starting point
dgrammatiko Nov 27, 2021
bd82bbc
Correct icon
dgrammatiko Nov 27, 2021
aff38d3
Merge branch '4.1-dev' into 4.1-dev-com_templates_clean
bembelimen Nov 27, 2021
db70e80
Undefined $isMedia Pfff
dgrammatiko Nov 27, 2021
13b3be7
Update administrator/components/com_templates/src/Controller/Template…
dgrammatiko Nov 27, 2021
2d1dfcf
Update administrator/components/com_templates/src/Controller/Template…
dgrammatiko Nov 27, 2021
61f3500
Merge #36011
dgrammatiko Nov 27, 2021
b962afb
Remove a debug line
dgrammatiko Nov 27, 2021
bfe1eb6
Windows use / instead of \
dgrammatiko Nov 27, 2021
4e76c7b
Winows double //
dgrammatiko Nov 27, 2021
29decb4
Update administrator/language/en-GB/com_templates.ini
dgrammatiko Nov 27, 2021
2359e7f
double //
dgrammatiko Nov 27, 2021
c7f7053
b->strong
dgrammatiko Nov 27, 2021
22de283
rename modatl tittle //
dgrammatiko Nov 27, 2021
9bb1974
Update administrator/components/com_templates/tmpl/template/default_t…
dgrammatiko Nov 27, 2021
d102440
Update plugins/editors/tinymce/tinymce.php
dgrammatiko Nov 27, 2021
23f9163
Switch the fallback icon
dgrammatiko Nov 27, 2021
1192e8d
Update administrator/components/com_templates/src/View/Styles/HtmlVie…
dgrammatiko Nov 28, 2021
486600e
Update administrator/language/en-GB/com_templates.ini
dgrammatiko Nov 28, 2021
f3039f1
Update plugins/editors/tinymce/tinymce.php
dgrammatiko Nov 28, 2021
748d50f
Update administrator/language/en-GB/com_templates.ini
dgrammatiko Nov 28, 2021
afedb4f
tabs
dgrammatiko Nov 28, 2021
63fab0e
Lang failsafe
dgrammatiko Nov 28, 2021
c1de0cd
Merge branch '4.1-dev' into 4.1-dev-com_templates_clean
richard67 Nov 28, 2021
83268a2
Merge branch '4.1-dev' into 4.1-dev-com_templates_clean
bembelimen Nov 28, 2021
be16a9f
Update administrator/components/com_templates/tmpl/template/default_f…
dgrammatiko Nov 29, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,9 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
$formFile = Path::clean($client->path . '/templates/' . $template . '/templateDetails.xml');

// Load the core and/or local language file(s).
$lang->load('tpl_' . $template, $client->path)
$lang->load('tpl_' . $template, $client->path)
|| $lang->load('tpl_' . $data->parent, $client->path)
|| $lang->load('tpl_' . $data->parent, $client->path . '/templates/' . $data->parent)
|| $lang->load('tpl_' . $template, $client->path . '/templates/' . $template);

if (file_exists($formFile))
Expand Down
Loading