bug fixes

ot_templating/Configuration/TypoScript/setup.txt

@@ -1,6 +1,7 @@
 # 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
 
 # -- 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(`
@@ -21,9 +22,9 @@
 # TODO: Réflechir à un système pour pouvoir afficher un message sur tous les minisites, type 'Maintenance prévue le...' ou autre
 
 ## DEBUG MODE: tout commenter pour la prod ##
-config.debug = 1
-config.contentObjectExceptionHandler = 0
-config.no_cache = 0
+config.debug = 0
+config.contentObjectExceptionHandler = 1
+config.no_cache = 1
 config.admPanel = 0
 
 plugin.tx_vhs.settings.debug = 0

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

@@ -18,7 +18,7 @@
         </div>
 
         <div class="postal-adress">
-            <h2><i class="fa fa-envelope" style="margin-right: 6px;"></i>Ou par courrier:</h2>
+            <h2><i class="fa fa-envelope" style="margin-right: 12px;"></i>Ou par courrier:</h2>
             <ot:organizations.getById as="organization" organizationId="{settings.organizationId}">
                 <p>
                     {organization.name}<br/>

ot_templating/Resources/Private/Layouts/Modern/Contact.html

@@ -1,3 +1,5 @@
+{namespace ot=Opentalent\OtTemplating\ViewHelpers}
+
 <f:comment><!-- Special layout for the Contact page --></f:comment>
 <f:layout name="Contact" />
 
@@ -14,6 +16,18 @@
                         <div class="contact-form">
                             <formvh:render persistenceIdentifier="EXT:ot_templating/Resources/Private/Forms/Contact.form.yaml" />
                         </div>
+
+                        <div class="postal-adress">
+                            <h2><i class="fa fa-envelope" style="margin-right: 12px;"></i>Ou par courrier :</h2>
+                            <ot:organizations.getById as="organization" organizationId="{settings.organizationId}">
+                                <p>
+                                    {organization.name}<br/>
+                                    {organization.streetAdress}<br/>
+                                    {organization.postalCode} {organization.addressCity}
+                                    {organization.country}
+                                </p>
+                            </ot:organizations.getById>
+                        </div>
                     </div>
                 </div>
             </div>

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

@@ -4,6 +4,8 @@
 <f:comment><!-- Panneau d'authentification ou espace utilisateur --></f:comment>
 
 <div class="user-toolbar">
+    <f:security.ifAuthenticated>
+        <f:then>
 
             <div class="dropdown">
                 <a href="#" class="user-toolbar-username">
@@ -26,4 +28,46 @@
                 </ul>
             </div>
 
+        </f:then>
+        <f:else>
+
+            <a href="#" id="login-btn">
+                <i class="fas fa-power-off"></i> Se connecter
+            </a>
+
+            <f:comment><!-- Popup de login --></f:comment>
+
+            <div id="login-popup" class="<f:if condition='{ot:loginFailed()}==1' then='show'></f:if>">
+                <form id="login_form" class="popup-form" action="" method="POST" enctype="multipart/form-data" >
+
+                    <f:comment><!-- Just for typo3 to indentify it as a login request --></f:comment>
+                    <input type="hidden" name="logintype" value="login" />
+
+                    <input type="text"
+                           class="form-control {f:if(then: 'is-invalid', condition: '{usernameErrors}')}"
+                           placeholder="Nom d'utilisateur"
+                           name="user"
+                           required="1" />
+
+                    <input type="password"
+                           class="form-control {f:if(then: 'is-invalid', condition: '{passwordErrors}')}"
+                           name="pass"
+                           placeholder="Mot de passe"
+                           required="1" />
+
+                    <input type="submit" id="login-button" value="Se connecter" />
+
+                    <f:if condition="{ot:loginFailed()}==1">
+                        <f:then>
+                            <div class="login-errormsg alert">
+                                La tentative de connexion a échoué...<br/>
+                                Êtes-vous sûr d'avoir bien renseigné vos identifiants?
+                            </div>
+                        </f:then>
+                    </f:if>
+                </form>
+            </div>
+
+        </f:else>
+    </f:security.ifAuthenticated>
 </div>

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

@@ -5,7 +5,7 @@
     Voir: https://fluidtypo3.org/viewhelpers/vhs/master/Page/Resources/FalViewHelper.html
 --></f:comment>
 
-<section class="rev-slider">
+<section id="main-carousel" class="rev-slider">
     <div id="rev_slider_268_1_wrapper" class="rev_slider_wrapper fullwidthbanner-container" data-alias="webster-slider-2" data-source="gallery" style="margin:0px auto;background:transparent;padding:0px;margin-top:0px;margin-bottom:0px;">
         <f:comment><!-- START REVOLUTION SLIDER 5.4.6.3 fullwidth mode --></f:comment>
         <div id="rev_slider_268_1" class="rev_slider" style="display:none;" data-version="5.4.6.3">

ot_templating/Resources/Public/assets/Classic/script/main.js

@@ -83,6 +83,12 @@ $(document).ready(function(){
 
     $(function(){
         $(window).scroll(function() {
+
+            // Not for little screens
+            if ($('#menu-container .toggle-menu').isVisible()) {
+                return;
+            }
+
             if ($(this).scrollTop() >= menuTop) {
                 $('#menu-container').addClass('sticky');
             }

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

@@ -15,9 +15,11 @@
 }
 
 .postal-adress {
-  width: 70%;
-  margin: auto;
-  border: solid 1px #cccccc;
-  padding: 1em;
+  width: 80%;
+  margin: 45px auto auto;
+}
+
+.postal-adress h2 {
+  margin-bottom: 12px;
 }
 

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

@@ -152,17 +152,12 @@ $cols-header-font-weight: $cols-header-font-weight;
     border-color: #BBB;
   }
 
-//   prevents iframe to oversize the content width
-  iframe {
-    width: 100%;
-    height: auto;
-    max-width: 560px;
-  }
 }
 
 .centralcol {
   flex: 1;
   padding: 0 2em;
+  max-width: 70%;
 
   // special case
   header {

ot_templating/Resources/Public/assets/Classic/style/module/_events-index.scss

@@ -67,7 +67,7 @@
   flex-direction: column;
   border-bottom: solid 2px $otbox-header-background-color;
   border-radius: 4px;
-  height: 200px;
+  min-height: 200px;
   padding: 1em;
   justify-content: space-around;
 }

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

@@ -85,6 +85,10 @@ $submenu-item-height: 30px;
   color: $menu-font-color-hovered;
 }
 
+#menu .menu-label {
+  width: 100%;
+}
+
 #menu .caret {
   margin-left: 5px;
 }

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

@@ -243,6 +243,10 @@ ul.dropdown-left {
   color: #555;
 }
 
+#menu .menu-label {
+  width: 100%;
+}
+
 #menu .caret {
   margin-left: 5px;
 }
@@ -421,15 +425,11 @@ ul.dropdown-left {
   margin: 15px 5px;
   border-color: #BBB;
 }
-.content iframe {
-  width: 100%;
-  height: auto;
-  max-width: 560px;
-}
 
 .centralcol {
   flex: 1;
   padding: 0 2em;
+  max-width: 70%;
 }
 .centralcol header h2 {
   color: #4facc6;
@@ -953,7 +953,7 @@ header .slick-track {
   flex-direction: column;
   border-bottom: solid 2px #323232;
   border-radius: 4px;
-  height: 200px;
+  min-height: 200px;
   padding: 1em;
   justify-content: space-around;
 }
@@ -1651,10 +1651,12 @@ form button[type=submit]:hover {
 }
 
 .postal-adress {
-  width: 70%;
-  margin: auto;
-  border: solid 1px #cccccc;
-  padding: 1em;
+  width: 80%;
+  margin: 45px auto auto;
+}
+
+.postal-adress h2 {
+  margin-bottom: 12px;
 }
 
 .faq-item .content {

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

@@ -243,6 +243,10 @@ ul.dropdown-left {
   color: #555;
 }
 
+#menu .menu-label {
+  width: 100%;
+}
+
 #menu .caret {
   margin-left: 5px;
 }
@@ -421,15 +425,11 @@ ul.dropdown-left {
   margin: 15px 5px;
   border-color: #BBB;
 }
-.content iframe {
-  width: 100%;
-  height: auto;
-  max-width: 560px;
-}
 
 .centralcol {
   flex: 1;
   padding: 0 2em;
+  max-width: 70%;
 }
 .centralcol header h2 {
   color: #097f9a;
@@ -953,7 +953,7 @@ header .slick-track {
   flex-direction: column;
   border-bottom: solid 2px #323232;
   border-radius: 4px;
-  height: 200px;
+  min-height: 200px;
   padding: 1em;
   justify-content: space-around;
 }
@@ -1651,10 +1651,12 @@ form button[type=submit]:hover {
 }
 
 .postal-adress {
-  width: 70%;
-  margin: auto;
-  border: solid 1px #cccccc;
-  padding: 1em;
+  width: 80%;
+  margin: 45px auto auto;
+}
+
+.postal-adress h2 {
+  margin-bottom: 12px;
 }
 
 .faq-item .content {

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

@@ -243,6 +243,10 @@ ul.dropdown-left {
   color: #555;
 }
 
+#menu .menu-label {
+  width: 100%;
+}
+
 #menu .caret {
   margin-left: 5px;
 }
@@ -421,15 +425,11 @@ ul.dropdown-left {
   margin: 15px 5px;
   border-color: #BBB;
 }
-.content iframe {
-  width: 100%;
-  height: auto;
-  max-width: 560px;
-}
 
 .centralcol {
   flex: 1;
   padding: 0 2em;
+  max-width: 70%;
 }
 .centralcol header h2 {
   color: #04a04c;
@@ -953,7 +953,7 @@ header .slick-track {
   flex-direction: column;
   border-bottom: solid 2px #323232;
   border-radius: 4px;
-  height: 200px;
+  min-height: 200px;
   padding: 1em;
   justify-content: space-around;
 }
@@ -1651,10 +1651,12 @@ form button[type=submit]:hover {
 }
 
 .postal-adress {
-  width: 70%;
-  margin: auto;
-  border: solid 1px #cccccc;
-  padding: 1em;
+  width: 80%;
+  margin: 45px auto auto;
+}
+
+.postal-adress h2 {
+  margin-bottom: 12px;
 }
 
 .faq-item .content {

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

@@ -243,6 +243,10 @@ ul.dropdown-left {
   color: #555;
 }
 
+#menu .menu-label {
+  width: 100%;
+}
+
 #menu .caret {
   margin-left: 5px;
 }
@@ -421,15 +425,11 @@ ul.dropdown-left {
   margin: 15px 5px;
   border-color: #BBB;
 }
-.content iframe {
-  width: 100%;
-  height: auto;
-  max-width: 560px;
-}
 
 .centralcol {
   flex: 1;
   padding: 0 2em;
+  max-width: 70%;
 }
 .centralcol header h2 {
   color: #8c8c8c;
@@ -953,7 +953,7 @@ header .slick-track {
   flex-direction: column;
   border-bottom: solid 2px #323232;
   border-radius: 4px;
-  height: 200px;
+  min-height: 200px;
   padding: 1em;
   justify-content: space-around;
 }
@@ -1651,10 +1651,12 @@ form button[type=submit]:hover {
 }
 
 .postal-adress {
-  width: 70%;
-  margin: auto;
-  border: solid 1px #cccccc;
-  padding: 1em;
+  width: 80%;
+  margin: 45px auto auto;
+}
+
+.postal-adress h2 {
+  margin-bottom: 12px;
 }
 
 .faq-item .content {

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

@@ -243,6 +243,10 @@ ul.dropdown-left {
   color: #555;
 }
 
+#menu .menu-label {
+  width: 100%;
+}
+
 #menu .caret {
   margin-left: 5px;
 }
@@ -421,15 +425,11 @@ ul.dropdown-left {
   margin: 15px 5px;
   border-color: #BBB;
 }
-.content iframe {
-  width: 100%;
-  height: auto;
-  max-width: 560px;
-}
 
 .centralcol {
   flex: 1;
   padding: 0 2em;
+  max-width: 70%;
 }
 .centralcol header h2 {
   color: #0aa5ec;
@@ -953,7 +953,7 @@ header .slick-track {
   flex-direction: column;
   border-bottom: solid 2px #323232;
   border-radius: 4px;
-  height: 200px;
+  min-height: 200px;
   padding: 1em;
   justify-content: space-around;
 }
@@ -1651,10 +1651,12 @@ form button[type=submit]:hover {
 }
 
 .postal-adress {
-  width: 70%;
-  margin: auto;
-  border: solid 1px #cccccc;
-  padding: 1em;
+  width: 80%;
+  margin: 45px auto auto;
+}
+
+.postal-adress h2 {
+  margin-bottom: 12px;
 }
 
 .faq-item .content {

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

@@ -243,6 +243,10 @@ ul.dropdown-left {
   color: #555;
 }
 
+#menu .menu-label {
+  width: 100%;
+}
+
 #menu .caret {
   margin-left: 5px;
 }
@@ -421,15 +425,11 @@ ul.dropdown-left {
   margin: 15px 5px;
   border-color: #BBB;
 }
-.content iframe {
-  width: 100%;
-  height: auto;
-  max-width: 560px;
-}
 
 .centralcol {
   flex: 1;
   padding: 0 2em;
+  max-width: 70%;
 }
 .centralcol header h2 {
   color: #dd453f;
@@ -953,7 +953,7 @@ header .slick-track {
   flex-direction: column;
   border-bottom: solid 2px #323232;
   border-radius: 4px;
-  height: 200px;
+  min-height: 200px;
   padding: 1em;
   justify-content: space-around;
 }
@@ -1651,10 +1651,12 @@ form button[type=submit]:hover {
 }
 
 .postal-adress {
-  width: 70%;
-  margin: auto;
-  border: solid 1px #cccccc;
-  padding: 1em;
+  width: 80%;
+  margin: 45px auto auto;
+}
+
+.postal-adress h2 {
+  margin-bottom: 12px;
 }
 
 .faq-item .content {

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

@@ -243,6 +243,10 @@ ul.dropdown-left {
   color: #555;
 }
 
+#menu .menu-label {
+  width: 100%;
+}
+
 #menu .caret {
   margin-left: 5px;
 }
@@ -421,15 +425,11 @@ ul.dropdown-left {
   margin: 15px 5px;
   border-color: #BBB;
 }
-.content iframe {
-  width: 100%;
-  height: auto;
-  max-width: 560px;
-}
 
 .centralcol {
   flex: 1;
   padding: 0 2em;
+  max-width: 70%;
 }
 .centralcol header h2 {
   color: #e4611b;
@@ -953,7 +953,7 @@ header .slick-track {
   flex-direction: column;
   border-bottom: solid 2px #323232;
   border-radius: 4px;
-  height: 200px;
+  min-height: 200px;
   padding: 1em;
   justify-content: space-around;
 }
@@ -1651,10 +1651,12 @@ form button[type=submit]:hover {
 }
 
 .postal-adress {
-  width: 70%;
-  margin: auto;
-  border: solid 1px #cccccc;
-  padding: 1em;
+  width: 80%;
+  margin: 45px auto auto;
+}
+
+.postal-adress h2 {
+  margin-bottom: 12px;
 }
 
 .faq-item .content {

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

@@ -243,6 +243,10 @@ ul.dropdown-left {
   color: #555;
 }
 
+#menu .menu-label {
+  width: 100%;
+}
+
 #menu .caret {
   margin-left: 5px;
 }
@@ -421,15 +425,11 @@ ul.dropdown-left {
   margin: 15px 5px;
   border-color: #BBB;
 }
-.content iframe {
-  width: 100%;
-  height: auto;
-  max-width: 560px;
-}
 
 .centralcol {
   flex: 1;
   padding: 0 2em;
+  max-width: 70%;
 }
 .centralcol header h2 {
   color: #a5377e;
@@ -953,7 +953,7 @@ header .slick-track {
   flex-direction: column;
   border-bottom: solid 2px #323232;
   border-radius: 4px;
-  height: 200px;
+  min-height: 200px;
   padding: 1em;
   justify-content: space-around;
 }
@@ -1651,10 +1651,12 @@ form button[type=submit]:hover {
 }
 
 .postal-adress {
-  width: 70%;
-  margin: auto;
-  border: solid 1px #cccccc;
-  padding: 1em;
+  width: 80%;
+  margin: 45px auto auto;
+}
+
+.postal-adress h2 {
+  margin-bottom: 12px;
 }
 
 .faq-item .content {

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

@@ -243,6 +243,10 @@ ul.dropdown-left {
   color: #555;
 }
 
+#menu .menu-label {
+  width: 100%;
+}
+
 #menu .caret {
   margin-left: 5px;
 }
@@ -421,15 +425,11 @@ ul.dropdown-left {
   margin: 15px 5px;
   border-color: #BBB;
 }
-.content iframe {
-  width: 100%;
-  height: auto;
-  max-width: 560px;
-}
 
 .centralcol {
   flex: 1;
   padding: 0 2em;
+  max-width: 70%;
 }
 .centralcol header h2 {
   color: #df0009;
@@ -953,7 +953,7 @@ header .slick-track {
   flex-direction: column;
   border-bottom: solid 2px #323232;
   border-radius: 4px;
-  height: 200px;
+  min-height: 200px;
   padding: 1em;
   justify-content: space-around;
 }
@@ -1651,10 +1651,12 @@ form button[type=submit]:hover {
 }
 
 .postal-adress {
-  width: 70%;
-  margin: auto;
-  border: solid 1px #cccccc;
-  padding: 1em;
+  width: 80%;
+  margin: 45px auto auto;
+}
+
+.postal-adress h2 {
+  margin-bottom: 12px;
 }
 
 .faq-item .content {

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

@@ -154,7 +154,7 @@
 
     /* Fix bug with long menus */
     .mega-menu .menu-bar {
-        width: 90%;
+        width: 80%;
     }
 
     .mega-menu > section.menu-list-items .menu-bar {
@@ -332,10 +332,6 @@
         padding: 3em 2em 0 2em;
     }
 
-    .cmfModal-content p {
-        font-weight: bold;
-    }
-
     .cmf-bg {
         /*background-color: #c50538;*/
     }
@@ -354,11 +350,6 @@
         padding: 3em 2em 0 2em;
     }
 
-    .opentalentModal-content p,
-    .opentalentModal-content ul li {
-        font-weight: bold;
-    }
-
     .opentalent-bg {
         background-color: #323232;    }
 
@@ -383,6 +374,14 @@
         width: 100%;
     }
 
+    .postal-adress {
+        width: 100%;
+        margin: 45px auto auto;
+    }
+
+    .postal-adress h2 {
+        margin-bottom: 12px;
+    }
 
 /*============================
     CORRECTIFS
@@ -762,7 +761,8 @@ Structures page
     flex-direction: column;
 }
 
-.ot-structures .structure-search form input, button {
+.ot-structures .structure-search form input,
+.ot-structures .structure-search form button {
     margin-bottom: 1em;
     line-height: 1.4em;
     font-size: 1.1em;
@@ -915,12 +915,18 @@ Sitemap page
 /*    max-width: 560px;*/
 /*}*/
 
+
+
 /*============================
 Media queries
 ============================*/
 
 @media screen and (max-width: 900px) {
 
+    /* Hide main carousel */
+    #main-carousel {
+        display: none;
+    }
 
     /* Events page*/
     .ot-all-events {