bug fixes

ot_templating/Classes/Controller/OtCustomizerController.php

@@ -3,9 +3,9 @@
 namespace Opentalent\OtTemplating\Controller;
 
 use Opentalent\OtTemplating\Page\OtPageRepository;
+use Opentalent\OtTemplating\Utility\CacheManager;
 use PDO;
 use TYPO3\CMS\Core\Database\ConnectionPool;
-use TYPO3\CMS\Core\DataHandling\DataHandler;
 use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
@@ -46,6 +46,7 @@ class OtCustomizerController extends ActionController {
 
     /**
      * A template has been selected, apply the change
+     *
      */
     public function selectTemplateAction() {
         $templateKey = $this->request->getArgument('template_key');
@@ -66,8 +67,9 @@ class OtCustomizerController extends ActionController {
             ->execute()
         ;
 
-        // Clear the page cache
-        $this->cleanCache();
+        // Clear the site's cache
+        CacheManager::clearSiteCache($rootPageUid);
+        CacheManager::clearAssetsTempfiles();
 
         $this->forward('index');
     }
@@ -103,8 +105,8 @@ class OtCustomizerController extends ActionController {
             ->execute()
         ;
 
-        // Clear the page cache
-        $this->cleanCache();
+        // Clear the site's cache
+        CacheManager::clearSiteCache($rootPageUid);
 
         $this->forward(
             'index',
@@ -135,15 +137,6 @@ class OtCustomizerController extends ActionController {
         return (int)$rootPage['uid'];
     }
 
-    /**
-     * Cleans the pages cache
-     */
-    public function cleanCache() {
-        $dataHandler = GeneralUtility::makeInstance(DataHandler::class);
-        $dataHandler->start([], []);
-        $dataHandler->clear_cacheCmd('all');
-    }
-
     /**
      * Gets the backend user
      *

ot_templating/Classes/Utility/CacheManager.php

@@ -0,0 +1,83 @@
+<?php
+
+namespace Opentalent\OtTemplating\Utility;
+
+use Psr\Http\Message\ResponseInterface;
+use RuntimeException;
+use TYPO3\CMS\Core\DataHandling\DataHandler;
+use TYPO3\CMS\Core\Service\OpcodeCacheService;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Install\Service\ClearCacheService;
+use TYPO3\CMS\Install\Service\Typo3tempFileService;
+
+class CacheManager
+{
+
+    /**
+     * Clears the page cache
+     *
+     * @param int $pageUid
+     */
+    public static function clearPageCache(int $pageUid) {
+        $dataHandler = GeneralUtility::makeInstance(DataHandler::class);
+        $dataHandler->start([], []);
+        $dataHandler->clear_cacheCmd($pageUid);
+    }
+
+    /**
+     * Clears cache for each page of the site
+     *
+     * @param int $pageUid
+     */
+    public static function clearSiteCache(int $pageUid) {
+
+        $pageRepository = new \Opentalent\OtTemplating\Page\OtPageRepository();
+        $rootPage = $pageRepository->getRootPageFor($pageUid);
+        $pages = $pageRepository->getAllSubpagesForPage($rootPage['uid']);
+
+        $dataHandler = GeneralUtility::makeInstance(DataHandler::class);
+        $dataHandler->start([], []);
+
+        foreach ($pages as $page) {
+            $dataHandler->clear_cacheCmd($page['uid']);
+        }
+
+    }
+
+    /**
+     * Clear cache framework and opcode caches
+     * (@see TYPO3\CMS\Install\Controller\MaintenanceController )
+     */
+    public static function clearAllCache(): ResponseInterface
+    {
+        GeneralUtility::makeInstance(ClearCacheService::class)->clearAll();
+        GeneralUtility::makeInstance(OpcodeCacheService::class)->clearAllActive();
+    }
+
+    /**
+     * Clear typo3temp/assets
+     * (@see TYPO3\CMS\Install\Controller\MaintenanceController )
+     */
+    public static function clearAssetsTempfiles()
+    {
+        $typo3tempFileService = new Typo3tempFileService();
+
+        try {
+            $typo3tempFileService->clearAssetsFolder("/typo3temp/assets/css");
+        } catch (RuntimeException $e) {
+            // 1501781454 code means directory does not exist, we can ignore this error
+            if ($e->getCode() != 1501781454) {
+                throw $e;
+            }
+        }
+
+        try {
+            $typo3tempFileService->clearAssetsFolder("/typo3temp/assets/js");
+        } catch (RuntimeException $e) {
+            // 1501781454 code means directory does not exist, we can ignore this error
+            if ($e->getCode() != 1501781454) {
+                throw $e;
+            }
+        }
+    }
+}

ot_templating/Configuration/TypoScript/constants.txt

@@ -40,9 +40,6 @@ plugin.tx_ottemplating {
 
             # Utiliser le mode caroussel pour les photos
             carousel = 1
-
-            # Couleur du theme
-            color = blue
         }
         events {
             # >> Ces paramètres doivent pouvoir être modifiés via l'onglet Page Configuration du backend (flux)
@@ -51,7 +48,7 @@ plugin.tx_ottemplating {
             limit = 5
 
             # Nombre de semaines d'affichage
-            period = 8
+            period = 0
         }
         donors {
             # >> Ces paramètres doivent pouvoir être modifiés via l'onglet Page Configuration du backend

ot_templating/Configuration/TypoScript/setup.txt

@@ -1,7 +1,4 @@
-# TODO: reprendre les formulaires custom
-# TODO: prévoir les fallbacks no-script (menu, donors)
-# TODO: viewhelpers - intégrer une gestion d'erreur, en particulier pour ce qui touche aux appels à l'api
-# TODO: changement de template: vider les assets processed
+# TODO: carousel: gérer les cas où pas d'image (ne rien mettre), une seule image (pas de carousel), ou plusieurs
 
 # -- après déploiement beta
 # TODO: DEPRECATION V10 corriger les appels ` $this->forward('...');`, `\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(` et `\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(`
@@ -16,7 +13,6 @@
 # TODO: permettre d'ajouter du contenu de type fichier
 # TODO: permettre d'ajouter du contenu de type vidéos
 # TODO: ajouter une recherche fulltext sur le site
-# TODO: créer un module de personnalisation du site
 # TODO: Faire des sites de demo / de test pour chaque thème avec un compte bidon mais représentatif
 # TODO: trouver un système pour garder à jour les mentions légales
 # TODO: Réflechir à un système pour pouvoir afficher un message sur tous les minisites, type 'Maintenance prévue le...' ou autre
@@ -112,10 +108,10 @@ plugin.tx_ottemplating {
         # Default values for flux parameters
         template = Classic
         themeColor = light-blue
-        displayCarousel = 1
-        staticDonors = 0
-        eventsLimit = 3
-        eventsPeriod = 12
+        displayCarousel = {$plugin.tx_ottemplating.settings.appearance.carousel}
+        staticDonors = {$plugin.tx_ottemplating.settings.donors.static}
+        eventsLimit = {$plugin.tx_ottemplating.settings.events.limit}
+        eventsPeriod = {$plugin.tx_ottemplating.settings.events.period}
     }
 }
 

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

@@ -13,7 +13,7 @@
             <div class="row">
                 <div class="col-xl-6 col-md-6">
                     <div class="footer-text">
-                        <p> &copy;<span id="copyright"> <script>document.getElementById('copyright').appendChild(document.createTextNode(new Date().getFullYear()))</script></span> - <a href="#"> {settings.structureName} </a> - Tous droits réservés</p>
+                        <p> &copy;<span id="copyright"> <script>document.getElementById('copyright').appendChild(document.createTextNode(new Date().getFullYear()))</script></span> - <a href="{ot:rootPage.getUri()}"> {settings.structureName} </a> - Tous droits réservés</p>
                     </div>
                 </div>
 

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

@@ -35,6 +35,10 @@ $menu-font-color: $menu-font-color;
     margin: 8px 0;
   }
 
+  #topbar .topbar-title {
+    text-align: center;
+  }
+
   // Breadcrumb
   .breadcrumb {
     flex-direction: column;

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

@@ -1689,6 +1689,26 @@ form button[type=submit]:hover {
   margin-right: 0;
 }
 
+.no-script-warning {
+  /* OLD - iOS 6-, Safari 3.1-6 */
+  display: -webkit-box;
+  /* OLD - Firefox 19- (buggy but mostly works) */
+  display: -moz-box;
+  /* TWEENER - IE 10 */
+  display: -ms-flexbox;
+  /* NEW - Chrome */
+  display: -webkit-flex;
+  /* NEW, Spec - Opera 12.1, Firefox 20+ */
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 100%;
+  background-color: #e60000;
+  color: #ffffff;
+  font-size: 1.2em;
+  margin-bottom: 0.5em;
+}
+
 .alert {
   color: #e60000;
   font-weight: bold;
@@ -1720,6 +1740,10 @@ form button[type=submit]:hover {
     margin: 8px 0;
   }
 
+  #topbar .topbar-title {
+    text-align: center;
+  }
+
   .breadcrumb {
     flex-direction: column;
   }

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

@@ -96,4 +96,5 @@ $warning-font-color: #ffffff !default;
 "module/_contact",
 "module/_faq",
 "module/_fce-2col",
+"module/_noscript",
 "_states";

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

@@ -1689,6 +1689,26 @@ form button[type=submit]:hover {
   margin-right: 0;
 }
 
+.no-script-warning {
+  /* OLD - iOS 6-, Safari 3.1-6 */
+  display: -webkit-box;
+  /* OLD - Firefox 19- (buggy but mostly works) */
+  display: -moz-box;
+  /* TWEENER - IE 10 */
+  display: -ms-flexbox;
+  /* NEW - Chrome */
+  display: -webkit-flex;
+  /* NEW, Spec - Opera 12.1, Firefox 20+ */
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 100%;
+  background-color: #e60000;
+  color: #ffffff;
+  font-size: 1.2em;
+  margin-bottom: 0.5em;
+}
+
 .alert {
   color: #e60000;
   font-weight: bold;
@@ -1720,6 +1740,10 @@ form button[type=submit]:hover {
     margin: 8px 0;
   }
 
+  #topbar .topbar-title {
+    text-align: center;
+  }
+
   .breadcrumb {
     flex-direction: column;
   }

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

@@ -1689,6 +1689,26 @@ form button[type=submit]:hover {
   margin-right: 0;
 }
 
+.no-script-warning {
+  /* OLD - iOS 6-, Safari 3.1-6 */
+  display: -webkit-box;
+  /* OLD - Firefox 19- (buggy but mostly works) */
+  display: -moz-box;
+  /* TWEENER - IE 10 */
+  display: -ms-flexbox;
+  /* NEW - Chrome */
+  display: -webkit-flex;
+  /* NEW, Spec - Opera 12.1, Firefox 20+ */
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 100%;
+  background-color: #e60000;
+  color: #ffffff;
+  font-size: 1.2em;
+  margin-bottom: 0.5em;
+}
+
 .alert {
   color: #e60000;
   font-weight: bold;
@@ -1720,6 +1740,10 @@ form button[type=submit]:hover {
     margin: 8px 0;
   }
 
+  #topbar .topbar-title {
+    text-align: center;
+  }
+
   .breadcrumb {
     flex-direction: column;
   }

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

@@ -1689,6 +1689,26 @@ form button[type=submit]:hover {
   margin-right: 0;
 }
 
+.no-script-warning {
+  /* OLD - iOS 6-, Safari 3.1-6 */
+  display: -webkit-box;
+  /* OLD - Firefox 19- (buggy but mostly works) */
+  display: -moz-box;
+  /* TWEENER - IE 10 */
+  display: -ms-flexbox;
+  /* NEW - Chrome */
+  display: -webkit-flex;
+  /* NEW, Spec - Opera 12.1, Firefox 20+ */
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 100%;
+  background-color: #e60000;
+  color: #ffffff;
+  font-size: 1.2em;
+  margin-bottom: 0.5em;
+}
+
 .alert {
   color: #e60000;
   font-weight: bold;
@@ -1720,6 +1740,10 @@ form button[type=submit]:hover {
     margin: 8px 0;
   }
 
+  #topbar .topbar-title {
+    text-align: center;
+  }
+
   .breadcrumb {
     flex-direction: column;
   }

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

@@ -1689,6 +1689,26 @@ form button[type=submit]:hover {
   margin-right: 0;
 }
 
+.no-script-warning {
+  /* OLD - iOS 6-, Safari 3.1-6 */
+  display: -webkit-box;
+  /* OLD - Firefox 19- (buggy but mostly works) */
+  display: -moz-box;
+  /* TWEENER - IE 10 */
+  display: -ms-flexbox;
+  /* NEW - Chrome */
+  display: -webkit-flex;
+  /* NEW, Spec - Opera 12.1, Firefox 20+ */
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 100%;
+  background-color: #e60000;
+  color: #ffffff;
+  font-size: 1.2em;
+  margin-bottom: 0.5em;
+}
+
 .alert {
   color: #e60000;
   font-weight: bold;
@@ -1720,6 +1740,10 @@ form button[type=submit]:hover {
     margin: 8px 0;
   }
 
+  #topbar .topbar-title {
+    text-align: center;
+  }
+
   .breadcrumb {
     flex-direction: column;
   }

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

@@ -231,16 +231,16 @@ ul.dropdown-left {
 }
 
 #menu li.active a {
-  color: #555;
+  color: #333333;
 }
 
 #menu li.dropdown-displayed a {
-  color: #555;
+  color: #333333;
 }
 
 #menu li a:hover {
   text-decoration: none;
-  color: #555;
+  color: #333333;
 }
 
 #menu .menu-label {
@@ -253,7 +253,7 @@ ul.dropdown-left {
 
 #menu .dropdown.dropdown-displayed {
   background-color: #dd453f;
-  color: #555;
+  color: #333333;
 }
 
 #menu .dropdown-menu {
@@ -1689,6 +1689,26 @@ form button[type=submit]:hover {
   margin-right: 0;
 }
 
+.no-script-warning {
+  /* OLD - iOS 6-, Safari 3.1-6 */
+  display: -webkit-box;
+  /* OLD - Firefox 19- (buggy but mostly works) */
+  display: -moz-box;
+  /* TWEENER - IE 10 */
+  display: -ms-flexbox;
+  /* NEW - Chrome */
+  display: -webkit-flex;
+  /* NEW, Spec - Opera 12.1, Firefox 20+ */
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 100%;
+  background-color: #e60000;
+  color: #ffffff;
+  font-size: 1.2em;
+  margin-bottom: 0.5em;
+}
+
 .alert {
   color: #e60000;
   font-weight: bold;
@@ -1720,6 +1740,10 @@ form button[type=submit]:hover {
     margin: 8px 0;
   }
 
+  #topbar .topbar-title {
+    text-align: center;
+  }
+
   .breadcrumb {
     flex-direction: column;
   }

ot_templating/Resources/Public/assets/Classic/style/theme-light-red.scss

@@ -6,7 +6,7 @@ $main-color: #dd453f;
   $menu-background-color-hovered: $main-color,
   $menu-background-color-current: $main-color,
   $menu-font-color: #ffffff,
-  $menu-font-color-hovered: #555,
+  $menu-font-color-hovered: #333333,
 
   $menu-dropdown-background-color: #ffffff,
   $menu-dropdown-background-color-hovered: #e6e6e6,

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

@@ -1689,6 +1689,26 @@ form button[type=submit]:hover {
   margin-right: 0;
 }
 
+.no-script-warning {
+  /* OLD - iOS 6-, Safari 3.1-6 */
+  display: -webkit-box;
+  /* OLD - Firefox 19- (buggy but mostly works) */
+  display: -moz-box;
+  /* TWEENER - IE 10 */
+  display: -ms-flexbox;
+  /* NEW - Chrome */
+  display: -webkit-flex;
+  /* NEW, Spec - Opera 12.1, Firefox 20+ */
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 100%;
+  background-color: #e60000;
+  color: #ffffff;
+  font-size: 1.2em;
+  margin-bottom: 0.5em;
+}
+
 .alert {
   color: #e60000;
   font-weight: bold;
@@ -1720,6 +1740,10 @@ form button[type=submit]:hover {
     margin: 8px 0;
   }
 
+  #topbar .topbar-title {
+    text-align: center;
+  }
+
   .breadcrumb {
     flex-direction: column;
   }

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

@@ -1689,6 +1689,26 @@ form button[type=submit]:hover {
   margin-right: 0;
 }
 
+.no-script-warning {
+  /* OLD - iOS 6-, Safari 3.1-6 */
+  display: -webkit-box;
+  /* OLD - Firefox 19- (buggy but mostly works) */
+  display: -moz-box;
+  /* TWEENER - IE 10 */
+  display: -ms-flexbox;
+  /* NEW - Chrome */
+  display: -webkit-flex;
+  /* NEW, Spec - Opera 12.1, Firefox 20+ */
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 100%;
+  background-color: #e60000;
+  color: #ffffff;
+  font-size: 1.2em;
+  margin-bottom: 0.5em;
+}
+
 .alert {
   color: #e60000;
   font-weight: bold;
@@ -1720,6 +1740,10 @@ form button[type=submit]:hover {
     margin: 8px 0;
   }
 
+  #topbar .topbar-title {
+    text-align: center;
+  }
+
   .breadcrumb {
     flex-direction: column;
   }

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

@@ -1689,6 +1689,26 @@ form button[type=submit]:hover {
   margin-right: 0;
 }
 
+.no-script-warning {
+  /* OLD - iOS 6-, Safari 3.1-6 */
+  display: -webkit-box;
+  /* OLD - Firefox 19- (buggy but mostly works) */
+  display: -moz-box;
+  /* TWEENER - IE 10 */
+  display: -ms-flexbox;
+  /* NEW - Chrome */
+  display: -webkit-flex;
+  /* NEW, Spec - Opera 12.1, Firefox 20+ */
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 100%;
+  background-color: #e60000;
+  color: #ffffff;
+  font-size: 1.2em;
+  margin-bottom: 0.5em;
+}
+
 .alert {
   color: #e60000;
   font-weight: bold;
@@ -1720,6 +1740,10 @@ form button[type=submit]:hover {
     margin: 8px 0;
   }
 
+  #topbar .topbar-title {
+    text-align: center;
+  }
+
   .breadcrumb {
     flex-direction: column;
   }

ot_templating/Resources/Public/assets/Modern/script/custom-ot.js

@@ -13,76 +13,6 @@
 ============================*/
 
 
-
-/*============================
-    SWITCH COULEURS
-==============================
-    Change la palette de
-    couleurs du site
-============================*/
-
-
-$('#site-colors').on('change', function() {
-	jQuery('#bt-removable-css').remove();
-	jQuery('head').append('<link type="text/css" rel="stylesheet" href="css/skins/skin-'+this.value+'.css" id="bt-removable-css">');
-});
-
-
-/*============================
-    AFFICHAGE SLIDER
-==============================
-    Affiche ou masque
-    le diaporama
-============================*/
-
-$("#slider-on").click(function() {
-	$('.rev_slider').show();
-	if(!$('#slider-off').hasClass('button-border')){
-		$('#slider-off').addClass('button-border');
-	}
-	if( $('#slider-on').hasClass('button-border')){
-		$('#slider-on').removeClass('button-border');
-	}
-});
-
-$("#slider-off").click(function() {
-	$('.rev_slider').hide();
-	if(!$('#slider-on').hasClass('button-border')){
-		$('#slider-on').addClass('button-border');
-	}
-	if( $('#slider-off').hasClass('button-border')){
-		$('#slider-off').removeClass('button-border');
-	}
-});
-
-
-/*============================
-    AFFICHAGE RESEAU
-==============================
-    Affiche ou masque
-    les éléments réseau
-============================*/
-
-$("#reseau-on").click(function() {
-	$('.reseau').show();
-	if(!$('#reseau-off').hasClass('button-border')){
-		$('#reseau-off').addClass('button-border');
-	}
-	if( $('#reseau-on').hasClass('button-border')){
-		$('#reseau-on').removeClass('button-border');
-	}
-});
-
-$("#reseau-off").click(function() {
-	$('.reseau').hide();
-	if(!$('#reseau-on').hasClass('button-border')){
-		$('#reseau-on').addClass('button-border');
-	}
-	if( $('#reseau-off').hasClass('button-border')){
-		$('#reseau-off').removeClass('button-border');
-	}
-});
-
 /*============================
     Slick carousels
 ============================*/
@@ -176,22 +106,6 @@ $(document).ready(function(){
 		showMap($('#structure-map').first());
 	}
 
-	// Automatically open popups if they have the display-modal class
-	// $('.modal.show-at-start').each(function() {
-	// 	console.log(this);
-	// 	$.magnificPopup.open({
-	// 		items: { src: this },
-	// 		type: "inline",
-	// 		modal: true,
-	// 		mainClass: "mfp-no-margins mfp-fade",
-	// 		closeBtnInside: !0,
-	// 		fixedContentPos: !0,
-	// 		removalDelay: 500
-	// 	}, 0);
-		// $(this).addClass('show');
-		// $(this).setStyle('padding-right: 15px; display: block;');
-	// });
-
 	// Automatically open popups if they have the display-modal class
     //	(the only/dirty way I found to force the opening of the popups is to trgigger the click on the link...)
 	$('.trigger-on-load').trigger('click');

ot_templating/Resources/Public/assets/Modern/style/custom.css

@@ -71,6 +71,12 @@
         font-weight: 600;
     }
 
+    /* Limit content width */
+    .page-section-ptb img {
+        max-width: 100%;
+        height: auto;
+    }
+
     /*------------------------
         Barre réseau
     ------------------------*/
@@ -878,6 +884,9 @@ Members page
     justify-content: center;
 }
 
+.team .team-photo img {
+    max-height: 200px;
+}
 
 /*============================
 Sitemap page
@@ -967,7 +976,12 @@ Media queries
         height: auto;
     }
 
+    /* Contents */
 
+    /* > fix a bug with floating contents and small screens */
+    .ce-right .ce-gallery {
+        float: none;
+    }
 
 
 }