Skip to content

Commit

Permalink
[BUGFIX]: enable lightbox on news media, remove fluid viewhelper from…
Browse files Browse the repository at this point in the history
… source code (#300)
  • Loading branch information
Anna Färber authored and pixelmatseriks committed Oct 4, 2017
1 parent 5883dc7 commit 637f96c
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- categories -->
<span class="news-list-category" xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers">
<span class="news-list-category" xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:for each="{categories}" as="category" iteration="iterator">
<f:if condition="{category.shortcut}">
<f:then>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:if condition="{media}">
<f:comment>
[PATCH begin]
2017-10-29 Anna Färber <anna[email protected]>
Add additional lightbox__wrp-news class to enable the lightbox.
<div class="news-img-wrap">...</div>
[PATCH end]
</f:comment>
<div class="news-img-wrap {f:if(condition:'{settings.detail.media.image.lightbox.enabled}', then:'lightbox__wrp-news' )}">
<f:for each="{media}" as="mediaElement">
<div class="outer">
<f:if condition="{mediaElement.originalResource.type} == 2">
<f:render partial="Detail/MediaImage" arguments="{mediaElement: mediaElement, settings:settings}"/>
</f:if>
<f:if condition="{mediaElement.originalResource.type} == 4">
<f:render partial="Detail/MediaVideo" arguments="{mediaElement: mediaElement, settings:settings}"/>
</f:if>
<f:if condition="{mediaElement.originalResource.type} == 5">
<f:render partial="Detail/MediaImage" arguments="{mediaElement: mediaElement, settings:settings}"/>
</f:if>
</div>
</f:for>
</div>
</f:if>
</html>
40 changes: 40 additions & 0 deletions Resources/Private/Extensions/News/Partials/Detail/MediaImage.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
xmlns:n="http://typo3.org/ns/GeorgRinger/News/ViewHelpers"
data-namespace-typo3-fluid="true">

<div class="mediaelement mediaelement-image">
<f:if condition="{mediaElement.link}">
<f:then>
<f:link.page pageUid="{mediaElement.link}" target="{n:targetLink(link:mediaElement.link)}">
<f:image image="{mediaElement}" title="{mediaElement.title}" alt="{mediaElement.alternative}" maxWidth="{f:if(condition: settings.media.maxWidth, then: settings.media.maxWidth, else: settings.detail.media.image.maxWidth)}" maxHeight="{f:if(condition: settings.media.maxHeight, then: settings.media.maxHeight, else: settings.detail.media.image.maxHeight)}" />
</f:link.page>
</f:then>
<f:else>
<f:if condition="{settings.detail.media.image.lightbox.enabled}">
<f:then>
<f:comment>
[PATCH begin]
2017-10-29 Anna Färber <anna[email protected]>
Remove rel Attribute from to have W3C confrom html.
[PATCH end]
<a href="{f:uri.image(image:mediaElement, width:'{settings.detail.media.image.lightbox.width}', height:'{settings.detail.media.image.lightbox.height}')}"
title="{mediaElement.title}" class="{settings.detail.media.image.lightbox.class}"
rel="{settings.detail.media.image.lightbox.rel}">...</a>
</f:comment>
<a href="{f:uri.image(image:mediaElement, width:'{settings.detail.media.image.lightbox.width}', height:'{settings.detail.media.image.lightbox.height}')}" title="{mediaElement.title}" class="{settings.detail.media.image.lightbox.class}">
<f:image image="{mediaElement}" title="{mediaElement.title}" alt="{mediaElement.alternative}" maxWidth="{f:if(condition: settings.media.maxWidth, then: settings.media.maxWidth, else: settings.detail.media.image.maxWidth)}" maxHeight="{f:if(condition: settings.media.maxHeight, then: settings.media.maxHeight, else: settings.detail.media.image.maxHeight)}" />
</a>
</f:then>
<f:else>
<f:image image="{mediaElement}" title="{mediaElement.title}" alt="{mediaElement.alternative}" maxWidth="{f:if(condition: settings.media.maxWidth, then: settings.media.maxWidth, else: settings.detail.media.image.maxWidth)}" maxHeight="{f:if(condition: settings.media.maxHeight, then: settings.media.maxHeight, else: settings.detail.media.image.maxHeight)}" />
</f:else>
</f:if>
</f:else>
</f:if>
</div>
<f:if condition="{mediaElement.description}">
<p class="news-img-caption">
{mediaElement.description}
</p>
</f:if>
</html>

0 comments on commit 637f96c

Please sign in to comment.