rename assets to avoid conflicts

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

@@ -10,53 +10,53 @@ 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="fontAwesome"
+<v:asset.style name="classic-fontAwesome"
                path="{assets_dir}/style/ext/font-awesome/css/all.min.css"/>
 
-<v:asset.style name="jquery-ui-css"
+<v:asset.style name="classic-jquery-ui-css"
                path="{assets_dir}/style/ext/jquery-ui.min.css"/>
 
-<v:asset.style name="slick-css"
+<v:asset.style name="classic-slick-css"
                path="{assets_dir}/style/ext/slick.css"/>
 
-<v:asset.style name="slick-theme"
+<v:asset.style name="classic-slick-theme"
                path="{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="leaflet-css"
+<v:asset.style name="classic-leaflet-css"
                path="{assets_dir}/style/ext/leaflet.css"
                rewrite="0"
                standalone="1"/>
 
 <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="theme"
-               path="{assets_dir}/style/theme-{ot:template.getPreference(key: 'themeColor')}.css"
+<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:comment><!-- Script assets --></f:comment>
-<v:asset.script name="jquery"
+<v:asset.script name="classic-jquery"
                 path="{assets_dir}/script/jquery-3.4.1.min.js"
                 defer="1"/>
 
-<v:asset.script name="datepicker"
+<v:asset.script name="classic-datepicker"
                 path="{assets_dir}/script/jquery-ui.min.js"
                 defer="1"/>
 
-<v:asset.script name="slick"
+<v:asset.script name="classic-slick"
                 path="{assets_dir}/script/slick.min.js"
                 dependencies="jquery"
                 defer="1"/>
 
-<v:asset.script name="leaflet"
+<v:asset.script name="classic-leaflet"
                 path="{assets_dir}/script/leaflet.js"
                 defer="1"/>
 
-<v:asset.script name="main"
+<v:asset.script name="classic-main"
                 path="{assets_dir}/script/main.js"
                 dependencies="jquery,datepicker,slick,leaflet"
                 standalone="1"

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

@@ -1,4 +1,5 @@
 {namespace v=FluidTYPO3\Vhs\ViewHelpers}
+{namespace ot=Opentalent\OtTemplating\ViewHelpers}
 
 <f:comment><!--
 Assets included with the VHS viewhelpers
@@ -11,12 +12,12 @@ Assets included with the VHS viewhelpers
 
 <f:comment><!-- Fonts assets --></f:comment>
 
-<v:asset.style name="montserrat-font"
+<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" />
+               standalone="1"/>
 
-<v:asset.style name="dosis-font"
+<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"/>
@@ -43,129 +44,88 @@ 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="plugins-css"
+<v:asset.style name="modern-plugins-css"
                path="{assets_dir}/style/plugins-css.css"
                standalone="{force_standalone}"/>
 
 <f:comment><!-- includes revolution stylesheets --></f:comment>
-<v:asset.style name="revolution-settings"
+<v:asset.style name="modern-revolution-settings"
                path="{assets_dir}/style/revolution/settings.css"
                standalone="{force_standalone}"/>
 
 <f:comment><!-- includes all typography stylesheets --></f:comment>
-<v:asset.style name="typography"
+<v:asset.style name="modern-typography"
                path="{assets_dir}/style/typography.css"
                standalone="{force_standalone}"/>
 
-<v:asset.style name="datetimepicker-css"
+<v:asset.style name="modern-datetimepicker-css"
                path="{assets_dir}/style/plugins/bootstrap-datetimepicker.min.css"
                standalone="{force_standalone}"/>
 
-<v:asset.style name="slick-css"
+<v:asset.style name="modern-slick-css"
                path="{assets_dir}/style/plugins/slick.css"
                standalone="{force_standalone}"/>
 
-<v:asset.style name="slick-theme-css"
+<v:asset.style name="modern-slick-theme-css"
                path="{assets_dir}/style/plugins/slick-theme.css"
                standalone="{force_standalone}"/>
 
-<v:asset.style name="leaflet-css"
+<v:asset.style name="modern-leaflet-css"
                path="{assets_dir}/style/plugins/leaflet.css"
                standalone="{force_standalone}"
                rewrite="0"/>
 
 <f:comment><!-- includes all shortcodes ; some of them may have to be removed --></f:comment>
-<v:asset.style group="shortcodes" path="{assets_dir}/style/shortcodes/accordion.css"/>
-<v:asset.style group="shortcodes" path="{assets_dir}/style/shortcodes/action-box.css"/>
-<v:asset.style group="shortcodes" path="{assets_dir}/style/shortcodes/blockquote.css"/>
-<v:asset.style group="shortcodes" path="{assets_dir}/style/shortcodes/bootstrap-typography.css"/>
-<v:asset.style group="shortcodes" path="{assets_dir}/style/shortcodes/button.css"/>
-<v:asset.style group="shortcodes" path="{assets_dir}/style/shortcodes/clients.css"/>
-<v:asset.style group="shortcodes" path="{assets_dir}/style/shortcodes/contact-form.css"/>
-<v:asset.style group="shortcodes" path="{assets_dir}/style/shortcodes/countdown.css"/>
-<v:asset.style group="shortcodes" path="{assets_dir}/style/shortcodes/counter.css"/>
-<v:asset.style group="shortcodes" path="{assets_dir}/style/shortcodes/divider.css"/>
-<v:asset.style group="shortcodes" path="{assets_dir}/style/shortcodes/dropcap.css"/>
-<v:asset.style group="shortcodes" path="{assets_dir}/style/shortcodes/feature-text.css"/>
-<v:asset.style group="shortcodes" path="{assets_dir}/style/shortcodes/list-style.css"/>
-<v:asset.style group="shortcodes" path="{assets_dir}/style/shortcodes/nice-select.css"/>
-<v:asset.style group="shortcodes" path="{assets_dir}/style/shortcodes/owl-carousel.css"/>
-<v:asset.style group="shortcodes" path="{assets_dir}/style/shortcodes/page-title.css"/>
-<v:asset.style group="shortcodes" path="{assets_dir}/style/shortcodes/pie-chart.css"/>
-<v:asset.style group="shortcodes" path="{assets_dir}/style/shortcodes/pricing.css"/>
-<v:asset.style group="shortcodes" path="{assets_dir}/style/shortcodes/progress-bar.css"/>
-<v:asset.style group="shortcodes" path="{assets_dir}/style/shortcodes/section-title.css"/>
-<v:asset.style group="shortcodes" path="{assets_dir}/style/shortcodes/shortcodes.css"/>
-<v:asset.style group="shortcodes" path="{assets_dir}/style/shortcodes/social-icons.css"/>
-<v:asset.style group="shortcodes" path="{assets_dir}/style/shortcodes/tabs.css"/>
-<v:asset.style group="shortcodes" path="{assets_dir}/style/shortcodes/team.css"/>
-<v:asset.style group="shortcodes" path="{assets_dir}/style/shortcodes/testimonial.css"/>
-<v:asset.style group="shortcodes" path="{assets_dir}/style/shortcodes/side-panel.css"/>
-<v:asset.style group="shortcodes" path="{assets_dir}/style/shortcodes/onload-modal.css"/>
+<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:comment><!-- main stylesheet of the template --></f:comment>
-<v:asset.style name="style-css"
+<v:asset.style name="modern-style-css"
                path="{assets_dir}/style/style.css"
                standalone="1"
                rewrite="0"/>
 
 <f:comment><!-- responsive stylesheet of the template (mediaqueries) --></f:comment>
-<v:asset.style name="responsive-css"
+<v:asset.style name="modern-responsive-css"
                path="{assets_dir}/style/responsive.css"
                standalone="{force_standalone}"/>
 
-<v:asset.style name="custom-css"
+<v:asset.style name="modern-custom-css"
                path="{assets_dir}/style/custom.css"
                standalone="1"/>
 
 
 <f:comment><!-- Chosen theme --></f:comment>
-<v:variable.set name="themeColor" value ="{ot:template.getPreference(key: 'themeColor')}"/>
-
-<f:if condition="{themeColor}=='light-blue'">
-    <f:then>
-        <v:asset.style name="theme"
-                       path="{assets_dir}/style/skins/skin-blue.css"
-                       standalone="1"/>
-    </f:then>
-    <f:else if="{themeColor}=='blue'">
-        <v:asset.style name="theme"
-                       path="{assets_dir}/style/skins/skin-steelblue.css"
-                       standalone="1"/>
-    </f:else>
-    <f:else if="{themeColor}=='green'">
-        <v:asset.style name="theme"
-                       path="{assets_dir}/style/skins/skin-green.css"
-                       standalone="1"/>
-    </f:else>
-    <f:else if="{themeColor}=='orange'">
-        <v:asset.style name="theme"
-                       path="{assets_dir}/style/skins/skin-orange.css"
-                       standalone="1"/>
-    </f:else>
-    <f:else if="{themeColor}=='grey'">
-        <v:asset.style name="theme"
-                       path="{assets_dir}/style/skins/skin-grey.css"
-                       standalone="1"/>
-    </f:else>
-    <f:else if="{themeColor}=='red'">
-        <v:asset.style name="theme"
-                       path="{assets_dir}/style/skins/skin-red.css"
-                       standalone="1"/>
-    </f:else>
-    <f:else if="{themeColor}=='light-red'">
-        <v:asset.style name="theme"
-                       path="{assets_dir}/style/skins/skin-red-light.css"
-                       standalone="1"/>
-    </f:else>
-    <f:else if="{themeColor}=='purple'">
-        <v:asset.style name="theme"
-                       path="{assets_dir}/style/skins/skin-purple.css"
-                       standalone="1"/>
-    </f:else>
-</f:if>
-
+<v:asset.style name="modern-theme"
+               path="{assets_dir}/style/skins/modern-{ot:template.getPreference(key: 'themeColor')}.css"
+               standalone="1"
+               rewrite="0"/>
 
 <f:comment><!-- Script assets --></f:comment>
 
@@ -174,132 +134,132 @@ Assets included with the VHS viewhelpers
     var plugin_path = '/typo3conf/ext/ot_templating/Resources/Public/assets/Modern/script/';
 </script>
 
-<v:asset.script name="jquery"
+<v:asset.script name="modern-jquery"
                 path="{assets_dir}/script/jquery-3.3.1.min.js"
                 standalone="{force_standalone}"
                 defer="1"/>
 
 <f:comment><!-- includes all plugins ; can be removed if none of those plugins are used --></f:comment>
-<v:asset.script name="plugins-jquery"
+<v:asset.script name="modern-plugins-jquery"
                 path="{assets_dir}/script/plugins-jquery.js"
                 standalone="{force_standalone}"
                 dependencies="jquery"
                 defer="1" />
 
-<v:asset.script name="recaptcha"
+<v:asset.script name="modern-recaptcha"
                 path="https://www.google.com/recaptcha/api.js"
                 external="1"
                 standalone="{force_standalone}"
                 dependencies="jquery"
                 defer="1"/>
 
-<v:asset.script name="jquery-tools"
+<v:asset.script name="modern-jquery-tools"
                 path="{assets_dir}/script/revolution/jquery.themepunch.tools.min.js"
                 standalone="{force_standalone}"
                 defer="1"/>
 
-<v:asset.script name="jquery-revolution"
+<v:asset.script name="modern-jquery-revolution"
                 path="{assets_dir}/script/revolution/jquery.themepunch.revolution.min.js"
                 standalone="{force_standalone}"
                 dependencies="jquery"
                 defer="1"/>
 
-<v:asset.script name="revolution-actions"
+<v:asset.script name="modern-revolution-actions"
                 path="{assets_dir}/script/revolution/extensions/revolution.extension.actions.min.js"
                 standalone="{force_standalone}"
                 dependencies="jquery"
                 defer="1"/>
 
-<v:asset.script name="revolution-carousel"
+<v:asset.script name="modern-revolution-carousel"
                 path="{assets_dir}/script/revolution/extensions/revolution.extension.carousel.min.js"
                 standalone="{force_standalone}"
                 dependencies="jquery"
                 defer="1"/>
 
-<v:asset.script name="revolution-kenburn"
+<v:asset.script name="modern-revolution-kenburn"
                 path="{assets_dir}/script/revolution/extensions/revolution.extension.kenburn.min.js"
                 standalone="{force_standalone}"
                 dependencies="jquery"
                 defer="1"/>
 
-<v:asset.script name="revolution-layeranimation"
+<v:asset.script name="modern-revolution-layeranimation"
                 path="{assets_dir}/script/revolution/extensions/revolution.extension.layeranimation.min.js"
                 standalone="{force_standalone}"
                 dependencies="jquery"
                 defer="1"/>
 
-<v:asset.script name="revolution-parallax"
+<v:asset.script name="modern-revolution-parallax"
                 path="{assets_dir}/script/revolution/extensions/revolution.extension.parallax.min.js"
                 standalone="{force_standalone}"
                 dependencies="jquery"
                 defer="1"/>
 
-<v:asset.script name="revolution-navigation"
+<v:asset.script name="modern-revolution-navigation"
                 path="{assets_dir}/script/revolution/extensions/revolution.extension.navigation.min.js"
                 standalone="{force_standalone}"
                 defer="1"/>
 
-<v:asset.script name="revolution-slideanims"
+<v:asset.script name="modern-revolution-slideanims"
                 path="{assets_dir}/script/revolution/extensions/revolution.extension.slideanims.min.js"
                 standalone="{force_standalone}"
                 dependencies="jquery"
                 defer="1"/>
 
-<v:asset.script name="revolution-navigation"
+<v:asset.script name="modern-revolution-navigation"
                 path="{assets_dir}/script/revolution/extensions/revolution.extension.navigation.min.js"
                 standalone="{force_standalone}"
                 dependencies="jquery"
                 defer="1"/>
 
-<v:asset.script name="revolution-video"
+<v:asset.script name="modern-revolution-video"
                 path="{assets_dir}/script/revolution/extensions/revolution.extension.video.min.js"
                 standalone="{force_standalone}"
                 dependencies="jquery"
                 defer="1"/>
 
-<v:asset.script name="revolution-custom"
+<v:asset.script name="modern-revolution-custom"
                 path="{assets_dir}/script/revolution/revolution-custom.js"
                 standalone="{force_standalone}"
                 dependencies="jquery"
                 defer="1"/>
 
-<v:asset.script name="moment-js"
+<v:asset.script name="modern-moment-js"
                 path="{assets_dir}/script/bootstrap-datetimepicker/moment-datepicker.js"
                 standalone="{force_standalone}"
                 dependencies="jquery"
                 defer="1"/>
 
-<v:asset.script name="datetimepicker-js"
+<v:asset.script name="modern-datetimepicker-js"
                 path="{assets_dir}/script/bootstrap-datetimepicker/bootstrap-datetimepicker.min.js"
                 standalone="{force_standalone}"
                 dependencies="jquery,moment-js"
                 defer="1"/>
 
-<v:asset.script name="slick-js"
+<v:asset.script name="modern-slick-js"
                 path="{assets_dir}/script/slick/slick.min.js"
                 standalone="{force_standalone}"
                 dependencies="jquery"
                 defer="1"/>
 
-<v:asset.script name="leaflet-js"
+<v:asset.script name="modern-leaflet-js"
                 path="{assets_dir}/script/leaflet/leaflet.js"
                 standalone="{force_standalone}"
                 dependencies="jquery"
                 defer="1"/>
 
-<v:asset.script name="magnific-popup"
+<v:asset.script name="modern-magnific-popup"
                 path="{assets_dir}/script/magnific-popup/jquery.magnific-popup.min.js"
                 standalone="{force_standalone}"
                 dependencies="jquery"
                 defer="1"/>
 
-<v:asset.script name="custom-js"
+<v:asset.script name="modern-custom-js"
                 path="{assets_dir}/script/custom.js"
                 standalone="{force_standalone}"
                 dependencies="jquery"
                 defer="1"/>
 
-<v:asset.script name="custom-ot-js"
+<v:asset.script name="modern-custom-ot-js"
                 path="{assets_dir}/script/custom-ot.js"
                 standalone="{force_standalone}"
                 dependencies="jquery"

ot_templating/Resources/Public/assets/Classic/style/theme-blue.css → ot_templating/Resources/Public/assets/Classic/style/classic-blue.css

@@ -2027,4 +2027,4 @@ form button[type=submit]:hover {
   }
 }
 
-/*# sourceMappingURL=theme-blue.css.map */
+/*# sourceMappingURL=classic-blue.css.map */

ot_templating/Resources/Public/assets/Classic/style/theme-green.css → ot_templating/Resources/Public/assets/Classic/style/classic-green.css

@@ -2027,4 +2027,4 @@ form button[type=submit]:hover {
   }
 }
 
-/*# sourceMappingURL=theme-green.css.map */
+/*# sourceMappingURL=classic-green.css.map */

ot_templating/Resources/Public/assets/Classic/style/theme-grey.css → ot_templating/Resources/Public/assets/Classic/style/classic-grey.css

@@ -2027,4 +2027,4 @@ form button[type=submit]:hover {
   }
 }
 
-/*# sourceMappingURL=theme-grey.css.map */
+/*# sourceMappingURL=classic-grey.css.map */

ot_templating/Resources/Public/assets/Classic/style/theme-light-blue.css → ot_templating/Resources/Public/assets/Classic/style/classic-light-blue.css

@@ -2027,4 +2027,4 @@ form button[type=submit]:hover {
   }
 }
 
-/*# sourceMappingURL=theme-light-blue.css.map */
+/*# sourceMappingURL=classic-light-blue.css.map */

ot_templating/Resources/Public/assets/Classic/style/theme-light-red.css → ot_templating/Resources/Public/assets/Classic/style/classic-light-red.css

@@ -2027,4 +2027,4 @@ form button[type=submit]:hover {
   }
 }
 
-/*# sourceMappingURL=theme-light-red.css.map */
+/*# sourceMappingURL=classic-light-red.css.map */

ot_templating/Resources/Public/assets/Classic/style/theme-orange.css → ot_templating/Resources/Public/assets/Classic/style/classic-orange.css

@@ -2027,4 +2027,4 @@ form button[type=submit]:hover {
   }
 }
 
-/*# sourceMappingURL=theme-orange.css.map */
+/*# sourceMappingURL=classic-orange.css.map */

ot_templating/Resources/Public/assets/Classic/style/theme-purple.css → ot_templating/Resources/Public/assets/Classic/style/classic-purple.css

@@ -2027,4 +2027,4 @@ form button[type=submit]:hover {
   }
 }
 
-/*# sourceMappingURL=theme-purple.css.map */
+/*# sourceMappingURL=classic-purple.css.map */

ot_templating/Resources/Public/assets/Classic/style/theme-red.css → ot_templating/Resources/Public/assets/Classic/style/classic-red.css

@@ -2027,4 +2027,4 @@ form button[type=submit]:hover {
   }
 }
 
-/*# sourceMappingURL=theme-red.css.map */
+/*# sourceMappingURL=classic-red.css.map */

ot_templating/Resources/Public/assets/Classic/style/style.scss

@@ -1,4 +1,5 @@
 // Default constants values
+
 $font-stack: Arial,"Helvetica Neue",Helvetica,sans-serif !default;
 $font-size: 14px !default;