Commit e0078359 authored by Thomas Löffler's avatar Thomas Löffler

Merge branch 'develop' into 'master'

Upgrade Release 19-12-19

See merge request !329
parents 813adcb5 73d49f04
Pipeline #8240 passed with stages
in 5 minutes and 7 seconds
......@@ -3633,11 +3633,11 @@
},
{
"name": "t3o/t3o_membership",
"version": "2.1.0",
"version": "2.1.1",
"source": {
"type": "git",
"url": "https://git-t3o.typo3.org/t3o/t3o_membership.git",
"reference": "30c0106e35e3bdaecacab5bf4cc86c6917aab9de"
"reference": "b0ed0341c0439dea9707f73a85496b1a6c93fdba"
},
"require": {
"lukebaird/dropbox-v2-php-sdk": "^1.1",
......@@ -3680,7 +3680,7 @@
"email": "maintenance@typo3.org",
"issues": "https://git-t3o.typo3.org/t3o/t3o_membership/issues"
},
"time": "2019-11-06T09:58:52+00:00"
"time": "2019-12-19T08:31:43+00:00"
},
{
"name": "t3o/t3olayout",
......
......@@ -30,7 +30,7 @@ languages:
hreflang: en-US
direction: ''
flag: gb
solr_core_read: ''
solr_core_read: 'core_en'
languageId: '0'
rootPageId: 1
routeEnhancers:
......@@ -110,9 +110,9 @@ routeEnhancers:
plugin: Pievent
routes:
- { routePath: '/', _controller: 'Event::list' }
- { routePath: '/{page}', _controller: 'Event::list', _arguments: {'page': '@widget_0/currentPage'} }
- { routePath: '/page/{page}', _controller: 'Event::list', _arguments: {'page': '@widget_0/currentPage'}, _requirements: {'page': \d+} }
- { routePath: '/{event_category}/all', _controller: 'Event::list', _arguments: {'event_category': 'overwriteDemand/category'} }
- { routePath: '/{event_category}/all/{page}', _controller: 'Event::list', _arguments: {'event_category': 'overwriteDemand/category', 'page': '@widget_0/currentPage'} }
- { routePath: '/{event_category}/all/page/{page}', _controller: 'Event::list', _arguments: {'event_category': 'overwriteDemand/category', 'page': '@widget_0/currentPage'}, _requirements: {'page': \d+} }
- { routePath: '/{event_title}', _controller: 'Event::detail', _arguments: {'event_title': 'event'} }
- { routePath: '/{event_title}/ical', _controller: 'Event::icalDownload', _arguments: {'event_title': 'event'} }
defaultController: 'Event::list'
......
......@@ -93,6 +93,12 @@ page.headerData.100.value = <link rel="alternate" type="application/rss+xml" tit
link = {$plugin.tx_news.rss.channel.link}
}
}
view < plugin.tx_news.view
view {
templateRootPaths {
2 = EXT:t3org_layout/Resources/Private/Templates/News/
}
}
}
}
[global]
......@@ -191,6 +197,12 @@ page.headerData.101.value = <link rel="alternate" type="application/rss+xml" tit
link = {$plugin.tx_news.rss.channel.link}
}
}
view < plugin.tx_news.view
view {
templateRootPaths {
2 = EXT:t3org_layout/Resources/Private/Templates/News/
}
}
}
}
[global]
......@@ -34,7 +34,7 @@
<div class="row">
<div class="{f:if(condition:'{categories -> f:count()} > 1',then:'col-md-8',else:'col-md-12')}">
<div id="accordion" role="tablist" aria-multiselectable="true">
<f:widget.paginate objects="{events}" as="paginatedEvents" configuration="{itemsPerPage: 10, insertAbove: 0, insertBelow: 1, maximumNumberOfLinks: 10}">
<f:widget.paginate objects="{events}" as="paginatedEvents" configuration="{itemsPerPage: 10, insertAbove: 0, insertBelow: 1, maximumNumberOfLinks: 10, addQueryStringMethod: 'GET'}">
<f:for each="{paginatedEvents}" as="event">
<f:render partial="Event/ListItem" arguments="{_all}" />
</f:for>
......
<?xml version="1.0" encoding="utf-8"?>
<rss version="2.0"
xmlns:content="http://purl.org/rss/1.0/modules/content/"
xmlns:atom="http://www.w3.org/2005/Atom"
xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
xmlns:n="http://typo3.org/ns/GeorgRinger/News/ViewHelpers">
<channel>
<title>{settings.list.rss.channel.title}</title>
<link>{settings.list.rss.channel.link}</link>
<description>{settings.list.rss.channel.description}</description>
<language>{settings.list.rss.channel.language}</language>
<f:if condition="{settings.list.rss.channel.copyright}">
<copyright>{settings.list.rss.channel.copyright}</copyright>
</f:if>
<pubDate>
<f:format.date format="r" date="now"/>
</pubDate>
<lastBuildDate>
<f:format.date format="r" date="now"/>
</lastBuildDate>
<f:if condition="{settings.list.rss.channel.category}">
<category>{settings.list.rss.channel.category}</category>
</f:if>
<atom:link href="{f:uri.page(pageType: 100, absolute: 1) -> f:format.htmlentities()}" rel="self"
type="application/rss+xml"/>
<generator>{settings.list.rss.channel.generator}</generator>
<f:if condition="{news}">
<f:for each="{news}" as="newsItem">
<item>
<guid isPermaLink="false">news-{newsItem.uid}</guid>
<pubDate>
<f:format.date format="r">{newsItem.datetime}</f:format.date>
</pubDate>
<title>{newsItem.pathSegment -> f:format.case(mode:'upper')}: {newsItem.title -> f:format.htmlspecialchars()}
</title>
<link>
<f:format.htmlentities>
<n:link newsItem="{newsItem}" settings="{settings}" uriOnly="1" configuration="{forceAbsoluteUrl: 1}"/>
</f:format.htmlentities>
</link>
<description>{newsItem.teaser -> f:format.stripTags() -> f:format.htmlspecialchars()}</description>
<content:encoded>
<f:format.cdata>
<f:format.html>{newsItem.bodytext}</f:format.html>
</f:format.cdata>
</content:encoded>
<f:if condition="{newsItem.categories}">
<f:for each="{newsItem.categories}" as="newsItemCategory">
<category>{newsItemCategory.title -> f:format.htmlspecialchars()}</category>
</f:for>
</f:if>
</item>
</f:for>
</f:if>
</channel>
</rss>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment