From d6892d4d2b89d236f88d0669b9be64e6889fcfef Mon Sep 17 00:00:00 2001 From: Steve Tentrop Date: Mon, 23 Sep 2024 21:41:12 +0200 Subject: [PATCH 01/13] fix link preview --- .../views/Widgets/Common/LinkWidget.twig | 51 ++++++++++--------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/resources/views/Widgets/Common/LinkWidget.twig b/resources/views/Widgets/Common/LinkWidget.twig index 027fab989e..1a225f5b68 100644 --- a/resources/views/Widgets/Common/LinkWidget.twig +++ b/resources/views/Widgets/Common/LinkWidget.twig @@ -40,36 +40,39 @@ {% endif %} {% endif %} -{{ Twig.if("real_url or trackingUrls or #{ isPreview | json_encode }") }} - +{{ Twig.elseif("trackingUrls") }} + {% if url.value.mobile == 'tracking' %} + -{{ Twig.endif() }} + + {%- endif -%} +{{ Twig.endif() }} \ No newline at end of file From 6e6d50d29fec80185833a7ce5eb8d500292a94ee Mon Sep 17 00:00:00 2001 From: Steve Tentrop Date: Tue, 24 Sep 2024 11:24:52 +0200 Subject: [PATCH 02/13] update markup --- .../views/Widgets/Common/LinkWidget.twig | 45 ++++++++++++------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/resources/views/Widgets/Common/LinkWidget.twig b/resources/views/Widgets/Common/LinkWidget.twig index 1a225f5b68..9ecac983da 100644 --- a/resources/views/Widgets/Common/LinkWidget.twig +++ b/resources/views/Widgets/Common/LinkWidget.twig @@ -40,25 +40,25 @@ {% endif %} {% endif %} -{{ Twig.if("real_url or #{ isPreview | json_encode }") }} - -{{ Twig.elseif("trackingUrls") }} + style="{% if inlineMargin | length > 0 %}{{ inlineMargin }}{% endif %} {% if inlinePadding | length > 0 %}{{ inlinePadding }}{% endif %}" + v-tooltip + title="{{ linkTitle }}"> + {%- if icon != "none" -%} + + {%- endif -%} + {{- text -}} + + + +{{ Twig.elseif("real_url or trackingUrls") }} {% if url.value.mobile == 'tracking' %} + {% else %} + + {%- if icon != "none" -%} + + {%- endif -%} + {{- text -}} + {%- endif -%} {{ Twig.endif() }} \ No newline at end of file From c5ef58395d2a965265b84d61332f03b487addb98 Mon Sep 17 00:00:00 2001 From: Steve Tentrop Date: Tue, 24 Sep 2024 11:48:37 +0200 Subject: [PATCH 03/13] testing --- resources/views/Widgets/Common/LinkWidget.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/Widgets/Common/LinkWidget.twig b/resources/views/Widgets/Common/LinkWidget.twig index 9ecac983da..4dfd39a55c 100644 --- a/resources/views/Widgets/Common/LinkWidget.twig +++ b/resources/views/Widgets/Common/LinkWidget.twig @@ -44,7 +44,7 @@