refactor to prepare multi-templating implementation

ot_templating/Configuration/TypoScript/setup.txt

@@ -40,7 +40,7 @@ config.concatenateCss = 1
 config.compressCss = 1
 config.compressJs = 1
 
-# Déclaration des plugins
+# **** Déclaration des plugins
 
 lib.allEvents = USER
 lib.allEvents {
@@ -92,15 +92,7 @@ lib.auth {
 #lib.contentElement.templateRootPaths.10 = EXT:ot_templating/Resources/Private/Templates/Ext/fluid_styled_content/Default/Templates/
 
 
-
-# **** Settings: récupère les variables utilisateur *****
-
-
-
-
 # **** Page: configuration générale de la page courante ****
-
-# **** Templating : configuration du template Flux ****
 page = PAGE
 page {
     typeNum = 0
@@ -113,21 +105,23 @@ page {
     }
     10 >
 }
+
+page.config.doctype=html5
+page.meta {
+    keywords.field = keywords
+    description.field = description
+    author.field = author
+    robots = index,follow,archive
+    viewport = width=device-width
+}
+
+# **** Configuration des extensions ****
 plugin.tx_flux {
 #    Allow pages which have is_siteroot = 1 to inherit chosen template from parent.
 #    Disable this to prevent subsites in a multisite environment from using the same template as the immediate parent of that site root.
     siteRootInheritance = 1
 }
 
-page.config.doctype=html5
-page.meta {
-     keywords.field = keywords
-     description.field = description
-     author.field = author
-     robots = index,follow,archive
-     viewport = width=device-width
-}
-
 plugin.tx_ottemplating {
     view {
         templateRootPaths.0 = {$templateRootPath}
@@ -152,10 +146,11 @@ plugin.tx_ottemplating {
 
         # computed
         structureLogoUrl = {$plugin.tx_ottemplating.settings.opentalent.fileStorageUrl}{$plugin.tx_ottemplating.settings.organization.logoid}/0x60
-        networkLogoUrl = /typo3conf/ext/ot_templating/Resources/Public/assets/media/{$plugin.tx_ottemplating.settings.network.logo}
+        networkLogoUrl = /typo3conf/ext/ot_templating/Resources/Public/media/{$plugin.tx_ottemplating.settings.network.logo}
 
         # Default values for flux parameters
-        themeColor = blue
+        template = Classic
+        themeColor = light-blue
         displayCarousel = 1
         staticDonors = 0
         eventsLimit = 5
@@ -163,8 +158,7 @@ plugin.tx_ottemplating {
     }
 }
 
-
-# **** Form extension ****
+# * Form extension
 # @see https://docs.typo3.org/c/typo3/cms-form/9.5/en-us/Introduction/Index.html
 
 module.tx_form {

ot_templating/Resources/Private/Layouts/1Col.html → ot_templating/Resources/Private/Layouts/Classic/1Col.html

@@ -2,7 +2,7 @@
 <f:layout name="1Col" />
 
 <f:comment><!-- Render the header defined in partial/header.html--></f:comment>
-<f:render partial="header" arguments="{_all}" />
+<f:render partial="Classic/Header" arguments="{_all}" />
 
 <div class="main">
 
@@ -15,7 +15,7 @@
         </div>
     </div>
 
-</div> <!-- /container -->
+</div>
 
 <f:comment><!-- Render the footer defined in partial/footer.html--></f:comment>
-<f:render partial="footer" />
+<f:render partial="Classic/Footer" />

ot_templating/Resources/Private/Layouts/3Col.html → ot_templating/Resources/Private/Layouts/Classic/3Col.html

@@ -2,7 +2,7 @@
 <f:layout name="3Col" />
 
 <f:comment><!-- Render the header defined in partial/header.html--></f:comment>
-<f:render partial="header" arguments="{_all}" />
+<f:render partial="Classic/Header" arguments="{_all}" />
 
 <div class="main">
     <f:comment><!-- Left column --></f:comment>
@@ -32,4 +32,4 @@
 </div> <!-- /container -->
 
 <f:comment><!-- Render the footer defined in partial/footer.html--></f:comment>
-<f:render partial="footer" />
+<f:render partial="Classic/Footer" />

ot_templating/Resources/Private/Layouts/Contact.html → ot_templating/Resources/Private/Layouts/Classic/Contact.html

@@ -2,7 +2,7 @@
 <f:layout name="Events" />
 
 <f:comment><!-- Render the header defined in partial/header.html--></f:comment>
-<f:render partial="header" arguments="{_all}" />
+<f:render partial="Classic/Header" arguments="{_all}" />
 
 <div class="main">
 
@@ -18,4 +18,4 @@
 </div>
 
 <f:comment><!-- Render the footer defined in partial/footer.html--></f:comment>
-<f:render partial="footer" />
+<f:render partial="Classic/Footer" />

ot_templating/Resources/Private/Layouts/Events.html → ot_templating/Resources/Private/Layouts/Classic/Events.html

@@ -4,7 +4,7 @@
 <f:layout name="Events" />
 
 <f:comment><!-- Render the header defined in partial/header.html--></f:comment>
-<f:render partial="header" arguments="{_all}" />
+<f:render partial="Classic/Header" arguments="{_all}" />
 
 <div class="main">
 
@@ -18,4 +18,4 @@
 </div> <!-- /container -->
 
 <f:comment><!-- Render the footer defined in partial/footer.html--></f:comment>
-<f:render partial="footer" />
+<f:render partial="Classic/Footer" />

ot_templating/Resources/Private/Layouts/Home.html → ot_templating/Resources/Private/Layouts/Classic/Home.html

@@ -2,13 +2,13 @@
 <f:layout name="Home" />
 
 <f:comment><!-- Render the header defined in partial/header.html--></f:comment>
-<f:render partial="header" arguments="{_all}" />
+<f:render partial="Classic/Header" arguments="{_all}" />
 
 <div class="main">
     <f:comment><!-- Left column --></f:comment>
     <div class="leftcol">
         <f:comment><!-- Render the next events section defined in partial/NextEvents.html--></f:comment>
-        <f:render partial="eventsPreview" />
+        <f:render partial="Classic/EventsPreview" />
 
         <div class="content">
             <f:comment><!-- render the content of the leftcol section (left column) --></f:comment>
@@ -27,7 +27,7 @@
     <f:comment><!-- Right column --></f:comment>
     <div class="rightcol">
         <f:comment><!-- Render the donors section defined in partial/Donors.html--></f:comment>
-        <f:render partial="donors" />
+        <f:render partial="Classic/Donors" />
 
         <div class="content">
             <f:comment><!-- defines the content of the rightcol section (right column) --></f:comment>
@@ -38,4 +38,4 @@
 </div> <!-- /container -->
 
 <f:comment><!-- Render the footer defined in partial/footer.html--></f:comment>
-<f:render partial="footer" />
+<f:render partial="Classic/Footer" />

ot_templating/Resources/Private/Layouts/Members.html → ot_templating/Resources/Private/Layouts/Classic/Members.html

@@ -4,7 +4,7 @@
 <f:layout name="Members" />
 
 <f:comment><!-- Render the header defined in partial/header.html--></f:comment>
-<f:render partial="header" arguments="{_all}" />
+<f:render partial="Classic/Header" arguments="{_all}" />
 
 <div class="main">
 
@@ -19,4 +19,4 @@
 </div> <!-- /container -->
 
 <f:comment><!-- Render the footer defined in partial/footer.html--></f:comment>
-<f:render partial="footer" />
+<f:render partial="Classic/Footer" />

ot_templating/Resources/Private/Layouts/MembersCa.html → ot_templating/Resources/Private/Layouts/Classic/MembersCa.html

@@ -4,7 +4,7 @@
 <f:layout name="Members" />
 
 <f:comment><!-- Render the header defined in partial/header.html--></f:comment>
-<f:render partial="header" arguments="{_all}" />
+<f:render partial="Classic/Header" arguments="{_all}" />
 
 <div class="main">
 
@@ -19,4 +19,4 @@
 </div> <!-- /container -->
 
 <f:comment><!-- Render the footer defined in partial/footer.html--></f:comment>
-<f:render partial="footer" />
+<f:render partial="Classic/Footer" />

ot_templating/Resources/Private/Partials/Assets.html

@@ -1,48 +0,0 @@
-{namespace v=FluidTYPO3\Vhs\ViewHelpers}
-
-<f:comment><!-- Assets included with the VHS viewhelpers
-
-/!\ Warning: assets'names shall be uniques, even among styles and scripts viewhelpers!
---></f:comment>
-
-<f:comment><!-- Style assets --></f:comment>
-<v:asset.style name="fontAwesome"
-               path="EXT:ot_templating/Resources/Public/assets/style/ext/font-awesome/css/all.css"/>
-
-<v:asset.style name="slick-css"
-               path="EXT:ot_templating/Resources/Public/assets/style/ext/slick.css"/>
-
-<v:asset.style name="slick-theme"
-               path="EXT:ot_templating/Resources/Public/assets/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"
-               path="EXT:ot_templating/Resources/Public/assets/style/ext/leaflet.css"
-               rewrite="0"
-               standalone="1"/>
-
-<v:asset.style name="theme"
-               path="EXT:ot_templating/Resources/Public/assets/style/theme-{f:if(condition: settings.themeColor, then: settings.themeColor, else: 'light-blue')}.css"
-               dependencies="fontAwesome,slick,slick-theme,leaflet"
-               standalone="1"/>
-
-<f:comment><!-- Script assets --></f:comment>
-<v:asset.script name="jquery"
-                path="EXT:ot_templating/Resources/Public/assets/script/jquery-3.4.1.min.js"/>
-
-<v:asset.script name="datepicker"
-                path="EXT:ot_templating/Resources/Public/assets/script/jquery-ui.js"/>
-
-<v:asset.script name="slick"
-                path="EXT:ot_templating/Resources/Public/assets/script/slick.min.js"
-                dependencies="jquery"/>
-
-<v:asset.script name="leaflet"
-                path="EXT:ot_templating/Resources/Public/assets/script/leaflet.js"/>
-
-<v:asset.script name="main"
-                path="EXT:ot_templating/Resources/Public/assets/script/main.js"
-                dependencies="jquery,datepicker,slick,leaflet"
-                standalone="1"/>
-

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

@@ -0,0 +1,54 @@
+{namespace v=FluidTYPO3\Vhs\ViewHelpers}
+
+<f:comment><!--
+Assets included with the VHS viewhelpers
+
+/!\ Warning: assets'names shall be uniques, even among styles and scripts viewhelpers!
+--></f:comment>
+
+<v:variable.set name="assets_dir" value="EXT:ot_templating/Resources/Public/assets/{settings.template}" />
+
+<f:comment><!-- Style assets --></f:comment>
+<v:asset.style name="fontAwesome"
+               path="{assets_dir}/style/ext/font-awesome/css/all.min.css"/>
+
+<v:asset.style name="slick-css"
+               path="{assets_dir}/style/ext/slick.css"/>
+
+<v:asset.style name="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"
+               path="{assets_dir}/style/ext/leaflet.css"
+               rewrite="0"
+               standalone="1"/>
+
+<v:asset.style name="theme"
+               path="{assets_dir}/style/theme-{f:if(condition: settings.themeColor, then: settings.themeColor, else: 'light-blue')}.css"
+               dependencies="fontAwesome,slick,slick-theme,leaflet"
+               standalone="1"/>
+
+
+
+
+<f:comment><!-- Script assets --></f:comment>
+<v:asset.script name="jquery"
+                path="{assets_dir}/script/jquery-3.4.1.min.js"/>
+
+<v:asset.script name="datepicker"
+                path="{assets_dir}/script/jquery-ui.js"/>
+
+<v:asset.script name="slick"
+                path="{assets_dir}/script/slick.min.js"
+                dependencies="jquery"/>
+
+<v:asset.script name="leaflet"
+                path="{assets_dir}/script/leaflet.js"/>
+
+<v:asset.script name="main"
+                path="{assets_dir}/script/main.js"
+                dependencies="jquery,datepicker,slick,leaflet"
+                standalone="1"/>
+

ot_templating/Resources/Private/Partials/Header.html → ot_templating/Resources/Private/Partials/Classic/Header.html

@@ -2,25 +2,25 @@
 <f:comment><!--Header partial: contains various partials, like topbar, cariousel, breadcrumb...--></f:comment>
 
 <f:comment><!-- Render the assets' includes --></f:comment>
-<f:render partial="Assets" />
+<f:render partial="Classic/Assets" />
 
 <header>
     <f:comment><!-- Render the topbar defined in partial/Topbar.html--></f:comment>
-    <f:render partial="Topbar" arguments="{_all}" />
+    <f:render partial="Classic/Topbar" arguments="{_all}" />
 
     <f:comment><!-- Render the no-script warning box defined in partial/NoScriptWarning.html--></f:comment>
-    <f:render partial="NoScriptWarning" />
+    <f:render partial="Classic/NoScriptWarning" />
 
     <f:if condition="{settings.displayCarousel}==1">
         <then>
             <f:comment><!-- Render the carousel defined in partial/Carousel.html--></f:comment>
-            <f:render partial="Carousel" />
+            <f:render partial="Classic/Carousel" />
         </then>
     </f:if>
 
     <f:comment><!-- Render the navbar defined in partial/Navbar.html--></f:comment>
-    <f:render partial="Menu" />
+    <f:render partial="Classic/Menu" />
 
     <f:comment><!-- Render the breadcrumb defined in partial/Breadcrumb.html--></f:comment>
-    <f:render partial="Breadcrumb" />
+    <f:render partial="Classic/Breadcrumb" />
 </header>

ot_templating/Resources/Private/Partials/Topbar.html → ot_templating/Resources/Private/Partials/Classic/Topbar.html

@@ -11,7 +11,7 @@
 
     <h1 class="topbar-title">{settings.structureName}</h1>
 
-    <f:render partial="UserToolbar" arguments="{_all}" />
+    <f:render partial="Classic/UserToolbar" arguments="{_all}" />
 
     <f:comment><!-- Si un networkLogo est définit, affiche le logo du réseau --></f:comment>
     <f:if condition="{settings.networkLogo} != ''">

ot_templating/Resources/Private/Templates/Page/1Col.html

@@ -2,7 +2,7 @@
 {namespace v=FluidTYPO3\Vhs\ViewHelpers}
 
 <!-- uses the layout 1Col, defined in layouts/1Col.html -->
-<f:layout name="1Col" />
+<f:layout name="{settings.template}/1Col" />
 
 <f:section name='Configuration'>
     <flux:form id="1col" label="Gabarit simple" extensionName="Opentalent.OtTemplating">

ot_templating/Resources/Private/Templates/Page/3Col.html

@@ -2,7 +2,7 @@
 {namespace v=FluidTYPO3\Vhs\ViewHelpers}
 
 <!-- uses the layout 3Col, defined in layouts/3Col.html -->
-<f:layout name="3Col" />
+<f:layout name="{settings.template}/3Col" />
 
 <f:section name='Configuration'>
     <flux:form id="3col" label="Gabarit 3 Colonnes" extensionName="Opentalent.OtTemplating">

ot_templating/Resources/Private/Templates/Page/Contact.html

@@ -1,6 +1,6 @@
 
 <f:comment><!-- uses the layout Contact, defined in layouts/Contact.html --></f:comment>
-<f:layout name="Contact" />
+<f:layout name="{settings.template}/Contact" />
 
 <f:section name='Configuration'>
     <flux:form id="contact" label="Gabarit Formulaire de contact" extensionName="Opentalent.OtTemplating">

ot_templating/Resources/Private/Templates/Page/Events.html

@@ -2,7 +2,7 @@
 {namespace v=FluidTYPO3\Vhs\ViewHelpers}
 
 <f:comment><!-- uses the layout Events, defined in layouts/Events.html --></f:comment>
-<f:layout name="Events" />
+<f:layout name="{settings.template}/Events" />
 
 <f:section name='Configuration'>
     <flux:form id="events" label="Gabarit Evènements" extensionName="Opentalent.OtTemplating">

ot_templating/Resources/Private/Templates/Page/Home.html

@@ -2,10 +2,11 @@
 {namespace v=FluidTYPO3\Vhs\ViewHelpers}
 
 <f:comment><!-- uses the layout Home, defined in layouts/Home.html --></f:comment>
-<f:layout name="Home" />
+<f:layout name="{settings.template}/Home" />
 
 <f:section name='Configuration'>
     <flux:form id="home" label="Gabarit Accueil" extensionName="Opentalent.OtTemplating">
+        <flux:field.select name="settings.template" label="Modèle de site" items="{ Classic: 'Classique' }" />
         <flux:field.select name="settings.themeColor" label="Couleur du thème" items="{ light-blue: 'Bleu ciel', blue: 'Bleu', green: 'Vert', orange: 'Orange', grey: 'Gris', red: 'Rouge', light-red: 'Rouge cerise', purple: 'Violet' }" />
         <flux:field.checkbox name="settings.displayCarousel" label="Afficher le caroussel" default="1"/>
         <flux:field.checkbox name="settings.staticDonors" label="Partenaires: affichage statique" default="0"/>

ot_templating/Resources/Private/Templates/Page/Members.html

@@ -2,7 +2,7 @@
 {namespace v=FluidTYPO3\Vhs\ViewHelpers}
 
 <f:comment><!-- uses the layout Members, defined in layouts/Members.html --></f:comment>
-<f:layout name="Members" />
+<f:layout name="{settings.template}/Members" />
 
 <f:section name='Configuration'>
     <flux:form id="members" label="Gabarit Adherents" extensionName="Opentalent.OtTemplating">

ot_templating/Resources/Private/Templates/Page/MembersCa.html

@@ -2,7 +2,7 @@
 {namespace v=FluidTYPO3\Vhs\ViewHelpers}
 
 <f:comment><!-- uses the layout Members, defined in layouts/Members.html --></f:comment>
-<f:layout name="MembersCa" />
+<f:layout name="{settings.template}/MembersCa" />
 
 <f:section name='Configuration'>
     <flux:form id="members_ca" label="Gabarit Membres CA" extensionName="Opentalent.OtTemplating">