Bladeren bron

minor fixes

Olivier Massot 5 jaren geleden
bovenliggende
commit
2997759cd2
25 gewijzigde bestanden met toevoegingen van 21 en 52 verwijderingen
  1. 1 2
      ot_templating/Classes/Controller/OtCustomizerController.php
  2. 4 3
      ot_templating/Configuration/TypoScript/constants.txt
  3. 3 3
      ot_templating/Configuration/TypoScript/setup.txt
  4. 1 0
      ot_templating/Resources/Private/Language/locallang.xlf
  5. 0 44
      ot_templating/Resources/Private/Partials/Classic/UserToolbar.html
  6. 2 0
      ot_templating/Resources/Public/assets/Classic/script/main.js
  7. 1 0
      ot_templating/Resources/Public/assets/Classic/style/module/_user-toolbar.scss
  8. 1 0
      ot_templating/Resources/Public/assets/Classic/style/style.css
  9. 0 0
      ot_templating/Resources/Public/assets/Classic/style/style.css.map
  10. 1 0
      ot_templating/Resources/Public/assets/Classic/style/theme-blue.css
  11. 0 0
      ot_templating/Resources/Public/assets/Classic/style/theme-blue.css.map
  12. 1 0
      ot_templating/Resources/Public/assets/Classic/style/theme-green.css
  13. 0 0
      ot_templating/Resources/Public/assets/Classic/style/theme-green.css.map
  14. 1 0
      ot_templating/Resources/Public/assets/Classic/style/theme-grey.css
  15. 0 0
      ot_templating/Resources/Public/assets/Classic/style/theme-grey.css.map
  16. 1 0
      ot_templating/Resources/Public/assets/Classic/style/theme-light-blue.css
  17. 0 0
      ot_templating/Resources/Public/assets/Classic/style/theme-light-blue.css.map
  18. 1 0
      ot_templating/Resources/Public/assets/Classic/style/theme-light-red.css
  19. 0 0
      ot_templating/Resources/Public/assets/Classic/style/theme-light-red.css.map
  20. 1 0
      ot_templating/Resources/Public/assets/Classic/style/theme-orange.css
  21. 0 0
      ot_templating/Resources/Public/assets/Classic/style/theme-orange.css.map
  22. 1 0
      ot_templating/Resources/Public/assets/Classic/style/theme-purple.css
  23. 0 0
      ot_templating/Resources/Public/assets/Classic/style/theme-purple.css.map
  24. 1 0
      ot_templating/Resources/Public/assets/Classic/style/theme-red.css
  25. 0 0
      ot_templating/Resources/Public/assets/Classic/style/theme-red.css.map

+ 1 - 2
ot_templating/Classes/Controller/OtCustomizerController.php

@@ -114,7 +114,6 @@ class OtCustomizerController extends ActionController {
         );
     }
 
-
     /**
      * Return the uid of the root page of the currently selected
      * site, or null if no site's page is selected
@@ -142,7 +141,7 @@ class OtCustomizerController extends ActionController {
     public function cleanCache() {
         $dataHandler = GeneralUtility::makeInstance(DataHandler::class);
         $dataHandler->start([], []);
-        $dataHandler->clear_cacheCmd('pages');
+        $dataHandler->clear_cacheCmd('all');
     }
 
     /**

+ 4 - 3
ot_templating/Configuration/TypoScript/constants.txt

@@ -24,8 +24,9 @@ plugin.tx_ottemplating {
             is_network = 0
             email =
             name = Opentalent
-            url = https://opentalent.fr
             logoid =
+            twitter =
+            facebook =
         }
         network {
             # >> Ces paramètres doivent être redéfinis dans le gabarit du site
@@ -35,7 +36,7 @@ plugin.tx_ottemplating {
             cmfUrl = https://www.cmf-musique.org/
         }
         appearance {
-            # >> Ces paramètres doivent pouvoir être modifiés via l'onglet Page Configuration du backend
+            # >> Ces paramètres doivent pouvoir être modifiés via l'onglet Page Configuration du backend (flux)
 
             # Utiliser le mode caroussel pour les photos
             carousel = 1
@@ -44,7 +45,7 @@ plugin.tx_ottemplating {
             color = blue
         }
         events {
-            # >> Ces paramètres doivent pouvoir être modifiés via l'onglet Page Configuration du backend
+            # >> Ces paramètres doivent pouvoir être modifiés via l'onglet Page Configuration du backend (flux)
 
             # Nombre maximum d'évènements à afficher
             limit = 5

+ 3 - 3
ot_templating/Configuration/TypoScript/setup.txt

@@ -21,9 +21,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 = 1
+config.debug = 0
+config.contentObjectExceptionHandler = 1
+config.no_cache = 0
 config.admPanel = 0
 
 plugin.tx_vhs.settings.debug = 0

+ 1 - 0
ot_templating/Resources/Private/Language/locallang.xlf

@@ -3,6 +3,7 @@
 	<file source-language="fr" datatype="plaintext" original="messages" date="2020-04-03T15:44:11Z" product-name="ot_templating">
 		<header/>
 		<body>
+			<!--  -->
 			<trans-unit id="noPageSelected">
 				<source>Veuillez sélectionner une des pages du site à personnaliser pour accéder à cette rubrique.</source>
 			</trans-unit>

+ 0 - 44
ot_templating/Resources/Private/Partials/Classic/UserToolbar.html

@@ -4,8 +4,6 @@
 <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">
@@ -28,46 +26,4 @@
                 </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>

+ 2 - 0
ot_templating/Resources/Public/assets/Classic/script/main.js

@@ -34,6 +34,8 @@ $(document).ready(function(){
             return;
         }
 
+        e.preventDefault();
+
         // stop any delayed hiding on this since the cursor went back on it
         stopDelayedHidingFor($(this));
 

+ 1 - 0
ot_templating/Resources/Public/assets/Classic/style/module/_user-toolbar.scss

@@ -11,6 +11,7 @@ $user-toolbar-popup-background-color: $user-toolbar-popup-background-color;
   font-size: 16px;
   position: relative;
   display: inline-block;
+  z-index: 9992;
 }
 
 .user-toolbar-username {

+ 1 - 0
ot_templating/Resources/Public/assets/Classic/style/style.css

@@ -527,6 +527,7 @@ footer .logo-ot {
   font-size: 16px;
   position: relative;
   display: inline-block;
+  z-index: 9992;
 }
 
 .user-toolbar-username {

File diff suppressed because it is too large
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/style.css.map


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

@@ -527,6 +527,7 @@ footer .logo-ot {
   font-size: 16px;
   position: relative;
   display: inline-block;
+  z-index: 9992;
 }
 
 .user-toolbar-username {

File diff suppressed because it is too large
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/theme-blue.css.map


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

@@ -527,6 +527,7 @@ footer .logo-ot {
   font-size: 16px;
   position: relative;
   display: inline-block;
+  z-index: 9992;
 }
 
 .user-toolbar-username {

File diff suppressed because it is too large
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/theme-green.css.map


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

@@ -527,6 +527,7 @@ footer .logo-ot {
   font-size: 16px;
   position: relative;
   display: inline-block;
+  z-index: 9992;
 }
 
 .user-toolbar-username {

File diff suppressed because it is too large
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/theme-grey.css.map


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

@@ -527,6 +527,7 @@ footer .logo-ot {
   font-size: 16px;
   position: relative;
   display: inline-block;
+  z-index: 9992;
 }
 
 .user-toolbar-username {

File diff suppressed because it is too large
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/theme-light-blue.css.map


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

@@ -527,6 +527,7 @@ footer .logo-ot {
   font-size: 16px;
   position: relative;
   display: inline-block;
+  z-index: 9992;
 }
 
 .user-toolbar-username {

File diff suppressed because it is too large
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/theme-light-red.css.map


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

@@ -527,6 +527,7 @@ footer .logo-ot {
   font-size: 16px;
   position: relative;
   display: inline-block;
+  z-index: 9992;
 }
 
 .user-toolbar-username {

File diff suppressed because it is too large
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/theme-orange.css.map


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

@@ -527,6 +527,7 @@ footer .logo-ot {
   font-size: 16px;
   position: relative;
   display: inline-block;
+  z-index: 9992;
 }
 
 .user-toolbar-username {

File diff suppressed because it is too large
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/theme-purple.css.map


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

@@ -527,6 +527,7 @@ footer .logo-ot {
   font-size: 16px;
   position: relative;
   display: inline-block;
+  z-index: 9992;
 }
 
 .user-toolbar-username {

File diff suppressed because it is too large
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/theme-red.css.map


Some files were not shown because too many files changed in this diff