Merge remote-tracking branch 'origin/fermeture-campaign-2023' into pr…

…eprod
afup · Dec 17, 2023 · f9056ff · f9056ff
2 parents 7295518 + 03392b7
commit f9056ff
Show file tree

Hide file tree

Showing 8 changed files with 338 additions and 55 deletions.
diff --git a/assets/sass/_tarteaucitron.scss b/assets/sass/_tarteaucitron.scss
diff --git a/config/routes.yaml b/config/routes.yaml
@@ -3,16 +3,18 @@ afup_barometre_homepage:
   methods: GET
   controller: Symfony\Bundle\FrameworkBundle\Controller\RedirectController
   defaults:
-    path: /campaign/2023
+    path: /about
     permanent: false
 
 afup_barometre_form:
   path: /campaign/2023
   methods: GET
-  defaults: { _controller: App\Controller\CampaignController::formAction }
+  controller: Symfony\Bundle\FrameworkBundle\Controller\RedirectController
+  defaults:
+    path: /about
 
 controllers:
-    resource:
-        path: ../src/Controller/
-        namespace: App\Controller
-    type: attribute
+  resource:
+    path: ../src/Controller/
+    namespace: App\Controller
+  type: attribute
diff --git a/docker/dockerfiles/cli/Dockerfile b/docker/dockerfiles/cli/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.0
+FROM php:8.1
 
 RUN apt-get update && apt-get install -y build-essential
 RUN apt-get update && apt-get install -y gnupg

diff --git a/docker/dockerfiles/web/Dockerfile b/docker/dockerfiles/web/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.0-apache
+FROM php:8.1-apache
 
 RUN apt-get update && apt-get install -y zlib1g zlib1g-dev
 RUN echo "date.timezone=Europe/Paris" >> "/usr/local/etc/php/php.ini"

diff --git a/src/Menu/MenuBuilder.php b/src/Menu/MenuBuilder.php
@@ -40,11 +40,6 @@ protected function getBaseMenu()
         $menu = $this->factory->createItem('menu');
         $menu->setChildrenAttribute('class', 'nav navbar-nav');
 
-        $menu->addChild('menu.survey', [
-            'route' => 'afup_barometre_form',
-            'routeAbsolute' => UrlGeneratorInterface::ABSOLUTE_URL,
-        ]);
-
         $menu->addChild(
             'menu.result2022',
             [

diff --git a/src/Report/SalaryReport.php b/src/Report/SalaryReport.php
@@ -47,7 +47,7 @@ public function execute()
             $baseResults = [];
         }
 
-        $results = $results + $baseResults;
+        $results += $baseResults;
         ksort($results);
 
         foreach ($results as $key => &$result) {

diff --git a/templates/Default/ga.html.twig b/templates/Default/ga.html.twig
@@ -1,7 +1,7 @@
 {% if ga_enabled %}
 <script>
-    tarteaucitron.user.analyticsUa = 'UA-33922307-2';
-    tarteaucitron.user.analyticsUaCreate = {'siteSpeedSampleRate': 100};
-    (tarteaucitron.job = tarteaucitron.job || []).push('analytics');
+    tarteaucitron.user.gtagUa = 'G-8VPQW2KWTE';
+    tarteaucitron.user.gtagMore = function () { };
+    (tarteaucitron.job = tarteaucitron.job || []).push('gtag');
 </script>
 {% endif %}
diff --git a/templates/tarteaucitron.twig b/templates/tarteaucitron.twig
@@ -3,21 +3,38 @@
     tarteaucitronForceLanguage = 'fr';
     tarteaucitron.init({
         "privacyUrl": "", /* Privacy policy url */
+        "bodyPosition": "bottom", /* or top to bring it as first element for accessibility */
 
         "hashtag": "#tarteaucitron", /* Open the panel with this hashtag */
         "cookieName": "tarteaucitron", /* Cookie name */
 
         "orientation": "bottom", /* Banner position (top - bottom) */
+        "groupServices": false, /* Group services by category */
+        "serviceDefaultState": "wait", /* Default state (true - wait - false) */
         "showAlertSmall": false, /* Show the small banner on bottom right */
         "cookieslist": true, /* Show the cookie list */
+        "closePopup": false, /* Show a close X on the banner */
+
+        "showIcon": false, /* Show cookie icon to manage cookies */
+        "iconPosition": "BottomRight", /* BottomRight, BottomLeft, TopRight and TopLeft */
 
         "adblocker": false, /* Show a Warning if an adblocker is detected */
+
+        "DenyAllCta" : true, /* Show the deny all button */
         "AcceptAllCta" : true, /* Show the accept all button when highPrivacy on */
-        "highPrivacy": false, /* Disable auto consent */
+        "highPrivacy": false, /* HIGHLY RECOMMANDED Disable auto consent */
+
         "handleBrowserDNTRequest": false, /* If Do Not Track == 1, disallow all */
 
-        "removeCredit": false, /* Remove credit link */
+        "removeCredit": true, /* Remove credit link */
         "moreInfoLink": true, /* Show more info link */
-        "useExternalCss": true /* If false, the tarteaucitron.css file will be loaded */
+
+        "useExternalCss": true, /* If false, the tarteaucitron.css file will be loaded */
+        "useExternalJs": false, /* If false, the tarteaucitron.js file will be loaded */
+
+        "readmoreLink": "", /* Change the default readmore link */
+
+        "mandatory": false, /* Show a message about mandatory cookies */
+        "mandatoryCta": false /* Show the disabled accept button when mandatory on */
     });
 </script>