浏览代码

minor fixes

Olivier Massot 5 年之前
父节点
当前提交
4f28ac3a3c
共有 25 个文件被更改,包括 141 次插入98 次删除
  1. 7 0
      ot_stats/Classes/Controller/OtStatsController.php
  2. 0 1
      ot_stats/Classes/Settings/StatsSettingsRepository.php
  3. 0 28
      ot_stats/Resources/Private/Templates/Header/Matomo.html
  4. 58 27
      ot_stats/Resources/Private/Templates/OtStats/Index.html
  5. 1 1
      ot_templating/Classes/ViewHelpers/Template/CurrentViewHelper.php
  6. 1 1
      ot_templating/Resources/Private/Layouts/Modern/MembersCa.html
  7. 19 19
      ot_templating/Resources/Private/Partials/Modern/Assets.html
  8. 6 2
      ot_templating/Resources/Public/assets/Classic/style/classic-blue.css
  9. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-blue.css.map
  10. 6 2
      ot_templating/Resources/Public/assets/Classic/style/classic-green.css
  11. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-green.css.map
  12. 6 2
      ot_templating/Resources/Public/assets/Classic/style/classic-grey.css
  13. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-grey.css.map
  14. 6 2
      ot_templating/Resources/Public/assets/Classic/style/classic-light-blue.css
  15. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-light-blue.css.map
  16. 6 2
      ot_templating/Resources/Public/assets/Classic/style/classic-light-red.css
  17. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-light-red.css.map
  18. 6 2
      ot_templating/Resources/Public/assets/Classic/style/classic-orange.css
  19. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-orange.css.map
  20. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-purple.css
  21. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-purple.css.map
  22. 6 2
      ot_templating/Resources/Public/assets/Classic/style/classic-red.css
  23. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-red.css.map
  24. 5 2
      ot_templating/Resources/Public/assets/Classic/style/module/_carousel.scss
  25. 8 5
      ot_templating/Resources/Public/assets/Modern/style/custom.css

+ 7 - 0
ot_stats/Classes/Controller/OtStatsController.php

@@ -19,6 +19,12 @@ use TYPO3\CMS\Extbase\Mvc\Exception\StopActionException;
  */
 class OtStatsController extends SelectedSiteController {
 
+    /**
+     * Access token of the 'typo3' user in matomo
+     */
+    const MATOMO_TOKEN = 'd781ebf1e210bc8ab1e9f4a3e21e9b01';
+
+
     /**
      * Index action (default action)
      * Displays the customizer page on the backend
@@ -32,6 +38,7 @@ class OtStatsController extends SelectedSiteController {
             $this->forward('askForActivationConfirmation');
         }
         $this->view->assign('matomoSiteId', (int)$matomoId);
+        $this->view->assign('matomoToken', self::MATOMO_TOKEN);
     }
 
     /**

+ 0 - 1
ot_stats/Classes/Settings/StatsSettingsRepository.php

@@ -26,7 +26,6 @@ class StatsSettingsRepository extends PageRepository
 
         // Set up a connection to the typo3 DB
         $cnnPool = GeneralUtility::makeInstance(ConnectionPool::class);
-
         $queryBuilder = $cnnPool->getQueryBuilderForTable('pages');
         $matomoId = $queryBuilder
                         ->select('tx_opentalent_matomo_id')

+ 0 - 28
ot_stats/Resources/Private/Templates/Header/Matomo.html

@@ -1,28 +0,0 @@
-{namespace v=FluidTYPO3\Vhs\ViewHelpers}
-{namespace st=Opentalent\OtStats\ViewHelpers}
-
-<f:comment>
-    <!-- render the matomo script for the current website (if stats are enabled) -->
-</f:comment>
-
-<f:comment><!--Matomo partial: contains the integration code of matomo ...--></f:comment>
-
-<v:variable.set name="matomo_site_id" value="{st:matomoSiteId()}" />
-
-<f:comment><!-- Matomo --></f:comment>
-<script type="text/javascript">
-    var _paq = window._paq || [];
-    _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
-    _paq.push(["setDomains", ["*.opentalent.fr"]]);
-    _paq.push(['trackPageView']);
-    _paq.push(['enableLinkTracking']);
-    (function() <f:format.raw>{</f:format.raw>
-    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);
-    <f:format.raw>}</f:format.raw>)();
-</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>

+ 58 - 27
ot_stats/Resources/Private/Templates/OtStats/Index.html

@@ -8,52 +8,83 @@
         <h3>Statistiques d'utilisation</h3>
         <div id="matomoReport">
 
-            <h4>Récapitulatif des visites</h4>
             <div class="reportSection">
 
                 <div class="reportSubSection">
-                    <f:comment><!-- Real time visits--></f:comment>
-                    <div class="widgetIframe" id="realTimeVisits"><iframe width="450" height="320" src="https://stats.2iopenservice.com/index.php?module=Widgetize&action=iframe&disableLink=0&widget=1&moduleToWidgetize=Live&actionToWidgetize=widget&idSite=5&period=month&date=today&disableLink=1&widget=1" scrolling="yes" frameborder="0" marginheight="0" marginwidth="0"></iframe></div>
-
-                    <f:comment><!-- Last visits graph--></f:comment>
-                    <div class="widgetIframe" id="lastVisitsGraph"><iframe width="450" height="260" src="https://stats.2iopenservice.com/index.php?module=Widgetize&action=iframe&forceView=1&viewDataTable=graphEvolution&disableLink=0&widget=1&moduleToWidgetize=VisitsSummary&actionToWidgetize=getEvolutionGraph&idSite=5&period=month&date=today&disableLink=1&widget=1" scrolling="yes" frameborder="0" marginheight="0" marginwidth="0"></iframe></div>
+                    <div class="reportCard">
+                        <f:comment><!-- Real time visits--></f:comment>
+                        <h5>Visites en temps réel</h5>
+                        <div class="widgetIframe" id="realTimeVisits"><iframe width="450" height="320" src="https://stats.2iopenservice.com/index.php?module=Widgetize&action=iframe&disableLink=1&widget=1&moduleToWidgetize=Live&actionToWidgetize=widget&idSite={matomoSiteId}&period=month&date=today&token_auth={matomoToken}" scrolling="yes" frameborder="0" marginheight="0" marginwidth="0"></iframe></div>
+                    </div>
+
+                    <f:comment>
+                        <!-- Disabled until this is fixed: https://github.com/matomo-org/matomo/issues/16867 -->
+                        <!-- <div class="reportCard"> -->
+                        <!-- <f:comment>&lt;!&ndash; Last visits graph&ndash;&gt;</f:comment> -->
+                        <!-- <div class="widgetIframe" id="lastVisitsGraph"><iframe width="450" height="260" src="https://stats.2iopenservice.com/index.php?module=Widgetize&action=iframe&disableLink=1&widget=1&moduleToWidgetize=VisitsSummary&actionToWidgetize=getEvolutionGraph&idSite={matomoSiteId}&period=day&date=today&token_auth={matomoToken}" scrolling="yes" frameborder="0" marginheight="0" marginwidth="0"></iframe></div>-->
+                        <!-- </div> -->
+                    </f:comment>
                 </div>
 
-                <f:comment><!-- Visits Summary --></f:comment>
-                <div class="widgetIframe" id="visitsSummary"><iframe width="450" height="600" src="https://stats.2iopenservice.com/index.php?module=Widgetize&action=iframe&forceView=1&viewDataTable=sparklines&disableLink=0&widget=1&moduleToWidgetize=VisitsSummary&actionToWidgetize=get&idSite=5&period=month&date=today&disableLink=1&widget=1" scrolling="yes" frameborder="0" marginheight="0" marginwidth="0"></iframe></div>
+                <div class="reportCard">
+                    <f:comment><!-- Visits Summary --></f:comment>
+                    <h5>Résumé</h5>
+                    <div class="widgetIframe" id="visitsSummary"><iframe width="450" height="600" src="https://stats.2iopenservice.com/index.php?module=Widgetize&action=iframe&disableLink=1&widget=1&moduleToWidgetize=VisitsSummary&actionToWidgetize=get&idSite={matomoSiteId}&period=month&date=today&token_auth={matomoToken}" scrolling="yes" frameborder="0" marginheight="0" marginwidth="0"></iframe></div>
+                </div>
             </div>
 
-            <h4>Répartition géographique et horaire</h4>
             <div class="reportSection">
-                <f:comment><!-- By weekday --></f:comment>
-                <div class="widgetIframe" id="visitsByWeekday"><iframe width="500" height="450" src="https://stats.2iopenservice.com/index.php?module=Widgetize&action=iframe&disableLink=0&widget=1&moduleToWidgetize=VisitTime&actionToWidgetize=getByDayOfWeek&idSite=5&period=month&date=today&disableLink=1&widget=1" scrolling="yes" frameborder="0" marginheight="0" marginwidth="0"></iframe></div>
+                <div class="reportCard">
+                    <f:comment><!-- By weekday --></f:comment>
+                    <h5>Par jours de la semaine</h5>
+                    <div class="widgetIframe" id="visitsByWeekday"><iframe width="500" height="450" src="https://stats.2iopenservice.com/index.php?module=Widgetize&action=iframe&disableLink=1&widget=1&moduleToWidgetize=VisitTime&actionToWidgetize=getByDayOfWeek&idSite={matomoSiteId}&period=month&date=today&token_auth={matomoToken}" scrolling="yes" frameborder="0" marginheight="0" marginwidth="0"></iframe></div>
+                </div>
 
-                <f:comment><!-- By local hour --></f:comment>
-                <div class="widgetIframe" id="visitsByHour"><iframe width="500" height="450" src="https://stats.2iopenservice.com/index.php?module=Widgetize&action=iframe&disableLink=0&widget=1&moduleToWidgetize=VisitTime&actionToWidgetize=getByDayOfWeek&idSite=5&period=month&date=today&disableLink=1&widget=1" scrolling="yes" frameborder="0" marginheight="0" marginwidth="0"></iframe></div>
+                <div class="reportCard">
+                    <f:comment><!-- By local hour --></f:comment>
+                    <h5>Par heures locales</h5>
+                    <div class="widgetIframe" id="visitsByHour"><iframe width="500" height="450" src="https://stats.2iopenservice.com/index.php?module=Widgetize&action=iframe&disableLink=1&widget=1&moduleToWidgetize=VisitTime&actionToWidgetize=getByDayOfWeek&idSite={matomoSiteId}&period=month&date=today&token_auth={matomoToken}" scrolling="yes" frameborder="0" marginheight="0" marginwidth="0"></iframe></div>
+                </div>
 
-                <f:comment><!-- Map --></f:comment>
-                <div class="widgetIframe" id="visitsMap"><iframe width="400" height="450" src="https://stats.2iopenservice.com/index.php?module=Widgetize&action=iframe&disableLink=0&widget=1&moduleToWidgetize=UserCountryMap&actionToWidgetize=visitorMap&idSite=5&period=month&date=today&disableLink=1&widget=1" scrolling="yes" frameborder="0" marginheight="0" marginwidth="0"></iframe></div>
+                <div class="reportCard">
+                    <f:comment><!-- Map --></f:comment>
+                    <h5>Répartition géographique</h5>
+                    <div class="widgetIframe" id="visitsMap"><iframe width="400" height="450" src="https://stats.2iopenservice.com/index.php?module=Widgetize&action=iframe&disableLink=1&widget=1&moduleToWidgetize=UserCountryMap&actionToWidgetize=visitorMap&idSite={matomoSiteId}&period=month&date=today&token_auth={matomoToken}" scrolling="yes" frameborder="0" marginheight="0" marginwidth="0"></iframe></div>
+                </div>
             </div>
 
-            <h4>Supports et référents</h4>
             <div class="reportSection">
-                <f:comment><!-- Refferers --></f:comment>
-                <div class="widgetIframe" id="visitsRefferers"><iframe width="360" height="450" src="https://stats.2iopenservice.com/index.php?module=Widgetize&action=iframe&disableLink=0&widget=1&moduleToWidgetize=Referrers&actionToWidgetize=getAll&idSite=5&period=month&date=today&disableLink=1&widget=1" scrolling="yes" frameborder="0" marginheight="0" marginwidth="0"></iframe></div>
+                <div class="reportCard">
+                    <f:comment><!-- Refferers --></f:comment>
+                    <h5>Référents</h5>
+                    <div class="widgetIframe" id="visitsRefferers"><iframe width="360" height="450" src="https://stats.2iopenservice.com/index.php?module=Widgetize&action=iframe&disableLink=1&widget=1&moduleToWidgetize=Referrers&actionToWidgetize=getAll&idSite={matomoSiteId}&period=month&date=today&token_auth={matomoToken}" scrolling="yes" frameborder="0" marginheight="0" marginwidth="0"></iframe></div>
+                </div>
 
-                <f:comment><!-- By web-browsers   --></f:comment>
-                <div class="widgetIframe" id="visitsByBrowsers"><iframe width="360" height="450" src="https://stats.2iopenservice.com/index.php?module=Widgetize&action=iframe&disableLink=0&widget=1&moduleToWidgetize=DevicesDetection&actionToWidgetize=getBrowsers&idSite=5&period=month&date=today&disableLink=1&widget=1" scrolling="yes" frameborder="0" marginheight="0" marginwidth="0"></iframe></div>
+                <div class="reportCard">
+                    <f:comment><!-- By web-browsers   --></f:comment>
+                    <h5>Navigateurs</h5>
+                    <div class="widgetIframe" id="visitsByBrowsers"><iframe width="360" height="450" src="https://stats.2iopenservice.com/index.php?module=Widgetize&action=iframe&disableLink=1&widget=1&moduleToWidgetize=DevicesDetection&actionToWidgetize=getBrowsers&idSite={matomoSiteId}&period=month&date=today&token_auth={matomoToken}" scrolling="yes" frameborder="0" marginheight="0" marginwidth="0"></iframe></div>
+                </div>
             </div>
 
-            <h4>Comportements des visiteurs</h4>
             <div class="reportSection">
-                <f:comment><!-- By page   --></f:comment>
-                <div class="widgetIframe" id="visitsByPage"><iframe width="360" height="450" src="https://stats.2iopenservice.com/index.php?module=Widgetize&action=iframe&disableLink=0&widget=1&moduleToWidgetize=Actions&actionToWidgetize=getPageUrls&idSite=5&period=month&date=today&disableLink=1&widget=1" scrolling="yes" frameborder="0" marginheight="0" marginwidth="0"></iframe></div>
+                <div class="reportCard">
+                    <f:comment><!-- By page   --></f:comment>
+                    <h5>Pages</h5>
+                    <div class="widgetIframe" id="visitsByPage"><iframe width="360" height="450" src="https://stats.2iopenservice.com/index.php?module=Widgetize&action=iframe&disableLink=1&widget=1&moduleToWidgetize=Actions&actionToWidgetize=getPageUrls&idSite={matomoSiteId}&period=month&date=today&token_auth={matomoToken}" scrolling="yes" frameborder="0" marginheight="0" marginwidth="0"></iframe></div>
+                </div>
 
-                <f:comment><!-- By entry page   --></f:comment>
-                <div class="widgetIframe" id="visitorsEntryPoints"><iframe width="360" height="450" src="https://stats.2iopenservice.com/index.php?module=Widgetize&action=iframe&disableLink=0&widget=1&moduleToWidgetize=Actions&actionToWidgetize=getEntryPageUrls&idSite=5&period=month&date=today&disableLink=1&widget=1" scrolling="yes" frameborder="0" marginheight="0" marginwidth="0"></iframe></div>
+                <div class="reportCard">
+                    <f:comment><!-- By entry page   --></f:comment>
+                    <h5>Pages d'entrée</h5>
+                    <div class="widgetIframe" id="visitorsEntryPoints"><iframe width="360" height="450" src="https://stats.2iopenservice.com/index.php?module=Widgetize&action=iframe&disableLink=1&widget=1&moduleToWidgetize=Actions&actionToWidgetize=getEntryPageUrls&idSite={matomoSiteId}&period=month&date=today&token_auth={matomoToken}" scrolling="yes" frameborder="0" marginheight="0" marginwidth="0"></iframe></div>
+                </div>
 
-                <f:comment><!-- By visits duration   --></f:comment>
-                <div class="widgetIframe" id="visitsByDuration"><iframe width="360" height="450" src="https://stats.2iopenservice.com/index.php?module=Widgetize&action=iframe&disableLink=0&widget=1&moduleToWidgetize=VisitorInterest&actionToWidgetize=getNumberOfVisitsPerVisitDuration&idSite=5&period=month&date=today&disableLink=1&widget=1" scrolling="yes" frameborder="0" marginheight="0" marginwidth="0"></iframe></div>
+                <div class="reportCard">
+                    <f:comment><!-- By visits duration   --></f:comment>
+                    <h5>Durées de visite</h5>
+                    <div class="widgetIframe" id="visitsByDuration"><iframe width="360" height="450" src="https://stats.2iopenservice.com/index.php?module=Widgetize&action=iframe&disableLink=1&widget=1&moduleToWidgetize=VisitorInterest&actionToWidgetize=getNumberOfVisitsPerVisitDuration&idSite={matomoSiteId}&period=month&date=today&token_auth={matomoToken}" scrolling="yes" frameborder="0" marginheight="0" marginwidth="0"></iframe></div>
+                </div>
             </div>
 
             <div class="reportFooter">

+ 1 - 1
ot_templating/Classes/ViewHelpers/Template/CurrentViewHelper.php

@@ -39,6 +39,6 @@ class CurrentViewHelper extends OtAbstractViewHelper
         $rootUid = $pageRepository->getCurrentSiteRootPageId();
 
         $templateRepository = GeneralUtility::makeInstance(TemplateRepository::class);
-        return $templateRepository->getCurrentTemplate($rootUid);
+        return $templateRepository->getTemplate($rootUid);
     }
 }

+ 1 - 1
ot_templating/Resources/Private/Layouts/Modern/MembersCa.html

@@ -16,7 +16,7 @@
                     <div class="col-lg-12 col-md-12">
                         <h1 class="text-center">Liste des membres du CA</h1>
 
-                        <ot:members.getAllCa as="membersCollection"
+                        <ot:members.getAllCa as="members"
                                            organizationId="{settings.organizationId}">
 
                             <f:if condition="{members -> f:count()} > 0">

+ 19 - 19
ot_templating/Resources/Private/Partials/Modern/Assets.html

@@ -145,14 +145,14 @@ Assets included with the VHS viewhelpers
 <v:asset.script name="modern-plugins-jquery"
                 path="{assets_dir}/script/plugins-jquery.js"
                 standalone="{force_standalone}"
-                dependencies="jquery"
+                dependencies="modern-jquery"
                 defer="1" />
 
 <v:asset.script name="modern-recaptcha"
                 path="https://www.google.com/recaptcha/api.js"
                 external="1"
                 standalone="{force_standalone}"
-                dependencies="jquery"
+                dependencies="modern-jquery"
                 defer="1"/>
 
 <v:asset.script name="modern-jquery-tools"
@@ -163,37 +163,37 @@ Assets included with the VHS viewhelpers
 <v:asset.script name="modern-jquery-revolution"
                 path="{assets_dir}/script/revolution/jquery.themepunch.revolution.min.js"
                 standalone="{force_standalone}"
-                dependencies="jquery"
+                dependencies="modern-jquery"
                 defer="1"/>
 
 <v:asset.script name="modern-revolution-actions"
                 path="{assets_dir}/script/revolution/extensions/revolution.extension.actions.min.js"
                 standalone="{force_standalone}"
-                dependencies="jquery"
+                dependencies="modern-jquery"
                 defer="1"/>
 
 <v:asset.script name="modern-revolution-carousel"
                 path="{assets_dir}/script/revolution/extensions/revolution.extension.carousel.min.js"
                 standalone="{force_standalone}"
-                dependencies="jquery"
+                dependencies="modern-jquery"
                 defer="1"/>
 
 <v:asset.script name="modern-revolution-kenburn"
                 path="{assets_dir}/script/revolution/extensions/revolution.extension.kenburn.min.js"
                 standalone="{force_standalone}"
-                dependencies="jquery"
+                dependencies="modern-jquery"
                 defer="1"/>
 
 <v:asset.script name="modern-revolution-layeranimation"
                 path="{assets_dir}/script/revolution/extensions/revolution.extension.layeranimation.min.js"
                 standalone="{force_standalone}"
-                dependencies="jquery"
+                dependencies="modern-jquery"
                 defer="1"/>
 
 <v:asset.script name="modern-revolution-parallax"
                 path="{assets_dir}/script/revolution/extensions/revolution.extension.parallax.min.js"
                 standalone="{force_standalone}"
-                dependencies="jquery"
+                dependencies="modern-jquery"
                 defer="1"/>
 
 <v:asset.script name="modern-revolution-navigation"
@@ -204,67 +204,67 @@ Assets included with the VHS viewhelpers
 <v:asset.script name="modern-revolution-slideanims"
                 path="{assets_dir}/script/revolution/extensions/revolution.extension.slideanims.min.js"
                 standalone="{force_standalone}"
-                dependencies="jquery"
+                dependencies="modern-jquery"
                 defer="1"/>
 
 <v:asset.script name="modern-revolution-navigation"
                 path="{assets_dir}/script/revolution/extensions/revolution.extension.navigation.min.js"
                 standalone="{force_standalone}"
-                dependencies="jquery"
+                dependencies="modern-jquery"
                 defer="1"/>
 
 <v:asset.script name="modern-revolution-video"
                 path="{assets_dir}/script/revolution/extensions/revolution.extension.video.min.js"
                 standalone="{force_standalone}"
-                dependencies="jquery"
+                dependencies="modern-jquery"
                 defer="1"/>
 
 <v:asset.script name="modern-revolution-custom"
                 path="{assets_dir}/script/revolution/revolution-custom.js"
                 standalone="{force_standalone}"
-                dependencies="jquery"
+                dependencies="modern-jquery"
                 defer="1"/>
 
 <v:asset.script name="modern-moment-js"
                 path="{assets_dir}/script/bootstrap-datetimepicker/moment-datepicker.js"
                 standalone="{force_standalone}"
-                dependencies="jquery"
+                dependencies="modern-jquery"
                 defer="1"/>
 
 <v:asset.script name="modern-datetimepicker-js"
                 path="{assets_dir}/script/bootstrap-datetimepicker/bootstrap-datetimepicker.min.js"
                 standalone="{force_standalone}"
-                dependencies="jquery,moment-js"
+                dependencies="modern-jquery,modern-moment-js"
                 defer="1"/>
 
 <v:asset.script name="modern-slick-js"
                 path="{assets_dir}/script/slick/slick.min.js"
                 standalone="{force_standalone}"
-                dependencies="jquery"
+                dependencies="modern-jquery"
                 defer="1"/>
 
 <v:asset.script name="modern-leaflet-js"
                 path="{assets_dir}/script/leaflet/leaflet.js"
                 standalone="{force_standalone}"
-                dependencies="jquery"
+                dependencies="modern-jquery"
                 defer="1"/>
 
 <v:asset.script name="modern-magnific-popup"
                 path="{assets_dir}/script/magnific-popup/jquery.magnific-popup.min.js"
                 standalone="{force_standalone}"
-                dependencies="jquery"
+                dependencies="modern-jquery"
                 defer="1"/>
 
 <v:asset.script name="modern-custom-js"
                 path="{assets_dir}/script/custom.js"
                 standalone="{force_standalone}"
-                dependencies="jquery"
+                dependencies="modern-jquery"
                 defer="1"/>
 
 <v:asset.script name="modern-custom-ot-js"
                 path="{assets_dir}/script/custom-ot.js"
                 standalone="{force_standalone}"
-                dependencies="jquery"
+                dependencies="modern-jquery"
                 defer="1"/>
 
 

+ 6 - 2
ot_templating/Resources/Public/assets/Classic/style/classic-blue.css

@@ -713,12 +713,16 @@ header .slick-track {
   height: auto;
 }
 
-.carousel div:not(.slick-slide) > .carousel-img {
+.carousel .carousel-img {
   width: 100%;
   display: none;
 }
 
-.carousel div:not(.slick-slide):first-child > .carousel-img {
+.carousel div:first-child > .carousel-img {
+  display: inline;
+}
+
+.carousel div.slick-slide .carousel-img {
   display: inline;
 }
 

文件差异内容过多而无法显示
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-blue.css.map


+ 6 - 2
ot_templating/Resources/Public/assets/Classic/style/classic-green.css

@@ -713,12 +713,16 @@ header .slick-track {
   height: auto;
 }
 
-.carousel div:not(.slick-slide) > .carousel-img {
+.carousel .carousel-img {
   width: 100%;
   display: none;
 }
 
-.carousel div:not(.slick-slide):first-child > .carousel-img {
+.carousel div:first-child > .carousel-img {
+  display: inline;
+}
+
+.carousel div.slick-slide .carousel-img {
   display: inline;
 }
 

文件差异内容过多而无法显示
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-green.css.map


+ 6 - 2
ot_templating/Resources/Public/assets/Classic/style/classic-grey.css

@@ -713,12 +713,16 @@ header .slick-track {
   height: auto;
 }
 
-.carousel div:not(.slick-slide) > .carousel-img {
+.carousel .carousel-img {
   width: 100%;
   display: none;
 }
 
-.carousel div:not(.slick-slide):first-child > .carousel-img {
+.carousel div:first-child > .carousel-img {
+  display: inline;
+}
+
+.carousel div.slick-slide .carousel-img {
   display: inline;
 }
 

文件差异内容过多而无法显示
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-grey.css.map


+ 6 - 2
ot_templating/Resources/Public/assets/Classic/style/classic-light-blue.css

@@ -713,12 +713,16 @@ header .slick-track {
   height: auto;
 }
 
-.carousel div:not(.slick-slide) > .carousel-img {
+.carousel .carousel-img {
   width: 100%;
   display: none;
 }
 
-.carousel div:not(.slick-slide):first-child > .carousel-img {
+.carousel div:first-child > .carousel-img {
+  display: inline;
+}
+
+.carousel div.slick-slide .carousel-img {
   display: inline;
 }
 

文件差异内容过多而无法显示
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-light-blue.css.map


+ 6 - 2
ot_templating/Resources/Public/assets/Classic/style/classic-light-red.css

@@ -713,12 +713,16 @@ header .slick-track {
   height: auto;
 }
 
-.carousel div:not(.slick-slide) > .carousel-img {
+.carousel .carousel-img {
   width: 100%;
   display: none;
 }
 
-.carousel div:not(.slick-slide):first-child > .carousel-img {
+.carousel div:first-child > .carousel-img {
+  display: inline;
+}
+
+.carousel div.slick-slide .carousel-img {
   display: inline;
 }
 

文件差异内容过多而无法显示
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-light-red.css.map


+ 6 - 2
ot_templating/Resources/Public/assets/Classic/style/classic-orange.css

@@ -713,12 +713,16 @@ header .slick-track {
   height: auto;
 }
 
-.carousel div:not(.slick-slide) > .carousel-img {
+.carousel .carousel-img {
   width: 100%;
   display: none;
 }
 
-.carousel div:not(.slick-slide):first-child > .carousel-img {
+.carousel div:first-child > .carousel-img {
+  display: inline;
+}
+
+.carousel div.slick-slide .carousel-img {
   display: inline;
 }
 

文件差异内容过多而无法显示
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-orange.css.map


文件差异内容过多而无法显示
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-purple.css


文件差异内容过多而无法显示
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-purple.css.map


+ 6 - 2
ot_templating/Resources/Public/assets/Classic/style/classic-red.css

@@ -713,12 +713,16 @@ header .slick-track {
   height: auto;
 }
 
-.carousel div:not(.slick-slide) > .carousel-img {
+.carousel .carousel-img {
   width: 100%;
   display: none;
 }
 
-.carousel div:not(.slick-slide):first-child > .carousel-img {
+.carousel div:first-child > .carousel-img {
+  display: inline;
+}
+
+.carousel div.slick-slide .carousel-img {
   display: inline;
 }
 

文件差异内容过多而无法显示
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-red.css.map


+ 5 - 2
ot_templating/Resources/Public/assets/Classic/style/module/_carousel.scss

@@ -21,12 +21,15 @@ header .slick-track {
 }
 
 // Default CSS, in case slick is not loaded or activated
-.carousel div:not(.slick-slide) > .carousel-img {
+.carousel .carousel-img {
   width: 100%;
   display: none;
 }
 
-.carousel div:not(.slick-slide):first-child > .carousel-img {
+.carousel div:first-child > .carousel-img {
+  display: inline;
+}
+.carousel div.slick-slide .carousel-img {
   display: inline;
 }
 

+ 8 - 5
ot_templating/Resources/Public/assets/Modern/style/custom.css

@@ -473,12 +473,15 @@ Slick carousels
     }
 
     /*Default CSS, in case slick is not loaded or activated*/
-    .carousel div:not(.slick-slide) > div > div > .carousel-img {
-           width: 100%;
-           display: none;
-       }
+    .carousel .carousel-img {
+       width: 100%;
+       display: none;
+    }
 
-    .carousel div:not(.slick-slide):first-child > div > div > .carousel-img {
+    .carousel div:first-child > .carousel-img {
+        display: inline;
+    }
+    .carousel div.slick-slide .carousel-img {
         display: inline;
     }
 

部分文件因为文件数量过多而无法显示