Merge branch 'release/2020.01-07'

.ddev/.gitignore

@@ -1,24 +0,0 @@
-#ddev-generated: Automatically generated ddev .gitignore.
-# You can remove the above line if you want to edit and maintain this file yourself.
-
-/commands/*/*.example
-/commands/*/README.txt
-/commands/host/launch
-/commands/db/mysql
-/homeadditions/*.example
-/homeadditions/README.txt
-/.gitignore
-/import.yaml
-/docker-compose.yaml
-/db_snapshots
-/sequelpro.spf
-/import-db
-/.bgsync*
-/config.*.y*ml
-/.webimageBuild
-/.dbimageBuild
-/.bgsyncimageBuild
-/.sshimageBuild
-/.webimageExtra
-/.dbimageExtra
-/*-build/Dockerfile.example

.ddev/config.yaml

@@ -17,5 +17,6 @@ additional_hostnames:
 additional_fqdns: []
 nfs_mount_enabled: true
 provider: default
+omit_containers: [dba]
 use_dns_when_possible: true
 timezone: Europe/Berlin

.nvmrc

@@ -1 +0,0 @@
-10

composer.lock

@@ -1263,16 +1263,16 @@
         },
         {
             "name": "kigkonsult/icalcreator",
-            "version": "v2.29.15",
+            "version": "v2.29.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/iCalcreator/iCalcreator.git",
-                "reference": "f66748df0858f5a9fecbecee41b81a3a63f12f4e"
+                "reference": "3687fe06deab48e889eae8afd1d31d201eb2b8a0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/iCalcreator/iCalcreator/zipball/f66748df0858f5a9fecbecee41b81a3a63f12f4e",
-                "reference": "f66748df0858f5a9fecbecee41b81a3a63f12f4e",
+                "url": "https://api.github.com/repos/iCalcreator/iCalcreator/zipball/3687fe06deab48e889eae8afd1d31d201eb2b8a0",
+                "reference": "3687fe06deab48e889eae8afd1d31d201eb2b8a0",
                 "shasum": ""
             },
             "require": {

package.json

@@ -6,7 +6,7 @@
   "license": "WTFPL",
   "repository": "https://gitlab.com/dreipunktnull/ep_theme.git",
   "scripts": {
-    "dev": "./node_modules/.bin/encore dev --watch",
+    "dev": "./node_modules/.bin/encore dev --watch --watch-poll",
     "build": "./node_modules/.bin/encore production"
   },
   "dependencies": {

public/typo3conf/ext/ep_theme/Configuration/TCA/tx_eptheme_domain_model_lineup.php

@@ -24,7 +24,7 @@ return [
 	],
 	'interface' => [
 		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, name, description, image, 
-		    facebook_url, twitter_url, youtube_url, instagram_url',
+		    facebook_url, twitter_url, youtube_url, instagram_url, soundcloud_url',
 	],
 	'types' => [
 		'1' => [
@@ -32,7 +32,7 @@ return [
 		],
 	],
 	'palettes' => [
-	    'social' => ['showitem' => 'facebook_url, twitter_url, youtube_url, instagram_url'],
+	    'social' => ['showitem' => 'facebook_url, twitter_url, youtube_url, instagram_url, soundcloud_url'],
 	],
 	'columns' => [
 
@@ -174,7 +174,7 @@ return [
 		],
         'facebook_url' => [
             'exclude' => 0,
-            'label' => 'LLL:EXT:ep_theme/Resources/Private/Language/locallang_db.xlf:tx_eptheme_domain_model_lineup.facebook_url',
+            'label' => 'Facebook URL',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -183,7 +183,7 @@ return [
         ],
         'twitter_url' => [
             'exclude' => 0,
-            'label' => 'LLL:EXT:ep_theme/Resources/Private/Language/locallang_db.xlf:tx_eptheme_domain_model_lineup.twitter_url',
+            'label' => 'Twitter URL',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -192,7 +192,7 @@ return [
         ],
         'instagram_url' => [
             'exclude' => 0,
-            'label' => 'LLL:EXT:ep_theme/Resources/Private/Language/locallang_db.xlf:tx_eptheme_domain_model_lineup.instagram_url',
+            'label' => 'Instagram URL',
             'config' => [
                 'type' => 'input',
                 'size' => 30,
@@ -201,7 +201,16 @@ return [
         ],
         'youtube_url' => [
             'exclude' => 0,
-            'label' => 'LLL:EXT:ep_theme/Resources/Private/Language/locallang_db.xlf:tx_eptheme_domain_model_lineup.youtube_url',
+            'label' => 'YouTube URL',
+            'config' => [
+                'type' => 'input',
+                'size' => 30,
+                'eval' => 'trim'
+            ],
+        ],
+        'soundcloud_url' => [
+            'exclude' => 0,
+            'label' => 'Soundcloud URL',
             'config' => [
                 'type' => 'input',
                 'size' => 30,

public/typo3conf/ext/ep_theme/Resources/Private/Templates/FluidStyledContent/Lineup.html

@@ -34,10 +34,15 @@
 									</a>
 								</f:if>
 								<f:if condition="{item.data.youtube_url}">
-									<a href="{item.data.youtube_url}" target="_blank" title="{item.data.name} bei Youtube">
+									<a href="{item.data.youtube_url}" target="_blank" title="{item.data.name} bei YouTube">
 										<i aria-hidden="true" class="fa fa-youtube-play"></i>
 									</a>
 								</f:if>
+								<f:if condition="{item.data.soundcloud_url}">
+									<a href="{item.data.soundcloud_url}" target="_blank" title="{item.data.name} bei Soundcloud">
+										<i aria-hidden="true" class="fa fa-soundcloud"></i>
+									</a>
+								</f:if>
 							</div>
 						</div>
 					</div>

public/typo3conf/ext/ep_theme/ext_tables.sql

@@ -61,6 +61,7 @@ CREATE TABLE tx_eptheme_domain_model_lineup
     twitter_url      varchar(255)        DEFAULT ''  NOT NULL,
     instagram_url    varchar(255)        DEFAULT ''  NOT NULL,
     youtube_url      varchar(255)        DEFAULT ''  NOT NULL,
+    soundcloud_url   varchar(255)        DEFAULT ''  NOT NULL,
     sorting          int(11) unsigned    DEFAULT '0' NOT NULL,
     tt_content       int(11) unsigned    DEFAULT '0' NOT NULL,