From 14fff65090336b3f1e45b55b84fa73e64047b0d7 Mon Sep 17 00:00:00 2001
From: "michael.daniel" <michael@pcsg.de>
Date: Mon, 9 Dec 2019 14:11:24 +0100
Subject: [PATCH] feat: Email order adjusted. quiqqer/template-cologne#39
---
locale.xml | 29 +------------------
.../quiqqer/lib/templates/mail/footer.html | 26 +++++++++++++++++
2 files changed, 27 insertions(+), 28 deletions(-)
diff --git a/locale.xml b/locale.xml
index 2fdf7f6..6e686c8 100644
--- a/locale.xml
+++ b/locale.xml
@@ -203,8 +203,6 @@
<a href="#" class="topbar-social-link"><span class="fa fa-facebook"> </span></a>
<a href="#" class="topbar-social-link"><span class="fa fa-twitter"> </span></a>
- <a href="#" class="topbar-social-link"><span class="fa fa-youtube-play"> </span></a>
- <a href="#" class="topbar-social-link"><span class="fa fa-instagram"> </span></a>
]]>
</de>
<en><![CDATA[
@@ -220,8 +218,6 @@
<a href="#" class="topbar-social-link"><span class="fa fa-facebook"> </span></a>
<a href="#" class="topbar-social-link"><span class="fa fa-twitter"> </span></a>
- <a href="#" class="topbar-social-link"><span class="fa fa-youtube-play"> </span></a>
- <a href="#" class="topbar-social-link"><span class="fa fa-instagram"> </span></a>
]]>
</en>
</locale>
@@ -509,8 +505,6 @@
<p>
<a class="font-icon" href="#"><span class="fa fa-facebook"> </span></a>
<a class="font-icon" href="#"><span class="fa fa-twitter"> </span></a>
- <a class="font-icon" href="#"><span class="fa fa-youtube-play"> </span></a>
- <a class="font-icon" href="#"><span class="fa fa-instagram"> </span></a>
</p>
]]>
</de>
@@ -524,8 +518,6 @@
<p>
<a class="font-icon" href="#"><span class="fa fa-facebook"> </span></a>
<a class="font-icon" href="#"><span class="fa fa-twitter"> </span></a>
- <a class="font-icon" href="#"><span class="fa fa-youtube-play"> </span></a>
- <a class="font-icon" href="#"><span class="fa fa-instagram"> </span></a>
</p>
]]>
</en>
@@ -696,11 +688,6 @@
alt="Folgen Sie uns auf Twitter">
</a>
- <a href="#" target="_blank" rel="noreferrer" style="color: #666666; text-decoration: none; padding: 0 10px;"
- title="Folgen Sie uns auf Instagram">
- <img width="15" height="15" src="[HOST]packages/quiqqer/template-cologne/bin/images/social/instagram.png"
- alt="Folgen Sie uns auf Instagram">
- </a>
]]>
</de>
<en>
@@ -717,11 +704,7 @@
alt="Follow us on Twitter">
</a>
- <a href="#" target="_blank" rel="noreferrer" style="color: #666666; text-decoration: none; padding: 0 10px;"
- title="Follow us on Instagram">
- <img width="15" height="15" src="[HOST]packages/quiqqer/template-cologne/bin/images/social/instagram.png"
- alt="Follow us on Instagram">
- </a>
+
]]>
</en>
</locale>
@@ -740,11 +723,6 @@
alt="Folgen Sie uns auf Twitter">
</a>
- <a href="#" target="_blank" rel="noreferrer" style="color: #666666; text-decoration: none; padding: 0 10px;"
- title="Folgen Sie uns auf Instagram">
- <img width="15" height="15" src="[HOST]packages/quiqqer/template-cologne/bin/images/social/instagram.png"
- alt="Folgen Sie uns auf Instagram">
- </a>
]]>
</de>
<en>
@@ -761,11 +739,6 @@
alt="Follow us on Twitter">
</a>
- <a href="#" target="_blank" rel="noreferrer" style="color: #666666; text-decoration: none; padding: 0 10px;"
- title="Follow us on Instagram">
- <img width="15" height="15" src="[HOST]packages/quiqqer/template-cologne/bin/images/social/instagram.png"
- alt="Follow us on Instagram">
- </a>
]]>
</en>
</locale>
diff --git a/quiqqer/quiqqer/lib/templates/mail/footer.html b/quiqqer/quiqqer/lib/templates/mail/footer.html
index 7e67d07..561a079 100644
--- a/quiqqer/quiqqer/lib/templates/mail/footer.html
+++ b/quiqqer/quiqqer/lib/templates/mail/footer.html
@@ -53,6 +53,29 @@
'limit' => 1
])}
+ {* contact *}
+ {$contact = $Project->getSites([
+ 'where' => [
+ 'type' => [
+ 'type' => 'IN',
+ 'value' => 'quiqqer/contact:types/contact'
+ ]
+ ],
+ 'limit' => 1
+ ])}
+
+ {if !$contact|count}
+ {$contact = $Project->getSites([
+ 'where' => [
+ 'type' => [
+ 'type' => 'IN',
+ 'value' => 'quiqqer/sitetypes:types/contact'
+ ]
+ ],
+ 'limit' => 1
+ ])}
+ {/if}
+
{if $legalNotes|count}
<a href="{$legalNotes[0]->getUrlRewrittenWithHost()}">{$legalNotes[0]->getAttribute('title')}</a>
{/if}
@@ -62,6 +85,9 @@
{if $generalTermsAndConditions|count}
| <a href="{$generalTermsAndConditions[0]->getUrlRewrittenWithHost()}">{$generalTermsAndConditions[0]->getAttribute('title')}</a>
{/if}
+ {if $contact|count}
+ | <a href="{$contact[0]->getUrlRewrittenWithHost()}">{$contact[0]->getAttribute('title')}</a>
+ {/if}
</td>
</tr>
--
GitLab