From 6701e5fb8a47bf933a04145ee895656ed08fc170 Mon Sep 17 00:00:00 2001 From: Sven Nierlein Date: Tue, 8 Oct 2024 09:03:32 +0200 Subject: [PATCH] fix static includes --- plugins/plugins-available/conf/templates/_conf_bare.tt | 4 ++-- plugins/plugins-available/conf/templates/_conf_frame.tt | 4 ++-- .../conf/templates/conf_objects_fancyeditor.tt | 2 +- plugins/plugins-available/editor/templates/editor.tt | 4 ++-- .../plugins-available/node-control/templates/node_control.tt | 2 +- plugins/plugins-available/reports2/templates/reports.tt | 2 +- .../reports2/templates/reports/comp/report.tt | 2 +- plugins/plugins-available/reports2/templates/reports_edit.tt | 2 +- plugins/plugins-available/reports2/templates/reports_email.tt | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/plugins/plugins-available/conf/templates/_conf_bare.tt b/plugins/plugins-available/conf/templates/_conf_bare.tt index b22e694e40..c34dc97d6e 100644 --- a/plugins/plugins-available/conf/templates/_conf_bare.tt +++ b/plugins/plugins-available/conf/templates/_conf_bare.tt @@ -5,9 +5,9 @@ [% title_prefix %][% title %] [% PROCESS _favicon.tt %] [% PROCESS _common_css.tt %] - + [% PROCESS _common_js_files.tt %] - + [% IF c.config.useragentcompat %][% END %] diff --git a/plugins/plugins-available/conf/templates/_conf_frame.tt b/plugins/plugins-available/conf/templates/_conf_frame.tt index 55769ec87e..da969c67cc 100644 --- a/plugins/plugins-available/conf/templates/_conf_frame.tt +++ b/plugins/plugins-available/conf/templates/_conf_frame.tt @@ -1,6 +1,6 @@ [% PROCESS _header.tt - css=["plugins/${plugin_name}/conf.css","vendor/linedtextarea-e619e09/jquery-linedtextarea.css", "vendor/jstree-3.3.8/themes/default/style.min.css"] - js=["plugins/${plugin_name}/conf.js", "vendor/jstree-3.3.8/jstree.min.js"] + css=["plugins/${plugin_name}/conf-${fileversion}.css","vendor/linedtextarea-e619e09/jquery-linedtextarea.css", "vendor/jstree-3.3.8/themes/default/style.min.css"] + js=["plugins/${plugin_name}/conf-${fileversion}.js", "vendor/jstree-3.3.8/jstree.min.js"] %] [% PROCESS _message.tt %] [% PROCESS _blocks.tt %] diff --git a/plugins/plugins-available/conf/templates/conf_objects_fancyeditor.tt b/plugins/plugins-available/conf/templates/conf_objects_fancyeditor.tt index c9e965d6e8..498d3803a0 100644 --- a/plugins/plugins-available/conf/templates/conf_objects_fancyeditor.tt +++ b/plugins/plugins-available/conf/templates/conf_objects_fancyeditor.tt @@ -1,5 +1,5 @@ [% WRAPPER _conf_frame.tt %] - + diff --git a/plugins/plugins-available/editor/templates/editor.tt b/plugins/plugins-available/editor/templates/editor.tt index 6a6ab098e7..df16417bb1 100644 --- a/plugins/plugins-available/editor/templates/editor.tt +++ b/plugins/plugins-available/editor/templates/editor.tt @@ -1,5 +1,5 @@ -[% PROCESS _header.tt css=[ "plugins/${plugin_name}/editor.css", "vendor/jstree-3.3.8/themes/default/style.min.css"] - js=[ "plugins/${plugin_name}/editor.js", +[% PROCESS _header.tt css=[ "plugins/${plugin_name}/editor-${fileversion}.css", "vendor/jstree-3.3.8/themes/default/style.min.css"] + js=[ "plugins/${plugin_name}/editor-${fileversion}.js", "vendor/ace-builds-1.4.12/src-min-noconflict/ace.js", "vendor/ace-builds-1.4.12/src-min-noconflict/ext-language_tools.js", "vendor/jstree-3.3.8/jstree.min.js"] diff --git a/plugins/plugins-available/node-control/templates/node_control.tt b/plugins/plugins-available/node-control/templates/node_control.tt index a03aeff99d..08e2e1e4de 100644 --- a/plugins/plugins-available/node-control/templates/node_control.tt +++ b/plugins/plugins-available/node-control/templates/node_control.tt @@ -1,4 +1,4 @@ -[% PROCESS _header.tt js="plugins/${plugin_name}/node_control.js" %] +[% PROCESS _header.tt js="plugins/${plugin_name}/node_control-${fileversion}.js" %] [% PROCESS _message.tt %] + [% PROCESS _common_js.tt %] diff --git a/plugins/plugins-available/reports2/templates/reports_edit.tt b/plugins/plugins-available/reports2/templates/reports_edit.tt index 5265dc1272..614a173c4f 100644 --- a/plugins/plugins-available/reports2/templates/reports_edit.tt +++ b/plugins/plugins-available/reports2/templates/reports_edit.tt @@ -1,4 +1,4 @@ -[% PROCESS _header.tt js="plugins/${plugin_name}/reports.js" %] +[% PROCESS _header.tt js="plugins/${plugin_name}/reports-${fileversion}.js" %] [% PROCESS _message.tt %] [% USE date %] diff --git a/plugins/plugins-available/reports2/templates/reports_email.tt b/plugins/plugins-available/reports2/templates/reports_email.tt index 315d236f48..ee6bbd6d7b 100644 --- a/plugins/plugins-available/reports2/templates/reports_email.tt +++ b/plugins/plugins-available/reports2/templates/reports_email.tt @@ -1,4 +1,4 @@ -[% PROCESS _header.tt js="plugins/${plugin_name}/reports.js" %] +[% PROCESS _header.tt js="plugins/${plugin_name}/reports-${fileversion}.js" %] [% PROCESS _message.tt %] [% USE date %]