EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/2020.03-07'

Browse Source
This commit is contained in:
Björn Fromme
2020-03-20 09:23:13 +01:00
parent f43fdd84f3 975b101101
commit 8a56dabc7d
6 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.ddev/config.yaml
+1 -1
View File
@@ -3,7 +3,7 @@ name: ep-reisen
type: typo3 type: typo3
docroot: public docroot: public
php_version: "7.3" php_version: "7.3"
webserver_type: nginx-fpm webserver_type: apache-cgi
router_http_port: "80" router_http_port: "80"
router_https_port: "443" router_https_port: "443"
xdebug_enabled: false xdebug_enabled: false
composer.lock
Generated
+15 -13
View File
@@ -1331,33 +1331,33 @@
}, },
{ {
"name": "league/csv", "name": "league/csv",
"version": "9.5.0", "version": "9.6.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/csv.git", "url": "https://github.com/thephpleague/csv.git",
"reference": "b348d09d0d258a4f068efb50a2510dc63101c213" "reference": "7351a74625601914409b42b32cabb91a93773b7b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/csv/zipball/b348d09d0d258a4f068efb50a2510dc63101c213", "url": "https://api.github.com/repos/thephpleague/csv/zipball/7351a74625601914409b42b32cabb91a93773b7b",
"reference": "b348d09d0d258a4f068efb50a2510dc63101c213", "reference": "7351a74625601914409b42b32cabb91a93773b7b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-dom": "*",
"ext-json": "*", "ext-json": "*",
"ext-mbstring": "*", "ext-mbstring": "*",
"php": ">=7.0.10" "php": "^7.2.5"
}, },
"require-dev": { "require-dev": {
"ext-curl": "*", "ext-curl": "*",
"friendsofphp/php-cs-fixer": "^2.12", "friendsofphp/php-cs-fixer": "^2.16",
"phpstan/phpstan": "^0.9.2", "phpstan/phpstan": "^0.12.0",
"phpstan/phpstan-phpunit": "^0.9.4", "phpstan/phpstan-phpunit": "^0.12.0",
"phpstan/phpstan-strict-rules": "^0.9.0", "phpstan/phpstan-strict-rules": "^0.12.0",
"phpunit/phpunit": "^6.0" "phpunit/phpunit": "^8.0"
}, },
"suggest": { "suggest": {
"ext-dom": "Required to use the XMLConverter and or the HTMLConverter classes",
"ext-iconv": "Needed to ease transcoding CSV using iconv stream filters" "ext-iconv": "Needed to ease transcoding CSV using iconv stream filters"
}, },
"type": "library", "type": "library",
@@ -1386,17 +1386,19 @@
"role": "Developer" "role": "Developer"
} }
], ],
"description": "Csv data manipulation made easy in PHP", "description": "CSV data manipulation made easy in PHP",
"homepage": "http://csv.thephpleague.com", "homepage": "http://csv.thephpleague.com",
"keywords": [ "keywords": [
"convert",
"csv", "csv",
"export", "export",
"filter", "filter",
"import", "import",
"read", "read",
"transform",
"write" "write"
], ],
"time": "2019-12-15T19:51:41+00:00" "time": "2020-03-17T15:15:35+00:00"
}, },
{ {
"name": "league/period", "name": "league/period",
public/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.typoscript
+2
View File
@@ -14,6 +14,8 @@ plugin.tx_eptheme {
topNavPid = topNavPid =
# cat=eptheme/200/110; type=string; label=Main navigation PID # cat=eptheme/200/110; type=string; label=Main navigation PID
mainNavPid = mainNavPid =
# cat=eptheme/200/115; type=string; label=Mobile navigation PID
mobileNavPid =
# cat=eptheme/200/120; type=string; label=Footer navigation PID # cat=eptheme/200/120; type=string; label=Footer navigation PID
footerNavPid = footerNavPid =
# cat=eptheme/200/130; type=string; label=Default homepage UID # cat=eptheme/200/130; type=string; label=Default homepage UID
public/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.typoscript
+1
View File
@@ -31,6 +31,7 @@ plugin.tx_eptheme {
settings { settings {
footerNavPid = {$plugin.tx_eptheme.settings.footerNavPid} footerNavPid = {$plugin.tx_eptheme.settings.footerNavPid}
mainNavPid = {$plugin.tx_eptheme.settings.mainNavPid} mainNavPid = {$plugin.tx_eptheme.settings.mainNavPid}
mobileNavPid = {$plugin.tx_eptheme.settings.mobileNavPid}
topNavPid = {$plugin.tx_eptheme.settings.topNavPid} topNavPid = {$plugin.tx_eptheme.settings.topNavPid}
legalNoticePageUid = {$plugin.tx_eptheme.settings.legalNoticePageUid} legalNoticePageUid = {$plugin.tx_eptheme.settings.legalNoticePageUid}
termsAndConditionsPageUid = {$plugin.tx_eptheme.settings.termsAndConditionsPageUid} termsAndConditionsPageUid = {$plugin.tx_eptheme.settings.termsAndConditionsPageUid}
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_app.js
+1 -1
View File
@@ -122,7 +122,7 @@ new Vue({
this.searchBoxVisible = false; this.searchBoxVisible = false;
}, },
toggleMobileNavigation () { toggleMobileNavigation () {
$('#ep-navbar-burger-menu').collapse('toggle'); $('[data-mobile-menu]').collapse('toggle');
}, },
toggleAreaNavigation () { toggleAreaNavigation () {
const $nav = $('.area-nav'); const $nav = $('.area-nav');
public/typo3conf/ext/ep_theme/Resources/Private/Partials/Mainnav.html
+9 -4
View File
@@ -8,7 +8,12 @@
<div class="navbar-main-wrapper" :class="{ 'searchbar-fixed': searchbarFixed }"> <div class="navbar-main-wrapper" :class="{ 'searchbar-fixed': searchbarFixed }">
<nav class="container navbar navbar-default navbar-main{f:if(condition: data.tx_eptheme_hide_searchbar, then: ' navbar-main--no-searchbar')}"> <nav class="container navbar navbar-default navbar-main{f:if(condition: data.tx_eptheme_hide_searchbar, then: ' navbar-main--no-searchbar')}">
<f:render section="NavbarHeader" arguments="{_all}"/> <f:render section="NavbarHeader" arguments="{_all}"/>
<f:render section="FirstLevel" arguments="{_all}"/> <div class="hidden-xs hidden-sm">
<f:render section="FirstLevel" arguments="{navPid: settings.mainNavPid, mobile: 0}"/>
</div>
<div class="hidden-md hidden-lg">
<f:render section="FirstLevel" arguments="{navPid: settings.mobileNavPid, mobile: 1}"/>
</div>
<f:if condition="{data.tx_eptheme_hide_searchbar}"> <f:if condition="{data.tx_eptheme_hide_searchbar}">
<f:else> <f:else>
<f:cObject typoscriptObjectPath="lib.searchBox"/> <f:cObject typoscriptObjectPath="lib.searchBox"/>
@@ -20,7 +25,7 @@
<f:section name="NavbarHeader"> <f:section name="NavbarHeader">
<div class="navbar-header"> <div class="navbar-header">
<a @click.prevent="toggleMobileNavigation()" type="button" class="navbar-toggle collapsed" id="navtoggle"> <a @click.prevent="toggleMobileNavigation()" href="#" class="navbar-toggle collapsed" id="navtoggle">
<span class="sr-only">Toggle navigation</span> <span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
@@ -40,9 +45,9 @@
</f:section> </f:section>
<f:section name="FirstLevel"> <f:section name="FirstLevel">
<div class="collapse navbar-collapse" id="ep-navbar-burger-menu"> <div class="collapse navbar-collapse"{f:if(condition: mobile, then: ' data-mobile-menu')}>
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<v:menu pageUid="{settings.mainNavPid}" entryLevel="1" useShortcutUid="true"> <v:menu pageUid="{navPid}" entryLevel="1" useShortcutUid="true">
<f:for each="{menu}" as="topitem" iteration="outerIteration"> <f:for each="{menu}" as="topitem" iteration="outerIteration">
<li class="dropdown"> <li class="dropdown">
<f:if condition="{topitem.hasSubPages}"> <f:if condition="{topitem.hasSubPages}">