Quellcode durchsuchen

Merge branch 'hotfix/V8-7628-ajouter-le-lien-vers-la-billeter'

Olivier Massot vor 4 Monaten
Ursprung
Commit
2561efd3ac
23 geänderte Dateien mit 33 neuen und 1 gelöschten Zeilen
  1. 3 1
      ot_templating/Classes/ViewHelpers/Utilities/AbsoluteUrlViewHelper.php
  2. 7 0
      ot_templating/Resources/Private/Partials/Classic/EventsShow.html
  3. 8 0
      ot_templating/Resources/Private/Partials/Modern/EventsShow.html
  4. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-blue.css
  5. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-blue.css.map
  6. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-green.css
  7. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-green.css.map
  8. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-grey.css
  9. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-grey.css.map
  10. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-light-blue.css
  11. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-light-blue.css.map
  12. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-light-red.css
  13. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-light-red.css.map
  14. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-orange.css
  15. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-orange.css.map
  16. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-purple.css
  17. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-purple.css.map
  18. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-red.css
  19. 0 0
      ot_templating/Resources/Public/assets/Classic/style/classic-red.css.map
  20. 7 0
      ot_templating/Resources/Public/assets/Classic/style/module/_events-show.scss
  21. 0 0
      ot_templating/Resources/Public/assets/Classic/style/style.css
  22. 0 0
      ot_templating/Resources/Public/assets/Classic/style/style.css.map
  23. 8 0
      ot_templating/Resources/Public/assets/Modern/style/custom.css

+ 3 - 1
ot_templating/Classes/ViewHelpers/Utilities/AbsoluteUrlViewHelper.php

@@ -44,6 +44,8 @@ class AbsoluteUrlViewHelper extends OtAbstractViewHelper {
         RenderingContextInterface $renderingContext
     ) {
         $url = $arguments['url'];
-        return 'https://' . preg_replace("/(?:https?:\/\/)?(.*)/", "$1", $url);
+        return $url ?
+            'https://' . preg_replace("/(?:https?:\/\/)?(.*)/", "$1", $url) :
+            null;
     }
 }

+ 7 - 0
ot_templating/Resources/Private/Partials/Classic/EventsShow.html

@@ -42,6 +42,13 @@
                     </i>{event.inlineFullAddress}
                 </span>
             </f:if>
+            <f:if condition="{event.url}">
+                <span class="event-url">
+                    <i class="fas fa-globe" style="width: 14px; margin-right: 5px; padding-top: 2px;">
+                    </i><f:link.external uri="{event.url}" target="_blank">{event.url}</f:link.external>
+                </span>
+            </f:if>
+
             <p class="event-description">
                 {f:format.nl2br(value: '{event.description}')}
             </p>

+ 8 - 0
ot_templating/Resources/Private/Partials/Modern/EventsShow.html

@@ -1,4 +1,6 @@
 {namespace v=FluidTYPO3\Vhs\ViewHelpers}
+{namespace ot=Opentalent\OtTemplating\ViewHelpers}
+{namespace f=TYPO3\CMS\Fluid\ViewHelpers}
 
 <f:comment><!-- Override default social metadata --></f:comment>
 <v:variable.register.set name="forceSocialTitle" value="{event.name}"/>
@@ -41,6 +43,12 @@
                     </i>{event.inlineFullAddress}
                 </span>
             </f:if>
+            <f:if condition="{event.url}">
+                <span class="event-url">
+                    <i class="fas fa-globe" style="width: 14px; margin-right: 5px; padding-top: 2px;">
+                    </i><f:link.external uri="{event.url}" target="_blank">{event.url}</f:link.external>
+                </span>
+            </f:if>
             <span class="event-description">
                 {f:format.nl2br(value: '{event.description}')}
             </span>

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-blue.css


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-blue.css.map


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-green.css


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-green.css.map


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-grey.css


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-grey.css.map


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-light-blue.css


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-light-blue.css.map


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-light-red.css


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-light-red.css.map


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-orange.css


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-orange.css.map


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-purple.css


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-purple.css.map


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-red.css


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/classic-red.css.map


+ 7 - 0
ot_templating/Resources/Public/assets/Classic/style/module/_events-show.scss

@@ -70,6 +70,13 @@
   flex-direction: row;
 }
 
+.ot-show-event .event-url {
+  color: #4d4d4d;
+  margin-top: 0.5em;
+  display: flex;
+  flex-direction: row;
+}
+
 .ot-show-event .event-description {
   margin-top: 2em;
 }

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/style.css


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
ot_templating/Resources/Public/assets/Classic/style/style.css.map


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

@@ -1000,6 +1000,14 @@ Event's details pages
     flex-direction: row;
 }
 
+.ot-show-event .event-url {
+    text-decoration: none;
+    color: #4d4d4d;
+    margin-top: 0.5em;
+    display: flex;
+    flex-direction: row;
+}
+
 .ot-show-event .event-description {
     margin-top: 2em;
 }

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.