replace v:asset viewhelpers by f:asset

ot_templating/Resources/Private/Partials/Classic/Assets.html

@@ -10,68 +10,56 @@ Assets included with the VHS viewhelpers
 <v:variable.set name="assets_dir" value="EXT:ot_templating/Resources/Public/assets/Classic" />
 
 <f:comment><!-- Style assets --></f:comment>
-<v:asset.style name="classic-fontAwesome"
-               path="{assets_dir}/style/ext/font-awesome/css/all.min.css"/>
+<f:asset.css identifier="classic-fontAwesome"
+               href="{assets_dir}/style/ext/font-awesome/css/all.min.css"/>
 
-<v:asset.style name="classic-jquery-ui-css"
-               path="{assets_dir}/style/ext/jquery-ui.min.css"/>
+<f:asset.css identifier="classic-jquery-ui-css"
+               href="{assets_dir}/style/ext/jquery-ui.min.css"/>
 
-<v:asset.style name="classic-slick-css"
-               path="{assets_dir}/style/ext/slick.css"/>
+<f:asset.css identifier="classic-slick-css"
+               href="{assets_dir}/style/ext/slick.css"/>
 
-<v:asset.style name="classic-slick-theme"
-               path="{assets_dir}/style/ext/slick-theme.css"/>
+<f:asset.css identifier="classic-slick-theme"
+               href="{assets_dir}/style/ext/slick-theme.css"/>
 
 <f:comment><!-- Leaflet's path shall not be rewritten since
                 it won't find the images files anymore --></f:comment>
-<v:asset.style name="classic-leaflet-css"
-               path="{assets_dir}/style/ext/leaflet.css"
-               rewrite="0"
-               standalone="1"/>
+<f:asset.css identifier="classic-leaflet-css"
+               href="{assets_dir}/style/ext/leaflet.css"/>
 
-<v:asset.style name="classic-leaflet-clusters-css"
-               path="{assets_dir}/style/ext/MarkerCluster.css"
-               rewrite="0"
-               standalone="1"/>
+<f:asset.css identifier="classic-leaflet-clusters-css"
+               href="{assets_dir}/style/ext/MarkerCluster.css"/>
 
-<v:asset.style name="classic-leaflet-clusters-default-css"
-               path="{assets_dir}/style/ext/MarkerCluster.Default.css"
-               rewrite="0"
-               standalone="1"/>
+<f:asset.css identifier="classic-leaflet-clusters-default-css"
+               href="{assets_dir}/style/ext/MarkerCluster.Default.css"/>
 
 <f:comment><!-- Theme's file shall not be rewritten since
                 it may not be updated from a website to another --></f:comment>
-<v:asset.style name="classic-theme"
-               path="{assets_dir}/style/classic-{ot:template.getPreference(key: 'themeColor')}.css"
-               dependencies="fontAwesome,slick,slick-theme,leaflet"
-               rewrite="0"
-               standalone="1"/>
+<f:asset.css identifier="classic-theme"
+               href="{assets_dir}/style/classic-{ot:template.getPreference(key: 'themeColor')}.css"/>
 
 
 <f:comment><!-- Script assets --></f:comment>
-<v:asset.script name="classic-jquery"
-                path="{assets_dir}/script/jquery-3.4.1.min.js"
+<f:asset.script identifier="classic-jquery"
+                src="{assets_dir}/script/jquery-3.4.1.min.js"
                 defer="1"/>
 
-<v:asset.script name="classic-datepicker"
-                path="{assets_dir}/script/jquery-ui.min.js"
+<f:asset.script identifier="classic-datepicker"
+                src="{assets_dir}/script/jquery-ui.min.js"
                 defer="1"/>
 
-<v:asset.script name="classic-slick"
-                path="{assets_dir}/script/slick.min.js"
-                dependencies="classic-jquery"
+<f:asset.script identifier="classic-slick"
+                src="{assets_dir}/script/slick.min.js"
                 defer="1"/>
 
-<v:asset.script name="classic-leaflet"
-                path="{assets_dir}/script/leaflet.js"
+<f:asset.script identifier="classic-leaflet"
+                src="{assets_dir}/script/leaflet.js"
                 defer="1"/>
 
-<v:asset.script name="classic-leaflet-clusters"
-                path="{assets_dir}/script/leaflet.markercluster.js"
+<f:asset.script identifier="classic-leaflet-clusters"
+                src="{assets_dir}/script/leaflet.markercluster.js"
                 defer="1"/>
 
-<v:asset.script name="classic-main"
-                path="{assets_dir}/script/main.js"
-                dependencies="classic-jquery,classic-datepicker,classic-slick,classic-leaflet"
-                standalone="1"
+<f:asset.script identifier="classic-main"
+                src="{assets_dir}/script/main.js"
                 defer="1"/>

ot_templating/Resources/Private/Partials/Modern/Assets.html

@@ -8,19 +8,16 @@ Assets included with the VHS viewhelpers
 --></f:comment>
 
 <v:variable.set name="assets_dir" value="EXT:ot_templating/Resources/Public/assets/Modern" />
-<v:variable.set name="force_standalone" value="0" />
 
 <f:comment><!-- Fonts assets --></f:comment>
 
-<v:asset.style name="modern-montserrat-font"
-               path="https://fonts.googleapis.com/css?family=Montserrat:300,300i,400,500,500i,600,700,800,900|Poppins:200,300,300i,400,400i,500,500i,600,600i,700,700i,800,800i,900"
-               external="1"
-               standalone="1"/>
+<f:asset.css identifier="modern-montserrat-font"
+             href="https://fonts.googleapis.com/css?family=Montserrat:300,300i,400,500,500i,600,700,800,900|Poppins:200,300,300i,400,400i,500,500i,600,600i,700,700i,800,800i,900"
+/>
 
-<v:asset.style name="modern-dosis-font"
-               path="https://fonts.googleapis.com/css?family=Dosis:300,400,500,600,700,800"
-               external="1"
-               standalone="1"/>
+<f:asset.css identifier="modern-dosis-font"
+             href="https://fonts.googleapis.com/css?family=Dosis:300,400,500,600,700,800"
+/>
 
 <style>
     @font-face {
@@ -44,90 +41,76 @@ Assets included with the VHS viewhelpers
 <f:comment><!-- Style assets --></f:comment>
 
 <f:comment><!-- includes all plugins ; can be removed if none of those plugins are used --></f:comment>
-<v:asset.style name="modern-plugins-css"
-               path="{assets_dir}/style/plugins-css.css"
-               standalone="{force_standalone}"/>
+<f:asset.css identifier="modern-plugins-css"
+               href="{assets_dir}/style/plugins-css.css"/>
 
 <f:comment><!-- includes revolution stylesheets --></f:comment>
-<v:asset.style name="modern-revolution-settings"
-               path="{assets_dir}/style/revolution/settings.css"
-               standalone="{force_standalone}"/>
+<f:asset.css identifier="modern-revolution-settings"
+               href="{assets_dir}/style/revolution/settings.css"/>
 
 <f:comment><!-- includes all typography stylesheets --></f:comment>
-<v:asset.style name="modern-typography"
-               path="{assets_dir}/style/typography.css"
-               standalone="{force_standalone}"/>
+<f:asset.css identifier="modern-typography"
+               href="{assets_dir}/style/typography.css"/>
 
-<v:asset.style name="modern-datetimepicker-css"
-               path="{assets_dir}/style/plugins/bootstrap-datetimepicker.min.css"
-               standalone="{force_standalone}"/>
+<f:asset.css identifier="modern-datetimepicker-css"
+               href="{assets_dir}/style/plugins/bootstrap-datetimepicker.min.css"/>
 
-<v:asset.style name="modern-slick-css"
-               path="{assets_dir}/style/plugins/slick.css"
-               standalone="{force_standalone}"/>
+<f:asset.css identifier="modern-slick-css"
+               href="{assets_dir}/style/plugins/slick.css"/>
 
-<v:asset.style name="modern-slick-theme-css"
-               path="{assets_dir}/style/plugins/slick-theme.css"
-               standalone="{force_standalone}"/>
+<f:asset.css identifier="modern-slick-theme-css"
+               href="{assets_dir}/style/plugins/slick-theme.css"/>
 
 <f:comment><!-- Leaflet's path shall not be rewritten since
                 it won't find the images files anymore --></f:comment>
-<v:asset.style name="modern-leaflet-css"
-               path="{assets_dir}/style/plugins/leaflet.css"
-               standalone="1"
-               rewrite="0"/>
+<f:asset.css identifier="modern-leaflet-css"
+               href="{assets_dir}/style/plugins/leaflet.css"/>
 
 <f:comment><!-- includes all shortcodes ; some of them may have to be removed --></f:comment>
-<v:asset.style group="modern-shortcodes" path="{assets_dir}/style/shortcodes/accordion.css"/>
-<v:asset.style group="modern-shortcodes" path="{assets_dir}/style/shortcodes/action-box.css"/>
-<v:asset.style group="modern-shortcodes" path="{assets_dir}/style/shortcodes/blockquote.css"/>
-<v:asset.style group="modern-shortcodes" path="{assets_dir}/style/shortcodes/bootstrap-typography.css"/>
-<v:asset.style group="modern-shortcodes" path="{assets_dir}/style/shortcodes/button.css"/>
-<v:asset.style group="modern-shortcodes" path="{assets_dir}/style/shortcodes/clients.css"/>
-<v:asset.style group="modern-shortcodes" path="{assets_dir}/style/shortcodes/contact-form.css"/>
-<v:asset.style group="modern-shortcodes" path="{assets_dir}/style/shortcodes/countdown.css"/>
-<v:asset.style group="modern-shortcodes" path="{assets_dir}/style/shortcodes/counter.css"/>
-<v:asset.style group="modern-shortcodes" path="{assets_dir}/style/shortcodes/divider.css"/>
-<v:asset.style group="modern-shortcodes" path="{assets_dir}/style/shortcodes/dropcap.css"/>
-<v:asset.style group="modern-shortcodes" path="{assets_dir}/style/shortcodes/feature-text.css"/>
-<v:asset.style group="modern-shortcodes" path="{assets_dir}/style/shortcodes/list-style.css"/>
-<v:asset.style group="modern-shortcodes" path="{assets_dir}/style/shortcodes/nice-select.css"/>
-<v:asset.style group="modern-shortcodes" path="{assets_dir}/style/shortcodes/owl-carousel.css"/>
-<v:asset.style group="modern-shortcodes" path="{assets_dir}/style/shortcodes/page-title.css"/>
-<v:asset.style group="modern-shortcodes" path="{assets_dir}/style/shortcodes/pie-chart.css"/>
-<v:asset.style group="modern-shortcodes" path="{assets_dir}/style/shortcodes/pricing.css"/>
-<v:asset.style group="modern-shortcodes" path="{assets_dir}/style/shortcodes/progress-bar.css"/>
-<v:asset.style group="modern-shortcodes" path="{assets_dir}/style/shortcodes/section-title.css"/>
-<v:asset.style group="modern-shortcodes" path="{assets_dir}/style/shortcodes/shortcodes.css"/>
-<v:asset.style group="modern-shortcodes" path="{assets_dir}/style/shortcodes/social-icons.css"/>
-<v:asset.style group="modern-shortcodes" path="{assets_dir}/style/shortcodes/tabs.css"/>
-<v:asset.style group="modern-shortcodes" path="{assets_dir}/style/shortcodes/team.css"/>
-<v:asset.style group="modern-shortcodes" path="{assets_dir}/style/shortcodes/testimonial.css"/>
-<v:asset.style group="modern-shortcodes" path="{assets_dir}/style/shortcodes/side-panel.css"/>
-<v:asset.style group="modern-shortcodes" path="{assets_dir}/style/shortcodes/onload-modal.css"/>
+<f:asset.css identifier="modern-shortcodes1" href="{assets_dir}/style/shortcodes/accordion.css"/>
+<f:asset.css identifier="modern-shortcodes2" href="{assets_dir}/style/shortcodes/action-box.css"/>
+<f:asset.css identifier="modern-shortcodes3" href="{assets_dir}/style/shortcodes/blockquote.css"/>
+<f:asset.css identifier="modern-shortcodes4" href="{assets_dir}/style/shortcodes/bootstrap-typography.css"/>
+<f:asset.css identifier="modern-shortcodes5" href="{assets_dir}/style/shortcodes/button.css"/>
+<f:asset.css identifier="modern-shortcodes6" href="{assets_dir}/style/shortcodes/clients.css"/>
+<f:asset.css identifier="modern-shortcodes7" href="{assets_dir}/style/shortcodes/contact-form.css"/>
+<f:asset.css identifier="modern-shortcodes8" href="{assets_dir}/style/shortcodes/countdown.css"/>
+<f:asset.css identifier="modern-shortcodes9" href="{assets_dir}/style/shortcodes/counter.css"/>
+<f:asset.css identifier="modern-shortcodes10" href="{assets_dir}/style/shortcodes/divider.css"/>
+<f:asset.css identifier="modern-shortcodes11" href="{assets_dir}/style/shortcodes/dropcap.css"/>
+<f:asset.css identifier="modern-shortcodes12" href="{assets_dir}/style/shortcodes/feature-text.css"/>
+<f:asset.css identifier="modern-shortcodes13" href="{assets_dir}/style/shortcodes/list-style.css"/>
+<f:asset.css identifier="modern-shortcodes14" href="{assets_dir}/style/shortcodes/nice-select.css"/>
+<f:asset.css identifier="modern-shortcodes15" href="{assets_dir}/style/shortcodes/owl-carousel.css"/>
+<f:asset.css identifier="modern-shortcodes16" href="{assets_dir}/style/shortcodes/page-title.css"/>
+<f:asset.css identifier="modern-shortcodes17" href="{assets_dir}/style/shortcodes/pie-chart.css"/>
+<f:asset.css identifier="modern-shortcodes18" href="{assets_dir}/style/shortcodes/pricing.css"/>
+<f:asset.css identifier="modern-shortcodes19" href="{assets_dir}/style/shortcodes/progress-bar.css"/>
+<f:asset.css identifier="modern-shortcodes20" href="{assets_dir}/style/shortcodes/section-title.css"/>
+<f:asset.css identifier="modern-shortcodes21" href="{assets_dir}/style/shortcodes/shortcodes.css"/>
+<f:asset.css identifier="modern-shortcodes22" href="{assets_dir}/style/shortcodes/social-icons.css"/>
+<f:asset.css identifier="modern-shortcodes23" href="{assets_dir}/style/shortcodes/tabs.css"/>
+<f:asset.css identifier="modern-shortcodes24" href="{assets_dir}/style/shortcodes/team.css"/>
+<f:asset.css identifier="modern-shortcodes25" href="{assets_dir}/style/shortcodes/testimonial.css"/>
+<f:asset.css identifier="modern-shortcodes26" href="{assets_dir}/style/shortcodes/side-panel.css"/>
+<f:asset.css identifier="modern-shortcodes27" href="{assets_dir}/style/shortcodes/onload-modal.css"/>
 
 
 <f:comment><!-- main stylesheet of the template --></f:comment>
-<v:asset.style name="modern-style-css"
-               path="{assets_dir}/style/style.css"
-               standalone="1"
-               rewrite="0"/>
+<f:asset.css identifier="modern-style-css"
+               href="{assets_dir}/style/style.css"/>
 
 <f:comment><!-- responsive stylesheet of the template (mediaqueries) --></f:comment>
-<v:asset.style name="modern-responsive-css"
-               path="{assets_dir}/style/responsive.css"
-               standalone="{force_standalone}"/>
+<f:asset.css identifier="modern-responsive-css"
+               href="{assets_dir}/style/responsive.css"/>
 
-<v:asset.style name="modern-custom-css"
-               path="{assets_dir}/style/custom.css"
-               standalone="1"/>
+<f:asset.css identifier="modern-custom-css"
+               href="{assets_dir}/style/custom.css"/>
 
 
 <f:comment><!-- Chosen theme --></f:comment>
-<v:asset.style name="modern-theme"
-               path="{assets_dir}/style/skins/modern-{ot:template.getPreference(key: 'themeColor')}.css"
-               standalone="1"
-               rewrite="0"/>
+<f:asset.css identifier="modern-theme"
+               href="{assets_dir}/style/skins/modern-{ot:template.getPreference(key: 'themeColor')}.css"/>
 
 <f:comment><!-- Script assets --></f:comment>
 
@@ -136,135 +119,93 @@ Assets included with the VHS viewhelpers
     var plugin_path = '/typo3conf/ext/ot_templating/Resources/Public/assets/Modern/script/';
 </script>
 
-<v:asset.script name="modern-jquery"
-                path="{assets_dir}/script/jquery-3.3.1.min.js"
-                standalone="{force_standalone}"
+<f:asset.script identifier="modern-jquery"
+                src="{assets_dir}/script/jquery-3.3.1.min.js"
                 defer="1"/>
 
 <f:comment><!-- includes all plugins ; can be removed if none of those plugins are used --></f:comment>
-<v:asset.script name="modern-plugins-jquery"
-                path="{assets_dir}/script/plugins-jquery.js"
-                standalone="{force_standalone}"
-                dependencies="modern-jquery"
+<f:asset.script identifier="modern-plugins-jquery"
+                src="{assets_dir}/script/plugins-jquery.js"
                 defer="1" />
 
-<v:asset.script name="modern-recaptcha"
-                path="https://www.google.com/recaptcha/api.js"
-                external="1"
-                standalone="{force_standalone}"
-                dependencies="modern-jquery"
+<f:asset.script identifier="modern-recaptcha"
+                src="https://www.google.com/recaptcha/api.js"
                 defer="1"/>
 
-<v:asset.script name="modern-jquery-tools"
-                path="{assets_dir}/script/revolution/jquery.themepunch.tools.min.js"
-                standalone="{force_standalone}"
+<f:asset.script identifier="modern-jquery-tools"
+                src="{assets_dir}/script/revolution/jquery.themepunch.tools.min.js"
                 defer="1"/>
 
-<v:asset.script name="modern-jquery-revolution"
-                path="{assets_dir}/script/revolution/jquery.themepunch.revolution.min.js"
-                standalone="{force_standalone}"
-                dependencies="modern-jquery"
+<f:asset.script identifier="modern-jquery-revolution"
+                src="{assets_dir}/script/revolution/jquery.themepunch.revolution.min.js"
                 defer="1"/>
 
-<v:asset.script name="modern-revolution-actions"
-                path="{assets_dir}/script/revolution/extensions/revolution.extension.actions.min.js"
-                standalone="{force_standalone}"
-                dependencies="modern-jquery"
+<f:asset.script identifier="modern-revolution-actions"
+                src="{assets_dir}/script/revolution/extensions/revolution.extension.actions.min.js"
                 defer="1"/>
 
-<v:asset.script name="modern-revolution-carousel"
-                path="{assets_dir}/script/revolution/extensions/revolution.extension.carousel.min.js"
-                standalone="{force_standalone}"
-                dependencies="modern-jquery"
+<f:asset.script identifier="modern-revolution-carousel"
+                src="{assets_dir}/script/revolution/extensions/revolution.extension.carousel.min.js"
                 defer="1"/>
 
-<v:asset.script name="modern-revolution-kenburn"
-                path="{assets_dir}/script/revolution/extensions/revolution.extension.kenburn.min.js"
-                standalone="{force_standalone}"
-                dependencies="modern-jquery"
+<f:asset.script identifier="modern-revolution-kenburn"
+                src="{assets_dir}/script/revolution/extensions/revolution.extension.kenburn.min.js"
                 defer="1"/>
 
-<v:asset.script name="modern-revolution-layeranimation"
-                path="{assets_dir}/script/revolution/extensions/revolution.extension.layeranimation.min.js"
-                standalone="{force_standalone}"
-                dependencies="modern-jquery"
+<f:asset.script identifier="modern-revolution-layeranimation"
+                src="{assets_dir}/script/revolution/extensions/revolution.extension.layeranimation.min.js"
                 defer="1"/>
 
-<v:asset.script name="modern-revolution-parallax"
-                path="{assets_dir}/script/revolution/extensions/revolution.extension.parallax.min.js"
-                standalone="{force_standalone}"
-                dependencies="modern-jquery"
+<f:asset.script identifier="modern-revolution-parallax"
+                src="{assets_dir}/script/revolution/extensions/revolution.extension.parallax.min.js"
                 defer="1"/>
 
-<v:asset.script name="modern-revolution-navigation"
-                path="{assets_dir}/script/revolution/extensions/revolution.extension.navigation.min.js"
-                standalone="{force_standalone}"
+<f:asset.script identifier="modern-revolution-navigation"
+                src="{assets_dir}/script/revolution/extensions/revolution.extension.navigation.min.js"
                 defer="1"/>
 
-<v:asset.script name="modern-revolution-slideanims"
-                path="{assets_dir}/script/revolution/extensions/revolution.extension.slideanims.min.js"
-                standalone="{force_standalone}"
-                dependencies="modern-jquery"
+<f:asset.script identifier="modern-revolution-slideanims"
+                src="{assets_dir}/script/revolution/extensions/revolution.extension.slideanims.min.js"
                 defer="1"/>
 
-<v:asset.script name="modern-revolution-navigation"
-                path="{assets_dir}/script/revolution/extensions/revolution.extension.navigation.min.js"
-                standalone="{force_standalone}"
-                dependencies="modern-jquery"
+<f:asset.script identifier="modern-revolution-navigation"
+                src="{assets_dir}/script/revolution/extensions/revolution.extension.navigation.min.js"
                 defer="1"/>
 
-<v:asset.script name="modern-revolution-video"
-                path="{assets_dir}/script/revolution/extensions/revolution.extension.video.min.js"
-                standalone="{force_standalone}"
-                dependencies="modern-jquery"
+<f:asset.script identifier="modern-revolution-video"
+                src="{assets_dir}/script/revolution/extensions/revolution.extension.video.min.js"
                 defer="1"/>
 
-<v:asset.script name="modern-revolution-custom"
-                path="{assets_dir}/script/revolution/revolution-custom.js"
-                standalone="{force_standalone}"
-                dependencies="modern-jquery"
+<f:asset.script identifier="modern-revolution-custom"
+                src="{assets_dir}/script/revolution/revolution-custom.js"
                 defer="1"/>
 
-<v:asset.script name="modern-moment-js"
-                path="{assets_dir}/script/bootstrap-datetimepicker/moment-datepicker.js"
-                standalone="{force_standalone}"
-                dependencies="modern-jquery"
+<f:asset.script identifier="modern-moment-js"
+                src="{assets_dir}/script/bootstrap-datetimepicker/moment-datepicker.js"
                 defer="1"/>
 
-<v:asset.script name="modern-datetimepicker-js"
-                path="{assets_dir}/script/bootstrap-datetimepicker/bootstrap-datetimepicker.min.js"
-                standalone="{force_standalone}"
-                dependencies="modern-jquery,modern-moment-js"
+<f:asset.script identifier="modern-datetimepicker-js"
+                src="{assets_dir}/script/bootstrap-datetimepicker/bootstrap-datetimepicker.min.js"
                 defer="1"/>
 
-<v:asset.script name="modern-slick-js"
-                path="{assets_dir}/script/slick/slick.min.js"
-                standalone="{force_standalone}"
-                dependencies="modern-jquery"
+<f:asset.script identifier="modern-slick-js"
+                src="{assets_dir}/script/slick/slick.min.js"
                 defer="1"/>
 
-<v:asset.script name="modern-leaflet-js"
-                path="{assets_dir}/script/leaflet/leaflet.js"
-                standalone="{force_standalone}"
-                dependencies="modern-jquery"
+<f:asset.script identifier="modern-leaflet-js"
+                src="{assets_dir}/script/leaflet/leaflet.js"
                 defer="1"/>
 
-<v:asset.script name="modern-magnific-popup"
-                path="{assets_dir}/script/magnific-popup/jquery.magnific-popup.min.js"
-                standalone="{force_standalone}"
-                dependencies="modern-jquery"
+<f:asset.script identifier="modern-magnific-popup"
+                src="{assets_dir}/script/magnific-popup/jquery.magnific-popup.min.js"
                 defer="1"/>
 
-<v:asset.script name="modern-custom-js"
-                path="{assets_dir}/script/custom.js"
-                standalone="{force_standalone}"
-                dependencies="modern-jquery"
+<f:asset.script identifier="modern-custom-js"
+                src="{assets_dir}/script/custom.js"
                 defer="1"/>
 
-<v:asset.script name="modern-custom-ot-js"
-                path="{assets_dir}/script/custom-ot.js"
-                standalone="{force_standalone}"
-                dependencies="modern-jquery"
+<f:asset.script identifier="modern-custom-ot-js"
+                src="{assets_dir}/script/custom-ot.js"
                 defer="1"/>