minor fixes

docker/conf/LocalConfiguration.php

@@ -4,7 +4,7 @@ return [
         'compressionLevel' => '7',
         'debug' => false,
         'enabledBeUserIPLock' => false,
-        'installToolPassword' => '$pbkdf2-sha256$25000$.PqaJ4/ltOEEgzkLb8qejA$7sU6uclI0hzXLbMNvpD7zFYeUuP9EsMZj/c5BmQXjVg',
+        'installToolPassword' => '$argon2i$v=19$m=65536,t=16,p=1$Z2NIbFRRVlVYZHhoaEUuMg$88qbJUyQLt7mgO0AhyVZIEzLWlX72oJ9oHuvzQHhYBM',
         'interfaces' => 'backend',
         'lockIP' => '0',
         'loginSecurityLevel' => 'normal',

docker/conf/composer.json

@@ -57,10 +57,11 @@
 	},
 	"autoload": {
 		"psr-4": {
-			"Opentalent\\OtWidgets\\": "public/typo3conf/ext/ot_widgets/Classes",
+			"Opentalent\\OtCore\\": "public/typo3conf/ext/ot_core/Classes",
 			"Opentalent\\OtConnect\\": "public/typo3conf/ext/ot_connect/Classes",
 			"Opentalent\\OtTemplating\\": "public/typo3conf/ext/ot_templating/Classes",
-			"Opentalent\\OtAdmin\\": "public/typo3conf/ext/ot_admin/Classes"
+			"Opentalent\\OtAdmin\\": "public/typo3conf/ext/ot_admin/Classes",
+			"Opentalent\\OtStats\\": "public/typo3conf/ext/ot_stats/Classes"
 		}
 	}
 }

ot_stats/Resources/Private/Partials/Matomo.html

@@ -1,29 +0,0 @@
-{namespace v=FluidTYPO3\Vhs\ViewHelpers}
-{namespace st=Opentalent\OtStats\ViewHelpers}
-
-<v:variable.set name="matomo_site_id" value="{st:matomoSiteId()}" />
-
-<f:if condition="{matomo_site_id}>0">
-
-    <f:comment><!--Matomo partial: contains the integration code of matomo ...--></f:comment>
-
-    <f:comment><!-- Matomo --></f:comment>
-    <script type="text/javascript">
-        var _paq = window._paq || [];
-        /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-        _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
-        _paq.push(["setDomains", ["*.www.opentalent.fr"]]);
-        _paq.push(['trackPageView']);
-        _paq.push(['enableLinkTracking']);
-        (function() {
-            var u="https://stats.2iopenservice.com/";
-            _paq.push(['setTrackerUrl', u+'matomo.php']);
-            _paq.push(['setSiteId', '{matomo_site_id}']);
-            var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-            g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-        })();
-    </script>
-    <noscript><p><img src="https://stats.2iopenservice.com/matomo.php?idsite={matomo_site_id}&amp;rec=1" style="border:0;" alt="" /></p></noscript>
-    <f:comment><!-- End Matomo Code --></f:comment>
-
-</f:if>

ot_templating/Classes/Page/ErrorHandler.php

@@ -2,6 +2,7 @@
 
 namespace Opentalent\OtTemplating\Page;
 
+use Opentalent\OtCore\Page\OtPageRepository;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Core\Error\PageErrorHandler\PageContentErrorHandler;

ot_templating/Configuration/TypoScript/setup.txt

@@ -1,7 +1,7 @@
 #### Configuration typoscript des sites
 
 # **** Options de debug ****
-[applicationContext == Development*]
+[applicationContext == "Development"]
     config.debug = 1
     config.contentObjectExceptionHandler = 0
     config.admPanel = 0
@@ -10,7 +10,7 @@
     plugin.tx_vhs.settings.asset.debug = 0
 [end]
 
-[applicationContext == Testing*]
+[applicationContext == "Testing"]
     config.debug = 1
 [end]
 

ot_templating/Resources/Private/Layouts/Backend/Default.html

@@ -1,9 +1,8 @@
 {namespace v=FluidTYPO3\Vhs\ViewHelpers}
 
-<f:be.container includeCssFiles="{ot_customizer: '{f:uri.resource(path:\'assets/Backend/style/ot_customizer.css\')}'}">
-    <div class="ot-templating">
-        <f:render section="content" />
-    </div>
+<f:be.container includeCssFiles="{ot_core: '{f:uri.resource(path:\'assets/Backend/style/ot_be_module.css\', extensionName:\'ot_core\')}',
+                                  ot_customizer: '{f:uri.resource(path:\'assets/Backend/style/ot_customizer.css\')}'}">
+    <f:render section="content" />
 </f:be.container>
 
 

ot_templating/Resources/Private/Templates/OtCustomizer/Index.html

@@ -3,9 +3,11 @@
 
 <f:layout name="Backend/Default" />
 
+
+
 <f:section name="content">
 
-    <div class="ot-customizer">
+    <div class="ot-be-module ot-customizer">
         <f:if condition="{pageSelected}">
             <f:then>
 
@@ -92,7 +94,7 @@
             <f:else>
                 <div class="no-page-warning">
                     <f:comment><!-- No page selected --></f:comment>
-                    <f:translate key="noPageSelected" />
+                    <f:translate key="noPageSelected" extensionName="ot_core" />
                 </div>
             </f:else>
         </f:if>

ot_templating/Resources/Private/Templates/Page/Error/403.html

@@ -1,5 +1,8 @@
 <f:layout name="ErrorPage" />
 
+<f:section name="Configuration">
+</f:section>
+
 <f:section name="Message">
     <p>Vous n'êtes pas autorisé à consulter cette page</p>
     <p>Avez vous pensé à vous authentifier?</p>

ot_templating/Resources/Private/Templates/Page/Error/404.html

@@ -2,6 +2,9 @@
 
 <f:layout name="ErrorPage" />
 
+<f:section name="Configuration">
+</f:section>
+
 <f:section name="Message">
     <p>Il semblerait que la page que vous souhaitez consulter n'existe pas ou n'est plus disponible.</p>
     <p>

ot_templating/Resources/Private/Templates/Page/Error/500.html

@@ -1,5 +1,8 @@
 <f:layout name="ErrorPage" />
 
+<f:section name="Configuration">
+</f:section>
+
 <f:section name="Message">
     <p>Une erreur s'est produite, nous nous excusons pour la gêne occasionnée</p>
 </f:section>

ot_templating/Resources/Public/assets/Backend/style/ot_customizer.css

@@ -4,12 +4,6 @@
     flex-direction: row;
 }
 
-.ot-customizer h3 {
-    font-weight: 500;
-    font-size: 1.35em;
-    line-height: 1.2em;
-}
-
 .ot-customizer .templates {
     width: 60%;
     display: flex;
@@ -74,24 +68,6 @@
     padding: 6px;
 }
 
-.ot-customizer .ot-btn {
-    padding: 6px;
-
-    border: solid 1px #bbb;
-    border-radius: 2px;
-    background-color: #eee;
-    font-weight: 600;
-}
-
-.ot-customizer .ot-btn:hover {
-    text-decoration: none;
-    cursor: pointer;
-
-    color: #333;
-    background-color: #d5d4d4;
-    border-color: #9c9c9c;
-}
-
 .ot-customizer .customizer {
     flex: 1;
     padding: 0 3%;
@@ -128,20 +104,3 @@
     flex-direction: row;
     justify-content: flex-end;
 }
-
-.ot-customizer .success-msg {
-    color: #009933;
-    width: 100%;
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    font-size: 14px;
-}
-
-.ot-customizer .no-page-warning {
-    margin: 36px;
-    padding: 12px;
-    background-color: #e6e6e6;
-    border: solid 1px #666666;
-}
-

ot_templating/ext_tables.php

@@ -19,8 +19,8 @@ call_user_func(
             \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerModule(
                 'Opentalent.OtTemplating',
                 'web', // Make module a submodule of 'web'
-                'ot_customizer', // Submodule key
-                'before:ot_stats', // Position
+                'otcustomizer', // Submodule key
+                'before:OtStatsOtstats', // Position
                 array(
                     'OtCustomizer' => 'index,selectTemplate,updatePreferences',
                 ),