Skip to content
GitLab
Commit 0ac61e4e authored by Thomas Löffler's avatar Thomas Löffler
Browse files

Merge branch 'develop' into 494-error-code-on-events-pages

parents fa285e8c cd2eb9cd
Pipeline #9192 passed with stages
in 5 minutes and 53 seconds
Expand all Hide whitespace changes
Inline Side-by-side
composer.json
View file @ 0ac61e4e
......@@ -82,5 +82,8 @@
"cms-package-dir": "{$vendor-dir}/typo3/cms"
},
"enable-patching": true
},
"require-dev": {
"ichhabrecht/filefill": "^3.2"
}
}
composer.lock
View file @ 0ac61e4e
This diff is collapsed.
extensions/t3org_layout/Configuration/PageTS/SfEventMgt.tsconfig
View file @ 0ac61e4e
tx_sfeventmgt.templateLayouts {
1 = Latest view
2 = List view, no category selector
3 = List view, nothing more
}
extensions/t3org_layout/Resources/Private/Extensions/SfEventMgt/Templates/Event/List.html
View file @ 0ac61e4e
......@@ -2,75 +2,93 @@
<f:layout name="Default" />
<f:section name="main">
<f:if condition="{settings.templateLayout} == 1">
<f:then>
<ul class="list-unstyled event-list listing__group">
<f:for each="{events}" as="event">
<li class="m-3 m-md-4 mx-lg-5 mt-lg-5">
<f:link.action action="detail" arguments="{event : event}" pageUid="{settings.detailPid}" class="media listing__group-item p-sm-2 card-date">
<div class="d-flex mr-sm-4">
<time class="listing__group-item_time" datetime="{event.startdate -> f:format.date(format:'Y-m-d H:i')}">
<span class="listing__group-item_time-day mt-sm-2">{event.startdate -> f:format.date(format:'d')}</span>
<span class="listing__group-item_time-month">{event.startdate -> f:format.date(format:'M')}</span>
<span class="listing__group-item_time-year">{event.startdate -> f:format.date(format:'Y')}</span>
</time>
</div>
<div class="media-body listing__group-item_body">
<h5 class="mb-0 mt-sm-1 mb-sm-3">
<strong>{event.title}</strong>
</h5>
<p class="listing__group-item_body-text">
{event.location.title}<br>{event.location.city}<br>{event.location.country}<i class="fa fa-chevron-right ml-2" aria-hidden="true"></i>
</p>
</div>
</f:link.action>
</li>
</f:for>
</ul>
<f:link.action class="btn btn-primary btn-block py-lg-3 mb-0" pageUid="433" action="list" controller="Event" arguments="{overwriteDemand:{category:settings.category}}">Show more</f:link.action>
</f:then>
<f:else>
<div class="container">
<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, addQueryStringMethod: 'GET'}">
<f:for each="{paginatedEvents}" as="event">
<f:render partial="Event/ListItem" arguments="{_all}" />
</f:for>
</f:widget.paginate>
</div>
</div>
<f:if condition="{categories -> f:count()} > 1">
<div class="col-md-4">
<f:render section="Filter" arguments="{_all}" />
</div>
</f:if>
<div class="col-md-12">
<f:link.action action="list" controller="Event">
<f:translate key="event.allEvents" />
</f:link.action>
</div>
</div>
</div>
</f:else>
</f:if>
<f:render section="layout{settings.templateLayout}" arguments="{_all}" />
</f:section>
<f:section name="Filter">
<f:if condition="{settings.templateLayout} == '2'">
<f:else>
<form class="event-filter">
<f:form.select class="custom-select" name="event-filter-neu" additionalAttributes="{onchange: 'location = this.value;'}">
<option value="{f:uri.action(action: 'list', controller: 'Event', arguments: '{overwriteDemand:{category: category}}')}"><f:translate key="tx_t3org_layout.events.all_category" extensionName="t3org_layout"/></option>
<f:for each="{categories}" as="category">
<option value="{f:uri.action(action: 'list', controller: 'Event', arguments: '{overwriteDemand:{category: category}}')}" {f:if(condition: '{overwriteDemand.category} == {category.uid}', then: 'class="active" selected="selected"')}>
{category.title}
</option>
</f:for>
</f:form.select>
</form>
</f:else>
</f:if>
<f:if condition="{settings.templateLayout} == '2'">
<f:else>
<form class="event-filter">
<f:form.select class="custom-select" name="event-filter-neu" additionalAttributes="{onchange: 'location = this.value;'}">
<option value="{f:uri.action(action: 'list', controller: 'Event', arguments: '{overwriteDemand:{category: category}}')}">
<f:translate key="tx_t3org_layout.events.all_category" extensionName="t3org_layout" />
</option>
<f:for each="{categories}" as="category">
<option value="{f:uri.action(action: 'list', controller: 'Event', arguments: '{overwriteDemand:{category: category}}')}" {f:if(condition:'{overwriteDemand.category} == {category.uid}', then: 'class="active" selected="selected"')}>
{category.title}
</option>
</f:for>
</f:form.select>
</form>
</f:else>
</f:if>
</f:section>
<f:section name="layout1">
<ul class="list-unstyled event-list listing__group">
<f:for each="{events}" as="event">
<li class="m-3 m-md-4 mx-lg-5 mt-lg-5">
<f:link.action action="detail" arguments="{event : event}" pageUid="{settings.detailPid}" class="media listing__group-item p-sm-2 card-date">
<div class="d-flex mr-sm-4">
<time class="listing__group-item_time" datetime="{event.startdate -> f:format.date(format:'Y-m-d H:i')}">
<span class="listing__group-item_time-day mt-sm-2">{event.startdate -> f:format.date(format:'d')}</span>
<span class="listing__group-item_time-month">{event.startdate -> f:format.date(format:'M')}</span>
<span class="listing__group-item_time-year">{event.startdate -> f:format.date(format:'Y')}</span>
</time>
</div>
<div class="media-body listing__group-item_body">
<h5 class="mb-0 mt-sm-1 mb-sm-3">
<strong>{event.title}</strong>
</h5>
<p class="listing__group-item_body-text">
{event.location.title}<br>{event.location.city}<br>{event.location.country}<i class="fa fa-chevron-right ml-2" aria-hidden="true"></i>
</p>
</div>
</f:link.action>
</li>
</f:for>
</ul>
<f:link.action class="btn btn-primary btn-block py-lg-3 mb-0" pageUid="433" action="list" controller="Event" arguments="{overwriteDemand:{category:settings.category}}">Show more</f:link.action>
</f:section>
<f:section name="layout2">
<div class="container">
<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, addQueryStringMethod: 'GET'}">
<f:for each="{paginatedEvents}" as="event">
<f:render partial="Event/ListItem" arguments="{_all}" />
</f:for>
</f:widget.paginate>
</div>
</div>
<f:if condition="{categories -> f:count()} > 1">
<div class="col-md-4">
<f:render section="Filter" arguments="{_all}" />
</div>
</f:if>
<div class="col-md-12">
<f:link.action action="list" controller="Event">
<f:translate key="event.allEvents" />
</f:link.action>
</div>
</div>
</div>
</f:section>
<f:section name="layout3">
<div class="container">
<div class="row">
<div class="col-md-12">
<h2>{contentObjectData.header}</h2>
<div id="accordion" role="tablist" aria-multiselectable="true">
<f:for each="{events}" as="event">
<f:render partial="Event/ListItem" arguments="{_all}" />
</f:for>
</div>
</div>
</div>
</div>
</f:section>
</html>
private/typo3conf/AdditionalConfiguration.ddev.php
View file @ 0ac61e4e
......@@ -16,8 +16,11 @@ $GLOBALS['TYPO3_CONF_VARS']['SYS']['displayErrors'] = 1;
$GLOBALS['TYPO3_CONF_VARS']['BE']['installToolPassword'] = '$P$CZqeoYBTHC0kXKny4tpTvBSzzV5wVY0'; /* joh316 */
$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['filefill']['storages'][1] = [
'domain' => [
'https://typo3.org/',
[
'identifier' => 'domain',
'configuration' => 'https://typo3.org/',
],
[
'identifier' => 'placeholder',
],
'placeholder' => true,
];
Supports Markdown
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