diff --git a/composer.json b/composer.json index 28cb34f1..fbb6efab 100644 --- a/composer.json +++ b/composer.json @@ -9,52 +9,46 @@ "require": { "php": "^7.1", "ext-json": "*", - "typo3/cms": "^7.6", - "georgringer/news": "^6.1", - "dmitryd/typo3-realurl": "^2.3", - "helhum/typo3-console": "^4.9", - "typo3/cms-backend": "^7.6", - "typo3/cms-belog": "^7.6", - "typo3/cms-beuser": "^7.6", - "typo3/cms-context-help": "^7.6", - "typo3/cms-core": "^7.6", - "typo3/cms-extbase": "^7.6", - "typo3/cms-extensionmanager": "^7.6", - "typo3/cms-filelist": "^7.6", - "typo3/cms-filemetadata": "^7.6", - "typo3/cms-fluid": "^7.6", - "typo3/cms-fluid-styled-content": "^7.6", - "typo3/cms-form": "^7.6", - "typo3/cms-frontend": "^7.6", - "typo3/cms-func": "^7.6", - "typo3/cms-func-wizards": "^7.6", - "typo3/cms-info": "^7.6", - "typo3/cms-info-pagetsconfig": "^7.6", - "typo3/cms-install": "^7.6", - "typo3/cms-lang": "^7.6", - "typo3/cms-lowlevel": "^7.6", - "typo3/cms-opendocs": "^7.6", - "typo3/cms-recordlist": "^7.6", - "typo3/cms-recycler": "^7.6", - "typo3/cms-reports": "^7.6", - "typo3/cms-rsaauth": "^7.6", - "typo3/cms-rtehtmlarea": "^7.6", - "typo3/cms-saltedpasswords": "^7.6", - "typo3/cms-scheduler": "^7.6", - "typo3/cms-setup": "^7.6", - "typo3/cms-sv": "^7.6", - "typo3/cms-sys-action": "^7.6", - "typo3/cms-t3editor": "^7.6", - "typo3/cms-t3skin": "^7.6", - "typo3/cms-taskcenter": "^7.6", - "typo3/cms-tstemplate": "^7.6", - "typo3/cms-viewpage": "^7.6", - "typo3/cms-wizard-crpages": "^7.6", - "typo3/cms-wizard-sortpages": "^7.6", - "fluidtypo3/vhs": "^3.1", - "typo3-ter/gridelements": "7.2", + "typo3/cms": "^8.7", + "typo3/cms-backend": "^8.7", + "typo3/cms-belog": "^8.7", + "typo3/cms-beuser": "^8.7", + "typo3/cms-context-help": "^8.7", + "typo3/cms-core": "^8.7", + "typo3/cms-rte-ckeditor": "^8.7", + "typo3/cms-extbase": "^8.7", + "typo3/cms-extensionmanager": "^8.7", + "typo3/cms-felogin": "^8.7", + "typo3/cms-filelist": "^8.7", + "typo3/cms-filemetadata": "^8.7", + "typo3/cms-fluid": "^8.7", + "typo3/cms-fluid-styled-content": "^8.7", + "typo3/cms-form": "^8.7", + "typo3/cms-frontend": "^8.7", + "typo3/cms-func": "^8.7", + "typo3/cms-func-wizards": "^8.7", + "typo3/cms-info": "^8.7", + "typo3/cms-info-pagetsconfig": "^8.7", + "typo3/cms-install": "^8.7", + "typo3/cms-lang": "^8.7", + "typo3/cms-lowlevel": "^8.7", + "typo3/cms-opendocs": "^8.7", + "typo3/cms-recordlist": "^8.7", + "typo3/cms-recycler": "^8.7", + "typo3/cms-reports": "^8.7", + "typo3/cms-rsaauth": "^8.7", + "typo3/cms-saltedpasswords": "^8.7", + "typo3/cms-scheduler": "^8.7", + "typo3/cms-setup": "^8.7", + "typo3/cms-sv": "^8.7", + "typo3/cms-sys-action": "^8.7", + "typo3/cms-t3editor": "^8.7", + "typo3/cms-taskcenter": "^8.7", + "typo3/cms-tstemplate": "^8.7", + "typo3/cms-viewpage": "^8.7", + "typo3/cms-wizard-crpages": "^8.7", + "typo3/cms-wizard-sortpages": "^8.7", "typo3-ter/media": "^4.5", - "typo3-ter/metaseo": "2.1", "typo3-ter/ods-redirects": "^1.3", "typo3-ter/pb-social": "^1.3", "typo3-ter/sourceopt": "^1.0", @@ -67,7 +61,14 @@ "symfony/serializer": "^3.3", "league/csv": "^8.2", "christophlehmann/imageoptimizer": "^1.1", - "smichaelsen/pagepath": "^1.1" + "smichaelsen/pagepath": "^1.1", + "georgringer/news": "^7.0", + "dmitryd/typo3-realurl": "^2.3", + "fluidtypo3/vhs": "^4.3", + "webdevops/metaseo": "3.0.0", + "helhum/typo3-console": "^4.9", + "gridelementsteam/gridelements": "^8.2", + "friendsoftypo3/form-legacy": "^8.7" }, "scripts": { "typo3-cms-scripts": [ diff --git a/composer.lock b/composer.lock index 44379577..3c0788ea 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1dba22f6a011fcf745ddabb92c3171cb", + "content-hash": "40ae079267d366554fc334aff3dd5506", "packages": [ { "name": "christophlehmann/imageoptimizer", @@ -162,6 +162,74 @@ ], "time": "2018-07-09T00:00:00+00:00" }, + { + "name": "doctrine/annotations", + "version": "v1.6.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/annotations.git", + "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5", + "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5", + "shasum": "" + }, + "require": { + "doctrine/lexer": "1.*", + "php": "^7.1" + }, + "require-dev": { + "doctrine/cache": "1.*", + "phpunit/phpunit": "^6.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.6.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "Docblock Annotations Parser", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "annotations", + "docblock", + "parser" + ], + "time": "2017-12-06T07:11:42+00:00" + }, { "name": "doctrine/cache", "version": "v1.8.0", @@ -238,33 +306,166 @@ "time": "2018-08-21T18:01:43+00:00" }, { - "name": "doctrine/dbal", - "version": "v2.8.0", + "name": "doctrine/collections", + "version": "v1.5.0", "source": { "type": "git", - "url": "https://github.com/doctrine/dbal.git", - "reference": "5140a64c08b4b607b9bedaae0cedd26f04a0e621" + "url": "https://github.com/doctrine/collections.git", + "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/5140a64c08b4b607b9bedaae0cedd26f04a0e621", - "reference": "5140a64c08b4b607b9bedaae0cedd26f04a0e621", + "url": "https://api.github.com/repos/doctrine/collections/zipball/a01ee38fcd999f34d9bfbcee59dbda5105449cbf", + "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf", "shasum": "" }, "require": { - "doctrine/cache": "^1.0", - "doctrine/event-manager": "^1.0", - "ext-pdo": "*", "php": "^7.1" }, "require-dev": { - "doctrine/coding-standard": "^4.0", - "jetbrains/phpstorm-stubs": "^2018.1.2", - "phpstan/phpstan": "^0.10.1", - "phpunit/phpunit": "^7.1.2", - "phpunit/phpunit-mock-objects": "!=3.2.4,!=3.2.5", - "symfony/console": "^2.0.5|^3.0|^4.0", - "symfony/phpunit-bridge": "^3.4.5|^4.0.5" + "doctrine/coding-standard": "~0.1@dev", + "phpunit/phpunit": "^5.7" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + } + }, + "autoload": { + "psr-0": { + "Doctrine\\Common\\Collections\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "Collections Abstraction library", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "array", + "collections", + "iterator" + ], + "time": "2017-07-22T10:37:32+00:00" + }, + { + "name": "doctrine/common", + "version": "v2.7.3", + "source": { + "type": "git", + "url": "https://github.com/doctrine/common.git", + "reference": "4acb8f89626baafede6ee5475bc5844096eba8a9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/common/zipball/4acb8f89626baafede6ee5475bc5844096eba8a9", + "reference": "4acb8f89626baafede6ee5475bc5844096eba8a9", + "shasum": "" + }, + "require": { + "doctrine/annotations": "1.*", + "doctrine/cache": "1.*", + "doctrine/collections": "1.*", + "doctrine/inflector": "1.*", + "doctrine/lexer": "1.*", + "php": "~5.6|~7.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.4.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Common\\": "lib/Doctrine/Common" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "Common Library for Doctrine projects", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "annotations", + "collections", + "eventmanager", + "persistence", + "spl" + ], + "time": "2017-07-22T08:35:12+00:00" + }, + { + "name": "doctrine/dbal", + "version": "v2.5.13", + "source": { + "type": "git", + "url": "https://github.com/doctrine/dbal.git", + "reference": "729340d8d1eec8f01bff708e12e449a3415af873" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/729340d8d1eec8f01bff708e12e449a3415af873", + "reference": "729340d8d1eec8f01bff708e12e449a3415af873", + "shasum": "" + }, + "require": { + "doctrine/common": ">=2.4,<2.8-dev", + "php": ">=5.3.2" + }, + "require-dev": { + "phpunit/phpunit": "4.*", + "symfony/console": "2.*||^3.0" }, "suggest": { "symfony/console": "For helpful console commands such as SQL execution and import of files." @@ -275,8 +476,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8.x-dev", - "dev-develop": "3.0.x-dev" + "dev-master": "2.5.x-dev" } }, "autoload": { @@ -314,41 +514,37 @@ "persistence", "queryobject" ], - "time": "2018-07-13T03:16:35+00:00" + "time": "2017-07-22T20:44:48+00:00" }, { - "name": "doctrine/event-manager", - "version": "v1.0.0", + "name": "doctrine/inflector", + "version": "v1.3.0", "source": { "type": "git", - "url": "https://github.com/doctrine/event-manager.git", - "reference": "a520bc093a0170feeb6b14e9d83f3a14452e64b3" + "url": "https://github.com/doctrine/inflector.git", + "reference": "5527a48b7313d15261292c149e55e26eae771b0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/event-manager/zipball/a520bc093a0170feeb6b14e9d83f3a14452e64b3", - "reference": "a520bc093a0170feeb6b14e9d83f3a14452e64b3", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/5527a48b7313d15261292c149e55e26eae771b0a", + "reference": "5527a48b7313d15261292c149e55e26eae771b0a", "shasum": "" }, "require": { "php": "^7.1" }, - "conflict": { - "doctrine/common": "<2.9@dev" - }, "require-dev": { - "doctrine/coding-standard": "^4.0", - "phpunit/phpunit": "^7.0" + "phpunit/phpunit": "^6.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { "psr-4": { - "Doctrine\\Common\\": "lib/Doctrine/Common" + "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector" } }, "notification-url": "https://packagist.org/downloads/", @@ -375,20 +571,17 @@ { "name": "Johannes Schmitt", "email": "schmittjoh@gmail.com" - }, - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com" } ], - "description": "Doctrine Event Manager component", - "homepage": "https://www.doctrine-project.org/projects/event-manager.html", + "description": "Common String Manipulations with regard to casing and singular/plural rules.", + "homepage": "http://www.doctrine-project.org", "keywords": [ - "event", - "eventdispatcher", - "eventmanager" + "inflection", + "pluralize", + "singularize", + "string" ], - "time": "2018-06-11T11:59:03+00:00" + "time": "2018-01-09T20:05:19+00:00" }, { "name": "doctrine/instantiator", @@ -445,29 +638,94 @@ "time": "2015-06-14T21:17:01+00:00" }, { - "name": "fluidtypo3/vhs", - "version": "3.1.0", + "name": "doctrine/lexer", + "version": "v1.0.1", "source": { "type": "git", - "url": "https://github.com/FluidTYPO3/vhs.git", - "reference": "8f0435a36f8141e15fca37d75b19bee1bce578f3" + "url": "https://github.com/doctrine/lexer.git", + "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FluidTYPO3/vhs/zipball/8f0435a36f8141e15fca37d75b19bee1bce578f3", - "reference": "8f0435a36f8141e15fca37d75b19bee1bce578f3", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c", + "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c", "shasum": "" }, "require": { - "php": ">=5.5.0" + "php": ">=5.3.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-0": { + "Doctrine\\Common\\Lexer\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "lexer", + "parser" + ], + "time": "2014-09-09T13:34:57+00:00" + }, + { + "name": "fluidtypo3/vhs", + "version": "4.4.0", + "source": { + "type": "git", + "url": "https://github.com/FluidTYPO3/vhs.git", + "reference": "0e1c001ce1bd2ee130aa6c4233d10bd4a0c3944e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/FluidTYPO3/vhs/zipball/0e1c001ce1bd2ee130aa6c4233d10bd4a0c3944e", + "reference": "0e1c001ce1bd2ee130aa6c4233d10bd4a0c3944e", + "shasum": "" + }, + "require": { + "php": ">=7.0.0", + "typo3/cms": ">=7.6.13, <=7.6.99|^8.4.1|dev-master" + }, + "replace": { + "typo3-ter/vhs": "self.version", + "vhs": "self.version" }, "require-dev": { - "fluidtypo3/development": "*" + "fluidtypo3/development": "^3.0" }, "suggest": { "ext-tidy": "Allows to make use of the tidy ViewHelper" }, "type": "typo3-cms-extension", + "extra": { + "typo3/cms": { + "cms-package-dir": "{$vendor-dir}/typo3/cms", + "web-dir": "build/web" + } + }, "autoload": { "psr-4": { "FluidTYPO3\\Vhs\\": "Classes/" @@ -475,7 +733,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "GPL-2.0+" + "GPL-2.0-or-later" ], "description": "The vhs package from FluidTYPO3", "homepage": "https://fluidtypo3.org", @@ -487,24 +745,61 @@ "utility", "viewhelper" ], - "time": "2016-10-18T13:44:09+00:00" + "time": "2018-03-11T08:26:39+00:00" }, { - "name": "georgringer/news", - "version": "6.3.0", + "name": "friendsoftypo3/form-legacy", + "version": "8.7.0", "source": { "type": "git", - "url": "https://github.com/georgringer/news.git", - "reference": "5d12b36e30cea3cd958e6efa1e5e6fd43d490390" + "url": "https://github.com/FriendsOfTYPO3/form_legacy.git", + "reference": "765fc2ee941860de83e6fdf8cff6ac4d1bc7e31d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/georgringer/news/zipball/5d12b36e30cea3cd958e6efa1e5e6fd43d490390", - "reference": "5d12b36e30cea3cd958e6efa1e5e6fd43d490390", + "url": "https://api.github.com/repos/FriendsOfTYPO3/form_legacy/zipball/765fc2ee941860de83e6fdf8cff6ac4d1bc7e31d", + "reference": "765fc2ee941860de83e6fdf8cff6ac4d1bc7e31d", "shasum": "" }, "require": { - "typo3/cms-core": "^7.6.13 || >=8.5.0 <9" + "typo3/cms-core": "~8" + }, + "replace": { + "form_legacy": "*" + }, + "type": "typo3-cms-extension", + "autoload": { + "psr-4": { + "TYPO3\\CMS\\Form\\": "Classes/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0+" + ], + "description": "Legacy version 7 of ext:form", + "homepage": "https://typo3.org", + "time": "2017-03-29T12:26:24+00:00" + }, + { + "name": "georgringer/news", + "version": "7.0.5", + "source": { + "type": "git", + "url": "https://github.com/georgringer/news.git", + "reference": "93d84c219938190c662507bfcb0ac85ed233450b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/georgringer/news/zipball/93d84c219938190c662507bfcb0ac85ed233450b", + "reference": "93d84c219938190c662507bfcb0ac85ed233450b", + "shasum": "" + }, + "require": { + "typo3/cms-core": "^8.7.13|| >=9.1.0 <9.3.0" + }, + "conflict": { + "symfony/finder": "2.7.44 || 2.8.37 || 3.4.7 || 4.0.7" }, "replace": { "news": "self.version", @@ -512,12 +807,12 @@ }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.0", - "nimut/testing-framework": "^1.0", - "phpunit/phpunit": "~4.8.0" + "nimut/testing-framework": "^1.0 || ^2.0 || ^3.0" }, "suggest": { - "dmitryd/typo3-dd-googlesitemap": "~2.0", - "reelworx/rx-shariff": "~10.0" + "dmitryd/typo3-dd-googlesitemap": "~2.1", + "dmitryd/typo3-realurl": "^2.3", + "reelworx/rx-shariff": "~11.0" }, "type": "typo3-cms-extension", "extra": { @@ -553,7 +848,222 @@ "news", "typo3" ], - "time": "2018-02-01T08:37:18+00:00" + "time": "2018-06-12T11:27:34+00:00" + }, + { + "name": "gridelementsteam/gridelements", + "version": "8.2.3", + "source": { + "type": "git", + "url": "https://git.typo3.org/TYPO3CMS/Extensions/gridelements.git", + "reference": "fc617c5e2359613afec7a881ca93fcff53a1c545" + }, + "require": { + "typo3/cms-core": ">=8.7.0,<9.0" + }, + "replace": { + "gridelements": "self.version", + "typo3-ter/gridelements": "self.version" + }, + "type": "typo3-cms-extension", + "autoload": { + "psr-4": { + "GridElementsTeam\\Gridelements\\": "Classes/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0-or-later" + ], + "description": "This extension integrates the grid layout concept also to regular content elements - the grid elements. It offers a lot of new features like advanced drag & drop or real references, that improve the usability of the page and list module to speed up the daily work with the backend.", + "homepage": "https://forge.typo3.org/projects/extension-gridelements2", + "keywords": [ + "Gridelements", + "TYPO3 CMS", + "grids" + ], + "time": "2018-06-18T18:23:18+00:00" + }, + { + "name": "guzzlehttp/guzzle", + "version": "6.3.3", + "source": { + "type": "git", + "url": "https://github.com/guzzle/guzzle.git", + "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba", + "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba", + "shasum": "" + }, + "require": { + "guzzlehttp/promises": "^1.0", + "guzzlehttp/psr7": "^1.4", + "php": ">=5.5" + }, + "require-dev": { + "ext-curl": "*", + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0", + "psr/log": "^1.0" + }, + "suggest": { + "psr/log": "Required for using the Log middleware" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "6.3-dev" + } + }, + "autoload": { + "files": [ + "src/functions_include.php" + ], + "psr-4": { + "GuzzleHttp\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "Guzzle is a PHP HTTP client library", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "client", + "curl", + "framework", + "http", + "http client", + "rest", + "web service" + ], + "time": "2018-04-22T15:46:56+00:00" + }, + { + "name": "guzzlehttp/promises", + "version": "v1.3.1", + "source": { + "type": "git", + "url": "https://github.com/guzzle/promises.git", + "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646", + "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646", + "shasum": "" + }, + "require": { + "php": ">=5.5.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Promise\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "Guzzle promises library", + "keywords": [ + "promise" + ], + "time": "2016-12-20T10:07:11+00:00" + }, + { + "name": "guzzlehttp/psr7", + "version": "1.4.2", + "source": { + "type": "git", + "url": "https://github.com/guzzle/psr7.git", + "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c", + "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c", + "shasum": "" + }, + "require": { + "php": ">=5.4.0", + "psr/http-message": "~1.0" + }, + "provide": { + "psr/http-message-implementation": "1.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Psr7\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "Tobias Schultze", + "homepage": "https://github.com/Tobion" + } + ], + "description": "PSR-7 message implementation that also provides common utility methods", + "keywords": [ + "http", + "message", + "request", + "response", + "stream", + "uri", + "url" + ], + "time": "2017-03-20T17:10:46+00:00" }, { "name": "helhum/typo3-console", @@ -994,33 +1504,32 @@ }, { "name": "mso/idna-convert", - "version": "v0.9.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/phlylabs/idna-convert.git", - "reference": "0a0a09e460e63739d82c3f0c3f0e5555567a6be3" + "reference": "a6dfb6f87611e3a89d2eec4924a0f51db755c573" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phlylabs/idna-convert/zipball/0a0a09e460e63739d82c3f0c3f0e5555567a6be3", - "reference": "0a0a09e460e63739d82c3f0c3f0e5555567a6be3", + "url": "https://api.github.com/repos/phlylabs/idna-convert/zipball/a6dfb6f87611e3a89d2eec4924a0f51db755c573", + "reference": "a6dfb6f87611e3a89d2eec4924a0f51db755c573", "shasum": "" }, "require": { "ext-pcre": "*", - "php": ">=5.0.0" + "php": ">=5.6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "0.9.x-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { - "classmap": [ - "idna_convert.class.php", - "uctc.php" - ] + "psr-4": { + "Mso\\IdnaConvert\\": "src" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1040,7 +1549,7 @@ "idna", "php" ], - "time": "2016-01-06T21:05:46+00:00" + "time": "2016-06-19T18:08:43+00:00" }, { "name": "natxet/CssMin", @@ -1208,184 +1717,6 @@ ], "time": "2016-04-19T09:28:22+00:00" }, - { - "name": "pear/http_request2", - "version": "v2.3.0", - "source": { - "type": "git", - "url": "https://github.com/pear/HTTP_Request2.git", - "reference": "3599cf0fe455a4e281da464f6510bfc5c2ce54c4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/pear/HTTP_Request2/zipball/3599cf0fe455a4e281da464f6510bfc5c2ce54c4", - "reference": "3599cf0fe455a4e281da464f6510bfc5c2ce54c4", - "shasum": "" - }, - "require": { - "pear/net_url2": "^2.2.0", - "pear/pear_exception": "^1.0.0", - "php": ">=5.2.0" - }, - "suggest": { - "ext-fileinfo": "Adds support for looking up mime-types using finfo.", - "ext-zlib": "Allows handling gzip compressed responses.", - "lib-curl": "Allows using cURL as a request backend.", - "lib-openssl": "Allows handling SSL requests when not using cURL." - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-trunk": "2.2-dev" - } - }, - "autoload": { - "psr-0": { - "HTTP_Request2": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "./" - ], - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Alexey Borzov", - "email": "avb@php.net" - } - ], - "description": "Provides an easy way to perform HTTP requests.", - "homepage": "http://pear.php.net/package/HTTP_Request2", - "keywords": [ - "PEAR", - "curl", - "http", - "request" - ], - "time": "2016-02-13T20:20:39+00:00" - }, - { - "name": "pear/net_url2", - "version": "v2.2.2", - "source": { - "type": "git", - "url": "https://github.com/pear/Net_URL2.git", - "reference": "07fd055820dbf466ee3990abe96d0e40a8791f9d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/pear/Net_URL2/zipball/07fd055820dbf466ee3990abe96d0e40a8791f9d", - "reference": "07fd055820dbf466ee3990abe96d0e40a8791f9d", - "shasum": "" - }, - "require": { - "php": ">=5.1.4" - }, - "require-dev": { - "phpunit/phpunit": ">=3.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.2.x-dev" - } - }, - "autoload": { - "classmap": [ - "Net/URL2.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "./" - ], - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "David Coallier", - "email": "davidc@php.net" - }, - { - "name": "Tom Klingenberg", - "email": "tkli@php.net" - }, - { - "name": "Christian Schmidt", - "email": "chmidt@php.net" - } - ], - "description": "Class for parsing and handling URL. Provides parsing of URLs into their constituent parts (scheme, host, path etc.), URL generation, and resolving of relative URLs.", - "homepage": "https://github.com/pear/Net_URL2", - "keywords": [ - "PEAR", - "net", - "networking", - "rfc3986", - "uri", - "url" - ], - "time": "2017-08-25T06:16:11+00:00" - }, - { - "name": "pear/pear_exception", - "version": "v1.0.0", - "source": { - "type": "git", - "url": "https://github.com/pear/PEAR_Exception.git", - "reference": "8c18719fdae000b690e3912be401c76e406dd13b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/pear/PEAR_Exception/zipball/8c18719fdae000b690e3912be401c76e406dd13b", - "reference": "8c18719fdae000b690e3912be401c76e406dd13b", - "shasum": "" - }, - "require": { - "php": ">=4.4.0" - }, - "require-dev": { - "phpunit/phpunit": "*" - }, - "type": "class", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-0": { - "PEAR": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "." - ], - "license": [ - "BSD-2-Clause" - ], - "authors": [ - { - "name": "Helgi Thormar", - "email": "dufuz@php.net" - }, - { - "name": "Greg Beaver", - "email": "cellog@php.net" - } - ], - "description": "The PEAR Exception base class.", - "homepage": "https://github.com/pear/PEAR_Exception", - "keywords": [ - "exception" - ], - "time": "2015-02-10T20:07:52+00:00" - }, { "name": "psr/http-message", "version": "1.0.1", @@ -1585,37 +1916,45 @@ }, { "name": "symfony/console", - "version": "v2.8.45", + "version": "v3.4.15", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "0c1fcbb9afb5cff992c982ff99c0434f0146dcfc" + "reference": "6b217594552b9323bcdcfc14f8a0ce126e84cd73" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/0c1fcbb9afb5cff992c982ff99c0434f0146dcfc", - "reference": "0c1fcbb9afb5cff992c982ff99c0434f0146dcfc", + "url": "https://api.github.com/repos/symfony/console/zipball/6b217594552b9323bcdcfc14f8a0ce126e84cd73", + "reference": "6b217594552b9323bcdcfc14f8a0ce126e84cd73", "shasum": "" }, "require": { - "php": ">=5.3.9", - "symfony/debug": "^2.7.2|~3.0.0", + "php": "^5.5.9|>=7.0.8", + "symfony/debug": "~2.8|~3.0|~4.0", "symfony/polyfill-mbstring": "~1.0" }, + "conflict": { + "symfony/dependency-injection": "<3.4", + "symfony/process": "<3.3" + }, "require-dev": { "psr/log": "~1.0", - "symfony/event-dispatcher": "~2.1|~3.0.0", - "symfony/process": "~2.1|~3.0.0" + "symfony/config": "~3.3|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/event-dispatcher": "~2.8|~3.0|~4.0", + "symfony/lock": "~3.4|~4.0", + "symfony/process": "~3.3|~4.0" }, "suggest": { "psr/log-implementation": "For using the console logger", "symfony/event-dispatcher": "", + "symfony/lock": "", "symfony/process": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -1642,37 +1981,36 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-07-26T11:13:39+00:00" + "time": "2018-07-26T11:19:56+00:00" }, { "name": "symfony/debug", - "version": "v2.8.45", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "cbb8a5f212148964efbc414838c527229f9951b7" + "reference": "47ead688f1f2877f3f14219670f52e4722ee7052" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/cbb8a5f212148964efbc414838c527229f9951b7", - "reference": "cbb8a5f212148964efbc414838c527229f9951b7", + "url": "https://api.github.com/repos/symfony/debug/zipball/47ead688f1f2877f3f14219670f52e4722ee7052", + "reference": "47ead688f1f2877f3f14219670f52e4722ee7052", "shasum": "" }, "require": { - "php": ">=5.3.9", + "php": "^7.1.3", "psr/log": "~1.0" }, "conflict": { - "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" + "symfony/http-kernel": "<3.4" }, "require-dev": { - "symfony/class-loader": "~2.2|~3.0.0", - "symfony/http-kernel": "~2.3.24|~2.5.9|^2.6.2|~3.0.0" + "symfony/http-kernel": "~3.4|~4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -1699,29 +2037,29 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2018-08-03T09:45:57+00:00" + "time": "2018-08-03T11:13:38+00:00" }, { "name": "symfony/finder", - "version": "v2.8.45", + "version": "v4.1.4", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "f0de0b51913eb2caab7dfed6413b87e14fca780e" + "reference": "e162f1df3102d0b7472805a5a9d5db9fcf0a8068" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/f0de0b51913eb2caab7dfed6413b87e14fca780e", - "reference": "f0de0b51913eb2caab7dfed6413b87e14fca780e", + "url": "https://api.github.com/repos/symfony/finder/zipball/e162f1df3102d0b7472805a5a9d5db9fcf0a8068", + "reference": "e162f1df3102d0b7472805a5a9d5db9fcf0a8068", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": "^7.1.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -1748,7 +2086,7 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2018-07-26T11:13:39+00:00" + "time": "2018-07-26T11:24:31+00:00" }, { "name": "symfony/inflector", @@ -2157,39 +2495,40 @@ }, { "name": "symfony/serializer", - "version": "v3.3.18", + "version": "v3.4.15", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "49a429eba5a2f96c170e8b4b834ce612c257fb32" + "reference": "40031683816470610af87c2d03ea86d1cf0f0104" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/49a429eba5a2f96c170e8b4b834ce612c257fb32", - "reference": "49a429eba5a2f96c170e8b4b834ce612c257fb32", + "url": "https://api.github.com/repos/symfony/serializer/zipball/40031683816470610af87c2d03ea86d1cf0f0104", + "reference": "40031683816470610af87c2d03ea86d1cf0f0104", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^5.5.9|>=7.0.8", + "symfony/polyfill-ctype": "~1.8" }, "conflict": { "phpdocumentor/type-resolver": "<0.2.1", "symfony/dependency-injection": "<3.2", "symfony/property-access": ">=3.0,<3.0.4|>=2.8,<2.8.4", "symfony/property-info": "<3.1", - "symfony/yaml": "<3.3" + "symfony/yaml": "<3.4" }, "require-dev": { "doctrine/annotations": "~1.0", "doctrine/cache": "~1.0", "phpdocumentor/reflection-docblock": "^3.0|^4.0", - "symfony/cache": "~3.1", - "symfony/config": "~2.8|~3.0", - "symfony/dependency-injection": "~3.2", - "symfony/http-foundation": "~2.8|~3.0", - "symfony/property-access": "~2.8|~3.0", - "symfony/property-info": "~3.1", - "symfony/yaml": "~3.3" + "symfony/cache": "~3.1|~4.0", + "symfony/config": "~2.8|~3.0|~4.0", + "symfony/dependency-injection": "~3.2|~4.0", + "symfony/http-foundation": "~2.8|~3.0|~4.0", + "symfony/property-access": "~2.8|~3.0|~4.0", + "symfony/property-info": "~3.1|~4.0", + "symfony/yaml": "~3.4|~4.0" }, "suggest": { "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.", @@ -2204,7 +2543,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -2231,20 +2570,79 @@ ], "description": "Symfony Serializer Component", "homepage": "https://symfony.com", - "time": "2018-01-17T08:02:20+00:00" + "time": "2018-07-26T11:58:24+00:00" }, { - "name": "tedivm/jshrink", - "version": "v1.3.0", + "name": "symfony/yaml", + "version": "v4.1.4", "source": { "type": "git", - "url": "https://github.com/tedious/JShrink.git", - "reference": "68ce379b213741e86f02bf6053b0d26b9f833448" + "url": "https://github.com/symfony/yaml.git", + "reference": "b832cc289608b6d305f62149df91529a2ab3c314" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tedious/JShrink/zipball/68ce379b213741e86f02bf6053b0d26b9f833448", - "reference": "68ce379b213741e86f02bf6053b0d26b9f833448", + "url": "https://api.github.com/repos/symfony/yaml/zipball/b832cc289608b6d305f62149df91529a2ab3c314", + "reference": "b832cc289608b6d305f62149df91529a2ab3c314", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "symfony/polyfill-ctype": "~1.8" + }, + "conflict": { + "symfony/console": "<3.4" + }, + "require-dev": { + "symfony/console": "~3.4|~4.0" + }, + "suggest": { + "symfony/console": "For validating YAML files using the lint command" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Yaml\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Yaml Component", + "homepage": "https://symfony.com", + "time": "2018-08-18T16:52:46+00:00" + }, + { + "name": "tedivm/jshrink", + "version": "v1.3.1", + "source": { + "type": "git", + "url": "https://github.com/tedious/JShrink.git", + "reference": "21254058dc3ce6aba6bef458cff4bfa25cf8b198" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/tedious/JShrink/zipball/21254058dc3ce6aba6bef458cff4bfa25cf8b198", + "reference": "21254058dc3ce6aba6bef458cff4bfa25cf8b198", "shasum": "" }, "require": { @@ -2277,44 +2675,7 @@ "javascript", "minifier" ], - "time": "2017-12-08T00:59:56+00:00" - }, - { - "name": "typo3-ter/gridelements", - "version": "7.2.0", - "dist": { - "type": "zip", - "url": "https://extensions.typo3.org/extension/download/gridelements/7.2.0/zip/", - "reference": null, - "shasum": null - }, - "require": { - "typo3/cms-core": ">= 7.6.0, <= 7.99.99" - }, - "conflict": { - "typo3-ter/jfmulticontent": "*", - "typo3-ter/templavoila": "*" - }, - "replace": { - "gridelements": "self.version" - }, - "type": "typo3-cms-extension", - "autoload": { - "psr-4": { - "GridElementsTeam\\Gridelements\\": "Classes/" - } - }, - "authors": [ - { - "name": "Grid Elements Team", - "email": "info@cybercraft.de", - "company": "", - "username": "cybercraft" - } - ], - "description": "This extension integrates the grid layout concept also to regular content elements - the grid elements.\r\nIt offers a lot of new features like advanced drag & drop or real references, that improve the usability of the page and list module to speed up the daily work with the backend.", - "homepage": "https://extensions.typo3.org/extension/gridelements/", - "time": "2017-12-23T18:15:17+00:00" + "time": "2018-09-16T00:02:51+00:00" }, { "name": "typo3-ter/html-compress", @@ -2387,40 +2748,6 @@ "homepage": "https://extensions.typo3.org/extension/media/", "time": "2017-11-02T13:08:04+00:00" }, - { - "name": "typo3-ter/metaseo", - "version": "2.1.0", - "dist": { - "type": "zip", - "url": "https://extensions.typo3.org/extension/download/metaseo/2.1.0/zip/", - "reference": null, - "shasum": null - }, - "require": { - "php": ">= 5.3.0", - "typo3/cms-core": ">= 6.2.1, <= 7.6.99" - }, - "replace": { - "metaseo": "self.version" - }, - "type": "typo3-cms-extension", - "autoload": { - "psr-4": { - "Metaseo\\Metaseo\\": "Classes/" - } - }, - "authors": [ - { - "name": "MetaSEO Team", - "email": "", - "company": "", - "username": "mblaschke" - } - ], - "description": "Search Engine Optimization (SEO), Indexed Google-Sitemap (TXT- and XML-Sitemap) for all Extensions (pibase, extbase), Metatags, Canonical-URL, Pagetitle manipulations, Crawler verification, Piwik and Google Analytics support and some more... multi-language- and multi-tree-support", - "homepage": "https://extensions.typo3.org/extension/metaseo/", - "time": "2017-06-11T18:32:55+00:00" - }, { "name": "typo3-ter/ods-redirects", "version": "1.3.4", @@ -2625,48 +2952,48 @@ }, { "name": "typo3/cms", - "version": "v7.6.31", + "version": "v8.7.19", "source": { "type": "git", "url": "https://github.com/TYPO3/TYPO3.CMS.git", - "reference": "9c2a581af498b16bdfe744647d2611fad92903d2" + "reference": "05185631e8b98a81340442ac1dd0b163c2c771cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3/TYPO3.CMS/zipball/9c2a581af498b16bdfe744647d2611fad92903d2", - "reference": "9c2a581af498b16bdfe744647d2611fad92903d2", + "url": "https://api.github.com/repos/TYPO3/TYPO3.CMS/zipball/05185631e8b98a81340442ac1dd0b163c2c771cc", + "reference": "05185631e8b98a81340442ac1dd0b163c2c771cc", "shasum": "" }, "require": { "cogpowered/finediff": "~0.3.1", + "doctrine/dbal": "~2.5.4", "doctrine/instantiator": "~1.0.4", + "doctrine/lexer": "^1.0", "ext-json": "*", "ext-pcre": "*", "ext-session": "*", "ext-xml": "*", - "mso/idna-convert": "^0.9.1", - "pear/http_request2": "~2.3.0", - "php": ">=5.5.0", + "guzzlehttp/guzzle": "^6.3.0", + "mso/idna-convert": "^1.1.0", + "php": ">=7.0.0 <=7.2.99", "psr/http-message": "~1.0", "psr/log": "~1.0.0", "swiftmailer/swiftmailer": "~5.4.5", - "symfony/console": "^2.7", - "symfony/debug": "^2.7", - "symfony/finder": "^2.7", + "symfony/console": "^2.7 || ^3.0 || ^4.0", + "symfony/finder": "^2.7 || ^3.0 || ^4.0", + "symfony/polyfill-mbstring": "^1.2", + "symfony/yaml": "^2.7 || ^3.0 || ^4.0", "typo3/class-alias-loader": "^1.0", - "typo3/cms-composer-installers": "^1.2.8" + "typo3/cms-cli": "^1.0.2", + "typo3/cms-composer-installers": "^1.2.8", + "typo3fluid/fluid": "^2.3" }, "conflict": { - "symfony/finder": "2.7.44 || 2.8.37" + "symfony/finder": "2.7.44 || 2.8.37 || 3.4.7 || 4.0.7" }, "replace": { - "typo3-ter/adodb": "*", - "typo3-ter/dbal": "*", "typo3-ter/func": "*", - "typo3-ter/rtehtmlarea": "*", "typo3/cms-about": "self.version", - "typo3/cms-aboutmodules": "self.version", - "typo3/cms-adodb": "self.version", "typo3/cms-backend": "self.version", "typo3/cms-belog": "self.version", "typo3/cms-beuser": "self.version", @@ -2674,7 +3001,6 @@ "typo3/cms-core": "self.version", "typo3/cms-cshmanual": "self.version", "typo3/cms-css-styled-content": "self.version", - "typo3/cms-dbal": "self.version", "typo3/cms-documentation": "self.version", "typo3/cms-extbase": "self.version", "typo3/cms-extensionmanager": "self.version", @@ -2690,7 +3016,6 @@ "typo3/cms-func-wizards": "self.version", "typo3/cms-impexp": "self.version", "typo3/cms-indexed-search": "self.version", - "typo3/cms-indexed-search-mysql": "self.version", "typo3/cms-info": "self.version", "typo3/cms-info-pagetsconfig": "self.version", "typo3/cms-install": "self.version", @@ -2702,7 +3027,7 @@ "typo3/cms-recycler": "self.version", "typo3/cms-reports": "self.version", "typo3/cms-rsaauth": "self.version", - "typo3/cms-rtehtmlarea": "self.version", + "typo3/cms-rte-ckeditor": "self.version", "typo3/cms-saltedpasswords": "self.version", "typo3/cms-scheduler": "self.version", "typo3/cms-setup": "self.version", @@ -2710,7 +3035,6 @@ "typo3/cms-sys-action": "self.version", "typo3/cms-sys-note": "self.version", "typo3/cms-t3editor": "self.version", - "typo3/cms-t3skin": "self.version", "typo3/cms-taskcenter": "self.version", "typo3/cms-tstemplate": "self.version", "typo3/cms-version": "self.version", @@ -2720,39 +3044,38 @@ "typo3/cms-workspaces": "self.version" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^2.2", - "mikey179/vfsstream": "1.6.0", - "phpunit/phpunit": "~4.8.0", - "symfony/event-dispatcher": "^2.8", - "symfony/filesystem": "^2.8", - "symfony/options-resolver": "^2.8", - "symfony/polyfill-mbstring": "~1.0", - "symfony/process": "^2.8", - "symfony/stopwatch": "^2.8", - "symfony/yaml": "^2.8" + "codeception/codeception": "^2.3", + "enm1989/chromedriver": "~2.30", + "fiunchinho/phpunit-randomizer": "~3.0.0", + "friendsofphp/php-cs-fixer": "^2.0", + "typo3/cms-styleguide": "~8.0.14", + "typo3/testing-framework": "~1.2.2" }, "suggest": { "ext-fileinfo": "Used for proper file type detection in the file abstraction layer", "ext-gd": "GDlib/Freetype is required for building images with text (GIFBUILDER) and can also be used to scale images", "ext-mysqli": "", "ext-openssl": "", - "ext-soap": "", "ext-zip": "", "ext-zlib": "TYPO3 uses zlib for amongst others output compression and un/packing t3x extension files" }, "type": "typo3-cms-core", "extra": { "typo3/class-alias-loader": { - "always-add-alias-loader": true + "always-add-alias-loader": true, + "class-alias-maps": [ + "typo3/sysext/extbase/Migrations/Code/ClassAliasMap.php", + "typo3/sysext/fluid/Migrations/Code/ClassAliasMap.php", + "typo3/sysext/version/Migrations/Code/ClassAliasMap.php" + ] }, "branch-alias": { - "dev-TYPO3_7-6": "7.x-dev" + "dev-TYPO3_8-7": "8.x-dev" } }, "autoload": { "psr-4": { "TYPO3\\CMS\\About\\": "typo3/sysext/about/Classes/", - "TYPO3\\CMS\\Aboutmodules\\": "typo3/sysext/aboutmodules/Classes/", "TYPO3\\CMS\\Backend\\": "typo3/sysext/backend/Classes/", "TYPO3\\CMS\\Belog\\": "typo3/sysext/belog/Classes/", "TYPO3\\CMS\\Beuser\\": "typo3/sysext/beuser/Classes/", @@ -2760,7 +3083,6 @@ "TYPO3\\CMS\\Core\\": "typo3/sysext/core/Classes/", "TYPO3\\CMS\\Cshmanual\\": "typo3/sysext/cshmanual/Classes/", "TYPO3\\CMS\\CssStyledContent\\": "typo3/sysext/css_styled_content/Classes/", - "TYPO3\\CMS\\Dbal\\": "typo3/sysext/dbal/Classes/", "TYPO3\\CMS\\Documentation\\": "typo3/sysext/documentation/Classes/", "TYPO3\\CMS\\Extbase\\": "typo3/sysext/extbase/Classes/", "TYPO3\\CMS\\Extensionmanager\\": "typo3/sysext/extensionmanager/Classes/", @@ -2774,7 +3096,6 @@ "TYPO3\\CMS\\Func\\": "typo3/sysext/func/Classes/", "TYPO3\\CMS\\Impexp\\": "typo3/sysext/impexp/Classes/", "TYPO3\\CMS\\IndexedSearch\\": "typo3/sysext/indexed_search/Classes/", - "TYPO3\\CMS\\IndexedSearchMysql\\": "typo3/sysext/indexed_search_mysql/Classes/", "TYPO3\\CMS\\Info\\": "typo3/sysext/info/Classes/", "TYPO3\\CMS\\InfoPagetsconfig\\": "typo3/sysext/info_pagetsconfig/Classes/", "TYPO3\\CMS\\Install\\": "typo3/sysext/install/Classes/", @@ -2786,7 +3107,7 @@ "TYPO3\\CMS\\Recycler\\": "typo3/sysext/recycler/Classes/", "TYPO3\\CMS\\Reports\\": "typo3/sysext/reports/Classes/", "TYPO3\\CMS\\Rsaauth\\": "typo3/sysext/rsaauth/Classes/", - "TYPO3\\CMS\\Rtehtmlarea\\": "typo3/sysext/rtehtmlarea/Classes/", + "TYPO3\\CMS\\RteCKEditor\\": "typo3/sysext/rte_ckeditor/Classes/", "TYPO3\\CMS\\Saltedpasswords\\": "typo3/sysext/saltedpasswords/Classes/", "TYPO3\\CMS\\Scheduler\\": "typo3/sysext/scheduler/Classes/", "TYPO3\\CMS\\Setup\\": "typo3/sysext/setup/Classes/", @@ -2803,8 +3124,7 @@ "TYPO3\\CMS\\Workspaces\\": "typo3/sysext/workspaces/Classes/" }, "classmap": [ - "typo3/sysext/core/Resources/PHP/", - "typo3/sysext/fluid/Resources/PHP/" + "typo3/sysext/core/Resources/PHP/" ], "files": [ "typo3/sysext/core/Resources/PHP/GlobalDebugFunctions.php" @@ -2834,7 +3154,41 @@ "extbase", "typo3" ], - "time": "2018-07-31T08:10:35+00:00" + "time": "2018-08-21T07:23:21+00:00" + }, + { + "name": "typo3/cms-cli", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/TYPO3/cms-cli.git", + "reference": "c27c3580b384353414d0b4ff61137127798f8189" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/TYPO3/cms-cli/zipball/c27c3580b384353414d0b4ff61137127798f8189", + "reference": "c27c3580b384353414d0b4ff61137127798f8189", + "shasum": "" + }, + "require": { + "php": "^7.0" + }, + "bin": [ + "typo3" + ], + "type": "library", + "autoload": { + "psr-4": { + "TYPO3\\CMS\\Cli\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0+" + ], + "description": "TYPO3 command line binary", + "homepage": "https://typo3.org", + "time": "2017-09-06T12:09:47+00:00" }, { "name": "typo3/cms-composer-installers", @@ -2905,6 +3259,84 @@ ], "time": "2018-04-09T08:16:52+00:00" }, + { + "name": "typo3fluid/fluid", + "version": "2.5.4", + "source": { + "type": "git", + "url": "https://github.com/TYPO3/Fluid.git", + "reference": "bcd0ff44dd3c4f9d0f37097b0237db6319c2b181" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/TYPO3/Fluid/zipball/bcd0ff44dd3c4f9d0f37097b0237db6319c2b181", + "reference": "bcd0ff44dd3c4f9d0f37097b0237db6319c2b181", + "shasum": "" + }, + "require": { + "php": ">=5.5.0" + }, + "require-dev": { + "mikey179/vfsstream": "^1.6", + "phpunit/phpunit": "^4.8", + "satooshi/php-coveralls": "^1.0", + "squizlabs/php_codesniffer": "^2.7" + }, + "bin": [ + "bin/fluid" + ], + "type": "library", + "autoload": { + "psr-4": { + "TYPO3Fluid\\Fluid\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-3.0-or-later" + ], + "description": "The TYPO3 Fluid template rendering engine", + "time": "2018-07-09T12:55:32+00:00" + }, + { + "name": "webdevops/metaseo", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/webdevops/TYPO3-metaseo.git", + "reference": "a67831dbf3e3e81d0ff367dc9060f7948cb3b288" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/webdevops/TYPO3-metaseo/zipball/a67831dbf3e3e81d0ff367dc9060f7948cb3b288", + "reference": "a67831dbf3e3e81d0ff367dc9060f7948cb3b288", + "shasum": "" + }, + "require": { + "php": ">=7.0.0", + "typo3/cms-core": ">=8.7.0,<9.0" + }, + "replace": { + "metaseo": "self.version", + "typo3-ter/metaseo": "self.version" + }, + "type": "typo3-cms-extension", + "autoload": { + "psr-4": { + "Metaseo\\Metaseo\\": "Classes/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-3.0+" + ], + "description": "SEO extension for TYPO3", + "homepage": "https://github.com/mblaschke/TYPO3-metaseo", + "keywords": [ + "TYPO3 CMS" + ], + "time": "2017-06-11T16:53:35+00:00" + }, { "name": "websharks/css-minifier", "version": "150820", @@ -3279,61 +3711,6 @@ "psr" ], "time": "2017-02-14T16:28:37+00:00" - }, - { - "name": "symfony/yaml", - "version": "v3.3.18", - "source": { - "type": "git", - "url": "https://github.com/symfony/yaml.git", - "reference": "af615970e265543a26ee712c958404eb9b7ac93d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/af615970e265543a26ee712c958404eb9b7ac93d", - "reference": "af615970e265543a26ee712c958404eb9b7ac93d", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8" - }, - "require-dev": { - "symfony/console": "~2.8|~3.0" - }, - "suggest": { - "symfony/console": "For validating YAML files using the lint command" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.3-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Yaml\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Yaml Component", - "homepage": "https://symfony.com", - "time": "2018-01-20T15:04:53+00:00" } ], "aliases": [], diff --git a/web/typo3conf/ext/ep_events/Classes/ViewHelpers/ConfiguratorTypeLabelsViewHelper.php b/web/typo3conf/ext/ep_events/Classes/ViewHelpers/ConfiguratorTypeLabelsViewHelper.php index bc179fc7..4dceca5f 100644 --- a/web/typo3conf/ext/ep_events/Classes/ViewHelpers/ConfiguratorTypeLabelsViewHelper.php +++ b/web/typo3conf/ext/ep_events/Classes/ViewHelpers/ConfiguratorTypeLabelsViewHelper.php @@ -28,43 +28,45 @@ namespace EP\EpEvents\ViewHelpers; ***************************************************************/ use TYPO3\CMS\Core\Utility\GeneralUtility; -use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface; use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper; +use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; +use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic; class ConfiguratorTypeLabelsViewHelper extends AbstractViewHelper { - /** - * @var array - */ - protected $settings; + use CompileWithRenderStatic; - /** - * @param \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface $configurationManager - */ - public function injectConfigurationManager(ConfigurationManagerInterface $configurationManager) + public function initializeArguments() { - $this->settings = $configurationManager->getConfiguration( - ConfigurationManagerInterface::CONFIGURATION_TYPE_SETTINGS, - 'epevents' - ); + parent::initializeArguments(); + + $this->registerArgument('type', 'string', 'The type', true); + $this->registerArgument('values', 'string', 'The labels', true); } /** - * @param string $type - * @param string $values - * - * @return string + * @param array $arguments + * @param \Closure $renderChildrenClosure + * @param RenderingContextInterface $renderingContext + * @return mixed */ - public function render($type, $values) + public static function renderStatic( + array $arguments, + \Closure $renderChildrenClosure, + RenderingContextInterface $renderingContext + ) { - if (empty($values)) { + if (empty($arguments['values'])) { return 'Keine Angabe'; } $types = []; - $indexes = GeneralUtility::trimExplode(',', $values); + $indexes = GeneralUtility::trimExplode(',', $arguments['values']); + $templateVariableContainer = $renderingContext->getViewHelperVariableContainer(); + $settings = $templateVariableContainer['settings']; + $type = $arguments['type']; foreach ($indexes as $index) { - $types[] = $this->settings['configurator']['options'][$type][$index]; + $types[] = $settings['configurator']['options'][$type][$index]; } return implode(', ', $types); } diff --git a/web/typo3conf/ext/ep_events/Classes/ViewHelpers/SectionCssClassViewHelper.php b/web/typo3conf/ext/ep_events/Classes/ViewHelpers/SectionCssClassViewHelper.php index 4e4e22d0..b4082cfb 100644 --- a/web/typo3conf/ext/ep_events/Classes/ViewHelpers/SectionCssClassViewHelper.php +++ b/web/typo3conf/ext/ep_events/Classes/ViewHelpers/SectionCssClassViewHelper.php @@ -5,7 +5,7 @@ namespace EP\EpEvents\ViewHelpers; * * Copyright notice * - * (c) 2017 Björn Fromme , dreipunktnull + * (c) 2018 Björn Fromme , dreipunktnull * Cedric Ziel , dreipunktnull * * All rights reserved @@ -28,30 +28,51 @@ namespace EP\EpEvents\ViewHelpers; ***************************************************************/ use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper; +use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; +use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic; class SectionCssClassViewHelper extends AbstractViewHelper { + use CompileWithRenderStatic; + /** * @var array */ - protected $cssClasses = [ + protected static $cssClasses = [ 1 => 'incentives', 2 => 'teambuilding', 3 => 'meetings', 4 => 'events', ]; - /** - * @param string $sectionValue - * - * @return string - */ - public function render($sectionValue) + public function initializeArguments() { - if (array_key_exists($sectionValue, $this->cssClasses)) { - return 'section-' . $this->cssClasses[$sectionValue]; + parent::initializeArguments(); + + $this->registerArgument('sectionValue', 'string', 'The section value'); + } + + /** + * @param array $arguments + * @param \Closure $renderChildrenClosure + * @param RenderingContextInterface $renderingContext + * @return mixed + */ + public static function renderStatic( + array $arguments, + \Closure $renderChildrenClosure, + RenderingContextInterface $renderingContext + ) + { + $sectionValue = $renderChildrenClosure(); + if ($sectionValue === null) { + $sectionValue = $arguments['sectionValue']; + } + if (array_key_exists($sectionValue, static::$cssClasses)) { + return 'section-' . static::$cssClasses[$sectionValue]; } return 'section-default'; } + } diff --git a/web/typo3conf/ext/ep_events/Classes/ViewHelpers/SectionIconViewHelper.php b/web/typo3conf/ext/ep_events/Classes/ViewHelpers/SectionIconViewHelper.php index 57a5eed0..919d5f3d 100644 --- a/web/typo3conf/ext/ep_events/Classes/ViewHelpers/SectionIconViewHelper.php +++ b/web/typo3conf/ext/ep_events/Classes/ViewHelpers/SectionIconViewHelper.php @@ -5,7 +5,7 @@ namespace EP\EpEvents\ViewHelpers; * * Copyright notice * - * (c) 2017 Björn Fromme , dreipunktnull + * (c) 2018 Björn Fromme , dreipunktnull * Cedric Ziel , dreipunktnull * * All rights reserved @@ -28,31 +28,52 @@ namespace EP\EpEvents\ViewHelpers; ***************************************************************/ use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper; +use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; +use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic; class SectionIconViewHelper extends AbstractViewHelper { + use CompileWithRenderStatic; + /** * @var array */ - protected $icons = [ + protected static $icons = [ 1 => 'icon_incentives', 2 => 'icon_teambuilding', 3 => 'icon_meetings', 4 => 'icon_events', ]; - /** - * @param string $sectionValue - * @param bool $opaque - * - * @return string - */ - public function render($sectionValue, $opaque = false) + public function initializeArguments() { + parent::initializeArguments(); + + $this->registerArgument('sectionValue', 'string', 'The section value'); + $this->registerArgument('opaque', 'bool', 'Whether to use opaque icon', false, false); + } + + /** + * @param array $arguments + * @param \Closure $renderChildrenClosure + * @param RenderingContextInterface $renderingContext + * @return mixed + */ + public static function renderStatic( + array $arguments, + \Closure $renderChildrenClosure, + RenderingContextInterface $renderingContext + ) + { + $sectionValue = $renderChildrenClosure(); + if ($sectionValue === null) { + $sectionValue = $arguments['sectionValue']; + } + $icon = ''; - if (array_key_exists($sectionValue, $this->icons)) { - $icon = $this->icons[$sectionValue]; - if ($opaque) { + if (array_key_exists($sectionValue, static::$icons)) { + $icon = static::$icons[$sectionValue]; + if ($arguments['opaque']) { $icon .= '_opaque'; } $icon .= '.svg'; @@ -60,4 +81,5 @@ class SectionIconViewHelper extends AbstractViewHelper return $icon; } + } diff --git a/web/typo3conf/ext/ep_events/Classes/ViewHelpers/SoftHyphenViewHelper.php b/web/typo3conf/ext/ep_events/Classes/ViewHelpers/SoftHyphenViewHelper.php index 025cf525..1db35bea 100644 --- a/web/typo3conf/ext/ep_events/Classes/ViewHelpers/SoftHyphenViewHelper.php +++ b/web/typo3conf/ext/ep_events/Classes/ViewHelpers/SoftHyphenViewHelper.php @@ -5,7 +5,7 @@ namespace EP\EpEvents\ViewHelpers; * * Copyright notice * - * (c) 2017 Björn Fromme , dreipunktnull + * (c) 2018 Björn Fromme , dreipunktnull * Cedric Ziel , dreipunktnull * * All rights reserved @@ -28,20 +28,43 @@ namespace EP\EpEvents\ViewHelpers; ***************************************************************/ use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper; +use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; +use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic; class SoftHyphenViewHelper extends AbstractViewHelper { + use CompileWithRenderStatic; + /** - * @param string $string - * - * @return string + * @var bool */ - public function render($string = null) + protected $escapeOutput = false; + + public function initializeArguments() { + parent::initializeArguments(); + + $this->registerArgument('string', 'string', 'The string to process'); + } + + /** + * @param array $arguments + * @param \Closure $renderChildrenClosure + * @param RenderingContextInterface $renderingContext + * @return mixed + */ + public static function renderStatic( + array $arguments, + \Closure $renderChildrenClosure, + RenderingContextInterface $renderingContext + ) + { + $string = $renderChildrenClosure(); if ($string === null) { - $string = $this->renderChildren(); + $string = $arguments['string']; } return str_replace('--', '­', $string); } + } diff --git a/web/typo3conf/ext/ep_events/Configuration/PageTS/main.ts b/web/typo3conf/ext/ep_events/Configuration/PageTS/Main.tsconfig similarity index 65% rename from web/typo3conf/ext/ep_events/Configuration/PageTS/main.ts rename to web/typo3conf/ext/ep_events/Configuration/PageTS/Main.tsconfig index 110f62ff..3ea834ad 100644 --- a/web/typo3conf/ext/ep_events/Configuration/PageTS/main.ts +++ b/web/typo3conf/ext/ep_events/Configuration/PageTS/Main.tsconfig @@ -1,4 +1,4 @@ - - - - + + + + diff --git a/web/typo3conf/ext/ep_events/Configuration/PageTS/Mod/WebLayout/BackendLayouts.ts b/web/typo3conf/ext/ep_events/Configuration/PageTS/Mod/WebLayout/BackendLayouts.tsconfig similarity index 100% rename from web/typo3conf/ext/ep_events/Configuration/PageTS/Mod/WebLayout/BackendLayouts.ts rename to web/typo3conf/ext/ep_events/Configuration/PageTS/Mod/WebLayout/BackendLayouts.tsconfig diff --git a/web/typo3conf/ext/ep_events/Configuration/PageTS/RTE.ts b/web/typo3conf/ext/ep_events/Configuration/PageTS/RTE.ts deleted file mode 100644 index 5dee5e26..00000000 --- a/web/typo3conf/ext/ep_events/Configuration/PageTS/RTE.ts +++ /dev/null @@ -1,38 +0,0 @@ -RTE { - default { - contentCSS = EXT:ep_events/Resources/Public/css/rte.min.css - showButtons ( - blockstylelabel, blockstyle, textstylelabel, textstyle, linebreak, - formatblock, bar, bold, italic, bar, orderedlist, unorderedlist, - indent, bar, link, unlink, removeformat, linebreak, - table, toggleborders, tableproperties, rowproperties, rowinsertabove, - rowinsertunder, rowdelete, rowsplit, columninsertbefore, columninsertafter, - columndelete, columnsplit, cellproperties, cellinsertbefore, cellinsertafter, - celldelete, cellsplit, cellmerge, image, insertcharacter, chMode, pastetoggle - ) - keepButtonGroupTogether = 1 - - proc { - allowedClasses = coloured-list, footnote-list - entryHTMLparser_db { - tags { - span.fixAttrib.style.unset = 1 - span.rmTagIfNoAttrib = 1 - } - } - } - - buttons { - formatblock.removeItems = h1,h5,h6,section,div,footer,header,nav,aside,blockquote,pre,address,article - pastetoggle.setActiveOnRteOpen = 1 - blockstyle.tags.ul.allowedClasses = coloured-list, footnote-list - } - } - - classes { - button.name = Button - buttonfull.name = Button (volle Breite) - coloured-list.name = Farbige Bullets - footnote-list.name = Fußnote - } -} diff --git a/web/typo3conf/ext/ep_events/Configuration/PageTS/RTE.tsconfig b/web/typo3conf/ext/ep_events/Configuration/PageTS/RTE.tsconfig new file mode 100644 index 00000000..ff891f00 --- /dev/null +++ b/web/typo3conf/ext/ep_events/Configuration/PageTS/RTE.tsconfig @@ -0,0 +1,16 @@ +RTE { + config { + tt_content { + bodytext { + types { + text { + preset = dpn + } + textmedia { + preset = dpn + } + } + } + } + } +} diff --git a/web/typo3conf/ext/ep_events/Configuration/PageTS/TCEFORM.ts b/web/typo3conf/ext/ep_events/Configuration/PageTS/TCEFORM.tsconfig similarity index 100% rename from web/typo3conf/ext/ep_events/Configuration/PageTS/TCEFORM.ts rename to web/typo3conf/ext/ep_events/Configuration/PageTS/TCEFORM.tsconfig diff --git a/web/typo3conf/ext/ep_events/Configuration/PageTS/Wizards/NewContentElement.ts b/web/typo3conf/ext/ep_events/Configuration/PageTS/Wizards/NewContentElement.tsconfig similarity index 100% rename from web/typo3conf/ext/ep_events/Configuration/PageTS/Wizards/NewContentElement.ts rename to web/typo3conf/ext/ep_events/Configuration/PageTS/Wizards/NewContentElement.tsconfig diff --git a/web/typo3conf/ext/ep_events/Configuration/RTE/Default.yaml b/web/typo3conf/ext/ep_events/Configuration/RTE/Default.yaml new file mode 100644 index 00000000..f9b52b27 --- /dev/null +++ b/web/typo3conf/ext/ep_events/Configuration/RTE/Default.yaml @@ -0,0 +1,37 @@ +imports: +- { resource: "EXT:rte_ckeditor/Configuration/RTE/Processing.yaml" } +- { resource: "EXT:rte_ckeditor/Configuration/RTE/Editor/Base.yaml" } +- { resource: "EXT:rte_ckeditor/Configuration/RTE/Editor/Plugins.yaml" } + +editor: + config: + contentsCss: + - "EXT:ep_events/Resources/Public/css/rte.min.css" + + stylesSet: + - { name: "Button", element: "a", attributes: { 'class': 'button' } } + - { name: "Button (volle Breite)", element: "a", attributes: { 'class': 'buttonfull' } } + - { name: "Farbige Bullets", element: "ul", attributes: { 'class': 'coloured-list' } } + - { name: "Fußnote", element: "ul", attributes: { 'class': 'footnote-list' } } + + toolbarGroups: + - { name: styles, groups: [ format, styles ] } + - { name: basicstyles, groups: [ basicstyles ] } + - { name: paragraph, groups: [ list] } + - "/" + - { name: links, groups: [ links ] } + - { name: clipboard, groups: [ clipboard, cleanup, undo ] } + - { name: editing, groups: [ spellchecker ] } + - { name: insert, groups: [ insert ] } + - { name: tools, groups: [ table, specialchar ] } + - { name: document, groups: [ mode ] } + + format_tags: "p;h1;h2;h3;h4" + + removePlugins: + - image + + removeButtons: + - Anchor + - Underline + - Strike diff --git a/web/typo3conf/ext/ep_events/Configuration/TCA/Overrides/pages.php b/web/typo3conf/ext/ep_events/Configuration/TCA/Overrides/pages.php index 15c534e8..381e703f 100644 --- a/web/typo3conf/ext/ep_events/Configuration/TCA/Overrides/pages.php +++ b/web/typo3conf/ext/ep_events/Configuration/TCA/Overrides/pages.php @@ -104,10 +104,16 @@ call_user_func(function() { (string) \EP\EpEvents\Constants::PAGETYPE_OFFER ); - \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::registerPageTSConfigFile( - 'ep_events', - 'Configuration/TypoScript/pageTSconfig.ts', - 'EP Events' - ); + // Add category page type + $GLOBALS['PAGES_TYPES'][\EP\EpEvents\Constants::PAGETYPE_CATEGORY] = [ + 'type' => 'web', + 'allowedTables' => '*', + ]; + + // Add offer page type + $GLOBALS['PAGES_TYPES'][\EP\EpEvents\Constants::PAGETYPE_OFFER] = [ + 'type' => 'web', + 'allowedTables' => '*', + ]; }); diff --git a/web/typo3conf/ext/ep_events/Configuration/TCA/Overrides/sys_template.php b/web/typo3conf/ext/ep_events/Configuration/TCA/Overrides/sys_template.php new file mode 100644 index 00000000..79a39820 --- /dev/null +++ b/web/typo3conf/ext/ep_events/Configuration/TCA/Overrides/sys_template.php @@ -0,0 +1,13 @@ + 'tstamp', 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', - 'dividers2tabs' => TRUE, - 'versioningWS' => 2, - 'versioning_followPages' => TRUE, + 'dividers2tabs' => true, + 'versioningWS' => true, 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', 'transOrigDiffSourceField' => 'l10n_diffsource', @@ -32,14 +31,6 @@ return [ --palette--;;naming, keywords, bannertext, --div--;Texte, description, footertext, --div--;Bilder, image_teaser, image_header, image_offer', - 'columnsOverrides' => [ - 'description' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'footertext' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - ], ], ], 'palettes' => [ @@ -97,34 +88,38 @@ return [ ], 'starttime' => [ 'exclude' => 1, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'endtime' => [ 'exclude' => 1, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'name' => [ @@ -163,6 +158,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'footertext' => [ @@ -173,6 +169,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'bannertext' => [ @@ -194,16 +191,13 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], ], 'maxitems' => 1 @@ -220,16 +214,13 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], ], 'maxitems' => 1 @@ -246,16 +237,13 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], ], 'maxitems' => 1 diff --git a/web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_contact.php b/web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_contact.php index c33a21b7..3a3e9243 100644 --- a/web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_contact.php +++ b/web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_contact.php @@ -8,9 +8,8 @@ return [ 'tstamp' => 'tstamp', 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', - 'dividers2tabs' => TRUE, - 'versioningWS' => 2, - 'versioning_followPages' => TRUE, + 'dividers2tabs' => true, + 'versioningWS' => true, 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', 'transOrigDiffSourceField' => 'l10n_diffsource', @@ -85,34 +84,38 @@ return [ ], 'starttime' => [ 'exclude' => 1, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'endtime' => [ 'exclude' => 1, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'sorting' => [ @@ -165,16 +168,13 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], ], 'maxitems' => 1 diff --git a/web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_hotel.php b/web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_hotel.php index bc3f674b..11464d3d 100644 --- a/web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_hotel.php +++ b/web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_hotel.php @@ -7,9 +7,8 @@ return [ 'tstamp' => 'tstamp', 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', - 'dividers2tabs' => TRUE, - 'versioningWS' => 2, - 'versioning_followPages' => TRUE, + 'dividers2tabs' => true, + 'versioningWS' => true, 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', 'transOrigDiffSourceField' => 'l10n_diffsource', @@ -30,11 +29,6 @@ return [ '1' => [ 'showitem' => '--palette--;;general, --palette--;;naming, description, --div--;Bilder, image_teaser, image_offer', - 'columnsOverrides' => [ - 'description' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - ], ], ], 'palettes' => [ @@ -92,34 +86,38 @@ return [ ], 'starttime' => [ 'exclude' => 1, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'endtime' => [ 'exclude' => 1, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'name' => [ @@ -148,6 +146,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'image_teaser' => [ @@ -159,16 +158,13 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], ], 'maxitems' => 1 @@ -185,16 +181,13 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], ], 'maxitems' => 1 diff --git a/web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_location.php b/web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_location.php index e9c5b24b..5b7e5be8 100644 --- a/web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_location.php +++ b/web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_location.php @@ -7,9 +7,8 @@ return [ 'tstamp' => 'tstamp', 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', - 'dividers2tabs' => TRUE, - 'versioningWS' => 2, - 'versioning_followPages' => TRUE, + 'dividers2tabs' => true, + 'versioningWS' => true, 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', 'transOrigDiffSourceField' => 'l10n_diffsource', @@ -33,23 +32,6 @@ return [ 'showitem' => 'hidden, --palette--;;configurator, name, description_short, description_long, season, footer_text1, footer_text2, footer_text3, --div--;Bilder, image_header, image_teaser, image_offer', - 'columnsOverrides' => [ - 'description_short' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'description_long' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'footer_text1' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'footer_text2' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'footer_text3' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - ], ], ], 'palettes' => [ @@ -106,34 +88,38 @@ return [ ], 'starttime' => [ 'exclude' => 1, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'endtime' => [ 'exclude' => 1, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'name' => [ @@ -153,6 +139,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'description_long' => [ @@ -163,6 +150,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'season' => [ @@ -173,6 +161,7 @@ return [ 'cols' => 40, 'rows' => 5, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'image_header' => [ @@ -184,16 +173,13 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], ], 'maxitems' => 1 @@ -210,16 +196,13 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], ], 'maxitems' => 1 @@ -236,16 +219,13 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], ], 'maxitems' => 1 @@ -261,6 +241,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'footer_text2' => [ @@ -271,6 +252,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'footer_text3' => [ @@ -281,6 +263,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'configurator_type' => [ diff --git a/web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_offer.php b/web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_offer.php index dfc8f163..57a02278 100644 --- a/web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_offer.php +++ b/web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_offer.php @@ -7,9 +7,8 @@ return [ 'tstamp' => 'tstamp', 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', - 'dividers2tabs' => TRUE, - 'versioningWS' => 2, - 'versioning_followPages' => TRUE, + 'dividers2tabs' => true, + 'versioningWS' => true, 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', 'transOrigDiffSourceField' => 'l10n_diffsource', @@ -37,14 +36,6 @@ return [ --palette--;;general, --palette--;;naming, headline, header, services, --div--;Bilder, image_teaser, image_teaser_mobile, image_header, --div--;Verknüpfungen, contact, hotel, location, activities', - 'columnsOverrides' => [ - 'header' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'services' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - ], ], '2' => [ 'showitem' => 'hidden, @@ -52,23 +43,6 @@ return [ services, arrival, schedule, guidelines, --div--;Bilder/Dateien, image_header, booking_form, --div--;Verknüpfungen, contact, hotel, location, activities', - 'columnsOverrides' => [ - 'header' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'arrival' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'schedule' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'services' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'guidelines' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - ], ], ], 'palettes' => [ @@ -128,34 +102,38 @@ return [ ], 'starttime' => [ 'exclude' => 1, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'endtime' => [ 'exclude' => 1, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'type' => [ @@ -225,6 +203,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'arrival' => [ @@ -235,6 +214,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'schedule' => [ @@ -245,6 +225,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'services' => [ @@ -255,6 +236,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'guidelines' => [ @@ -265,6 +247,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'image_teaser' => [ @@ -276,16 +259,13 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], ], 'maxitems' => 1 @@ -302,16 +282,13 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], ], 'maxitems' => 1 @@ -328,16 +305,13 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], ], 'maxitems' => 1 @@ -354,16 +328,13 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:media.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_UNKNOWN => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], ], 'maxitems' => 1 @@ -494,21 +465,7 @@ return [ 'type' => 'input', 'size' => 4, 'eval' => 'int,required', - 'wizards' => [ - '_PADDING' => 2, - 'link' => [ - 'type' => 'popup', - 'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:header_link_formlabel', - 'icon' => 'actions-wizard-link', - 'module' => [ - 'name' => 'wizard_link', - ], - 'params' => [ - 'blindLinkOptions' => 'file,folder,mail,spec,url', - ], - 'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1' - ], - ], + 'renderType' => 'inputLink', 'softref' => 'typolink' ], ], diff --git a/web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_testimonial.php b/web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_testimonial.php index 60ebb937..8ac1e3cf 100644 --- a/web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_testimonial.php +++ b/web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_testimonial.php @@ -7,9 +7,8 @@ return [ 'tstamp' => 'tstamp', 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', - 'dividers2tabs' => TRUE, - 'versioningWS' => 2, - 'versioning_followPages' => TRUE, + 'dividers2tabs' => true, + 'versioningWS' => true, 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', 'transOrigDiffSourceField' => 'l10n_diffsource', @@ -29,11 +28,6 @@ return [ 'types' => [ '1' => [ 'showitem' => 'hidden, client_name, client_image, quote', - 'columnsOverrides' => [ - 'quote' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - ], ], ], 'palettes' => [ @@ -90,34 +84,38 @@ return [ ], 'starttime' => [ 'exclude' => 1, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'endtime' => [ 'exclude' => 1, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'client_name' => [ @@ -138,16 +136,13 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], ], 'maxitems' => 1 @@ -163,6 +158,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], ], diff --git a/web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_traveltype.php b/web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_traveltype.php index 1d082947..c5fb1720 100644 --- a/web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_traveltype.php +++ b/web/typo3conf/ext/ep_events/Configuration/TCA/tx_epevents_domain_model_traveltype.php @@ -7,9 +7,8 @@ return [ 'tstamp' => 'tstamp', 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', - 'dividers2tabs' => TRUE, - 'versioningWS' => 2, - 'versioning_followPages' => TRUE, + 'dividers2tabs' => true, + 'versioningWS' => true, 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', 'transOrigDiffSourceField' => 'l10n_diffsource', @@ -31,11 +30,6 @@ return [ 'showitem' => '--palette--;;general, --palette--;;herounit, subheadline, bannertext, buttonlabel, description, --div--;Bilder,image_header, image_banner', - 'columnsOverrides' => [ - 'description' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - ], ], ], 'palettes' => [ @@ -93,34 +87,38 @@ return [ ], 'starttime' => [ 'exclude' => 1, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'endtime' => [ 'exclude' => 1, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'title' => [ @@ -170,6 +168,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'bannertext' => [ @@ -202,16 +201,13 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], ], 'maxitems' => 1 @@ -228,16 +224,13 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:cms/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], ], 'maxitems' => 1 diff --git a/web/typo3conf/ext/ep_events/Configuration/TypoScript/ContentElements/banner.ts b/web/typo3conf/ext/ep_events/Configuration/TypoScript/ContentElements/banner.typoscript similarity index 86% rename from web/typo3conf/ext/ep_events/Configuration/TypoScript/ContentElements/banner.ts rename to web/typo3conf/ext/ep_events/Configuration/TypoScript/ContentElements/banner.typoscript index a05e0632..24aea269 100644 --- a/web/typo3conf/ext/ep_events/Configuration/TypoScript/ContentElements/banner.ts +++ b/web/typo3conf/ext/ep_events/Configuration/TypoScript/ContentElements/banner.typoscript @@ -1,4 +1,4 @@ -tt_content.banner =< lib.fluidContent +tt_content.banner =< lib.contentElement tt_content.banner { templateName = Banner dataProcessing { diff --git a/web/typo3conf/ext/ep_events/Configuration/TypoScript/ContentElements/herounit.ts b/web/typo3conf/ext/ep_events/Configuration/TypoScript/ContentElements/herounit.typoscript similarity index 86% rename from web/typo3conf/ext/ep_events/Configuration/TypoScript/ContentElements/herounit.ts rename to web/typo3conf/ext/ep_events/Configuration/TypoScript/ContentElements/herounit.typoscript index 7f070dab..1fbbed98 100644 --- a/web/typo3conf/ext/ep_events/Configuration/TypoScript/ContentElements/herounit.ts +++ b/web/typo3conf/ext/ep_events/Configuration/TypoScript/ContentElements/herounit.typoscript @@ -1,4 +1,4 @@ -tt_content.herounit =< lib.fluidContent +tt_content.herounit =< lib.contentElement tt_content.herounit { templateName = Herounit dataProcessing { diff --git a/web/typo3conf/ext/ep_events/Configuration/TypoScript/ContentElements/statement.ts b/web/typo3conf/ext/ep_events/Configuration/TypoScript/ContentElements/statement.typoscript similarity index 55% rename from web/typo3conf/ext/ep_events/Configuration/TypoScript/ContentElements/statement.ts rename to web/typo3conf/ext/ep_events/Configuration/TypoScript/ContentElements/statement.typoscript index 6f91dfdf..54627aea 100644 --- a/web/typo3conf/ext/ep_events/Configuration/TypoScript/ContentElements/statement.ts +++ b/web/typo3conf/ext/ep_events/Configuration/TypoScript/ContentElements/statement.typoscript @@ -1,4 +1,4 @@ -tt_content.statement =< lib.fluidContent +tt_content.statement =< lib.contentElement tt_content.statement { templateName = Statement } diff --git a/web/typo3conf/ext/ep_events/Configuration/TypoScript/ContentElements/tile.ts b/web/typo3conf/ext/ep_events/Configuration/TypoScript/ContentElements/tile.typoscript similarity index 87% rename from web/typo3conf/ext/ep_events/Configuration/TypoScript/ContentElements/tile.ts rename to web/typo3conf/ext/ep_events/Configuration/TypoScript/ContentElements/tile.typoscript index e8bae0a9..0a924bd6 100644 --- a/web/typo3conf/ext/ep_events/Configuration/TypoScript/ContentElements/tile.ts +++ b/web/typo3conf/ext/ep_events/Configuration/TypoScript/ContentElements/tile.typoscript @@ -1,4 +1,4 @@ -tt_content.tile =< lib.fluidContent +tt_content.tile =< lib.contentElement tt_content.tile { templateName = Tile dataProcessing { diff --git a/web/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/FluidStyledContent.ts b/web/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/FluidStyledContent.typoscript similarity index 85% rename from web/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/FluidStyledContent.ts rename to web/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/FluidStyledContent.typoscript index da75e676..0e6064ec 100644 --- a/web/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/FluidStyledContent.ts +++ b/web/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/FluidStyledContent.typoscript @@ -1,6 +1,6 @@ - + -lib.fluidContent { +lib.contentElement { layoutRootPaths.20 = EXT:ep_events/Resources/Private/Layouts/FluidStyledContent templateRootPaths.20 = EXT:ep_events/Resources/Private/Templates/FluidStyledContent partialRootPaths.20 = EXT:ep_events/Resources/Private/Partials diff --git a/web/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/Form.ts b/web/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/Form.ts deleted file mode 100644 index e1f6073b..00000000 --- a/web/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/Form.ts +++ /dev/null @@ -1 +0,0 @@ - diff --git a/web/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/Form.typoscript b/web/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/Form.typoscript new file mode 100644 index 00000000..cc762f3c --- /dev/null +++ b/web/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/Form.typoscript @@ -0,0 +1 @@ + diff --git a/web/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/News.ts b/web/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/News.typoscript similarity index 100% rename from web/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/News.ts rename to web/typo3conf/ext/ep_events/Configuration/TypoScript/Extensions/News.typoscript diff --git a/web/typo3conf/ext/ep_events/Configuration/TypoScript/Library/Configurator.ts b/web/typo3conf/ext/ep_events/Configuration/TypoScript/Library/Configurator.typoscript similarity index 100% rename from web/typo3conf/ext/ep_events/Configuration/TypoScript/Library/Configurator.ts rename to web/typo3conf/ext/ep_events/Configuration/TypoScript/Library/Configurator.typoscript diff --git a/web/typo3conf/ext/ep_events/Configuration/TypoScript/Library/DynamicContent.ts b/web/typo3conf/ext/ep_events/Configuration/TypoScript/Library/DynamicContent.typoscript similarity index 100% rename from web/typo3conf/ext/ep_events/Configuration/TypoScript/Library/DynamicContent.ts rename to web/typo3conf/ext/ep_events/Configuration/TypoScript/Library/DynamicContent.typoscript diff --git a/web/typo3conf/ext/ep_events/Configuration/TypoScript/Library/ParseFunc.ts b/web/typo3conf/ext/ep_events/Configuration/TypoScript/Library/ParseFunc.typoscript similarity index 100% rename from web/typo3conf/ext/ep_events/Configuration/TypoScript/Library/ParseFunc.ts rename to web/typo3conf/ext/ep_events/Configuration/TypoScript/Library/ParseFunc.typoscript diff --git a/web/typo3conf/ext/ep_events/Configuration/TypoScript/Library/SearchForm.ts b/web/typo3conf/ext/ep_events/Configuration/TypoScript/Library/SearchForm.typoscript similarity index 100% rename from web/typo3conf/ext/ep_events/Configuration/TypoScript/Library/SearchForm.ts rename to web/typo3conf/ext/ep_events/Configuration/TypoScript/Library/SearchForm.typoscript diff --git a/web/typo3conf/ext/ep_events/Configuration/TypoScript/Page/Ajax.ts b/web/typo3conf/ext/ep_events/Configuration/TypoScript/Page/Ajax.typoscript similarity index 100% rename from web/typo3conf/ext/ep_events/Configuration/TypoScript/Page/Ajax.ts rename to web/typo3conf/ext/ep_events/Configuration/TypoScript/Page/Ajax.typoscript diff --git a/web/typo3conf/ext/ep_events/Configuration/TypoScript/Page/Main.ts b/web/typo3conf/ext/ep_events/Configuration/TypoScript/Page/Main.typoscript similarity index 100% rename from web/typo3conf/ext/ep_events/Configuration/TypoScript/Page/Main.ts rename to web/typo3conf/ext/ep_events/Configuration/TypoScript/Page/Main.typoscript diff --git a/web/typo3conf/ext/ep_events/Configuration/TypoScript/Page/XMLSitemap.ts b/web/typo3conf/ext/ep_events/Configuration/TypoScript/Page/XMLSitemap.typoscript similarity index 100% rename from web/typo3conf/ext/ep_events/Configuration/TypoScript/Page/XMLSitemap.ts rename to web/typo3conf/ext/ep_events/Configuration/TypoScript/Page/XMLSitemap.typoscript diff --git a/web/typo3conf/ext/ep_events/Configuration/TypoScript/constants.txt b/web/typo3conf/ext/ep_events/Configuration/TypoScript/constants.txt index b31f4d29..9f5b09d5 100644 --- a/web/typo3conf/ext/ep_events/Configuration/TypoScript/constants.txt +++ b/web/typo3conf/ext/ep_events/Configuration/TypoScript/constants.txt @@ -58,5 +58,5 @@ plugin.tx_epevents { } - + diff --git a/web/typo3conf/ext/ep_events/Configuration/TypoScript/setup.txt b/web/typo3conf/ext/ep_events/Configuration/TypoScript/setup.txt index 72759cfa..d32cafa7 100644 --- a/web/typo3conf/ext/ep_events/Configuration/TypoScript/setup.txt +++ b/web/typo3conf/ext/ep_events/Configuration/TypoScript/setup.txt @@ -1,19 +1,22 @@ - - - + + + - - - - + + + + - - - - + + + + plugin.tx_epevents { - features.skipDefaultArguments = 1 + features { + requireCHashArgumentForActionArguments = 0 + skipDefaultArguments = 1 + } view { layoutRootPaths.10 = EXT:ep_events/Resources/Private/Layouts/ templateRootPaths.10 = EXT:ep_events/Resources/Private/Templates/ @@ -68,9 +71,9 @@ lib.parseFunc_RTE { tt_content.stdWrap.innerWrap > lib.stdheader.3.headerClass > - - - + + + config { doctype = html5 diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Partials/PageHeader.html b/web/typo3conf/ext/ep_events/Resources/Private/Partials/PageHeader.html index 65f9fcc6..2f031a74 100644 --- a/web/typo3conf/ext/ep_events/Resources/Private/Partials/PageHeader.html +++ b/web/typo3conf/ext/ep_events/Resources/Private/Partials/PageHeader.html @@ -90,9 +90,8 @@ extensionName: 'epevents' pluginName: 'Configurator', arguments: '{travelType: \'{traveltype.configuratorType -> v:or(alternative: 0)}\', locationType: \'{locationtype -> v:or(alternative: 0)}\'}', - additionalParams: '{ref: data.uid}', - noCacheHash: 1 - )}">» Anfragen « + additionalParams: '{ref: data.uid}' + )}" rel="nofollow">» Anfragen « diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/Configurator.html b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/Configurator.html index d256b6f7..b3f34e1b 100644 --- a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/Configurator.html +++ b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/Configurator.html @@ -56,9 +56,8 @@ :options-budget='{configuratorConfig.budgetOptions -> v:format.json.encode()}' :options-period='{configuratorConfig.periodOptions -> v:format.json.encode()}' inline-template> - + diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/ContactForm.html b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/ContactForm.html index 8dd4c87a..e6ca1229 100644 --- a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/ContactForm.html +++ b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/ContactForm.html @@ -10,8 +10,8 @@
-
diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/InquiryForm.html b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/InquiryForm.html index 52593ed5..c9be54d6 100644 --- a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/InquiryForm.html +++ b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Form/InquiryForm.html @@ -11,8 +11,8 @@

Ihre
Anfrage zu
{inquiry.inquiryName -> ep:softHyphen()}

- diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Search/Form.html b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Search/Form.html index ad0b8098..c8510521 100644 --- a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Search/Form.html +++ b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Search/Form.html @@ -4,8 +4,8 @@ - + diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Search/Result.html b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Search/Result.html index b7cb4898..adc1ac7f 100644 --- a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Search/Result.html +++ b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Search/Result.html @@ -15,7 +15,8 @@ configuration="{itemsPerPage: 10, insertAbove: 0, insertBelow: 1, addQueryStringMethod: 'GET,POST'}"> + additionalParams="{search: search.query}" title="Beispielangebot {offer.name} {offer.location.name}" + rel="nofollow">
diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Testimonial/List.html b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Testimonial/List.html index eef0c198..1da13264 100644 --- a/web/typo3conf/ext/ep_events/Resources/Private/Templates/Testimonial/List.html +++ b/web/typo3conf/ext/ep_events/Resources/Private/Templates/Testimonial/List.html @@ -5,9 +5,11 @@
-
-

{content.header}{content.subheader}

-
+ +
+

{content.header}{content.subheader}

+
+
diff --git a/web/typo3conf/ext/ep_events/Resources/Private/Templates/ViewHelpers/Widget/Paginate/Index.html b/web/typo3conf/ext/ep_events/Resources/Private/Templates/ViewHelpers/Widget/Paginate/Index.html index 04089e79..5943e4a2 100644 --- a/web/typo3conf/ext/ep_events/Resources/Private/Templates/ViewHelpers/Widget/Paginate/Index.html +++ b/web/typo3conf/ext/ep_events/Resources/Private/Templates/ViewHelpers/Widget/Paginate/Index.html @@ -18,17 +18,17 @@
  • - + - +
  • - 1 + 1
    • @@ -45,10 +45,10 @@
  • - {page.number} + {page.number} - {page.number} + {page.number}
    • @@ -60,12 +60,12 @@
  • - {pagination.numberOfPages} + {pagination.numberOfPages}
  • - +
    • diff --git a/web/typo3conf/ext/ep_events/ext_localconf.php b/web/typo3conf/ext/ep_events/ext_localconf.php index 4926d14f..55bc8531 100644 --- a/web/typo3conf/ext/ep_events/ext_localconf.php +++ b/web/typo3conf/ext/ep_events/ext_localconf.php @@ -118,6 +118,9 @@ call_user_func(function() { ] ); + $GLOBALS['TYPO3_CONF_VARS']['RTE']['Presets']['default'] = 'EXT:ep_events/Configuration/RTE/Default.yaml'; + $GLOBALS['TYPO3_CONF_VARS']['RTE']['Presets']['dpn'] = 'EXT:ep_events/Configuration/RTE/Default.yaml'; + $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass']['EP.EpEvents'] = \EP\EpEvents\Hooks\Tcemain::class; diff --git a/web/typo3conf/ext/ep_events/ext_tables.php b/web/typo3conf/ext/ep_events/ext_tables.php index c1dee991..d1fecc2b 100644 --- a/web/typo3conf/ext/ep_events/ext_tables.php +++ b/web/typo3conf/ext/ep_events/ext_tables.php @@ -2,25 +2,7 @@ defined('TYPO3_MODE') or die(); -call_user_func(function() { - - \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( - 'ep_events', - 'Configuration/TypoScript', - 'EP Events' - ); - - // Add category page type - $GLOBALS['PAGES_TYPES'][\EP\EpEvents\Constants::PAGETYPE_CATEGORY] = [ - 'type' => 'web', - 'allowedTables' => '*', - ]; - - // Add offer page type - $GLOBALS['PAGES_TYPES'][\EP\EpEvents\Constants::PAGETYPE_OFFER] = [ - 'type' => 'web', - 'allowedTables' => '*', - ]; +call_user_func(function () { // Register icons $icons = [ @@ -36,52 +18,4 @@ call_user_func(function() { ); } - \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.EpEvents', - 'OfferTeasers', - 'EP Events: Reisebeispiele Slider' - ); - - \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.EpEvents', - 'Testimonials', - 'EP Events: Testimonials Slider' - ); - - \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.EpEvents', - 'Contacts', - 'EP Events: Team' - ); - - \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.EpEvents', - 'ActivityTeasers', - 'EP Events: Programmpunkte Slider' - ); - - \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.EpEvents', - 'ActivityDetail', - 'EP Events: Programmpunkt Detail' - ); - - \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.EpEvents', - 'ContactForm', - 'EP Events: Kontaktformular' - ); - - \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.EpEvents', - 'Configurator', - 'EP Events: Anfragurator' - ); - - \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.EpEvents', - 'SearchResult', - 'EP Events: Suchergebnis' - ); - }); diff --git a/web/typo3conf/ext/ep_products/Classes/Utility/DbUtility.php b/web/typo3conf/ext/ep_products/Classes/Utility/DbUtility.php index 736537f7..eb11066a 100644 --- a/web/typo3conf/ext/ep_products/Classes/Utility/DbUtility.php +++ b/web/typo3conf/ext/ep_products/Classes/Utility/DbUtility.php @@ -43,16 +43,16 @@ class DbUtility * * @return Connection */ - public static function getDbConnection($configIndex = 'DB') + public static function getDbConnection() { if (static::$connection === null) { $config = new Configuration(); $connectionParams = [ - 'dbname' => $GLOBALS['TYPO3_CONF_VARS'][$configIndex]['database'], - 'user' => $GLOBALS['TYPO3_CONF_VARS'][$configIndex]['username'], - 'password' => $GLOBALS['TYPO3_CONF_VARS'][$configIndex]['password'], - 'host' => $GLOBALS['TYPO3_CONF_VARS'][$configIndex]['host'], - 'unix_socket' => $GLOBALS['TYPO3_CONF_VARS'][$configIndex]['socket'], + 'dbname' => $GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['dbname'], + 'user' => $GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['user'], + 'password' => $GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['password'], + 'host' => $GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['host'], + 'unix_socket' => $GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['socket'], 'charset' => 'utf8', 'driver' => 'mysqli', ]; diff --git a/web/typo3conf/ext/ep_products/Configuration/TCA/Overrides/sys_template.php b/web/typo3conf/ext/ep_products/Configuration/TCA/Overrides/sys_template.php new file mode 100644 index 00000000..3ad35448 --- /dev/null +++ b/web/typo3conf/ext/ep_products/Configuration/TCA/Overrides/sys_template.php @@ -0,0 +1,5 @@ + 'tstamp', 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', - 'dividers2tabs' => TRUE, - 'versioningWS' => 2, - 'versioning_followPages' => TRUE, + 'dividers2tabs' => true, + 'versioningWS' => true, 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', 'transOrigDiffSourceField' => 'l10n_diffsource', @@ -20,7 +19,7 @@ return [ 'endtime' => 'endtime', ], 'searchFields' => 'headline,subline', - 'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_badge.gif' + 'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg', ], 'interface' => [ 'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, title, subtitle, link', @@ -86,34 +85,38 @@ return [ ], 'starttime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'endtime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], @@ -140,22 +143,8 @@ return [ 'label' => 'LLL:EXT:ep_products/Resources/Private/Language/locallang.xlf:tx_epproducts_domain_model_badge.link', 'config' => [ 'type' => 'input', - 'size' => 4, - 'eval' => 'int', - 'wizards' => [ - 'link' => [ - 'type' => 'popup', - 'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:header_link_formlabel', - 'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif', - 'module' => [ - 'name' => 'wizard_link', - 'urlParameters' => [ - 'mode' => 'wizard' - ] - ], - 'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1' - ] - ], + 'size' => 30, + 'renderType' => 'inputLink', ] ], ], diff --git a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_city.php b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_city.php index 3c797a5e..47a1671d 100644 --- a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_city.php +++ b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_city.php @@ -7,10 +7,8 @@ return [ 'tstamp' => 'tstamp', 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', - 'dividers2tabs' => TRUE, - 'versioningWS' => 2, - 'versioning_followPages' => TRUE, - + 'dividers2tabs' => true, + 'versioningWS' => true, 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', 'transOrigDiffSourceField' => 'l10n_diffsource', @@ -21,7 +19,7 @@ return [ 'endtime' => 'endtime', ], 'searchFields' => 'name,headline,teaser,description,party,leisure,teaser_images,header_images, images,latitude,longitude,country,region,facts,', - 'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_city.gif' + 'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg', ], 'interface' => [ 'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, detail_page, exclude_from_teasergroups, name, name_internal, headline, teaser, keywords, description, party, leisure, teaser_images, images, latitude, longitude, season, country, region, facts, officetip,header_title,header_subtitle', @@ -29,20 +27,6 @@ return [ 'types' => [ '1' => [ 'showitem' => '--palette--;;top, name_internal, --palette--;;name, --palette--;;destinations, teaser, keywords, description, party, leisure, facts, officetip, --div--;Bilder/Dateien, teaser_images, header_images, images', - 'columnsOverrides' => [ - 'teaser' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'description' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'party' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'leisure' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - ], ], ], 'palettes' => [ @@ -104,34 +88,38 @@ return [ ], 'starttime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'endtime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], @@ -140,22 +128,8 @@ return [ 'label' => 'LLL:EXT:ep_products/Resources/Private/Language/locallang.xlf:tx_epproducts_domain_model_city.detail_page', 'config' => [ 'type' => 'input', - 'size' => 4, - 'eval' => 'int', - 'wizards' => [ - 'link' => [ - 'type' => 'popup', - 'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:header_link_formlabel', - 'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif', - 'module' => [ - 'name' => 'wizard_link', - 'urlParameters' => [ - 'mode' => 'wizard' - ] - ], - 'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1' - ] - ], + 'size' => 30, + 'renderType' => 'inputLink', ] ], 'exclude_from_teasergroups' => [ @@ -222,6 +196,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'header_title' => [ @@ -250,6 +225,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'party' => [ @@ -260,6 +236,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'leisure' => [ @@ -270,6 +247,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'teaser_images' => [ @@ -281,18 +259,40 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - ], + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], + ], + 'columns' => [ + 'crop' => [ + 'config' => [ + 'cropVariants' => [ + 'default' => [ + 'title' => 'Alle Geräte', + 'allowedAspectRatios' => [ + 'teaserEven' => [ + 'title' => 'Teaser gerade', + 'value' => 1.3333333333333334, + ], + 'teaserOdd' => [ + 'title' => 'Teaser ungerade', + 'value' => 2.0555555555555556, + ], + 'free' => [ + 'title' => 'Frei', + 'value' => 'NaN', + ], + ], + ], + ], + ], + ], + ], + ], 'maxitems' => 10 ], $GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext'] @@ -307,18 +307,40 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - ], + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], + ], + 'columns' => [ + 'crop' => [ + 'config' => [ + 'cropVariants' => [ + 'default' => [ + 'title' => 'Alle Geräte', + 'allowedAspectRatios' => [ + 'headerLarge' => [ + 'title' => 'Header groß', + 'value' => 2.3333333333333334, + ], + 'headerSmall' => [ + 'title' => 'Header klein', + 'value' => 3.3333333333333334, + ], + 'free' => [ + 'title' => 'Frei', + 'value' => 'NaN', + ], + ], + ], + ], + ], + ], + ], + ], 'maxitems' => 10 ], $GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext'] @@ -333,18 +355,15 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - ], + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], + ], + ], 'maxitems' => 10 ], $GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext'] @@ -416,22 +435,16 @@ return [ 'autoSizeMax' => 30, 'maxitems' => 9999, 'multiple' => 0, - 'wizards' => [ - '_VERTICAL' => 1, - 'add' => [ - 'type' => 'script', - 'title' => 'hinzufügen', - 'icon' => 'actions-add', - 'params' => [ - 'table' => 'tx_epproducts_domain_model_fact', - 'pid' => '###PAGE_TSCONFIG_ID###', - 'setValue' => 'prepend' - ], - 'module' => [ - 'name' => 'wizard_add' - ] - ], - ], + 'fieldControl' => [ + 'addRecord' => [ + 'disabled' => false, + 'options' => [ + 'table' => 'tx_epproducts_domain_model_fact', + 'pid' => '###PAGE_TSCONFIG_ID###', + 'setValue' => 'prepend', + ], + ], + ], ], ], ], diff --git a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_concept.php b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_concept.php index 12d955f0..896d3852 100644 --- a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_concept.php +++ b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_concept.php @@ -8,10 +8,8 @@ return [ 'tstamp' => 'tstamp', 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', - 'dividers2tabs' => TRUE, - 'versioningWS' => 2, - 'versioning_followPages' => TRUE, - + 'dividers2tabs' => true, + 'versioningWS' => true, 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', 'transOrigDiffSourceField' => 'l10n_diffsource', @@ -22,7 +20,7 @@ return [ 'endtime' => 'endtime', ], 'searchFields' => 'name,description,detail_page,', - 'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_concept.gif' + 'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg', ], 'interface' => [ 'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, bus_pro_id, name, headline, code, @@ -33,17 +31,6 @@ return [ '1' => [ 'showitem' => '--palette--;;top, --palette--;;naming, --palette--;;header, teaser, description, description_extended, --div--;Bilder/Dateien, teaser_images, header_images', - 'columnsOverrides' => [ - 'teaser' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'description' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'description_extended' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - ], ], ], 'palettes' => [ @@ -105,34 +92,38 @@ return [ ], 'starttime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'endtime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'sorting' => [ @@ -175,6 +166,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'description_extended' => [ @@ -185,6 +177,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'teaser' => [ @@ -195,6 +188,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'headline' => [ @@ -229,22 +223,8 @@ return [ 'label' => 'LLL:EXT:ep_products/Resources/Private/Language/locallang.xlf:tx_epproducts_domain_model_concept.detail_page', 'config' => [ 'type' => 'input', - 'size' => 4, - 'eval' => 'int', - 'wizards' => [ - 'link' => [ - 'type' => 'popup', - 'title' => 'EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:header_link_formlabel', - 'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif', - 'module' => [ - 'name' => 'wizard_link', - 'urlParameters' => [ - 'mode' => 'wizard' - ] - ], - 'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1' - ] - ], + 'size' => 30, + 'renderType' => 'inputLink', ] ], 'teaser_images' => [ @@ -256,16 +236,38 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'columns' => [ + 'crop' => [ + 'config' => [ + 'cropVariants' => [ + 'default' => [ + 'title' => 'Alle Geräte', + 'allowedAspectRatios' => [ + 'teaserEven' => [ + 'title' => 'Teaser gerade', + 'value' => 1.3333333333333334, + ], + 'teaserOdd' => [ + 'title' => 'Teaser ungerade', + 'value' => 2.0555555555555556, + ], + 'free' => [ + 'title' => 'Frei', + 'value' => 'NaN', + ], + ], + ], + ], + ], + ], ], ], 'maxitems' => 10 @@ -282,16 +284,38 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], + 'columns' => [ + 'crop' => [ + 'config' => [ + 'cropVariants' => [ + 'default' => [ + 'title' => 'Alle Geräte', + 'allowedAspectRatios' => [ + 'headerLarge' => [ + 'title' => 'Header groß', + 'value' => 2.3333333333333334, + ], + 'headerSmall' => [ + 'title' => 'Header klein', + 'value' => 3.3333333333333334, + ], + 'free' => [ + 'title' => 'Frei', + 'value' => 'NaN', + ], + ], + ], + ], + ], + ], + ], ], ], 'maxitems' => 10 diff --git a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_contingent.php b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_contingent.php index b2b7b684..e7c2346a 100644 --- a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_contingent.php +++ b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_contingent.php @@ -9,10 +9,8 @@ return [ 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', 'dividers2tabs' => true, - 'versioningWS' => 2, - 'versioning_followPages' => true, + 'versioningWS' => false, 'hideTable' => true, - 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', 'transOrigDiffSourceField' => 'l10n_diffsource', @@ -23,7 +21,7 @@ return [ 'endtime' => 'endtime', ], 'searchFields' => 'code', - 'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_contingent.gif' + 'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg', ], 'interface' => [ 'showRecordFieldList' => 'date,pax,available,status,hotel,groupsch_id', @@ -86,34 +84,38 @@ return [ ], 'starttime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'endtime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], @@ -144,7 +146,8 @@ return [ 'size' => 7, 'eval' => 'date,required', 'checkbox' => 0, - 'default' => '0000-00-00' + 'default' => '0000-00-00', + 'renderType' => 'inputDateTime', ], ], 'hotel' => [ diff --git a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_country.php b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_country.php index 9533b994..eacc5c47 100644 --- a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_country.php +++ b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_country.php @@ -7,10 +7,8 @@ return [ 'tstamp' => 'tstamp', 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', - 'dividers2tabs' => TRUE, - 'versioningWS' => 2, - 'versioning_followPages' => TRUE, - + 'dividers2tabs' => true, + 'versioningWS' => true, 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', 'transOrigDiffSourceField' => 'l10n_diffsource', @@ -21,7 +19,7 @@ return [ 'endtime' => 'endtime', ], 'searchFields' => 'code,name,headline,teaser,description,teaser_images,images,latitude,longitude,facts,', - 'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_country.gif' + 'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg', ], 'interface' => [ 'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, detail_page, code, name, @@ -35,17 +33,6 @@ return [ --div--;Texte, teaser, description, description_extended, --div--;Verknüpfungen, facts, snowreport, officetip, --div--;Bilder/Dateien, teaser_images, header_images, images', - 'columnsOverrides' => [ - 'teaser' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'description' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'description_extended' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - ], ], ], 'palettes' => [ @@ -107,34 +94,38 @@ return [ ], 'starttime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'endtime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], @@ -143,22 +134,8 @@ return [ 'label' => 'LLL:EXT:ep_products/Resources/Private/Language/locallang.xlf:tx_epproducts_domain_model_country.detail_page', 'config' => [ 'type' => 'input', - 'size' => 4, - 'eval' => 'int', - 'wizards' => [ - 'link' => [ - 'type' => 'popup', - 'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:header_link_formlabel', - 'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif', - 'module' => [ - 'name' => 'wizard_link', - 'urlParameters' => [ - 'mode' => 'wizard' - ] - ], - 'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1' - ] - ], + 'size' => 30, + 'renderType' => 'inputLink', ] ], 'code' => [ @@ -227,6 +204,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'description' => [ @@ -237,6 +215,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'description_extended' => [ @@ -247,6 +226,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'header_title' => [ @@ -276,16 +256,38 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'columns' => [ + 'crop' => [ + 'config' => [ + 'cropVariants' => [ + 'default' => [ + 'title' => 'Alle Geräte', + 'allowedAspectRatios' => [ + 'teaserEven' => [ + 'title' => 'Teaser gerade', + 'value' => 1.3333333333333334, + ], + 'teaserOdd' => [ + 'title' => 'Teaser ungerade', + 'value' => 2.0555555555555556, + ], + 'free' => [ + 'title' => 'Frei', + 'value' => 'NaN', + ], + ], + ], + ], + ], + ], ], ], 'maxitems' => 10 @@ -302,16 +304,38 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'columns' => [ + 'crop' => [ + 'config' => [ + 'cropVariants' => [ + 'default' => [ + 'title' => 'Alle Geräte', + 'allowedAspectRatios' => [ + 'headerLarge' => [ + 'title' => 'Header groß', + 'value' => 2.3333333333333334, + ], + 'headerSmall' => [ + 'title' => 'Header klein', + 'value' => 3.3333333333333334, + ], + 'free' => [ + 'title' => 'Frei', + 'value' => 'NaN', + ], + ], + ], + ], + ], + ], ], ], 'maxitems' => 10 @@ -328,18 +352,15 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - ], + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], + ], + ], 'maxitems' => 10 ], $GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext'] @@ -404,22 +425,16 @@ return [ 'autoSizeMax' => 30, 'maxitems' => 9999, 'multiple' => 0, - 'wizards' => [ - '_VERTICAL' => 1, - 'add' => [ - 'type' => 'script', - 'title' => 'hinzufügen', - 'icon' => 'actions-add', - 'params' => [ - 'table' => 'tx_epproducts_domain_model_fact', - 'pid' => '###PAGE_TSCONFIG_ID###', - 'setValue' => 'prepend' - ], - 'module' => [ - 'name' => 'wizard_add' - ] - ], - ], + 'fieldControl' => [ + 'addRecord' => [ + 'disabled' => false, + 'options' => [ + 'table' => 'tx_epproducts_domain_model_fact', + 'pid' => '###PAGE_TSCONFIG_ID###', + 'setValue' => 'prepend', + ], + ], + ], ], ], ], diff --git a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_date.php b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_date.php index bb52baf9..db63a6f0 100644 --- a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_date.php +++ b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_date.php @@ -7,11 +7,9 @@ return [ 'tstamp' => 'tstamp', 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', - 'dividers2tabs' => TRUE, - 'versioningWS' => 2, - 'versioning_followPages' => TRUE, - 'hideTable' => TRUE, - + 'dividers2tabs' => true, + 'versioningWS' => false, + 'hideTable' => true, 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', 'transOrigDiffSourceField' => 'l10n_diffsource', @@ -22,7 +20,7 @@ return [ 'endtime' => 'endtime', ], 'searchFields' => 'bus_pro_id,code,date_start,date_end,', - 'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_date.gif' + 'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg', ], 'interface' => [ 'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, bus_pro_id, hotel_bus_pro_id, @@ -92,34 +90,38 @@ return [ ], 'starttime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'endtime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], @@ -157,7 +159,8 @@ return [ 'size' => 7, 'eval' => 'date', 'checkbox' => 0, - 'default' => '0000-00-00' + 'default' => '0000-00-00', + 'renderType' => 'inputDateTime', ], ], 'date_end' => [ @@ -169,7 +172,8 @@ return [ 'size' => 7, 'eval' => 'date', 'checkbox' => 0, - 'default' => '0000-00-00' + 'default' => '0000-00-00', + 'renderType' => 'inputDateTime', ], ], 'nights' => [ diff --git a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_fact.php b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_fact.php index 2146a0da..fe7a356c 100644 --- a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_fact.php +++ b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_fact.php @@ -7,10 +7,8 @@ return [ 'tstamp' => 'tstamp', 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', - 'dividers2tabs' => TRUE, - 'versioningWS' => 2, - 'versioning_followPages' => TRUE, - + 'dividers2tabs' => true, + 'versioningWS' => true, 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', 'transOrigDiffSourceField' => 'l10n_diffsource', @@ -21,7 +19,7 @@ return [ 'endtime' => 'endtime', ], 'searchFields' => 'name,tags,', - 'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_fact.gif' + 'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg', ], 'interface' => [ 'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, label, name, keywords', @@ -86,34 +84,38 @@ return [ ], 'starttime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'endtime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], diff --git a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_faq.php b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_faq.php index 3682dd55..d331dfd2 100644 --- a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_faq.php +++ b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_faq.php @@ -6,10 +6,8 @@ return [ 'tstamp' => 'tstamp', 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', - 'dividers2tabs' => TRUE, - 'versioningWS' => 2, - 'versioning_followPages' => TRUE, - + 'dividers2tabs' => true, + 'versioningWS' => true, 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', 'transOrigDiffSourceField' => 'l10n_diffsource', @@ -20,7 +18,7 @@ return [ 'endtime' => 'endtime', ], 'searchFields' => 'question,answer,', - 'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_faq.gif' + 'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg', ], 'interface' => [ 'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, label, question, answer', @@ -28,11 +26,6 @@ return [ 'types' => [ '1' => [ 'showitem' => 'hidden, label, question, answer', - 'columnsOverrides' => [ - 'answer' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - ], ], ], 'palettes' => [ @@ -92,34 +85,38 @@ return [ ], 'starttime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'endtime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], @@ -148,7 +145,8 @@ return [ 'type' => 'text', 'cols' => 40, 'rows' => 15, - 'eval' => 'trim,required' + 'eval' => 'trim,required', + 'enableRichtext' => true, ] ], diff --git a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_hotel.php b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_hotel.php index 0798dd04..5ec3caea 100644 --- a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_hotel.php +++ b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_hotel.php @@ -8,10 +8,8 @@ return [ 'tstamp' => 'tstamp', 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', - 'dividers2tabs' => TRUE, - 'versioningWS' => 2, - 'versioning_followPages' => TRUE, - + 'dividers2tabs' => true, + 'versioningWS' => true, 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', 'transOrigDiffSourceField' => 'l10n_diffsource', @@ -23,7 +21,7 @@ return [ ], 'searchFields' => 'name,headline,teaser,description,features,room_types,additional_information,teaser_images, header_images,images,reseller_images,code,type,category,country,region,city,teamer,products,external_link', - 'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_hotel.gif' + 'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg', ], 'interface' => [ 'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, name, detail_page, keywords, @@ -38,23 +36,6 @@ return [ --div--;Texte, teaser, description, features, room_types, additional_information, --div--;Verknüpfungen, facts, teamer, additional_codes, --div--;Bilder/Dateien, teaser_images, header_images, images, reseller_images', - 'columnsOverrides' => [ - 'teaser' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'description' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'features' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'room_types' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'additional_information' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - ], ], ], 'palettes' => [ @@ -118,34 +99,38 @@ return [ ], 'starttime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'endtime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], @@ -175,22 +160,8 @@ return [ 'label' => 'LLL:EXT:ep_products/Resources/Private/Language/locallang.xlf:tx_epproducts_domain_model_hotel.detail_page', 'config' => [ 'type' => 'input', - 'size' => 4, - 'eval' => 'int', - 'wizards' => [ - 'link' => [ - 'type' => 'popup', - 'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:header_link_formlabel', - 'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif', - 'module' => [ - 'name' => 'wizard_link', - 'urlParameters' => [ - 'mode' => 'wizard' - ] - ], - 'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1' - ] - ], + 'size' => 30, + 'renderType' => 'inputLink', ] ], 'name' => [ @@ -230,6 +201,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'description' => [ @@ -240,6 +212,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'header_title' => [ @@ -268,6 +241,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'room_types' => [ @@ -278,6 +252,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'additional_information' => [ @@ -288,6 +263,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'teaser_images' => [ @@ -299,16 +275,38 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'columns' => [ + 'crop' => [ + 'config' => [ + 'cropVariants' => [ + 'default' => [ + 'title' => 'Alle Geräte', + 'allowedAspectRatios' => [ + 'teaserEven' => [ + 'title' => 'Teaser gerade', + 'value' => 1.3333333333333334, + ], + 'teaserOdd' => [ + 'title' => 'Teaser ungerade', + 'value' => 2.0555555555555556, + ], + 'free' => [ + 'title' => 'Frei', + 'value' => 'NaN', + ], + ], + ], + ], + ], + ], ], ], 'maxitems' => 10 @@ -325,16 +323,38 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'columns' => [ + 'crop' => [ + 'config' => [ + 'cropVariants' => [ + 'default' => [ + 'title' => 'Alle Geräte', + 'allowedAspectRatios' => [ + 'headerLarge' => [ + 'title' => 'Header groß', + 'value' => 2.3333333333333334, + ], + 'headerSmall' => [ + 'title' => 'Header klein', + 'value' => 3.3333333333333334, + ], + 'free' => [ + 'title' => 'Frei', + 'value' => 'NaN', + ], + ], + ], + ], + ], + ], ], ], 'maxitems' => 10 @@ -351,16 +371,13 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], ], 'maxitems' => 10 @@ -377,16 +394,13 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], ], 'maxitems' => 10 @@ -419,20 +433,7 @@ return [ 'type' => 'input', 'size' => 30, 'eval' => 'trim', - 'wizards' => [ - 'link' => [ - 'type' => 'popup', - 'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:header_link_formlabel', - 'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif', - 'module' => [ - 'name' => 'wizard_link', - 'urlParameters' => [ - 'mode' => 'wizard' - ] - ], - 'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1' - ] - ], + 'renderType' => 'inputLink', ], ], 'type' => [ @@ -518,20 +519,14 @@ return [ 'autoSizeMax' => 30, 'maxitems' => 9999, 'multiple' => 0, - 'wizards' => [ - '_VERTICAL' => 1, - 'add' => [ - 'type' => 'script', - 'title' => 'hinzufügen', - 'icon' => 'actions-add', - 'params' => [ + 'fieldControl' => [ + 'addRecord' => [ + 'disabled' => false, + 'options' => [ 'table' => 'tx_epproducts_domain_model_fact', 'pid' => '###PAGE_TSCONFIG_ID###', - 'setValue' => 'prepend' + 'setValue' => 'prepend', ], - 'module' => [ - 'name' => 'wizard_add' - ] ], ], ], diff --git a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_journey.php b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_journey.php index 76b09719..0f0e62fb 100644 --- a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_journey.php +++ b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_journey.php @@ -7,10 +7,8 @@ return [ 'tstamp' => 'tstamp', 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', - 'dividers2tabs' => TRUE, - 'versioningWS' => 2, - 'versioning_followPages' => TRUE, - + 'dividers2tabs' => true, + 'versioningWS' => true, 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', 'transOrigDiffSourceField' => 'l10n_diffsource', @@ -21,7 +19,7 @@ return [ 'endtime' => 'endtime', ], 'searchFields' => 'name,by_car,by_bus,', - 'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_journey.gif' + 'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg', ], 'interface' => [ 'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, name, by_car, by_bus, image', @@ -29,14 +27,6 @@ return [ 'types' => [ '1' => [ 'showitem' => 'hidden, name, by_car, by_bus, image', - 'columnsOverrides' => [ - 'by_car' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'by_bus' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - ], ], ], 'columns' => [ @@ -93,34 +83,38 @@ return [ ], 'starttime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'endtime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], @@ -141,6 +135,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'by_bus' => [ @@ -151,6 +146,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'image' => [ @@ -162,16 +158,13 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], ], 'maxitems' => 1, diff --git a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_matchcode.php b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_matchcode.php index f6d87d0b..420205fa 100644 --- a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_matchcode.php +++ b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_matchcode.php @@ -6,11 +6,9 @@ return [ 'tstamp' => 'tstamp', 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', - 'dividers2tabs' => TRUE, - 'versioningWS' => 2, - 'versioning_followPages' => TRUE, - 'hideTable' => TRUE, - + 'dividers2tabs' => true, + 'versioningWS' => false, + 'hideTable' => true, 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', 'transOrigDiffSourceField' => 'l10n_diffsource', @@ -21,7 +19,7 @@ return [ 'endtime' => 'endtime', ], 'searchFields' => 'code', - 'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_matchcode.gif' + 'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg', ], 'interface' => [ 'showRecordFieldList' => 'code,entity_type', @@ -86,34 +84,38 @@ return [ ], 'starttime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'endtime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], diff --git a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_officetip.php b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_officetip.php index 80a0750e..7a2f7a51 100644 --- a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_officetip.php +++ b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_officetip.php @@ -7,10 +7,8 @@ return [ 'tstamp' => 'tstamp', 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', - 'dividers2tabs' => TRUE, - 'versioningWS' => 2, - 'versioning_followPages' => TRUE, - + 'dividers2tabs' => true, + 'versioningWS' => true, 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', 'transOrigDiffSourceField' => 'l10n_diffsource', @@ -21,7 +19,7 @@ return [ 'endtime' => 'endtime', ], 'searchFields' => 'text,author,product,', - 'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_officetip.gif' + 'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg', ], 'interface' => [ 'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, text, author', @@ -86,34 +84,38 @@ return [ ], 'starttime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'endtime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], diff --git a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_product.php b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_product.php index 37842bbd..17f4188c 100644 --- a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_product.php +++ b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_product.php @@ -8,10 +8,8 @@ return [ 'tstamp' => 'tstamp', 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', - 'dividers2tabs' => TRUE, - 'versioningWS' => 2, - 'versioning_followPages' => TRUE, - + 'dividers2tabs' => true, + 'versioningWS' => true, 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', 'transOrigDiffSourceField' => 'l10n_diffsource', @@ -22,7 +20,7 @@ return [ 'endtime' => 'endtime', ], 'searchFields' => 'name,headline', - 'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_product.gif' + 'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg', ], 'interface' => [ 'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, searchable, bookable, @@ -42,32 +40,6 @@ return [ additional_regions, badge, --div--;Bilder/Dateien, teaser_images, header_images, images, reseller_images, banner, video, --div--;Bewertung, --palette--;;rating, testimonials', - 'columnsOverrides' => [ - 'teaser' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'teaser_long' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'concept_description' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'board_description' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'additional_services' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'programme_description' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'ski_pass_description' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'testimonials' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - ], ], ], 'palettes' => [ @@ -133,34 +105,38 @@ return [ ], 'starttime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'endtime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], @@ -190,22 +166,8 @@ return [ 'label' => 'LLL:EXT:ep_products/Resources/Private/Language/locallang.xlf:tx_epproducts_domain_model_product.detail_page', 'config' => [ 'type' => 'input', - 'size' => 4, - 'eval' => 'int', - 'wizards' => [ - 'link' => [ - 'type' => 'popup', - 'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:header_link_formlabel', - 'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif', - 'module' => [ - 'name' => 'wizard_link', - 'urlParameters' => [ - 'mode' => 'wizard' - ] - ], - 'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1' - ] - ], + 'size' => 30, + 'renderType' => 'inputLink', ] ], 'bus_pro_id' => [ @@ -289,6 +251,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'teaser_long' => [ @@ -299,6 +262,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'header_title' => [ @@ -327,6 +291,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'board_description' => [ @@ -337,6 +302,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'additional_services' => [ @@ -347,6 +313,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'programme_description' => [ @@ -357,6 +324,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'ski_pass_description' => [ @@ -367,6 +335,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'rating_average' => [ @@ -395,6 +364,7 @@ return [ 'cols' => 40, 'rows' => 5, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'teaser_images' => [ @@ -406,16 +376,38 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'columns' => [ + 'crop' => [ + 'config' => [ + 'cropVariants' => [ + 'default' => [ + 'title' => 'Alle Geräte', + 'allowedAspectRatios' => [ + 'teaserEven' => [ + 'title' => 'Teaser gerade', + 'value' => 1.3333333333333334, + ], + 'teaserOdd' => [ + 'title' => 'Teaser ungerade', + 'value' => 2.0555555555555556, + ], + 'free' => [ + 'title' => 'Frei', + 'value' => 'NaN', + ], + ], + ], + ], + ], + ], ], ], 'maxitems' => 10 @@ -432,16 +424,38 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'columns' => [ + 'crop' => [ + 'config' => [ + 'cropVariants' => [ + 'default' => [ + 'title' => 'Alle Geräte', + 'allowedAspectRatios' => [ + 'headerLarge' => [ + 'title' => 'Header groß', + 'value' => 2.3333333333333334, + ], + 'headerSmall' => [ + 'title' => 'Header klein', + 'value' => 3.3333333333333334, + ], + 'free' => [ + 'title' => 'Frei', + 'value' => 'NaN', + ], + ], + ], + ], + ], + ], ], ], 'maxitems' => 10 @@ -458,16 +472,13 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], ], 'maxitems' => 10 @@ -484,16 +495,13 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], ], 'maxitems' => 10 @@ -577,20 +585,14 @@ return [ 'autoSizeMax' => 30, 'maxitems' => 9999, 'multiple' => 0, - 'wizards' => [ - '_VERTICAL' => 1, - 'add' => [ - 'type' => 'script', - 'title' => 'hinzufügen', - 'icon' => 'actions-add', - 'params' => [ + 'fieldControl' => [ + 'addRecord' => [ + 'disabled' => false, + 'options' => [ 'table' => 'tx_epproducts_domain_model_fact', 'pid' => '###PAGE_TSCONFIG_ID###', - 'setValue' => 'prepend' + 'setValue' => 'prepend', ], - 'module' => [ - 'name' => 'wizard_add' - ] ], ], ], @@ -652,20 +654,14 @@ return [ 'autoSizeMax' => 30, 'maxitems' => 9999, 'multiple' => 0, - 'wizards' => [ - '_VERTICAL' => 1, - 'add' => [ - 'type' => 'script', - 'title' => 'hinzufügen', - 'icon' => 'actions-add', - 'params' => [ + 'fieldControl' => [ + 'addRecord' => [ + 'disabled' => false, + 'options' => [ 'table' => 'tx_epproducts_domain_model_faq', 'pid' => '###PAGE_TSCONFIG_ID###', - 'setValue' => 'prepend' + 'setValue' => 'prepend', ], - 'module' => [ - 'name' => 'wizard_add' - ] ], ], ], @@ -712,16 +708,13 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], ], 'maxitems' => 1 diff --git a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_region.php b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_region.php index 0ffcb6e1..15983522 100644 --- a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_region.php +++ b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_region.php @@ -7,10 +7,8 @@ return [ 'tstamp' => 'tstamp', 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', - 'dividers2tabs' => TRUE, - 'versioningWS' => 2, - 'versioning_followPages' => TRUE, - + 'dividers2tabs' => true, + 'versioningWS' => true, 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', 'transOrigDiffSourceField' => 'l10n_diffsource', @@ -21,7 +19,7 @@ return [ 'endtime' => 'endtime', ], 'searchFields' => 'name,headline,teaser,ski_area,ski_pass,description,news', - 'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_region.gif' + 'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg', ], 'interface' => [ 'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, detail_page, @@ -37,26 +35,6 @@ return [ --div--;Texte, ski_area, ski_area_extended, ski_pass, description, news, --div--;Daten, --palette--;;dimensions, --div--;Bilder/Dateien, teaser_images, header_images, images, region_maps', - 'columnsOverrides' => [ - 'teaser' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'ski_area' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'ski_area_extended' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'ski_pass' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'description' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - 'news' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - ], ], ], 'palettes' => [ @@ -121,34 +99,38 @@ return [ ], 'starttime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'endtime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], @@ -157,22 +139,8 @@ return [ 'label' => 'Detailseite', 'config' => [ 'type' => 'input', - 'size' => 4, - 'eval' => 'int', - 'wizards' => [ - 'link' => [ - 'type' => 'popup', - 'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:header_link_formlabel', - 'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif', - 'module' => [ - 'name' => 'wizard_link', - 'urlParameters' => [ - 'mode' => 'wizard' - ] - ], - 'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1' - ] - ], + 'size' => 30, + 'renderType' => 'inputLink', ] ], 'exclude_from_teasergroups' => [ @@ -239,6 +207,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'header_title' => [ @@ -267,6 +236,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'ski_area_extended' => [ @@ -277,6 +247,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'ski_pass' => [ @@ -287,6 +258,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'description' => [ @@ -297,6 +269,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'news' => [ @@ -307,6 +280,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'length' => [ @@ -354,16 +328,38 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'columns' => [ + 'crop' => [ + 'config' => [ + 'cropVariants' => [ + 'default' => [ + 'title' => 'Alle Geräte', + 'allowedAspectRatios' => [ + 'teaserEven' => [ + 'title' => 'Teaser gerade', + 'value' => 1.3333333333333334, + ], + 'teaserOdd' => [ + 'title' => 'Teaser ungerade', + 'value' => 2.0555555555555556, + ], + 'free' => [ + 'title' => 'Frei', + 'value' => 'NaN', + ], + ], + ], + ], + ], + ], ], ], 'maxitems' => 10 @@ -380,16 +376,38 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'columns' => [ + 'crop' => [ + 'config' => [ + 'cropVariants' => [ + 'default' => [ + 'title' => 'Alle Geräte', + 'allowedAspectRatios' => [ + 'headerLarge' => [ + 'title' => 'Header groß', + 'value' => 2.3333333333333334, + ], + 'headerSmall' => [ + 'title' => 'Header klein', + 'value' => 3.3333333333333334, + ], + 'free' => [ + 'title' => 'Frei', + 'value' => 'NaN', + ], + ], + ], + ], + ], + ], ], ], 'maxitems' => 10 @@ -406,18 +424,15 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - ], + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], + ], + ], 'maxitems' => 10 ], $GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext'] @@ -432,18 +447,15 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - ], + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], + ], + ], 'maxitems' => 5 ], $GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext'] @@ -490,22 +502,16 @@ return [ 'autoSizeMax' => 30, 'maxitems' => 9999, 'multiple' => 0, - 'wizards' => [ - '_VERTICAL' => 1, - 'add' => [ - 'type' => 'script', - 'title' => 'hinzufügen', - 'icon' => 'actions-add', - 'params' => [ - 'table' => 'tx_epproducts_domain_model_fact', - 'pid' => '###PAGE_TSCONFIG_ID###', - 'setValue' => 'prepend' - ], - 'module' => [ - 'name' => 'wizard_add' - ] - ], - ], + 'fieldControl' => [ + 'addRecord' => [ + 'disabled' => false, + 'options' => [ + 'table' => 'tx_epproducts_domain_model_fact', + 'pid' => '###PAGE_TSCONFIG_ID###', + 'setValue' => 'prepend', + ], + ], + ], ], ], 'officetip' => [ @@ -561,16 +567,13 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], ], 'maxitems' => 1 @@ -585,20 +588,7 @@ return [ 'type' => 'input', 'size' => 32, 'eval' => 'trim', - 'wizards' => [ - 'link' => [ - 'type' => 'popup', - 'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:header_link_formlabel', - 'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif', - 'module' => [ - 'name' => 'wizard_link', - 'urlParameters' => [ - 'mode' => 'wizard' - ] - ], - 'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1' - ] - ], + 'renderType' => 'inputLink', ] ], 'award_label' => [ diff --git a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_reseller.php b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_reseller.php index 3d7d150a..2cc6aac5 100644 --- a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_reseller.php +++ b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_reseller.php @@ -8,8 +8,7 @@ return [ 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', 'dividers2tabs' => true, - 'versioningWS' => 2, - 'versioning_followPages' => true, + 'versioningWS' => true, 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', 'transOrigDiffSourceField' => 'l10n_diffsource', @@ -20,7 +19,7 @@ return [ 'endtime' => 'endtime', ], 'searchFields' => 'name', - 'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_reseller.gif' + 'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg', ], 'interface' => [ 'showRecordFieldList' => 'name,code,pa_code,products', @@ -83,34 +82,38 @@ return [ ], 'starttime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'endtime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], diff --git a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_roommapping.php b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_roommapping.php index 05d6ff8e..2487183a 100644 --- a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_roommapping.php +++ b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_roommapping.php @@ -7,10 +7,8 @@ return [ 'tstamp' => 'tstamp', 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', - 'dividers2tabs' => TRUE, - 'versioningWS' => 2, - 'versioning_followPages' => TRUE, - + 'dividers2tabs' => true, + 'versioningWS' => false, 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', 'transOrigDiffSourceField' => 'l10n_diffsource', @@ -21,7 +19,7 @@ return [ 'endtime' => 'endtime', ], 'searchFields' => 'name,tags,', - 'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_roommapping.gif' + 'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg', ], 'interface' => [ 'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, code, type', @@ -86,34 +84,38 @@ return [ ], 'starttime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'endtime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], diff --git a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_snowreport.php b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_snowreport.php index d394c944..292a8c7d 100644 --- a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_snowreport.php +++ b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_snowreport.php @@ -7,10 +7,8 @@ return [ 'tstamp' => 'tstamp', 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', - 'dividers2tabs' => TRUE, - 'versioningWS' => 2, - 'versioning_followPages' => TRUE, - + 'dividers2tabs' => true, + 'versioningWS' => true, 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', 'transOrigDiffSourceField' => 'l10n_diffsource', @@ -21,7 +19,7 @@ return [ 'endtime' => 'endtime', ], 'searchFields' => 'regionName,', - 'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_snowreport.gif' + 'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg', ], 'interface' => [ 'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, vendor_uid, region_name, glacier, height_max, height_min, opened, snow_level_mountain, snow_level_valley, snow_quality, last_snowfall, lifts_total, lifts_opened, last_update, season_start, season_end, webcams', @@ -85,34 +83,38 @@ return [ ], 'starttime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'endtime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'date', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], @@ -204,13 +206,13 @@ return [ 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'date', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'renderType' => 'inputDateTime', ], ], 'lifts_total' => [ @@ -237,13 +239,13 @@ return [ 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'date', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'renderType' => 'inputDateTime', ], ], 'webcams' => [ @@ -261,13 +263,13 @@ return [ 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'date', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'renderType' => 'inputDateTime', ], ], 'season_end' => [ @@ -276,13 +278,13 @@ return [ 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'date', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'renderType' => 'inputDateTime', ], ], ], diff --git a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_staticsearchparams.php b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_staticsearchparams.php index 03c180a2..52f38b61 100644 --- a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_staticsearchparams.php +++ b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_staticsearchparams.php @@ -7,10 +7,8 @@ return [ 'tstamp' => 'tstamp', 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', - 'dividers2tabs' => TRUE, - 'versioningWS' => 2, - 'versioning_followPages' => TRUE, - + 'dividers2tabs' => true, + 'versioningWS' => true, 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', 'transOrigDiffSourceField' => 'l10n_diffsource', @@ -21,7 +19,7 @@ return [ 'endtime' => 'endtime', ], 'searchFields' => 'name,path_segment', - 'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_product.gif' + 'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg', ], 'interface' => [ 'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, name, path_segment, @@ -88,34 +86,38 @@ return [ ], 'starttime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'endtime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], @@ -231,7 +233,8 @@ return [ 'size' => 7, 'eval' => 'date', 'checkbox' => 0, - 'default' => '0000-00-00' + 'default' => '0000-00-00', + 'renderType' => 'inputDateTime', ] ], 'date_to' => [ @@ -243,7 +246,8 @@ return [ 'size' => 7, 'eval' => 'date', 'checkbox' => 0, - 'default' => '0000-00-00' + 'default' => '0000-00-00', + 'renderType' => 'inputDateTime', ] ], ], diff --git a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_teammember.php b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_teammember.php index 39e518a3..f3b928ba 100644 --- a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_teammember.php +++ b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_teammember.php @@ -1,4 +1,10 @@ [ 'title' => 'LLL:EXT:ep_products/Resources/Private/Language/locallang.xlf:tx_epproducts_domain_model_teammember', @@ -8,10 +14,8 @@ return [ 'tstamp' => 'tstamp', 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', - 'dividers2tabs' => TRUE, - 'versioningWS' => 2, - 'versioning_followPages' => TRUE, - + 'dividers2tabs' => true, + 'versioningWS' => true, 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', 'transOrigDiffSourceField' => 'l10n_diffsource', @@ -22,7 +26,7 @@ return [ 'endtime' => 'endtime', ], 'searchFields' => 'name,email,', - 'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_teammember.gif' + 'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg', ], 'interface' => [ 'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, name, email, phone, tasks, description, image', @@ -30,11 +34,6 @@ return [ 'types' => [ '1' => [ 'showitem' => 'hidden, --palette--;;top, --palette--;;contact, description, image', - 'columnsOverrides' => [ - 'description' => [ - 'defaultExtras' => 'richtext[]:rte_transform[mode=ts_links]', - ], - ], ], ], 'palettes' => [ @@ -95,34 +94,38 @@ return [ ], 'starttime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'endtime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'sorting' => [ @@ -175,6 +178,7 @@ return [ 'cols' => 40, 'rows' => 15, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'image' => [ @@ -186,16 +190,13 @@ return [ 'appearance' => [ 'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference' ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], ], ], 'maxitems' => 1, diff --git a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_webcam.php b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_webcam.php index a08859fd..60498f7c 100644 --- a/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_webcam.php +++ b/web/typo3conf/ext/ep_products/Configuration/TCA/tx_epproducts_domain_model_webcam.php @@ -7,10 +7,8 @@ return [ 'tstamp' => 'tstamp', 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', - 'dividers2tabs' => TRUE, - 'versioningWS' => 2, - 'versioning_followPages' => TRUE, - + 'dividers2tabs' => true, + 'versioningWS' => true, 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', 'transOrigDiffSourceField' => 'l10n_diffsource', @@ -21,7 +19,7 @@ return [ 'endtime' => 'endtime', ], 'searchFields' => 'name', - 'iconfile' => 'EXT:ep_products/Resources/Public/Icons/tx_epproducts_domain_model_webcam.gif' + 'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg', ], 'interface' => [ 'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, name, url, vendor_uid, available, snowreport', @@ -85,34 +83,38 @@ return [ ], 'starttime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'endtime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'date', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], diff --git a/web/typo3conf/ext/ep_products/Resources/Private/Templates/Backend/index.html b/web/typo3conf/ext/ep_products/Resources/Private/Templates/Backend/index.html index 018c6ab9..56444728 100644 --- a/web/typo3conf/ext/ep_products/Resources/Private/Templates/Backend/index.html +++ b/web/typo3conf/ext/ep_products/Resources/Private/Templates/Backend/index.html @@ -6,7 +6,7 @@

    E&P Funktionen

    - +

    diff --git a/web/typo3conf/ext/ep_products/ext_tables.php b/web/typo3conf/ext/ep_products/ext_tables.php index dd0b78c4..84ec6b2a 100644 --- a/web/typo3conf/ext/ep_products/ext_tables.php +++ b/web/typo3conf/ext/ep_products/ext_tables.php @@ -1,244 +1,22 @@ 'index, importProducts, importContingents, importSnowReport, dumpSearchLogEpreisen, dumpSearchLogEpevents', + ], + [ + 'access' => 'user,group', + 'labels' => 'LLL:EXT:ep_products/Resources/Private/Language/locallang_mod.xlf', + 'icon' => 'EXT:ep_products/Resources/Public/Icons/logo.svg' + ] + ); -\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.' . $_EXTKEY, - 'product_detail', - 'Produktdetails' -); - -\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.' . $_EXTKEY, - 'product_teasergroup', - 'Produktteaser' -); - -\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.' . $_EXTKEY, - 'product_pricetable', - 'Buchungstabelle' -); - -\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.' . $_EXTKEY, - 'country_detail', - 'Land' -); - -\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.' . $_EXTKEY, - 'region_teasergroup', - 'Gebietsteaser' -); - -\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.' . $_EXTKEY, - 'region_detail', - 'Gebietsdetails' -); - -\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.' . $_EXTKEY, - 'city_teasergroup', - 'Ortsteaser' -); - -\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.' . $_EXTKEY, - 'city_detail', - 'Ortsdetails' -); - -\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.' . $_EXTKEY, - 'hotel_teasergroup', - 'Hotelteaser' -); - -\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.' . $_EXTKEY, - 'hotel_teasergroup_nodate', - 'Hotelteaser (terminunabhängig)' -); - -\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.' . $_EXTKEY, - 'hotel_detail', - 'Hoteldetails' -); - -\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.' . $_EXTKEY, - 'hotel_detail_event', - 'Hoteldetails (Event)' -); - -\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.' . $_EXTKEY, - 'concept_teasergroup', - 'Konzeptteaser' -); - -\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.' . $_EXTKEY, - 'concept_detail', - 'Konzeptdetails' -); - -\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.' . $_EXTKEY, - 'snowreport_list', - 'Schneehöhen' -); - -\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.' . $_EXTKEY, - 'teammembers', - 'Team' -); - -\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.' . $_EXTKEY, - 'faq', - 'FAQ' -); - -\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.' . $_EXTKEY, - 'newsletter', - 'Newsletter' -); - -\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.' . $_EXTKEY, - 'maps', - 'Übersichtskarte Hotels/Produkte' -); - -\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.' . $_EXTKEY, - 'pricetable', - 'Preistabelle' -); - -\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.' . $_EXTKEY, - 'reseller', - 'Vertriebspartner Export' -); - -\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.' . $_EXTKEY, - 'watchlist', - 'Merkliste' -); - -$extensionName = strtolower(\TYPO3\CMS\Core\Utility\GeneralUtility::underscoredToUpperCamelCase($_EXTKEY)); - -$pluginSignature = str_replace('_', '', $_EXTKEY) . '_product_detail'; -$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform'; -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_product_detail.xml'); - -$pluginSignature = str_replace('_', '', $_EXTKEY) . '_product_teasergroup'; -$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform'; -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_product_teaser.xml'); - -$pluginSignature = str_replace('_', '', $_EXTKEY) . '_product_pricetable'; -$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform'; -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_product_pricetable.xml'); - -$pluginSignature = str_replace('_', '', $_EXTKEY) . '_country_detail'; -$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform'; -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_country.xml'); - -$pluginSignature = str_replace('_', '', $_EXTKEY) . '_region_teasergroup'; -$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform'; -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_region_teaser.xml'); - -$pluginSignature = str_replace('_', '', $_EXTKEY) . '_region_detail'; -$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform'; -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_region_detail.xml'); - -$pluginSignature = str_replace('_', '', $_EXTKEY) . '_city_teasergroup'; -$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform'; -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_city_teaser.xml'); - -$pluginSignature = str_replace('_', '', $_EXTKEY) . '_city_detail'; -$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform'; -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_city_detail.xml'); - -$pluginSignature = str_replace('_', '', $_EXTKEY) . '_hotel_teasergroup'; -$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform'; -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_hotel_teaser.xml'); - -$pluginSignature = str_replace('_', '', $_EXTKEY) . '_hotel_teasergroup_nodate'; -$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform'; -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_hotel_teaser_date_independent.xml'); - -$pluginSignature = str_replace('_', '', $_EXTKEY) . '_hotel_detail'; -$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform'; -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_hotel_detail.xml'); - -$pluginSignature = str_replace('_', '', $_EXTKEY) . '_hotel_detail_event'; -$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform'; -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_hotel_detail_event.xml'); - -$pluginSignature = str_replace('_', '', $_EXTKEY) . '_concept_detail'; -$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform'; -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_concept_detail.xml'); - -$pluginSignature = str_replace('_', '', $_EXTKEY) . '_faq'; -$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform'; -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_faq.xml'); - -$pluginSignature = str_replace('_', '', $_EXTKEY) . '_maps'; -$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform'; -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_maps.xml'); - -$pluginSignature = str_replace('_', '', $_EXTKEY) . '_pricetable'; -$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform'; -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_pricetable.xml'); - -$pluginSignature = str_replace('_', '', $_EXTKEY) . '_snowreport_list'; -$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform'; -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_snowreport.xml'); - -$pluginSignature = str_replace('_', '', $_EXTKEY) . '_teammembers'; -$GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$pluginSignature] = 'pi_flexform'; -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue($pluginSignature, 'FILE:EXT:' . $_EXTKEY . '/Configuration/FlexForms/flexform_teammembers.xml'); - -\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerModule( - 'EP.' . $_EXTKEY, - 'web', - 'management', - 'after:list', - [ - 'Backend' => 'index, importProducts, importContingents, importSnowReport, dumpSearchLogEpreisen, dumpSearchLogEpevents', - ], - [ - 'access' => 'user,group', - 'labels' => 'LLL:EXT:ep_products/Resources/Private/Language/locallang_mod.xlf', - 'icon' => 'EXT:ep_products/Resources/Public/Icons/logo.svg' - ] -); - -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::makeCategorizable( - 'epproducts', - 'tx_epproducts_domain_model_teammember' -); +}); diff --git a/web/typo3conf/ext/ep_theme/Classes/DataProcessing/SliderProcessor.php b/web/typo3conf/ext/ep_theme/Classes/DataProcessing/SliderProcessor.php index 2e891298..f787bdb4 100644 --- a/web/typo3conf/ext/ep_theme/Classes/DataProcessing/SliderProcessor.php +++ b/web/typo3conf/ext/ep_theme/Classes/DataProcessing/SliderProcessor.php @@ -79,7 +79,11 @@ class SliderProcessor implements DataProcessorInterface foreach ($slides as $slide) { $processedData['slides'][$slide['uid']] = $slide; - $processedData['slides'][$slide['uid']]['image'] = $fileRepository->findByRelation('tx_eptheme_domain_model_slide', 'images', $slide['uid']); + $processedData['slides'][$slide['uid']]['image'] = $fileRepository->findByRelation( + 'tx_eptheme_domain_model_slide', + 'images', + $slide['uid'] + ); } } diff --git a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/ArgumentPrefixViewHelper.php b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/ArgumentPrefixViewHelper.php index a3359fa2..3b0b7ba2 100644 --- a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/ArgumentPrefixViewHelper.php +++ b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/ArgumentPrefixViewHelper.php @@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers; * * Copyright notice * - * (c) 2016 Björn Fromme , dreipunktnull + * (c) 2018 Björn Fromme , dreipunktnull * * All rights reserved * @@ -28,22 +28,39 @@ namespace EP\EpTheme\ViewHelpers; ***************************************************************/ use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper; +use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; +use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic; class ArgumentPrefixViewHelper extends AbstractViewHelper { + use CompileWithRenderStatic; + + public function initializeArguments() + { + parent::initializeArguments(); + + $this->registerArgument('pluginName', 'string', 'Plugin name'); + $this->registerArgument('extensionName', 'string', 'Extension name'); + } /** - * @param string $pluginName - * @param string $extensionName - * - * @return string + * @param array $arguments + * @param \Closure $renderChildrenClosure + * @param RenderingContextInterface $renderingContext + * @return mixed */ - public function render($pluginName = null, $extensionName = null) + public static function renderStatic( + array $arguments, + \Closure $renderChildrenClosure, + RenderingContextInterface $renderingContext + ) { - $request = $this->controllerContext->getRequest(); + $request = $renderingContext->getControllerContext()->getRequest(); + $pluginName = $arguments['pluginName']; if ($pluginName === null) { $pluginName = $request->getPluginName(); } + $extensionName = $arguments['extensionName']; if ($extensionName === null) { $extensionName = $request->getControllerExtensionName(); } diff --git a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Calendar/ContingentViewHelper.php b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Calendar/ContingentViewHelper.php index 1818aab7..d91fae3d 100644 --- a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Calendar/ContingentViewHelper.php +++ b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Calendar/ContingentViewHelper.php @@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers\Calendar; * * Copyright notice * - * (c) 2016 Björn Fromme , dreipunktnull + * (c) 2018 Björn Fromme , dreipunktnull * * All rights reserved * @@ -32,22 +32,54 @@ use CalendR\Period\Day; use CalendR\Period\Month; use EP\EpProducts\Domain\Model\Contingent; use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper; +use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; +use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic; class ContingentViewHelper extends AbstractViewHelper { + use CompileWithRenderStatic; + + /** + * @var bool + */ + protected $escapeOutput = false; + const LEVEL_GREEN = 1; const LEVEL_YELLOW = 2; const LEVEL_RED = 3; - public function render(Month $month, Day $day, Basic $events) + public function initializeArguments() { + parent::initializeArguments(); + + $this->registerArgument('month', Month::class, 'The month', true); + $this->registerArgument('day', Day::class, 'The day', true); + $this->registerArgument('events', Basic::class, 'The calendar events', true); + } + + /** + * @param array $arguments + * @param \Closure $renderChildrenClosure + * @param RenderingContextInterface $renderingContext + * @return mixed + */ + public static function renderStatic( + array $arguments, + \Closure $renderChildrenClosure, + RenderingContextInterface $renderingContext + ) + { + $month = $arguments['month']; + $day = $arguments['day']; + $events = $arguments['events']; + if (!$month->includes($day)) { return ''; } $now = new \DateTime('now'); if ($now > $day->getBegin()) { $class = [ 'text-muted' ]; - return $this->getHtml($class, $day->format('d')); + return static::getHtml($class, $day->format('d')); } $contingents = $events->find($day); if (count($contingents) === 0) { @@ -57,7 +89,7 @@ class ContingentViewHelper extends AbstractViewHelper $contingent = reset($contingents); $percentage = $contingent->getPercentageAvailable(); $status = $contingent->getStatus(); - $level = $this->getOccupancyLevel($percentage, $status); + $level = static::getOccupancyLevel($percentage, $status); } $previousDay = $day->getPrevious(); $previousContingents = $events->find($previousDay); @@ -67,16 +99,16 @@ class ContingentViewHelper extends AbstractViewHelper $previousContingent = reset($previousContingents); $previousPercentage = $previousContingent->getPercentageAvailable(); $previousStatus = $previousContingent->getStatus(); - $previousLevel = $this->getOccupancyLevel($previousPercentage, $previousStatus); + $previousLevel = static::getOccupancyLevel($previousPercentage, $previousStatus); } if ($previousLevel !== $level) { - $class = $this->getTransientLabelClasses($previousLevel, $level); + $class = static::getTransientLabelClasses($previousLevel, $level); } else { - $class = $this->getLabelClasses($percentage, $level); + $class = static::getLabelClasses($percentage, $level); } - return $this->getHtml($class, $day->format('d')); + return static::getHtml($class, $day->format('d')); } /** @@ -85,9 +117,9 @@ class ContingentViewHelper extends AbstractViewHelper * * @return array */ - protected function getLabelClasses($percentage, $level) + protected static function getLabelClasses($percentage, $level) { - $classes = $this->getTransientLabelClasses($level); + $classes = static::getTransientLabelClasses($level); $classes[] = 'available-' . $percentage; return $classes; } @@ -98,7 +130,7 @@ class ContingentViewHelper extends AbstractViewHelper * * @return array */ - protected function getTransientLabelClasses($levelFrom, $levelTo = null) + protected static function getTransientLabelClasses($levelFrom, $levelTo = null) { $classes = [ 'label' ]; if ($levelFrom === static::LEVEL_RED) { @@ -125,7 +157,7 @@ class ContingentViewHelper extends AbstractViewHelper * * @return int */ - protected function getOccupancyLevel($percentage, $status) + protected static function getOccupancyLevel($percentage, $status) { if ($percentage <= 20 || $status === Contingent::STATUS_BLOCKED) { return static::LEVEL_RED; @@ -141,7 +173,7 @@ class ContingentViewHelper extends AbstractViewHelper * @param string $label * @return string */ - protected function getHtml(array $class, $label) + protected static function getHtml(array $class, $label) { $cssClass = ' class="' . implode(' ', $class) . '"'; return sprintf('%s', $cssClass, $label); diff --git a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Calendar/IncludesViewHelper.php b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Calendar/IncludesViewHelper.php index 60143193..a4660ee4 100644 --- a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Calendar/IncludesViewHelper.php +++ b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Calendar/IncludesViewHelper.php @@ -34,6 +34,7 @@ class IncludesViewHelper extends AbstractConditionViewHelper public function initializeArguments() { parent::initializeArguments(); + $this->registerArgument('range', 'object', 'Range to check against', true); $this->registerArgument('period', 'object', 'Period to check if it is included in range', true); } diff --git a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/ComfortCategoryViewHelper.php b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/ComfortCategoryViewHelper.php index 6d515d69..4702bd3d 100644 --- a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/ComfortCategoryViewHelper.php +++ b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/ComfortCategoryViewHelper.php @@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers; * * Copyright notice * - * (c) 2016 Björn Fromme , dreipunktnull + * (c) 2018 Björn Fromme , dreipunktnull * * All rights reserved * @@ -29,17 +29,35 @@ namespace EP\EpTheme\ViewHelpers; use EP\EpProducts\Domain\Model\Hotel; use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper; +use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; +use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic; class ComfortCategoryViewHelper extends AbstractViewHelper { + use CompileWithRenderStatic; + + public function initializeArguments() + { + parent::initializeArguments(); + + $this->registerArgument('hotel', Hotel::class, 'The hotel'); + } /** - * @param Hotel $hotel - * - * @return string + * @param array $arguments + * @param \Closure $renderChildrenClosure + * @param RenderingContextInterface $renderingContext + * @return mixed */ - public function render(Hotel $hotel) + public static function renderStatic( + array $arguments, + \Closure $renderChildrenClosure, + RenderingContextInterface $renderingContext + ) { + /** @var Hotel $hotel */ + $hotel = $arguments['hotel']; + $flag = '%s'; switch ($hotel->getCategory()) diff --git a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/ContainerViewHelper.php b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/ContainerViewHelper.php index 131ba064..448978e5 100644 --- a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/ContainerViewHelper.php +++ b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/ContainerViewHelper.php @@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers; * * Copyright notice * - * (c) 2016 Björn Fromme , dreipunktnull + * (c) 2018 Björn Fromme , dreipunktnull * * All rights reserved * @@ -28,38 +28,63 @@ namespace EP\EpTheme\ViewHelpers; ***************************************************************/ use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper; +use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; +use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic; class ContainerViewHelper extends AbstractViewHelper { + use CompileWithRenderStatic; + + /** + * @var bool + */ + protected $escapeOutput = false; + /** * @var array */ - protected $columnsWithoutContainers = [ 0, 1, 3 ]; + protected static $columnsWithoutContainers = [ 0, 1, 3 ]; + + public function initializeArguments() + { + parent::initializeArguments(); + + $this->registerArgument('content', 'string', 'The content'); + $this->registerArgument('cssClasses', 'string', 'Additional css classes'); + $this->registerArgument('data', 'Array', 'The data', true); + } /** - * @param array $data - * @param string $content - * @param string $cssClasses - * - * @return string + * @param array $arguments + * @param \Closure $renderChildrenClosure + * @param RenderingContextInterface $renderingContext + * @return mixed */ - public function render(array $data, $content = null, $cssClasses = null) + public static function renderStatic( + array $arguments, + \Closure $renderChildrenClosure, + RenderingContextInterface $renderingContext + ) { + $content = $renderChildrenClosure(); + if ($content === null) { - $content = $this->renderChildren(); + $content = $arguments['content']; } + $classes = []; - if (in_array($data['colPos'], $this->columnsWithoutContainers, false)) { + if (in_array($arguments['data']['colPos'], static::$columnsWithoutContainers, false)) { $classes[] = 'container'; } else { $classes[] = 'in-column'; } - if ($cssClasses !== null) { - $classes[] = $cssClasses; + if ($arguments['cssClasses'] !== null) { + $classes[] = $arguments['cssClasses']; } if (count($classes) > 0) { return '

    ' . $content . '
    '; } + return $content; } } diff --git a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/ContextClassesViewHelper.php b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/ContextClassesViewHelper.php index b7009bcc..099355f7 100644 --- a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/ContextClassesViewHelper.php +++ b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/ContextClassesViewHelper.php @@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers; * * Copyright notice * - * (c) 2016 Björn Fromme , dreipunktnull + * (c) 2018 Björn Fromme , dreipunktnull * * All rights reserved * @@ -28,23 +28,38 @@ namespace EP\EpTheme\ViewHelpers; ***************************************************************/ use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper; +use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; +use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic; class ContextClassesViewHelper extends AbstractViewHelper { + use CompileWithRenderStatic; + + public function initializeArguments() + { + parent::initializeArguments(); + + $this->registerArgument('context', 'Array', 'The context', true); + } /** - * @param array $context - * - * @return string + * @param array $arguments + * @param \Closure $renderChildrenClosure + * @param RenderingContextInterface $renderingContext + * @return mixed */ - public function render(array $context) + public static function renderStatic( + array $arguments, + \Closure $renderChildrenClosure, + RenderingContextInterface $renderingContext + ) { $classes = []; - if (isset($context['country'])) { - $classes[] = mb_strtolower($context['country']['name']); + if (isset($arguments['context']['country'])) { + $classes[] = mb_strtolower($arguments['context']['country']['name']); } - if (isset($context['region'])) { - $classes[] = mb_strtolower($context['region']['name']); + if (isset($arguments['context']['region'])) { + $classes[] = mb_strtolower($arguments['context']['region']['name']); } $classesString = implode(' ', $classes); @@ -53,5 +68,4 @@ class ContextClassesViewHelper extends AbstractViewHelper return $classesString; } - } diff --git a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/DateRangeViewHelper.php b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/DateRangeViewHelper.php index 4db0d788..0609e963 100644 --- a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/DateRangeViewHelper.php +++ b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/DateRangeViewHelper.php @@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers; * * Copyright notice * - * (c) 2016 Björn Fromme , dreipunktnull + * (c) 2018 Björn Fromme , dreipunktnull * * All rights reserved * @@ -29,21 +29,40 @@ namespace EP\EpTheme\ViewHelpers; use EP\EpProducts\Utility\DateUtility; use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper; +use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; +use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic; class DateRangeViewHelper extends AbstractViewHelper { + use CompileWithRenderStatic; - /** - * @param \DateTime $dateFrom - * @param \DateTime $dateTo - * @param bool $includeLabel - * @param string $format - * - * @return string - */ - public function render(\DateTime $dateFrom = null, \DateTime $dateTo = null, $includeLabel = true, $format = 'd.m.Y') + public function initializeArguments() { - return DateUtility::formatDateRange($dateFrom, $dateTo, $includeLabel, $format); + parent::initializeArguments(); + + $this->registerArgument('dateFrom', \DateTime::class, 'Date range start'); + $this->registerArgument('dateTo', \DateTime::class, 'Date range end'); + $this->registerArgument('includeLabel', 'Bool', 'Whether to include a label', false, true); + $this->registerArgument('format', 'String', 'The date format', false, 'd.m.Y'); } + /** + * @param array $arguments + * @param \Closure $renderChildrenClosure + * @param RenderingContextInterface $renderingContext + * @return mixed + */ + public static function renderStatic( + array $arguments, + \Closure $renderChildrenClosure, + RenderingContextInterface $renderingContext + ) + { + return DateUtility::formatDateRange( + $arguments['dateFrom'], + $arguments['dateTo'], + $arguments['includeLabel'], + $arguments['format'] + ); + } } diff --git a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/FilterSettingsEncoderViewHelper.php b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/FilterSettingsEncoderViewHelper.php index 4051be96..13729788 100644 --- a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/FilterSettingsEncoderViewHelper.php +++ b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/FilterSettingsEncoderViewHelper.php @@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers; * * Copyright notice * - * (c) 2016 Björn Fromme , dreipunktnull + * (c) 2018 Björn Fromme , dreipunktnull * * All rights reserved * @@ -30,24 +30,47 @@ namespace EP\EpTheme\ViewHelpers; use EP\EpProducts\Service\FilterSettingsEncoder; use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper; +use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; +use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic; class FilterSettingsEncoderViewHelper extends AbstractViewHelper { + use CompileWithRenderStatic; + /** - * @param string $argument - * - * @return string + * @var bool */ - public function render($argument = null) + protected $escapeOutput = false; + + public function initializeArguments() { + parent::initializeArguments(); + + $this->registerArgument('argument', 'string', 'The argument string to encode'); + } + + /** + * @param array $arguments + * @param \Closure $renderChildrenClosure + * @param RenderingContextInterface $renderingContext + * @return mixed + */ + public static function renderStatic( + array $arguments, + \Closure $renderChildrenClosure, + RenderingContextInterface $renderingContext + ) + { + $argument = $renderChildrenClosure(); if ($argument === null) { - $argument = $this->renderChildren(); + $argument = $arguments['argument']; } if ($argument === null) { return ''; } + /** @var \EP\EpProducts\Service\FilterSettingsEncoder $encoder */ $encoder = GeneralUtility::makeInstance(FilterSettingsEncoder::class); - return $encoder->encode($argument); + return $encoder::encode($argument); } } diff --git a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/FlagiconSourceViewHelper.php b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/FlagiconSourceViewHelper.php index 2b8b61f7..78cf5502 100644 --- a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/FlagiconSourceViewHelper.php +++ b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/FlagiconSourceViewHelper.php @@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers; * * Copyright notice * - * (c) 2016 Björn Fromme , dreipunktnull + * (c) 2018 Björn Fromme , dreipunktnull * * All rights reserved * @@ -29,26 +29,41 @@ namespace EP\EpTheme\ViewHelpers; use EP\EpProducts\Domain\Model\Country; use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper; +use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; +use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic; class FlagiconSourceViewHelper extends AbstractViewHelper { + use CompileWithRenderStatic; public function initializeArguments() { + parent::initializeArguments(); + $this->registerArgument('countryCode', 'string', 'Country code to return a flag icon source for.'); - $this->registerArgument('country', 'object', 'Country entity to return a flag icon source for.'); + $this->registerArgument('country', 'mixed', 'Country entity to return a flag icon source for.'); } - public function render() + /** + * @param array $arguments + * @param \Closure $renderChildrenClosure + * @param RenderingContextInterface $renderingContext + * @return mixed + */ + public static function renderStatic( + array $arguments, + \Closure $renderChildrenClosure, + RenderingContextInterface $renderingContext + ) { $code = null; - if (is_object($this->arguments['country']) && $this->arguments['country'] instanceof Country) { + if (\is_object($arguments['country']) && $arguments['country'] instanceof Country) { /** @var \EP\EpProducts\Domain\Model\Country $country */ - $country = $this->arguments['country']; + $country = $arguments['country']; $code = strtolower($country->getCode()); - } elseif (!empty($this->arguments['countryCode'])) { - $code = strtolower($this->arguments['countryCode']); + } elseif (!empty($arguments['countryCode'])) { + $code = strtolower($arguments['countryCode']); } if ($code !== null) { @@ -57,5 +72,4 @@ class FlagiconSourceViewHelper extends AbstractViewHelper return ''; } - } diff --git a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/GmapsStaticMapViewHelper.php b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/GmapsStaticMapViewHelper.php deleted file mode 100644 index e2b3fbb1..00000000 --- a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/GmapsStaticMapViewHelper.php +++ /dev/null @@ -1,89 +0,0 @@ -, dreipunktnull - * - * All rights reserved - * - * This script is part of the TYPO3 project. The TYPO3 project is - * free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * The GNU General Public License can be found at - * http://www.gnu.org/copyleft/gpl.html. - * - * This script is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * This copyright notice MUST APPEAR in all copies of the script! - ***************************************************************/ - -use EP\EpProducts\Domain\Model\Hotel; -use EP\EpProducts\Domain\Model\Region; -use TYPO3\CMS\Core\Utility\GeneralUtility; -use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface; -use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper; - -class GmapsStaticMapViewHelper extends AbstractViewHelper -{ - const URLBASE = '%s¢er=%s,%s&zoom=%d&size=%dx%d'; - - /** - * @var ConfigurationManagerInterface - */ - protected $configurationManager; - - /** - * @var array - */ - protected $settings = []; - - /** - * @param ConfigurationManagerInterface $manager - * @return void - */ - public function injectConfigurationManager(ConfigurationManagerInterface $manager) - { - $this->configurationManager = $manager; - $settings = GeneralUtility::removeDotsFromTS( - $this->configurationManager->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT) - ); - $this->settings = $settings['plugin']['tx_eptheme']['settings']; - } - - /** - * @param Hotel $hotel - * @param Region $region - * @param int $zoom - * @param int $width - * @param int $height - * - * @return string - */ - public function render(Hotel $hotel = null, Region $region = null, $zoom = 10, $width = 0, $height = 0) - { - if ($hotel !== null && $hotel->getLatitude() && $hotel->getLongitude()) { - $source = $hotel; - } elseif ($hotel !== null && $hotel->getRegion()->getLatitude() && $hotel->getRegion()->getLongitude()) { - $source = $hotel->getRegion(); - } elseif ($region !== null) { - $source = $region; - } else { - return ''; - } - $staticMapsBaseUrl = $this->settings['googleStaticMapsBaseUrl']; - $url = sprintf(static::URLBASE, $staticMapsBaseUrl, $source->getLatitude(), $source->getLongitude(), $zoom, $width, $height); - $tag = sprintf('%s', $url, $source->getName(), $source->getName()); - - return $tag; - } -} diff --git a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/GmapsUrlViewHelper.php b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/GmapsUrlViewHelper.php index e910d2eb..17fa0125 100644 --- a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/GmapsUrlViewHelper.php +++ b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/GmapsUrlViewHelper.php @@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers; * * Copyright notice * - * (c) 2016 Björn Fromme , dreipunktnull + * (c) 2018 Björn Fromme , dreipunktnull * * All rights reserved * @@ -30,21 +30,44 @@ namespace EP\EpTheme\ViewHelpers; use EP\EpProducts\Domain\Model\Hotel; use EP\EpProducts\Domain\Model\Region; use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper; +use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; +use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic; class GmapsUrlViewHelper extends AbstractViewHelper { - const URLBASE = 'http://maps.google.com/maps?q=%s,%s&t=%s&z=%d'; + use CompileWithRenderStatic; /** - * @param Hotel $hotel - * @param Region $region - * @param string $type - * @param int $zoom - * - * @return string + * @var bool */ - public function render(Hotel $hotel = null, Region $region = null, $type = 'p', $zoom = 10) + protected $escapeOutput = false; + + const URLBASE = 'http://maps.google.com/maps?q=%s,%s&t=%s&z=%d'; + + public function initializeArguments() { + parent::initializeArguments(); + + $this->registerArgument('hotel', Hotel::class, 'The hotel'); + $this->registerArgument('region', Region::class, 'The region'); + $this->registerArgument('type', 'string', 'The map type', false, 'p'); + $this->registerArgument('zoom', 'int', 'The zoom level', false, 10); + } + + /** + * @param array $arguments + * @param \Closure $renderChildrenClosure + * @param RenderingContextInterface $renderingContext + * @return mixed + */ + public static function renderStatic( + array $arguments, + \Closure $renderChildrenClosure, + RenderingContextInterface $renderingContext + ) + { + $hotel = $arguments['hotel']; + $region = $arguments['region']; if ($hotel !== null && $hotel->getLatitude() && $hotel->getLongitude()) { $source = $hotel; } elseif ($hotel !== null && $hotel->getRegion()->getLatitude() && $hotel->getRegion()->getLongitude()) { @@ -54,6 +77,7 @@ class GmapsUrlViewHelper extends AbstractViewHelper } else { return 'http://www.google.de/maps'; } - return sprintf(static::URLBASE, $source->getLatitude(), $source->getLongitude(), $type, $zoom); + return sprintf(static::URLBASE, $source->getLatitude(), $source->getLongitude(), $arguments['type'], $arguments['zoom']); } + } diff --git a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/HotelCategoriesViewHelper.php b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/HotelCategoriesViewHelper.php index 674fe423..a861b997 100644 --- a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/HotelCategoriesViewHelper.php +++ b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/HotelCategoriesViewHelper.php @@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers; * * Copyright notice * - * (c) 2016 Björn Fromme , dreipunktnull + * (c) 2018 Björn Fromme , dreipunktnull * * All rights reserved * @@ -27,19 +27,35 @@ namespace EP\EpTheme\ViewHelpers; * This copyright notice MUST APPEAR in all copies of the script! ***************************************************************/ -use EP\EpProducts\Domain\Model\Hotel; use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper; +use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; +use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic; class HotelCategoriesViewHelper extends AbstractViewHelper { + use CompileWithRenderStatic; + + public function initializeArguments() + { + parent::initializeArguments(); + + $this->registerArgument('categories', 'array', 'The categories', true); + } /** - * @param array $categories - * - * @return string + * @param array $arguments + * @param \Closure $renderChildrenClosure + * @param RenderingContextInterface $renderingContext + * @return mixed */ - public function render($categories) + public static function renderStatic( + array $arguments, + \Closure $renderChildrenClosure, + RenderingContextInterface $renderingContext + ) { + $categories = $arguments['categories']; + switch (count($categories)) { case 1: $label = reset($categories); @@ -52,4 +68,5 @@ class HotelCategoriesViewHelper extends AbstractViewHelper return $label; } + } diff --git a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/HotelCategoryViewHelper.php b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/HotelCategoryViewHelper.php index 8bd3e16c..fd5cfcbc 100644 --- a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/HotelCategoryViewHelper.php +++ b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/HotelCategoryViewHelper.php @@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers; * * Copyright notice * - * (c) 2016 Björn Fromme , dreipunktnull + * (c) 2018 Björn Fromme , dreipunktnull * * All rights reserved * @@ -29,9 +29,13 @@ namespace EP\EpTheme\ViewHelpers; use EP\EpProducts\Domain\Model\Hotel; use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper; +use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; +use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic; class HotelCategoryViewHelper extends AbstractViewHelper { + use CompileWithRenderStatic; + /** * @var array */ @@ -42,13 +46,28 @@ class HotelCategoryViewHelper extends AbstractViewHelper Hotel::CATEGORY_SUPER_DELUXE => 'Super Deluxe', ]; - /** - * @param int $category - * - * @return string - */ - public function render($category) + public function initializeArguments() { + parent::initializeArguments(); + + $this->registerArgument('category', 'int', 'The category id', true); + } + + /** + * @param array $arguments + * @param \Closure $renderChildrenClosure + * @param RenderingContextInterface $renderingContext + * @return mixed + */ + public static function renderStatic( + array $arguments, + \Closure $renderChildrenClosure, + RenderingContextInterface $renderingContext + ) + { + $category = $arguments['category']; + return static::$categoryLabels[$category]; } + } diff --git a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/NightsOptionsViewHelper.php b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/NightsOptionsViewHelper.php index 6362f0e6..3f13da6a 100644 --- a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/NightsOptionsViewHelper.php +++ b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/NightsOptionsViewHelper.php @@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers; * * Copyright notice * - * (c) 2016 Björn Fromme , dreipunktnull + * (c) 2018 Björn Fromme , dreipunktnull * * All rights reserved * @@ -28,17 +28,33 @@ namespace EP\EpTheme\ViewHelpers; ***************************************************************/ use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper; +use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; +use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic; class NightsOptionsViewHelper extends AbstractViewHelper { + use CompileWithRenderStatic; + + public function initializeArguments() + { + parent::initializeArguments(); + + $this->registerArgument('options', 'array', 'The options'); + } /** - * @param array $options - * - * @return string + * @param array $arguments + * @param \Closure $renderChildrenClosure + * @param RenderingContextInterface $renderingContext + * @return mixed */ - public function render(array $options = null) + public static function renderStatic( + array $arguments, + \Closure $renderChildrenClosure, + RenderingContextInterface $renderingContext + ) { + $options = $arguments['options']; if ($options === null) { return ''; } @@ -54,6 +70,7 @@ class NightsOptionsViewHelper extends AbstractViewHelper $output = $lastOption; } $output .= (int) $lastOption > 1 ? ' Nächte' : ' Nacht'; + return $output; } diff --git a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/RatingViewHelper.php b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/RatingViewHelper.php index ba341df9..01459f24 100644 --- a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/RatingViewHelper.php +++ b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/RatingViewHelper.php @@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers; * * Copyright notice * - * (c) 2016 Björn Fromme , dreipunktnull + * (c) 2018 Björn Fromme , dreipunktnull * * All rights reserved * @@ -29,17 +29,41 @@ namespace EP\EpTheme\ViewHelpers; use EP\EpProducts\Domain\Model\Product; use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper; +use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; +use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic; class RatingViewHelper extends AbstractViewHelper { + use CompileWithRenderStatic; /** - * @param Product $product - * - * @return string + * @var bool */ - public function render(Product $product) + protected $escapeOutput = false; + + public function initializeArguments() { + parent::initializeArguments(); + + $this->registerArgument('product', Product::class, 'The product', true); + } + + /** + * @param array $arguments + * @param \Closure $renderChildrenClosure + * @param RenderingContextInterface $renderingContext + * @return mixed + */ + public static function renderStatic( + array $arguments, + \Closure $renderChildrenClosure, + RenderingContextInterface $renderingContext + ) + { + $product = $renderChildrenClosure(); + if ($product === null) { + $product = $arguments['product']; + } $ratingAverage = $product->getRatingAverage(); $ratingVotesCount = $product->getRatingVotesCount(); $fullStars = floor($ratingAverage); @@ -55,6 +79,7 @@ class RatingViewHelper extends AbstractViewHelper $content .= ''; } $content .= sprintf('%s Sterne (%d)', $ratingAverageLabel, $ratingVotesCount); + return $content; } diff --git a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/TopnavItemViewHelper.php b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/TopnavItemViewHelper.php index ee40b960..a6636401 100644 --- a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/TopnavItemViewHelper.php +++ b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/TopnavItemViewHelper.php @@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers; * * Copyright notice * - * (c) 2016 Björn Fromme , dreipunktnull + * (c) 2018 Björn Fromme , dreipunktnull * * All rights reserved * @@ -28,27 +28,48 @@ namespace EP\EpTheme\ViewHelpers; ***************************************************************/ use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper; +use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; +use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic; class TopnavItemViewHelper extends AbstractViewHelper { + use CompileWithRenderStatic; /** - * @param string $item - * - * @return string + * @var bool */ - public function render($item = null) - { - if ($item === null) { - $item = $this->renderChildren(); - } + protected $escapeOutput = false; + public function initializeArguments() + { + parent::initializeArguments(); + + $this->registerArgument('item', 'string', 'The navigation item'); + } + + /** + * @param array $arguments + * @param \Closure $renderChildrenClosure + * @param RenderingContextInterface $renderingContext + * @return mixed + */ + public static function renderStatic( + array $arguments, + \Closure $renderChildrenClosure, + RenderingContextInterface $renderingContext + ) + { + $item = $renderChildrenClosure(); + if ($item === null) { + $item = $arguments['item']; + } $parts = explode(' ', $item); if (count($parts) === 1) { return $item; } $hiddenMobileText = array_shift($parts); $linkText = implode(' ', $parts); + return '' . $hiddenMobileText . ' ' . $linkText; } diff --git a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/AjaxViewHelper.php b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/AjaxViewHelper.php index f95140ab..41270964 100644 --- a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/AjaxViewHelper.php +++ b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/AjaxViewHelper.php @@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers\Uri; * * Copyright notice * - * (c) 2016 Björn Fromme , dreipunktnull + * (c) 2018 Björn Fromme , dreipunktnull * * All rights reserved * @@ -27,9 +27,8 @@ namespace EP\EpTheme\ViewHelpers\Uri; * This copyright notice MUST APPEAR in all copies of the script! ***************************************************************/ -use TYPO3\CMS\Core\Utility\GeneralUtility; -use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface; use TYPO3\CMS\Fluid\ViewHelpers\Uri\ActionViewHelper; +use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; class AjaxViewHelper extends ActionViewHelper { @@ -37,58 +36,40 @@ class AjaxViewHelper extends ActionViewHelper const PAGE_TYPE_JSON = 1701; const PAGE_TYPE_HTML = 1702; - /** - * @var array - */ - protected $settings; - - /** - * @param ConfigurationManagerInterface $manager - */ - public function injectConfigurationManager(ConfigurationManagerInterface $manager) + public function initializeArguments() { - $configurationManager = $manager; - $settings = GeneralUtility::removeDotsFromTS($configurationManager->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT)); - $this->settings = $settings['plugin']['tx_eptheme']['settings']; + parent::initializeArguments(); + + $this->overrideArgument('extensionName', 'string', 'Target extension name', false, 'epproducts'); + $this->overrideArgument('pluginName', 'string', 'Target plugin name', false, 'Ajax'); + $this->overrideArgument('format', 'string', 'The requested format', false, 'json'); } /** - * @param string $action Target action - * @param array $arguments Arguments - * @param string $controller Target controller. If NULL current controllerName is used - * @param string $extensionName Target Extension Name (without "tx_" prefix and no underscores). If NULL the current extension name is used - * @param string $pluginName Target plugin. If empty, the current plugin name is used - * @param int $pageUid target page. See TypoLink destination - * @param int $pageType type of the target page. See typolink.parameter - * @param bool $noCache set this to disable caching for the target page. You should not need this. - * @param bool $noCacheHash set this to suppress the cHash query parameter created by TypoLink. You should not need this. - * @param string $section the anchor to be added to the URI - * @param string $format The requested format, e.g. ".html - * @param bool $linkAccessRestrictedPages If set, links pointing to access restricted pages will still link to the page even though the page cannot be accessed. - * @param array $additionalParams additional query parameters that won't be prefixed like $arguments (overrule $arguments) - * @param bool $absolute If set, an absolute URI is rendered - * @param bool $addQueryString If set, the current query parameters will be kept in the URI - * @param array $argumentsToBeExcludedFromQueryString arguments to be removed from the URI. Only active if $addQueryString = TRUE - * @param string $addQueryStringMethod Set which parameters will be kept. Only active if $addQueryString = TRUE - * - * @return string Rendered link + * @param array $arguments + * @param \Closure $renderChildrenClosure + * @param RenderingContextInterface $renderingContext + * @return string */ - public function render($action = null, array $arguments = array(), $controller = null, $extensionName = 'epproducts', $pluginName = 'Ajax', $pageUid = null, $pageType = 0, $noCache = false, $noCacheHash = true, $section = '', $format = 'json', $linkAccessRestrictedPages = false, array $additionalParams = array(), $absolute = false, $addQueryString = false, array $argumentsToBeExcludedFromQueryString = array(), $addQueryStringMethod = null) + public static function renderStatic + ( + array $arguments, + \Closure $renderChildrenClosure, + RenderingContextInterface $renderingContext + ) { - if (array_key_exists('defaultAjaxUid', $this->settings)) { - $pageUid = $this->settings['defaultAjaxUid']; - } - if (strtolower(trim($format)) === 'json') { - $pageType = self::PAGE_TYPE_JSON; + if (strtolower(trim($arguments['format'])) === 'json') { + $arguments['pageType'] = self::PAGE_TYPE_JSON; } else { - $pageType = self::PAGE_TYPE_HTML; + $arguments['pageType'] = self::PAGE_TYPE_HTML; } - if ($pageUid === null) { + if ($arguments['pageUid'] === null) { $rootLine = $GLOBALS['TSFE']->sys_page->getRootLine($GLOBALS['TSFE']->id); $rootPage = array_pop($rootLine); - $pageUid = $rootPage['uid']; + $arguments['pageUid'] = $rootPage['uid']; } - return parent::render($action, $arguments, $controller, $extensionName, $pluginName, $pageUid, $pageType, $noCache, $noCacheHash, $section, '', $linkAccessRestrictedPages, $additionalParams, $absolute, $addQueryString, $argumentsToBeExcludedFromQueryString, $addQueryStringMethod); + + return parent::renderStatic($arguments, $renderChildrenClosure, $renderingContext); } } diff --git a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/BookingViewHelper.php b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/BookingViewHelper.php index 18af50e7..8e63ce86 100644 --- a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/BookingViewHelper.php +++ b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/BookingViewHelper.php @@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers\Uri; * * Copyright notice * - * (c) 2016 Björn Fromme , dreipunktnull + * (c) 2018 Björn Fromme , dreipunktnull * * All rights reserved * @@ -31,47 +31,62 @@ use EP\EpProducts\Utility\BookingUrlUtility; use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface; use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper; +use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; +use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic; class BookingViewHelper extends AbstractViewHelper { - /** - * @var ConfigurationManagerInterface - */ - protected $configurationManager; + use CompileWithRenderStatic; /** * @var array */ - protected $settings = []; + protected static $settings = []; /** - * @param ConfigurationManagerInterface $manager - * @return void + * @param ConfigurationManagerInterface $configurationManager */ - public function injectConfigurationManager(ConfigurationManagerInterface $manager) + public function __construct(ConfigurationManagerInterface $configurationManager) { - $this->configurationManager = $manager; - $settings = GeneralUtility::removeDotsFromTS($this->configurationManager->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT)); - $this->settings = $settings['plugin']['tx_theme']; + $settings = GeneralUtility::removeDotsFromTS( + $configurationManager->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT) + ); + static::$settings = $settings['plugin']['tx_theme']; + } + + public function initializeArguments() + { + parent::initializeArguments(); + + $this->registerArgument('bookingId', 'string', 'The booking id', true); + $this->registerArgument('hotelId', 'string', 'The hotel id', true); + $this->registerArgument('template', 'string', 'The booking template'); } /** - * @param int $bookingId - * @param int $hotelId - * @param string $template - * - * @return string + * @param array $arguments + * @param \Closure $renderChildrenClosure + * @param RenderingContextInterface $renderingContext + * @return mixed */ - public function render($bookingId, $hotelId, $template = null) + public static function renderStatic( + array $arguments, + \Closure $renderChildrenClosure, + RenderingContextInterface $renderingContext + ) { + $template = $arguments['template']; + if ($template === null) { - $template = $this->settings['bpnBookingUrlTemplateCode']; + $template = static::$settings['bpnBookungUrlTemplateCode']; } + $options = [ - 'bookingId' => $bookingId, - 'hotelId' => $hotelId, + 'bookingId' => $arguments['bookingId'], + 'hotelId' => $arguments['hotelId'], 'template' => $template, ]; return BookingUrlUtility::generateUrl($options); } + } diff --git a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/ExternalImageViewHelper.php b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/ExternalImageViewHelper.php index 5b0b584d..c64efe2f 100644 --- a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/ExternalImageViewHelper.php +++ b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/ExternalImageViewHelper.php @@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers\Uri; * * Copyright notice * - * (c) 2016 Björn Fromme , dreipunktnull + * (c) 2018 Björn Fromme , dreipunktnull * * All rights reserved * @@ -28,18 +28,44 @@ namespace EP\EpTheme\ViewHelpers\Uri; ***************************************************************/ use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper; +use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; +use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic; class ExternalImageViewHelper extends AbstractViewHelper { + use CompileWithRenderStatic; + /** - * @param string $url - * - * @return string + * @var bool */ - public function render($url) + protected $escapeOutput = false; + + public function initializeArguments() { + parent::initializeArguments(); + + $this->registerArgument('url', 'string', 'The url'); + } + + /** + * @param array $arguments + * @param \Closure $renderChildrenClosure + * @param RenderingContextInterface $renderingContext + * @return mixed + */ + public static function renderStatic( + array $arguments, + \Closure $renderChildrenClosure, + RenderingContextInterface $renderingContext + ) + { + $url = $renderChildrenClosure(); + if ($url === null) { + $url = $arguments['url']; + } $encryptionKey = $GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey']; $token = sha1($url . $encryptionKey); return 'https://www.ep-reisen.de/typo3conf/ext/ep_theme/extimg.php?url=' . urlencode($url) . '&token=' . $token; } + } diff --git a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/ProductViewHelper.php b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/ProductViewHelper.php index 7766086b..ca7b388f 100644 --- a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/ProductViewHelper.php +++ b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/ProductViewHelper.php @@ -6,7 +6,7 @@ namespace EP\EpTheme\ViewHelpers\Uri; * * Copyright notice * - * (c) 2016 Björn Fromme , dreipunktnull + * (c) 2018 Björn Fromme , dreipunktnull * * All rights reserved * @@ -29,71 +29,66 @@ namespace EP\EpTheme\ViewHelpers\Uri; use EP\EpProducts\Domain\Model\Hotel; use EP\EpProducts\Domain\Model\Product; -use TYPO3\CMS\Core\Utility\GeneralUtility; -use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface; use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper; +use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; +use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic; class ProductViewHelper extends AbstractViewHelper { + use CompileWithRenderStatic; - /** - * @var ConfigurationManagerInterface - */ - protected $configurationManager; - - /** - * @var array - */ - protected $settings = []; - - /** - * @param ConfigurationManagerInterface $manager - * @return void - */ - public function injectConfigurationManager(ConfigurationManagerInterface $manager) + public function initializeArgument() { - $this->configurationManager = $manager; - $settings = GeneralUtility::removeDotsFromTS($this->configurationManager->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT)); - $this->settings = $settings['plugin']['tx_epproducts']; + parent::initializeArguments(); + + $this->registerArgument('product', Product::class, 'The product', true); + $this->registerArgument('hotel', Hotel::class, 'The hotel'); + $this->registerArgument('linkHotel', 'bool', 'Whether to link the hotel', false, false); + $this->registerArgument('referringPageUid', 'int', 'Uid of the referring page'); + $this->registerArgument('defaultDetailPageUid', 'int', 'Uid of default page for product details'); + $this->registerArgument('origin', 'string', 'Origin of the link'); } /** - * @param Product $product - * @param Hotel|null $hotel - * @param bool $linkHotel - * @param int $referringPageUid - * @param string $origin - * - * @return string + * @param array $arguments + * @param \Closure $renderChildrenClosure + * @param RenderingContextInterface $renderingContext + * @return mixed */ - public function render(Product $product, Hotel $hotel = null, $linkHotel = false, $referringPageUid = null, $origin = null) + public static function renderStatic( + array $arguments, + \Closure $renderChildrenClosure, + RenderingContextInterface $renderingContext + ) { + $product = $arguments['product']; if ($product->getDetailPage()) { - return $this - ->controllerContext + return $renderingContext + ->getControllerContext() ->getUriBuilder() ->reset() ->setTargetPageUid($product->getDetailPage()) ->build() - ; + ; } - $pageUid = $this->settings['defaultDetailPageUid']; - $arguments = [ 'product' => $product ]; - if ((int) $referringPageUid > 0) { - $arguments['referringPageUid'] = $referringPageUid; + + $pageUid = $arguments['defaultDetailPageUid']; + $uriArguments = [ 'product' => $product ]; + if ((int) $arguments['referringPageUid'] > 0) { + $uriArguments['referringPageUid'] = $arguments['referringPageUid']; } - if ($origin !== null) { - $arguments['origin'] = $origin; + if ($arguments['origin'] !== null) { + $uriArguments['origin'] = $arguments['origin']; } - if ((bool) $linkHotel && $hotel !== null) { - $arguments['hotel'] = $hotel; + if ((bool) $arguments['linkHotel'] && $arguments['hotel'] !== null) { + $uriArguments['hotel'] = $arguments['hotel']; } - return $this - ->controllerContext + return $renderingContext + ->getControllerContext() ->getUriBuilder() ->reset() ->setTargetPageUid($pageUid) - ->uriFor('detail', $arguments, 'Product', 'epproducts', 'product_detail') + ->uriFor('detail', $uriArguments, 'Product', 'epproducts', 'product_detail') ; } diff --git a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/VideoViewHelper.php b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/VideoViewHelper.php index 37c5400d..b9dbd0b9 100644 --- a/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/VideoViewHelper.php +++ b/web/typo3conf/ext/ep_theme/Classes/ViewHelpers/Uri/VideoViewHelper.php @@ -28,24 +28,48 @@ namespace EP\EpTheme\ViewHelpers\Uri; ***************************************************************/ use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper; +use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; +use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic; class VideoViewHelper extends AbstractViewHelper { + use CompileWithRenderStatic; + /** - * @param string $value - * @param int $layout - * @return string + * @var bool */ - public function render($value, $layout = 1) + protected $escapeOutput = false; + + public function initializeArguments() + { + parent::initializeArguments(); + + $this->registerArgument('value', 'string', 'The video url', true); + $this->registerArgument('layout', 'int', 'The layout', false, 1); + } + + /** + * @param array $arguments + * @param \Closure $renderChildrenClosure + * @param RenderingContextInterface $renderingContext + * @return mixed + */ + public static function renderStatic( + array $arguments, + \Closure $renderChildrenClosure, + RenderingContextInterface $renderingContext + ) { // YouTube - if ((int) $layout === 0) { - return $value . '?rel=0&controls=0&showinfo=0'; + if ((int) $arguments['layout'] === 0) { + return $arguments['value'] . '?rel=0&controls=0&showinfo=0'; } // Vimeo - if ((int) $layout === 1) { - return sprintf('https://player.vimeo.com/video/%d?html5=1', $value); + if ((int) $arguments['layout'] === 1) { + return sprintf('https://player.vimeo.com/video/%d?html5=1', $arguments['value']); } + return ''; } + } diff --git a/web/typo3conf/ext/ep_theme/Configuration/PageTS/Extensions/GridElements.ts b/web/typo3conf/ext/ep_theme/Configuration/PageTS/Extensions/GridElements.tsconfig similarity index 100% rename from web/typo3conf/ext/ep_theme/Configuration/PageTS/Extensions/GridElements.ts rename to web/typo3conf/ext/ep_theme/Configuration/PageTS/Extensions/GridElements.tsconfig diff --git a/web/typo3conf/ext/ep_theme/Configuration/PageTS/main.ts b/web/typo3conf/ext/ep_theme/Configuration/PageTS/Main.tsconfig similarity index 65% rename from web/typo3conf/ext/ep_theme/Configuration/PageTS/main.ts rename to web/typo3conf/ext/ep_theme/Configuration/PageTS/Main.tsconfig index 9358a767..46e64bfc 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/PageTS/main.ts +++ b/web/typo3conf/ext/ep_theme/Configuration/PageTS/Main.tsconfig @@ -1,5 +1,5 @@ - - - - - + + + + + diff --git a/web/typo3conf/ext/ep_theme/Configuration/PageTS/Mod/WebLayout/BackendLayouts.ts b/web/typo3conf/ext/ep_theme/Configuration/PageTS/Mod/WebLayout/BackendLayouts.tsconfig similarity index 100% rename from web/typo3conf/ext/ep_theme/Configuration/PageTS/Mod/WebLayout/BackendLayouts.ts rename to web/typo3conf/ext/ep_theme/Configuration/PageTS/Mod/WebLayout/BackendLayouts.tsconfig diff --git a/web/typo3conf/ext/ep_theme/Configuration/PageTS/Mod/Wizards/NewContentElement.ts b/web/typo3conf/ext/ep_theme/Configuration/PageTS/Mod/Wizards/NewContentElement.tsconfig similarity index 77% rename from web/typo3conf/ext/ep_theme/Configuration/PageTS/Mod/Wizards/NewContentElement.ts rename to web/typo3conf/ext/ep_theme/Configuration/PageTS/Mod/Wizards/NewContentElement.tsconfig index 64e560eb..aec556e4 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/PageTS/Mod/Wizards/NewContentElement.ts +++ b/web/typo3conf/ext/ep_theme/Configuration/PageTS/Mod/Wizards/NewContentElement.tsconfig @@ -1,46 +1,50 @@ mod { wizards.newContentElement.wizardItems { + common.show := removeFromList(table,bullets,uploads) + menu.show := removeFromList(menu_abstract,menu_categorized_content,menu_categorized_pages,menu_recently_updated,menu_related_pages,menu_section_pages,menu_sitemap,menu_sitemap_pages) + special.show = div,shortcut,html + forms.show = teaser { header = Teaser elements { teaser { - iconIdentifier = content-image + iconIdentifier = content-ep_theme-ce title = Teaser allgemein description = Teaser mit konfigurierbarem Kontext tt_content_defValues.CType = teaser } teaser_country { - iconIdentifier = content-image + iconIdentifier = content-ep_theme-ce title = Teaser Land description = Teaser für ein auswählbares Land tt_content_defValues.CType = teaser_country } teaser_region { - iconIdentifier = content-image + iconIdentifier = content-ep_theme-ce title = Teaser Gebiet description = Teaser für ein auswählbares Gebiet tt_content_defValues.CType = teaser_region } teaser_city { - iconIdentifier = content-image + iconIdentifier = content-ep_theme-ce title = Teaser Ort description = Teaser für einen auswählbaren Ort tt_content_defValues.CType = teaser_city } teaser_hotel { - iconIdentifier = content-image + iconIdentifier = content-ep_theme-ce title = Teaser Hotel description = Teaser für ein auswählbares Hotel tt_content_defValues.CType = teaser_hotel } teaser_concept { - iconIdentifier = content-image + iconIdentifier = content-ep_theme-ce title = Teaser Konzept description = Teaser für ein auswählbares Konzept tt_content_defValues.CType = teaser_concept } teaser_product { - iconIdentifier = content-image + iconIdentifier = content-ep_theme-ce title = Teaser Produkt description = Teaser für ein auswählbares Produkt tt_content_defValues.CType = teaser_product @@ -52,13 +56,13 @@ mod { header = Störer elements { disturber { - iconIdentifier = content-image + iconIdentifier = content-ep_theme-ce title = Störer description = Störer mit Bild, mehreren Buttons und Kontaktinfo tt_content_defValues.CType = disturber } deal_of_the_week { - iconIdentifier = content-image + iconIdentifier = content-ep_theme-ce title = Deal der Woche description = Störer 'Deal der Woche' mit link auf Produkt tt_content_defValues.CType = deal_of_the_week @@ -69,19 +73,19 @@ mod { special { elements { lineup { - iconIdentifier = content-image + iconIdentifier = content-ep_theme-ce title = Lineup description = Links/rechts alternierende Boxen tt_content_defValues.CType = lineup } event_pricetable { - iconIdentifier = content-image + iconIdentifier = content-ep_theme-ce title = Event Preistabelle description = Preistabelle nach Verfügbarkeit tt_content_defValues.CType = event_pricetable } nlform { - iconIdentifier = content-image + iconIdentifier = content-ep_theme-ce title = Newsletter Anmeldung description = Anmeldeformular tt_content_defValues.CType = nlform @@ -92,31 +96,31 @@ mod { common { elements { gmap { - iconIdentifier = content-image + iconIdentifier = content-ep_theme-ce title = Google Map description = Google Map für Hotel oder Gebiet tt_content_defValues.CType = gmap } contact { - iconIdentifier = content-image + iconIdentifier = content-ep_theme-ce title = Ansprechpartner description = Kontaktbox mit Ansprechpartner für Sidebar tt_content_defValues.CType = contact } calendar { - iconIdentifier = content-image + iconIdentifier = content-ep_theme-ce title = Belegungskalender description = Belegungskalender zu einem ausgewählten Vertragspartner tt_content_defValues.CType = calendar } ytvideo { - iconIdentifier = content-image + iconIdentifier = content-ep_theme-ce title = YouTube Video description = Responsiv eingebettetes Video tt_content_defValues.CType = ytvideo } button { - iconIdentifier = content-image + iconIdentifier = content-ep_theme-ce title = Button description = Button mit Referrer Übertragung tt_content_defValues.CType = button diff --git a/web/typo3conf/ext/ep_theme/Configuration/PageTS/RTE.ts b/web/typo3conf/ext/ep_theme/Configuration/PageTS/RTE.ts deleted file mode 100644 index 15768312..00000000 --- a/web/typo3conf/ext/ep_theme/Configuration/PageTS/RTE.ts +++ /dev/null @@ -1,42 +0,0 @@ -RTE { - default { - contentCSS = EXT:ep_theme/Resources/Public/css/rte.min.css - showButtons ( - blockstylelabel, blockstyle, textstylelabel, textstyle, linebreak, - formatblock, bar, bold, italic, bar, orderedlist, unorderedlist, - indent, bar, link, unlink, removeformat, linebreak, - table, toggleborders, tableproperties, rowproperties, rowinsertabove, - rowinsertunder, rowdelete, rowsplit, columninsertbefore, columninsertafter, - columndelete, columnsplit, cellproperties, cellinsertbefore, cellinsertafter, - celldelete, cellsplit, cellmerge, image, insertcharacter, chMode, pastetoggle - ) - keepButtonGroupTogether = 1 - - proc { - allowedClasses = - entryHTMLparser_db { - tags { - span.fixAttrib.style.unset = 1 - span.rmTagIfNoAttrib = 1 - } - } - } - - buttons { - formatblock.removeItems = h1,h6,section,div,footer,header,nav,aside,blockquote,pre,address,article - link.properties.class.allowedClasses = - pastetoggle.setActiveOnRteOpen = 1 - link.properties.class.allowedClasses = button,button--full - } - } - - classes { - button { - name = Button - } - button--full { - name = Button (volle Breite) - requires = button - } - } -} diff --git a/web/typo3conf/ext/ep_theme/Configuration/PageTS/RTE.tsconfig b/web/typo3conf/ext/ep_theme/Configuration/PageTS/RTE.tsconfig new file mode 100644 index 00000000..ff891f00 --- /dev/null +++ b/web/typo3conf/ext/ep_theme/Configuration/PageTS/RTE.tsconfig @@ -0,0 +1,16 @@ +RTE { + config { + tt_content { + bodytext { + types { + text { + preset = dpn + } + textmedia { + preset = dpn + } + } + } + } + } +} diff --git a/web/typo3conf/ext/ep_theme/Configuration/PageTS/TCEFORM.ts b/web/typo3conf/ext/ep_theme/Configuration/PageTS/TCEFORM.tsconfig similarity index 100% rename from web/typo3conf/ext/ep_theme/Configuration/PageTS/TCEFORM.ts rename to web/typo3conf/ext/ep_theme/Configuration/PageTS/TCEFORM.tsconfig diff --git a/web/typo3conf/ext/ep_theme/Configuration/RTE/Default.yaml b/web/typo3conf/ext/ep_theme/Configuration/RTE/Default.yaml new file mode 100644 index 00000000..c4d8d244 --- /dev/null +++ b/web/typo3conf/ext/ep_theme/Configuration/RTE/Default.yaml @@ -0,0 +1,35 @@ +imports: +- { resource: "EXT:rte_ckeditor/Configuration/RTE/Processing.yaml" } +- { resource: "EXT:rte_ckeditor/Configuration/RTE/Editor/Base.yaml" } +- { resource: "EXT:rte_ckeditor/Configuration/RTE/Editor/Plugins.yaml" } + +editor: + config: + contentsCss: + - "EXT:ep_theme/Resources/Public/css/rte.css" + + stylesSet: + - { name: "Button", element: "a", attributes: { 'class': 'button' } } + - { name: "Button (volle Breite)", element: "a", attributes: { 'class': 'button button--full' } } + + toolbarGroups: + - { name: styles, groups: [ format, styles ] } + - { name: basicstyles, groups: [ basicstyles ] } + - { name: paragraph, groups: [ list] } + - "/" + - { name: links, groups: [ links ] } + - { name: clipboard, groups: [ clipboard, cleanup, undo ] } + - { name: editing, groups: [ spellchecker ] } + - { name: insert, groups: [ insert ] } + - { name: tools, groups: [ table, specialchar ] } + - { name: document, groups: [ mode ] } + + format_tags: "p;h1;h2;h3;h4" + + removePlugins: + - image + + removeButtons: + - Anchor + - Underline + - Strike diff --git a/web/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/sys_file_reference.php b/web/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/sys_file_reference.php index 8e6771c0..eb166646 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/sys_file_reference.php +++ b/web/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/sys_file_reference.php @@ -1,20 +1,31 @@ 'imageManipulation', - 'allowedExtensions' => 'jpg', - 'ratios' => [ - '1.3333333333333334' => 'EP Reisen: Teaser gerade', - '2.0555555555555556' => 'EP Reisen: Teaser ungerade', - '2.3333333333333334' => 'EP Reisen: Header groß', - '3.3333333333333334' => 'EP Reisen: Header klein', - '1.59' => 'EP Reisen: Content Slider', - '1.79069767' => 'EP Reisen: Content Slider Produkttexte', - '1.625' => 'EP Reisen: Slider Produkt Header', - '1' => 'EP Events: Teaser Slider Desktop', - '1.7857' => 'EP Events: Teaser Slider Mobile', - '2.0571' => 'EP Events: Header groß', - '2.63333333333333' => 'EP Events: Header Beispielangebot', - 'NaN' => 'Free', +/** +$GLOBALS['TCA']['sys_file_reference']['columns']['crop']['config']['cropVariants'] = [ + 'default' => [ + 'title' => 'Default', + 'allowedAspectRatios' => [ + 'epEventsTeaserSliderDesktop' => [ + 'title' => 'EP Events: Teaser Slider Desktop', + 'value' => 1, + ], + 'epEventsTeaserSliderMobile' => [ + 'title' => 'EP Events: Teaser Slider Mobile', + 'value' => 1.7857 + ], + 'epEventsHeaderLarge' => [ + 'title' => 'EP Events: Header groß', + 'value' => 2.0571, + ], + 'epEventsHeaderOffer' => [ + 'title' => 'EP Events: Header Beispielangebot', + 'value' => 2.63333333333333, + ], + 'free' => [ + 'title' => 'Frei', + 'value' => 'NaN', + ], + ], ], ]; +**/ diff --git a/web/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/sys_template.php b/web/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/sys_template.php index 276ac78d..495a32df 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/sys_template.php +++ b/web/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/sys_template.php @@ -2,8 +2,12 @@ defined('TYPO3_MODE') or die(); -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( - 'ep_theme', - 'Configuration/TypoScript', - 'EP Theme' -); +call_user_func(function () { + + \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( + 'ep_theme', + 'Configuration/TypoScript', + 'EP Theme' + ); + +}); diff --git a/web/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/tt_content.php b/web/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/tt_content.php index e92888b5..a0529983 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/tt_content.php +++ b/web/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/tt_content.php @@ -2,7 +2,8 @@ defined('TYPO3_MODE') or die(); -call_user_func(function() { +call_user_func(function () { + $ttContentColumns = [ 'tx_eptheme_context_country' => [ 'exclude' => 0, @@ -101,6 +102,7 @@ call_user_func(function() { 'type' => 'input', 'size' => 12, 'eval' => 'date', + 'renderType' => 'inputDateTime', ] ], 'tx_eptheme_context_date_to' => [ @@ -110,6 +112,7 @@ call_user_func(function() { 'type' => 'input', 'size' => 12, 'eval' => 'date', + 'renderType' => 'inputDateTime', ] ], 'button' => [ @@ -166,4 +169,16 @@ call_user_func(function() { 'after:header_layout' ); + \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( + 'EP.EpTheme', + 'SimpleForm', + 'Kurzformular' + ); + + \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( + 'EP.EpTheme', + 'FullForm', + 'Anfrageformular Gruppen' + ); + }); diff --git a/web/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/tt_content_element_disturber.php b/web/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/tt_content_element_disturber.php index bc6c7918..e7b3c316 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/tt_content_element_disturber.php +++ b/web/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/tt_content_element_disturber.php @@ -44,7 +44,9 @@ call_user_func(function() { 'columnsOverrides' => [ 'bodytext' => [ 'label' => 'Text', - 'defaultExtras' => 'richtext:rte_transform[mode=ts_css]' + 'config' => [ + 'enableRichtext' => true, + ] ], 'assets' => [ 'label' => 'Bild', diff --git a/web/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/tt_content_element_teaser.php b/web/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/tt_content_element_teaser.php index c9fbeeaf..090d0cfb 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/tt_content_element_teaser.php +++ b/web/typo3conf/ext/ep_theme/Configuration/TCA/Overrides/tt_content_element_teaser.php @@ -106,7 +106,9 @@ call_user_func(function() { 'columnsOverrides' => [ 'bodytext' => [ 'label' => 'Teasertext', - 'defaultExtras' => 'richtext:rte_transform[mode=ts_css]' + 'config' => [ + 'enableRichtext' => true, + ], ], 'header' => [ 'config' => [ @@ -120,7 +122,33 @@ call_user_func(function() { 'appearance' => [ 'createNewRelationLinkTitle' => 'Hinzufügen' ], - 'foreign_types' => $GLOBALS['TCA']['tt_content']['columns']['image']['config']['foreign_types'], + 'overrideChildTca' => [ + 'columns' => [ + 'crop' => [ + 'config' => [ + 'cropVariants' => [ + 'default' => [ + 'title' => 'Alle Geräte', + 'allowedAspectRatios' => [ + 'teaserEven' => [ + 'title' => 'Teaser gerade', + 'value' => 1.3333333333333334, + ], + 'teaserOdd' => [ + 'title' => 'Teaser ungerade', + 'value' => 2.0555555555555556, + ], + 'free' => [ + 'title' => 'Frei', + 'value' => 'NaN', + ], + ], + ], + ], + ], + ], + ], + ], 'maxitems' => 1, 'minitems' => 0, ], $GLOBALS['TYPO3_CONF_VARS']['SYS']['mediafile_ext']) diff --git a/web/typo3conf/ext/ep_theme/Configuration/TCA/tx_eptheme_domain_model_lineup.php b/web/typo3conf/ext/ep_theme/Configuration/TCA/tx_eptheme_domain_model_lineup.php index 564d3ebb..e972134e 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TCA/tx_eptheme_domain_model_lineup.php +++ b/web/typo3conf/ext/ep_theme/Configuration/TCA/tx_eptheme_domain_model_lineup.php @@ -7,10 +7,9 @@ return [ 'tstamp' => 'tstamp', 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', - 'dividers2tabs' => TRUE, - 'versioningWS' => 2, - 'versioning_followPages' => TRUE, - 'hideTable' => TRUE, + 'dividers2tabs' => true, + 'versioningWS' => true, + 'hideTable' => true, 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', 'transOrigDiffSourceField' => 'l10n_diffsource', @@ -21,7 +20,7 @@ return [ 'endtime' => 'endtime', ], 'searchFields' => 'headline,subline', - 'iconfile' => 'EXT:ep_theme/Resources/Public/images/tx_eptheme_domain_model_lineup.gif' + 'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg', ], 'interface' => [ 'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, name, description, image, @@ -30,11 +29,6 @@ return [ 'types' => [ '1' => [ 'showitem' => 'hidden, name, description, image, --palette--;;social', - 'columnsOverrides' => [ - 'description' => [ - 'defaultExtras' => 'richtext[]', - ], - ], ], ], 'palettes' => [ @@ -94,34 +88,38 @@ return [ ], 'starttime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'endtime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'sorting' => [ @@ -147,6 +145,7 @@ return [ 'cols' => 40, 'rows' => 10, 'eval' => 'trim', + 'enableRichtext' => true, ], ], 'image' => [ @@ -159,18 +158,15 @@ return [ 'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference', 'useSortable' => false, ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - ], + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette', + ], + ], + ], 'maxitems' => 1 ], $GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext'] diff --git a/web/typo3conf/ext/ep_theme/Configuration/TCA/tx_eptheme_domain_model_slide.php b/web/typo3conf/ext/ep_theme/Configuration/TCA/tx_eptheme_domain_model_slide.php index 955092ef..6bc209a4 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TCA/tx_eptheme_domain_model_slide.php +++ b/web/typo3conf/ext/ep_theme/Configuration/TCA/tx_eptheme_domain_model_slide.php @@ -1,16 +1,15 @@ [ - 'title' => 'LLL:EXT:ep_theme/Resources/Private/Language/locallang_db.xlf:tx_eptheme_domain_model_slide', + 'title' => 'Slide', 'default_sortby' => 'ORDER BY headline', 'label' => 'headline', 'tstamp' => 'tstamp', 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', - 'dividers2tabs' => TRUE, - 'versioningWS' => 2, - 'versioning_followPages' => TRUE, - 'hideTable' => TRUE, + 'dividers2tabs' => true, + 'versioningWS' => true, + 'hideTable' => true, 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', 'transOrigDiffSourceField' => 'l10n_diffsource', @@ -21,7 +20,7 @@ return [ 'endtime' => 'endtime', ], 'searchFields' => 'headline,subline', - 'iconfile' => 'EXT:ep_theme/Resources/Public/images/tx_eptheme_domain_model_slide.gif' + 'iconfile' => 'EXT:ep_theme/Resources/Public/images/icon_ce.svg', ], 'interface' => [ 'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, headline, subline, button, @@ -89,34 +88,38 @@ return [ ], 'starttime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'endtime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'sorting' => [ @@ -159,48 +162,69 @@ return [ 'type' => 'input', 'size' => 4, 'eval' => 'int', - 'wizards' => [ - 'link' => [ - 'type' => 'popup', - 'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:header_link_formlabel', - 'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif', - 'module' => [ - 'name' => 'wizard_link', - 'urlParameters' => [ - 'mode' => 'wizard' - ] - ], - 'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1' - ] - ], + 'renderType' => 'inputLink', ] ], 'image' => [ 'exclude' => 0, - 'label' => 'LLL:EXT:ep_theme/Resources/Private/Language/locallang_db.xlf:tx_eptheme_domain_model_slide.image', + 'label' => 'Bild', 'config' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getFileFieldTCAConfig( 'images', - [ - 'appearance' => [ - 'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference', - 'useSortable' => false, - ], - 'foreign_types' => [ - '0' => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ - 'showitem' => ' - --palette--;LLL:EXT:lang/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, - --palette--;;filePalette' - ], - ], - 'minitems' => 1, - 'maxitems' => 1, - ], - $GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext'] + [ + 'appearance' => [ + 'createNewRelationLinkTitle' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:images.addFileReference', + 'fileUploadAllowed' => false, + ], + 'overrideChildTca' => [ + 'types' => [ + \TYPO3\CMS\Core\Resource\File::FILETYPE_IMAGE => [ + 'showitem' => ' + --palette--;LLL:EXT:lang/Resources/Private/Language/locallang_tca.xlf:sys_file_reference.imageoverlayPalette;imageoverlayPalette, + --palette--;;filePalette' + ], + ], + 'columns' => [ + 'crop' => [ + 'config' => [ + 'cropVariants' => [ + 'default' => [ + 'title' => 'Alle Geräte', + 'allowedAspectRatios' => [ + 'headerLarge' => [ + 'title' => 'Header groß', + 'value' => 2.3333333333333334, + ], + 'headerSmall' => [ + 'title' => 'Header klein', + 'value' => 3.3333333333333334, + ], + 'contentSlider' => [ + 'title' => 'Content Slider/Galerie', + 'value' => 1.59, + ], + 'contentSliderProduct' => [ + 'title' => 'Content Slider/Galerie Produkttexte', + 'value' => 1.79069767, + ], + 'sliderProductHeader' => [ + 'title' => 'Slider Produkt Header', + 'value' => 1.625, + ], + 'free' => [ + 'title' => 'Frei', + 'value' => 'NaN', + ], + ], + ], + ], + ], + ], + ], + ], + 'maxitems' => 1, + 'minitems' => 1, + ], + 'jpg,jpeg' ), ], 'page' => [ diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/button.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/button.typoscript similarity index 76% rename from web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/button.ts rename to web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/button.typoscript index 3c9a336c..d7f1e396 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/button.ts +++ b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/button.typoscript @@ -1,4 +1,4 @@ -tt_content.button =< lib.fluidContent +tt_content.button =< lib.contentElement tt_content.button { templateName = Button variables { diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/calendar.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/calendar.typoscript similarity index 89% rename from web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/calendar.ts rename to web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/calendar.typoscript index e6f26879..1684e498 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/calendar.ts +++ b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/calendar.typoscript @@ -1,4 +1,4 @@ -tt_content.calendar =< lib.fluidContent +tt_content.calendar =< lib.contentElement tt_content.calendar { templateName = Calendar dataProcessing { diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/contact.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/contact.typoscript similarity index 94% rename from web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/contact.ts rename to web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/contact.typoscript index 433afb93..919d6b71 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/contact.ts +++ b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/contact.typoscript @@ -1,4 +1,4 @@ -tt_content.contact =< lib.fluidContent +tt_content.contact =< lib.contentElement tt_content.contact { templateName = Contact dataProcessing { diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/disturber.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/disturber.typoscript similarity index 78% rename from web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/disturber.ts rename to web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/disturber.typoscript index 538509f5..144d0777 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/disturber.ts +++ b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/disturber.typoscript @@ -1,4 +1,4 @@ -tt_content.deal_of_the_week =< lib.fluidContent +tt_content.deal_of_the_week =< lib.contentElement tt_content.deal_of_the_week { templateName = DealOfTheWeek dataProcessing { @@ -6,7 +6,7 @@ tt_content.deal_of_the_week { } } -tt_content.disturber =< lib.fluidContent +tt_content.disturber =< lib.contentElement tt_content.disturber { templateName = Disturber dataProcessing { diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/event_pricetable.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/event_pricetable.typoscript similarity index 87% rename from web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/event_pricetable.ts rename to web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/event_pricetable.typoscript index 105d575d..94dccc49 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/event_pricetable.ts +++ b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/event_pricetable.typoscript @@ -1,4 +1,4 @@ -tt_content.event_pricetable =< lib.fluidContent +tt_content.event_pricetable =< lib.contentElement tt_content.event_pricetable { templateName = EventPricetable variables { diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/gmap.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/gmap.typoscript similarity index 100% rename from web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/gmap.ts rename to web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/gmap.typoscript diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/lineup.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/lineup.typoscript similarity index 94% rename from web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/lineup.ts rename to web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/lineup.typoscript index 45640dd9..f5b0872f 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/lineup.ts +++ b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/lineup.typoscript @@ -1,4 +1,4 @@ -tt_content.lineup =< lib.fluidContent +tt_content.lineup =< lib.contentElement tt_content.lineup { templateName = Lineup dataProcessing { diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/list.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/list.typoscript similarity index 100% rename from web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/list.ts rename to web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/list.typoscript diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/nlform.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/nlform.typoscript similarity index 58% rename from web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/nlform.ts rename to web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/nlform.typoscript index 3d677590..7b962455 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/nlform.ts +++ b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/nlform.typoscript @@ -1,4 +1,4 @@ -tt_content.nlform =< lib.fluidContent +tt_content.nlform =< lib.contentElement tt_content.nlform { templateName = NewsletterForm } diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/teaser.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/teaser.typoscript similarity index 92% rename from web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/teaser.ts rename to web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/teaser.typoscript index 822e3904..ab084bbd 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/teaser.ts +++ b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/teaser.typoscript @@ -1,4 +1,4 @@ -tt_content.teaser =< lib.fluidContent +tt_content.teaser =< lib.contentElement tt_content.teaser { templateName = Teaser dataProcessing { @@ -8,7 +8,7 @@ tt_content.teaser { settings.teaserTextMaxChars = {$plugin.tx_eptheme.settings.teaserTextMaxChars} } -tt_content.teaser_country < lib.fluidContent +tt_content.teaser_country < lib.contentElement tt_content.teaser_country { templateName = TeaserCountry dataProcessing { diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/ytvideo.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/ytvideo.typoscript similarity index 57% rename from web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/ytvideo.ts rename to web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/ytvideo.typoscript index 355907e0..2107bc1b 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/ytvideo.ts +++ b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/ContentElements/ytvideo.typoscript @@ -1,4 +1,4 @@ -tt_content.ytvideo =< lib.fluidContent +tt_content.ytvideo =< lib.contentElement tt_content.ytvideo { templateName = YoutubeVideo } diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/EpProducts.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/EpProducts.typoscript similarity index 93% rename from web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/EpProducts.ts rename to web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/EpProducts.typoscript index 08e3d887..c897c8d4 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/EpProducts.ts +++ b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/EpProducts.typoscript @@ -9,6 +9,7 @@ plugin.tx_epproducts { settings { teaserTextMaxChars = {$plugin.tx_eptheme.settings.teaserTextMaxChars} infoPageUid = {$plugin.tx_eptheme.settings.infoPageUid} + defaultAjaxUid = {$plugin.tx_eptheme.settings.defaultAjaxUid} defaultContactFormPageUid = {$plugin.tx_eptheme.settings.defaultContactFormPageUid} phoneNumber = {$plugin.tx_eptheme.settings.phoneNumber} bpnBookingUrlTemplateCode = {$plugin.tx_eptheme.settings.bpnBookingUrlTemplateCode} diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/FluidStyledContent.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/FluidStyledContent.typoscript similarity index 85% rename from web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/FluidStyledContent.ts rename to web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/FluidStyledContent.typoscript index be6cf9e3..28040d8b 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/FluidStyledContent.ts +++ b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/FluidStyledContent.typoscript @@ -1,6 +1,6 @@ - + -lib.fluidContent { +lib.contentElement { layoutRootPaths.20 = EXT:ep_theme/Resources/Private/Layouts/FluidStyledContent templateRootPaths.20 = EXT:ep_theme/Resources/Private/Templates/FluidStyledContent partialRootPaths.20 = EXT:ep_theme/Resources/Private/Partials diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/Form.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/Form.typoscript similarity index 68% rename from web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/Form.ts rename to web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/Form.typoscript index b22a8467..0d75bd13 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/Form.ts +++ b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/Form.typoscript @@ -1,4 +1,4 @@ - + plugin.tx_form { view { diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/GridElements.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/GridElements.typoscript similarity index 100% rename from web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/GridElements.ts rename to web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/GridElements.typoscript diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/Mailform.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/Mailform.typoscript similarity index 100% rename from web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/Mailform.ts rename to web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/Mailform.typoscript diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/News.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/News.typoscript similarity index 100% rename from web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/News.ts rename to web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/News.typoscript diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/PbSocial.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/PbSocial.typoscript similarity index 100% rename from web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/PbSocial.ts rename to web/typo3conf/ext/ep_theme/Configuration/TypoScript/Extensions/PbSocial.typoscript diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/DynamicContent.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/DynamicContent.typoscript similarity index 100% rename from web/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/DynamicContent.ts rename to web/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/DynamicContent.typoscript diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/ParseFunc.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/ParseFunc.typoscript similarity index 100% rename from web/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/ParseFunc.ts rename to web/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/ParseFunc.typoscript diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/SearchBar.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/SearchBar.typoscript similarity index 100% rename from web/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/SearchBar.ts rename to web/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/SearchBar.typoscript diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/SearchBox.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/SearchBox.typoscript similarity index 100% rename from web/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/SearchBox.ts rename to web/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/SearchBox.typoscript diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/SearchResult.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/SearchResult.typoscript similarity index 100% rename from web/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/SearchResult.ts rename to web/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/SearchResult.typoscript diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/Sitemap.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/Sitemap.typoscript similarity index 100% rename from web/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/Sitemap.ts rename to web/typo3conf/ext/ep_theme/Configuration/TypoScript/Library/Sitemap.typoscript diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Ajax.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Ajax.typoscript similarity index 100% rename from web/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Ajax.ts rename to web/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Ajax.typoscript diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Export.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Export.typoscript similarity index 100% rename from web/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Export.ts rename to web/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Export.typoscript diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Main.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Main.typoscript similarity index 100% rename from web/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Main.ts rename to web/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Main.typoscript diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/XMLSitemap.ts b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/XMLSitemap.typoscript similarity index 100% rename from web/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/XMLSitemap.ts rename to web/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/XMLSitemap.typoscript diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.txt b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.txt index 927e1082..a6f82130 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.txt +++ b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/constants.txt @@ -149,4 +149,4 @@ plugin.tx_eptheme { - + diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.txt b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.txt index 5b52d5cf..fe00fccd 100644 --- a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.txt +++ b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/setup.txt @@ -1,32 +1,32 @@ - - - - - - - + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - + + + + + + + + + + + plugin.tx_eptheme { - settings < lib.fluidContent.settings + settings < lib.contentElement.settings settings { footerNavPid = {$plugin.tx_eptheme.settings.footerNavPid} mainNavPid = {$plugin.tx_eptheme.settings.mainNavPid} @@ -96,10 +96,10 @@ plugin.tx_eptheme { tt_content.stdWrap.innerWrap > lib.stdheader.3.headerClass > - - - - + + + + config { doctype = html5 diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/css/rte.css b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/css/rte.css deleted file mode 100644 index cae3dd7f..00000000 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/css/rte.css +++ /dev/null @@ -1,25 +0,0 @@ -table { - border: 1px solid #ccc; - border-collapse: collapse; - font-size: inherit; -} - -a.button { - border: 1px solid #999; - padding: 0.25em; -} - -a.button--full { - border: 1px solid #999; - padding: 0.25em; - display: block; - width: 95%; -} - -td, th { - border: 1px solid #ccc; - border-collapse: collapse; - vertical-align: top; - text-align: left; - padding: 3px; -} diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/bg_login.jpg b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/bg_login.jpg new file mode 100644 index 00000000..10588da6 Binary files /dev/null and b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/bg_login.jpg differ diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/icon_ce.svg b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/icon_ce.svg new file mode 100644 index 00000000..e23d1f8e --- /dev/null +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/icon_ce.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_images.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_images.js index 193967ab..f7961691 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_images.js +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_images.js @@ -1,6 +1,7 @@ 'use strict'; // Require images +require('../images/bg_login.jpg'); require('../images/logo.svg'); require('../images/logo_wide.svg'); require('../images/favicon_ep.ico'); @@ -12,6 +13,9 @@ require('../images/gb.png'); require('../images/badge_skipass.png'); require('../images/polygon.jpg'); +require('../images/icons/icon_ce.svg'); +require('../images/icons/tx_eptheme_domain_model_lineup.gif'); +require('../images/icons/tx_eptheme_domain_model_slide.gif'); require('../images/icons/tx_eptheme_gridelements_half_and_two_quarters.png'); require('../images/icons/tx_eptheme_gridelements_halves.png'); require('../images/icons/tx_eptheme_gridelements_quarters.png'); diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/rte.scss b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/rte.scss new file mode 100644 index 00000000..80f87aa6 --- /dev/null +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/rte.scss @@ -0,0 +1,39 @@ +$output-bourbon-deprecation-warnings: false; +@import "~bourbon/app/assets/stylesheets/bourbon"; + +@include font-face('Lato', '../fonts/lato-v14-latin-300', 300); +@include font-face('Lato', '../fonts/lato-v14-latin-regular', 400); +@include font-face('Lato', '../fonts/lato-v14-latin-700', 700); +@include font-face('Lato', '../fonts/lato-v14-latin-900', 900); + +body { + font-family: "Lato", $helvetica; + font-size: 16px; + line-height: 26px; +} + +table { + border: 1px solid #ccc; + border-collapse: collapse; + font-size: inherit; +} + +a.button { + border: 1px solid #999; + padding: 0.25em; +} + +a.button--full { + border: 1px solid #999; + padding: 0.25em; + display: block; + width: 95%; +} + +td, th { + border: 1px solid #ccc; + border-collapse: collapse; + vertical-align: top; + text-align: left; + padding: 3px; +} diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Menu/Type-0.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Menu/Type-0.html deleted file mode 100644 index 43f2fff9..00000000 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Menu/Type-0.html +++ /dev/null @@ -1,17 +0,0 @@ - - - -
      - -
    • - {page.title} -
      • -       -
    -     - - diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Menu/Type-1.html b/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Menu/Type-1.html deleted file mode 100644 index 8fe7c169..00000000 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Partials/Menu/Type-1.html +++ /dev/null @@ -1,17 +0,0 @@ - - - -
      - -
    • - {page.title} -
      • -       -
    -     - - diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Calendar.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Calendar.html index aa4245b7..3245a170 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Calendar.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Calendar.html @@ -9,7 +9,7 @@
    {element.data.header} + + + + + + + + + + + diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/MenuSectionPages.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/MenuSectionPages.html new file mode 100644 index 00000000..5ca23d62 --- /dev/null +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/MenuSectionPages.html @@ -0,0 +1,32 @@ + + + + + + + + + + + + + diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/MenuSubpages.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/MenuSubpages.html new file mode 100644 index 00000000..ada9e7fc --- /dev/null +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/MenuSubpages.html @@ -0,0 +1,21 @@ + + + + + + + +
      + +
    • + + {page.title} + +
      • +       +
    +     + +     + + diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/TeaserProduct.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/TeaserProduct.html index 8e8f983a..f568c3d5 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/TeaserProduct.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/TeaserProduct.html @@ -15,9 +15,9 @@ {v:variable.set(name: 'partial', value: 'Product/TeaserWide')} - + {v:variable.set(name: 'partial', value: 'Product/Teaser')} - + diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Textmedia.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Textmedia.html index 0c2a1399..0fec478d 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Textmedia.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Textmedia.html @@ -19,11 +19,11 @@ - + - + diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Hotel/DetailEvent.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Hotel/DetailEvent.html index 35bad7a3..d9555e19 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Hotel/DetailEvent.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Hotel/DetailEvent.html @@ -24,7 +24,7 @@

    Buchungsoptionen

    diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Newsletter/Index.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Newsletter/Index.html index 44a26def..e231bebc 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Newsletter/Index.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Newsletter/Index.html @@ -35,9 +35,9 @@
    Diese E-Mail-Adresse ist bereits für unseren Newsletter registriert.
     - +
    Ein Problem ist aufgetreten. Bitte versuche es erneut.
    -     + diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Pricetable/Event.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Pricetable/Event.html index 6c9cdefe..44446966 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Pricetable/Event.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Pricetable/Event.html @@ -8,7 +8,7 @@ ", - pricetable: "{ep:uri.ajax(action: 'pricetable', controller: 'AjaxTable', arguments: '{product: product, hotel: hotel}', format: 'json', noCacheHash: 1)}" + dates: "{ep:uri.ajax(action: 'dates', controller: 'AjaxDate', pageUid: settings.defaultAjaxUid, arguments: '{product: product, hotel: hotel}', format: 'json')}", + pricetable: "{ep:uri.ajax(action: 'pricetable', controller: 'AjaxTable', pageUid: settings.defaultAjaxUid, arguments: '{product: product, hotel: hotel}', format: 'json')}" }' argument-prefix='' :hotel-first="{f:if(condition: settings.hotelOnTop, then: 'true', else: 'false')}" @@ -34,13 +34,13 @@ + :class="{ 'button--active': activeSection === 'hotel'}" + @click.prevent="showHtml('hotel')">Unterkunft + :class="{ 'button--active': activeSection === 'dates'}" + @click.prevent="loadDatesView()">Termine/Preise
    @@ -50,27 +50,27 @@ + :class="{ 'button--active': activeSection === 'dates'}" + @click.prevent="loadDatesView()">Termine/Preise + :class="{ 'button--active': activeSection === 'hotel'}" + @click.prevent="showHtml('hotel')">Unterkunft + :class="{ 'button--active': activeSection === 'region'}" + @click.prevent="showHtml('region')">Gebiet
    + :class="{ 'button--active': activeSection === 'city'}" + @click.prevent="showHtml('city')">Ort + :class="{ 'button--active': activeSection === 'journey'}" + @click.prevent="showHtml('journey')">Anreise
    @@ -226,7 +226,7 @@

    Belegungskalender

    - diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbar.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbar.html index 2c68ee4b..2c104687 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbar.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbar.html @@ -8,8 +8,8 @@
    @@ -260,14 +260,14 @@
    @@ -284,15 +284,15 @@
    diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Watchlist/List.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Watchlist/List.html index dd8a0988..33d3c07e 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Watchlist/List.html +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Watchlist/List.html @@ -8,7 +8,7 @@ + watchlist-uri="{ep:uri.ajax(action: 'list', controller: 'AjaxWatchlist', pageUid: settings.defaultAjaxUid)}"> diff --git a/web/typo3conf/ext/ep_theme/ext_localconf.php b/web/typo3conf/ext/ep_theme/ext_localconf.php index 8ff68cb0..13dba2ea 100644 --- a/web/typo3conf/ext/ep_theme/ext_localconf.php +++ b/web/typo3conf/ext/ep_theme/ext_localconf.php @@ -8,6 +8,10 @@ $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['cms/layout/class.tx_cms_layout.php'][ \EP\EpTheme\Hook\PageLayoutView::class; $GLOBALS['TYPO3_CONF_VARS']['FE']['cacheHash']['excludedParameters'][] = 'ref'; +$GLOBALS['TYPO3_CONF_VARS']['FE']['addRootLineFields'] = 'tx_eptheme_slides'; + +$GLOBALS['TYPO3_CONF_VARS']['RTE']['Presets']['default'] = 'EXT:ep_theme/Configuration/RTE/Default.yaml'; +$GLOBALS['TYPO3_CONF_VARS']['RTE']['Presets']['dpn'] = 'EXT:ep_theme/Configuration/RTE/Default.yaml'; \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin( 'EP.EpTheme', diff --git a/web/typo3conf/ext/ep_theme/ext_tables.php b/web/typo3conf/ext/ep_theme/ext_tables.php index 403dde8f..d37e8537 100644 --- a/web/typo3conf/ext/ep_theme/ext_tables.php +++ b/web/typo3conf/ext/ep_theme/ext_tables.php @@ -2,25 +2,45 @@ defined('TYPO3_MODE') or die(); -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile( - 'ep_theme', - 'Configuration/TypoScript', - 'E&P Theme' -); +call_user_func(function () { -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('tx_eptheme_domain_model_slide'); -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('tx_eptheme_domain_model_lineup'); -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('tx_eptheme_domain_model_badge'); + \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('tx_eptheme_domain_model_slide'); + \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('tx_eptheme_domain_model_lineup'); + \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages('tx_eptheme_domain_model_badge'); -\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.' . $_EXTKEY, - 'SimpleForm', - 'Kurzformular' -); + if (TYPO3_MODE === 'BE') { + $iconRegistry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Imaging\IconRegistry::class); + $iconRegistry->registerIcon( + 'content-ep_theme-ce', + \TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider::class, + ['source' => 'EXT:ep_theme/Resources/Public/images/logo.svg'] + ); -\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin( - 'EP.' . $_EXTKEY, - 'FullForm', - 'Anfrageformular Gruppen' -); + if (!is_array($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['backend'])) { + $GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['backend'] = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['backend']); + } + if (!isset($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['backend']['loginLogo']) + || empty(trim($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['backend']['loginLogo'])) + ) { + $GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['backend']['loginLogo'] = 'EXT:ep_theme/Resources/Public/images/logo_wide.svg'; + } + + if (!isset($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['backend']['loginBackgroundImage']) + || empty(trim($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['backend']['loginBackgroundImage'])) + ) { + $GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['backend']['loginBackgroundImage'] = 'EXT:ep_theme/Resources/Public/images/bg_login.jpg'; + } + + if (!isset($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['backend']['loginHighlightColor']) + || empty(trim($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['backend']['loginHighlightColor'])) + ) { + $GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['backend']['loginHighlightColor'] = '#f9cb0d'; + } + + if (is_array($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['backend'])) { + $GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['backend'] = serialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['backend']); + } + } + +}); diff --git a/web/typo3conf/ext/ep_theme/ext_tables.sql b/web/typo3conf/ext/ep_theme/ext_tables.sql index 8560f18e..ea3329ff 100644 --- a/web/typo3conf/ext/ep_theme/ext_tables.sql +++ b/web/typo3conf/ext/ep_theme/ext_tables.sql @@ -103,6 +103,18 @@ CREATE TABLE pages ( tx_eptheme_badge int(11) unsigned DEFAULT '0' ); +CREATE TABLE pages_language_overlay ( + tx_eptheme_context_country_code char(2) DEFAULT '', + tx_eptheme_context_country int(11) unsigned DEFAULT '0', + tx_eptheme_context_region int(11) unsigned DEFAULT '0', + tx_eptheme_context_concept int(11) unsigned DEFAULT '0', + tx_eptheme_context_product int(11) unsigned DEFAULT '0', + tx_eptheme_hide_searchbar tinyint(4) unsigned DEFAULT '0' NOT NULL, + tx_eptheme_bodyclass varchar(255) DEFAULT '' NOT NULL, + tx_eptheme_slides int(11) unsigned DEFAULT '0', + tx_eptheme_badge int(11) unsigned DEFAULT '0' +); + CREATE TABLE tt_content ( tx_eptheme_context_country int(11) unsigned DEFAULT '0', tx_eptheme_context_region int(11) unsigned DEFAULT '0', diff --git a/web/typo3conf/ext/ep_track/Configuration/TCA/tx_eptrack_domain_model_redirect.php b/web/typo3conf/ext/ep_track/Configuration/TCA/tx_eptrack_domain_model_redirect.php index 4ea39fae..7ef5c58f 100644 --- a/web/typo3conf/ext/ep_track/Configuration/TCA/tx_eptrack_domain_model_redirect.php +++ b/web/typo3conf/ext/ep_track/Configuration/TCA/tx_eptrack_domain_model_redirect.php @@ -8,9 +8,8 @@ return [ 'tstamp' => 'tstamp', 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', - 'dividers2tabs' => TRUE, - 'versioningWS' => 2, - 'versioning_followPages' => TRUE, + 'dividers2tabs' => true, + 'versioningWS' => true, 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', 'transOrigDiffSourceField' => 'l10n_diffsource', @@ -89,34 +88,38 @@ return [ ], 'starttime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.starttime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'endtime' => [ 'exclude' => 0, - 'l10n_mode' => 'mergeIfNotBlank', 'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.endtime', 'config' => [ 'type' => 'input', 'size' => 13, - 'max' => 20, 'eval' => 'datetime', 'checkbox' => 0, 'default' => 0, 'range' => [ 'lower' => mktime(0, 0, 0, date('m'), date('d'), date('Y')) ], + 'behaviour' => [ + 'allowLanguageSynchronization' => true, + ], + 'renderType' => 'inputDateTime', ], ], 'sorting' => [ @@ -148,22 +151,9 @@ return [ 'label' => 'LLL:EXT:ep_track/Resources/Private/Language/locallang.xlf:tx_eptrack_domain_model_redirect.target_page_uid', 'config' => [ 'type' => 'input', - 'size' => 4, - 'eval' => 'int,required', - 'wizards' => [ - 'link' => [ - 'type' => 'popup', - 'title' => 'LLL:EXT:frontend/Resources/Private/Language/locallang_ttc.xlf:header_link_formlabel', - 'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif', - 'module' => [ - 'name' => 'wizard_link', - 'urlParameters' => [ - 'mode' => 'wizard' - ] - ], - 'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1' - ] - ], + 'size' => 30, + 'eval' => 'required', + 'renderType' => 'inputLink', ], ], 'tracking_code' => [ diff --git a/web/typo3conf/realurl_conf.php b/web/typo3conf/realurl_conf.php index f62eb29b..96098b12 100644 --- a/web/typo3conf/realurl_conf.php +++ b/web/typo3conf/realurl_conf.php @@ -302,8 +302,8 @@ $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['realurl']['www.ski-boarderweek.de']['pag $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['realurl']['www.ep-events.de'] = $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['realurl']['_DEFAULT']; $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['realurl']['www.ep-events.de']['pagePath']['rootpage_id'] = '884'; -$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['realurl']['ski-wochenenden.burn.dpn'] = $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['realurl']['www.ski-wochenenden.de']; -$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['realurl']['snowzone.burn.dpn'] = $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['realurl']['www.snowzone.net']; -$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['realurl']['unichamp.burn.dpn'] = $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['realurl']['www.unichamp.de']; -$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['realurl']['ski-boarderweek.burn.dpn'] = $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['realurl']['www.ski-boarderweek.de']; -$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['realurl']['ep-events.burn.dpn'] = $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['realurl']['www.ep-events.de']; +$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['realurl']['ski-wochenenden-lts.burn.dpn'] = $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['realurl']['www.ski-wochenenden.de']; +$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['realurl']['snowzone-lts.burn.dpn'] = $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['realurl']['www.snowzone.net']; +$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['realurl']['unichamp-lts.burn.dpn'] = $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['realurl']['www.unichamp.de']; +$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['realurl']['ski-boarderweek-lts.burn.dpn'] = $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['realurl']['www.ski-boarderweek.de']; +$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['realurl']['ep-events-lts.burn.dpn'] = $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['realurl']['www.ep-events.de']; diff --git a/webpack.config.js b/webpack.config.js index 0f7a90fd..49487b84 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -9,7 +9,7 @@ Encore .addEntry('boarderweek', './web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/boarderweek.js') .addEntry('snowzone', './web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/snowzone.js') .addEntry('unichamp', './web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/unichamp.js') - .addStyleEntry('rte', './web/typo3conf/ext/ep_theme/Resources/Private/Assets/css/rte.css') + .addStyleEntry('rte', './web/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/rte.scss') .createSharedEntry('vendor', [ 'jquery', 'vue', 'vue-session', 'flatpickr', 'jquery-lazy', 'bootstrap-sass/assets/javascripts/bootstrap', 'slick-carousel',