Skip to content

Commit d61162e

Browse files
pixelmatseriksdmh
pixelmatseriks
authored and
dmh
committed
[!!!][BUGFIX] fix header middle social media icons (#432)
Breaking if any of following partials are overridden: - ContentElements/Socialmedia.html - ContentElements/SocialmediaLink.html - Breaking if partial Header/Header.html Changes rendering from Partial to typoscriptObjectPath in Header.html partial.
1 parent 02c21e2 commit d61162e

File tree

4 files changed

+73
-20
lines changed

4 files changed

+73
-20
lines changed

‎Configuration/TypoScript/Library/lib.header.middle.socialmedia.setupts‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
lib.header.middle.socialmedia =< lib.contentElement
2+
lib.header.middle.socialmedia {
3+
templateName = SocialIcons
4+
settings {
5+
## To override links in middle header social media element
6+
# facebookLink =
7+
# twitterLink =
8+
# linkedInLink =
9+
# xingLink =
10+
# vimeoLink =
11+
# googlePlusLink =
12+
# pinterestLink =
13+
# instagramLink =
14+
# youtubeLink =
15+
# mynewsdeskLink =
16+
}
17+
variables {
18+
# set fluid variable "allowLinksFromConstants"
19+
# to use as a condition in template if social links from constants are allowed
20+
allowLinksFromConstants = TEXT
21+
allowLinksFromConstants {
22+
# default to "false"
23+
value = 0
24+
stdWrap {
25+
# override to "true" for default language
26+
override = 1
27+
override {
28+
if {
29+
value = 0
30+
equals.data = TSFE:sys_language_uid
31+
}
32+
}
33+
stdWrap {
34+
# override to "true" for non default languages AND allowFallback is "true"
35+
override = 1
36+
override {
37+
if {
38+
value = 0
39+
isGreaterThan.data = TSFE:sys_language_uid
40+
isTrue.cObject = TEXT
41+
isTrue.cObject {
42+
value = 1
43+
if.value = 1
44+
if.equals = {$themes.configuration.socialmedia.allowFallback}
45+
}
46+
}
47+
}
48+
}
49+
}
50+
}
51+
}
52+
}

‎Resources/Private/Partials/ContentElements/Socialmedia.html‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</f:if>
1717
</f:else>
1818
</f:if>
19-
<f:render partial="SocialmediaLink" arguments="{linkHref: facebookLink, linkTitle: 'Facebook', iconClass: 'icons icon-t3-facebook'}"/>
19+
<f:render section="SocialmediaLink" arguments="{linkHref: facebookLink, linkTitle: 'Facebook', iconClass: 'icons icon-t3-facebook'}"/>
2020
</f:if>
2121
<f:comment><!-- twitterLink --></f:comment>
2222
<f:if condition="{theme:constant(constant:'themes.configuration.socialmedia.useTwitter')}">
@@ -30,7 +30,7 @@
3030
</f:if>
3131
</f:else>
3232
</f:if>
33-
<f:render partial="SocialmediaLink" arguments="{linkHref: twitterLink, linkTitle: 'Twitter', iconClass: 'icons icon-t3-twitter'}"/>
33+
<f:render section="SocialmediaLink" arguments="{linkHref: twitterLink, linkTitle: 'Twitter', iconClass: 'icons icon-t3-twitter'}"/>
3434
</f:if>
3535
<f:comment><!-- linkedInLink --></f:comment>
3636
<f:if condition="{theme:constant(constant:'themes.configuration.socialmedia.useLinkedIn')}">
@@ -44,7 +44,7 @@
4444
</f:if>
4545
</f:else>
4646
</f:if>
47-
<f:render partial="SocialmediaLink" arguments="{linkHref: linkedInLink, linkTitle: 'LinkedIn', iconClass: 'icons icon-t3-linkedin'}"/>
47+
<f:render section="SocialmediaLink" arguments="{linkHref: linkedInLink, linkTitle: 'LinkedIn', iconClass: 'icons icon-t3-linkedin'}"/>
4848
</f:if>
4949
<f:comment><!-- xingLink --></f:comment>
5050
<f:if condition="{theme:constant(constant:'themes.configuration.socialmedia.useXing')}">
@@ -58,7 +58,7 @@
5858
</f:if>
5959
</f:else>
6060
</f:if>
61-
<f:render partial="SocialmediaLink" arguments="{linkHref: xingLink, linkTitle: 'Xing', iconClass: 'icons icon-t3-xing'}"/>
61+
<f:render section="SocialmediaLink" arguments="{linkHref: xingLink, linkTitle: 'Xing', iconClass: 'icons icon-t3-xing'}"/>
6262
</f:if>
6363
<f:comment><!-- vimeoLink --></f:comment>
6464
<f:if condition="{theme:constant(constant:'themes.configuration.socialmedia.useVimeo')}">
@@ -72,7 +72,7 @@
7272
</f:if>
7373
</f:else>
7474
</f:if>
75-
<f:render partial="SocialmediaLink" arguments="{linkHref: vimeoLink, linkTitle: 'Vimeo', iconClass: 'icons icon-t3-vimeo'}"/>
75+
<f:render section="SocialmediaLink" arguments="{linkHref: vimeoLink, linkTitle: 'Vimeo', iconClass: 'icons icon-t3-vimeo'}"/>
7676
</f:if>
7777
<f:comment><!-- googlePlusLink --></f:comment>
7878
<f:if condition="{theme:constant(constant:'themes.configuration.socialmedia.useGooglePlus')}">
@@ -86,7 +86,7 @@
8686
</f:if>
8787
</f:else>
8888
</f:if>
89-
<f:render partial="SocialmediaLink" arguments="{linkHref: googlePlusLink, linkTitle: 'Googleplus', iconClass: 'icons icon-t3-googleplus'}"/>
89+
<f:render section="SocialmediaLink" arguments="{linkHref: googlePlusLink, linkTitle: 'Googleplus', iconClass: 'icons icon-t3-googleplus'}"/>
9090
</f:if>
9191
<f:comment><!-- pinterestLink --></f:comment>
9292
<f:if condition="{theme:constant(constant:'themes.configuration.socialmedia.usePinterest')}">
@@ -100,7 +100,7 @@
100100
</f:if>
101101
</f:else>
102102
</f:if>
103-
<f:render partial="SocialmediaLink" arguments="{linkHref: pinterestLink, linkTitle: 'Pinterest', iconClass: 'icons icon-t3-pinterest'}"/>
103+
<f:render section="SocialmediaLink" arguments="{linkHref: pinterestLink, linkTitle: 'Pinterest', iconClass: 'icons icon-t3-pinterest'}"/>
104104
</f:if>
105105
<f:comment><!-- instagramLink --></f:comment>
106106
<f:if condition="{theme:constant(constant:'themes.configuration.socialmedia.useInstagram')}">
@@ -114,7 +114,7 @@
114114
</f:if>
115115
</f:else>
116116
</f:if>
117-
<f:render partial="SocialmediaLink" arguments="{linkHref: instagramLink, linkTitle: 'Instagram', iconClass: 'icons icon-t3-instagram'}"/>
117+
<f:render section="SocialmediaLink" arguments="{linkHref: instagramLink, linkTitle: 'Instagram', iconClass: 'icons icon-t3-instagram'}"/>
118118
</f:if>
119119
<f:comment><!-- youtubeLink --></f:comment>
120120
<f:if condition="{theme:constant(constant:'themes.configuration.socialmedia.useYoutube')}">
@@ -128,7 +128,7 @@
128128
</f:if>
129129
</f:else>
130130
</f:if>
131-
<f:render partial="SocialmediaLink" arguments="{linkHref: youtubeLink, linkTitle: 'Youtube', iconClass: 'icons icon-t3-youtube'}"/>
131+
<f:render section="SocialmediaLink" arguments="{linkHref: youtubeLink, linkTitle: 'Youtube', iconClass: 'icons icon-t3-youtube'}"/>
132132
</f:if>
133133
<f:comment><!-- mynewsdeskLink --></f:comment>
134134
<f:if condition="{theme:constant(constant:'themes.configuration.socialmedia.useMynewsdesk')}">
@@ -142,9 +142,19 @@
142142
</f:if>
143143
</f:else>
144144
</f:if>
145-
<f:render partial="SocialmediaLink" arguments="{linkHref: mynewsdeskLink, linkTitle: 'Mynewsdesk', iconClass: 'icons icon-t3-mynewsdesk'}"/>
145+
<f:render section="SocialmediaLink" arguments="{linkHref: mynewsdeskLink, linkTitle: 'Mynewsdesk', iconClass: 'icons icon-t3-mynewsdesk'}"/>
146146
</f:if>
147147
</div>
148148
<!-- theme_t3kit: Partials/Footer/Socialmedia.html [end] -->
149149
</f:section>
150+
151+
<f:section name="SocialmediaLink">
152+
<f:if condition="{linkHref}">
153+
<f:spaceless>
154+
<a class="social-icons__item" href="{linkHref}" target="_blank" title="{linkTitle}" aria-label="{linkTitle}">
155+
<span aria-hidden="true" class="{iconClass}"></span>
156+
</a>
157+
</f:spaceless>
158+
</f:if>
159+
</f:section>
150160
</div>

‎Resources/Private/Partials/ContentElements/SocialmediaLink.html‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎Resources/Private/Partials/Header/Header.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363

6464
<f:if condition="{theme:constant(constant:'themes.configuration.elem.status.showHeaderMiddleSocIcons')}">
6565
<div class="header-middle__social-icon">
66-
<f:render partial="ContentElements/Socialmedia" section="Default" />
66+
<f:cObject typoscriptObjectPath="lib.header.middle.socialmedia" />
6767
</div>
6868
</f:if>
6969
<f:if condition="{theme:constant(constant:'themes.configuration.elem.status.showHeaderMiddleSearch')}">

0 commit comments

Comments
 (0)