Skip to content

Commit

Permalink
[!!!][BUGFIX] fix header middle social media icons (#432)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
pixelmatseriks authored and dmh committed Jun 21, 2018
1 parent 02c21e2 commit d61162e
Show file tree
Hide file tree
Showing 4 changed files with 73 additions and 20 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
lib.header.middle.socialmedia =< lib.contentElement
lib.header.middle.socialmedia {
templateName = SocialIcons
settings {
## To override links in middle header social media element
# facebookLink =
# twitterLink =
# linkedInLink =
# xingLink =
# vimeoLink =
# googlePlusLink =
# pinterestLink =
# instagramLink =
# youtubeLink =
# mynewsdeskLink =
}
variables {
# set fluid variable "allowLinksFromConstants"
# to use as a condition in template if social links from constants are allowed
allowLinksFromConstants = TEXT
allowLinksFromConstants {
# default to "false"
value = 0
stdWrap {
# override to "true" for default language
override = 1
override {
if {
value = 0
equals.data = TSFE:sys_language_uid
}
}
stdWrap {
# override to "true" for non default languages AND allowFallback is "true"
override = 1
override {
if {
value = 0
isGreaterThan.data = TSFE:sys_language_uid
isTrue.cObject = TEXT
isTrue.cObject {
value = 1
if.value = 1
if.equals = {$themes.configuration.socialmedia.allowFallback}
}
}
}
}
}
}
}
}
30 changes: 20 additions & 10 deletions Resources/Private/Partials/ContentElements/Socialmedia.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
</f:if>
</f:else>
</f:if>
<f:render partial="SocialmediaLink" arguments="{linkHref: facebookLink, linkTitle: 'Facebook', iconClass: 'icons icon-t3-facebook'}"/>
<f:render section="SocialmediaLink" arguments="{linkHref: facebookLink, linkTitle: 'Facebook', iconClass: 'icons icon-t3-facebook'}"/>
</f:if>
<f:comment><!-- twitterLink --></f:comment>
<f:if condition="{theme:constant(constant:'themes.configuration.socialmedia.useTwitter')}">
Expand All @@ -30,7 +30,7 @@
</f:if>
</f:else>
</f:if>
<f:render partial="SocialmediaLink" arguments="{linkHref: twitterLink, linkTitle: 'Twitter', iconClass: 'icons icon-t3-twitter'}"/>
<f:render section="SocialmediaLink" arguments="{linkHref: twitterLink, linkTitle: 'Twitter', iconClass: 'icons icon-t3-twitter'}"/>
</f:if>
<f:comment><!-- linkedInLink --></f:comment>
<f:if condition="{theme:constant(constant:'themes.configuration.socialmedia.useLinkedIn')}">
Expand All @@ -44,7 +44,7 @@
</f:if>
</f:else>
</f:if>
<f:render partial="SocialmediaLink" arguments="{linkHref: linkedInLink, linkTitle: 'LinkedIn', iconClass: 'icons icon-t3-linkedin'}"/>
<f:render section="SocialmediaLink" arguments="{linkHref: linkedInLink, linkTitle: 'LinkedIn', iconClass: 'icons icon-t3-linkedin'}"/>
</f:if>
<f:comment><!-- xingLink --></f:comment>
<f:if condition="{theme:constant(constant:'themes.configuration.socialmedia.useXing')}">
Expand All @@ -58,7 +58,7 @@
</f:if>
</f:else>
</f:if>
<f:render partial="SocialmediaLink" arguments="{linkHref: xingLink, linkTitle: 'Xing', iconClass: 'icons icon-t3-xing'}"/>
<f:render section="SocialmediaLink" arguments="{linkHref: xingLink, linkTitle: 'Xing', iconClass: 'icons icon-t3-xing'}"/>
</f:if>
<f:comment><!-- vimeoLink --></f:comment>
<f:if condition="{theme:constant(constant:'themes.configuration.socialmedia.useVimeo')}">
Expand All @@ -72,7 +72,7 @@
</f:if>
</f:else>
</f:if>
<f:render partial="SocialmediaLink" arguments="{linkHref: vimeoLink, linkTitle: 'Vimeo', iconClass: 'icons icon-t3-vimeo'}"/>
<f:render section="SocialmediaLink" arguments="{linkHref: vimeoLink, linkTitle: 'Vimeo', iconClass: 'icons icon-t3-vimeo'}"/>
</f:if>
<f:comment><!-- googlePlusLink --></f:comment>
<f:if condition="{theme:constant(constant:'themes.configuration.socialmedia.useGooglePlus')}">
Expand All @@ -86,7 +86,7 @@
</f:if>
</f:else>
</f:if>
<f:render partial="SocialmediaLink" arguments="{linkHref: googlePlusLink, linkTitle: 'Googleplus', iconClass: 'icons icon-t3-googleplus'}"/>
<f:render section="SocialmediaLink" arguments="{linkHref: googlePlusLink, linkTitle: 'Googleplus', iconClass: 'icons icon-t3-googleplus'}"/>
</f:if>
<f:comment><!-- pinterestLink --></f:comment>
<f:if condition="{theme:constant(constant:'themes.configuration.socialmedia.usePinterest')}">
Expand All @@ -100,7 +100,7 @@
</f:if>
</f:else>
</f:if>
<f:render partial="SocialmediaLink" arguments="{linkHref: pinterestLink, linkTitle: 'Pinterest', iconClass: 'icons icon-t3-pinterest'}"/>
<f:render section="SocialmediaLink" arguments="{linkHref: pinterestLink, linkTitle: 'Pinterest', iconClass: 'icons icon-t3-pinterest'}"/>
</f:if>
<f:comment><!-- instagramLink --></f:comment>
<f:if condition="{theme:constant(constant:'themes.configuration.socialmedia.useInstagram')}">
Expand All @@ -114,7 +114,7 @@
</f:if>
</f:else>
</f:if>
<f:render partial="SocialmediaLink" arguments="{linkHref: instagramLink, linkTitle: 'Instagram', iconClass: 'icons icon-t3-instagram'}"/>
<f:render section="SocialmediaLink" arguments="{linkHref: instagramLink, linkTitle: 'Instagram', iconClass: 'icons icon-t3-instagram'}"/>
</f:if>
<f:comment><!-- youtubeLink --></f:comment>
<f:if condition="{theme:constant(constant:'themes.configuration.socialmedia.useYoutube')}">
Expand All @@ -128,7 +128,7 @@
</f:if>
</f:else>
</f:if>
<f:render partial="SocialmediaLink" arguments="{linkHref: youtubeLink, linkTitle: 'Youtube', iconClass: 'icons icon-t3-youtube'}"/>
<f:render section="SocialmediaLink" arguments="{linkHref: youtubeLink, linkTitle: 'Youtube', iconClass: 'icons icon-t3-youtube'}"/>
</f:if>
<f:comment><!-- mynewsdeskLink --></f:comment>
<f:if condition="{theme:constant(constant:'themes.configuration.socialmedia.useMynewsdesk')}">
Expand All @@ -142,9 +142,19 @@
</f:if>
</f:else>
</f:if>
<f:render partial="SocialmediaLink" arguments="{linkHref: mynewsdeskLink, linkTitle: 'Mynewsdesk', iconClass: 'icons icon-t3-mynewsdesk'}"/>
<f:render section="SocialmediaLink" arguments="{linkHref: mynewsdeskLink, linkTitle: 'Mynewsdesk', iconClass: 'icons icon-t3-mynewsdesk'}"/>
</f:if>
</div>
<!-- theme_t3kit: Partials/Footer/Socialmedia.html [end] -->
</f:section>

<f:section name="SocialmediaLink">
<f:if condition="{linkHref}">
<f:spaceless>
<a class="social-icons__item" href="{linkHref}" target="_blank" title="{linkTitle}" aria-label="{linkTitle}">
<span aria-hidden="true" class="{iconClass}"></span>
</a>
</f:spaceless>
</f:if>
</f:section>
</div>

This file was deleted.

2 changes: 1 addition & 1 deletion Resources/Private/Partials/Header/Header.html
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@

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

0 comments on commit d61162e

Please sign in to comment.