Merge branch 'release/0.7.1'

dwenzel · Jan 5, 2017 · a15ac90 · a15ac90
2 parents 0bb8c60 + ab55306
commit a15ac90
Show file tree

Hide file tree

Showing 15 changed files with 122 additions and 55 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2017-01-05         [RELEASE] Release of t3events_course 0.7.1 (Dirk Wenzel)
+2016-12-30 31cd59c [TASK] deprecated settings replaced in table configuration (Dirk Wenzel)
+2016-12-30 0662cb3 [TASK] deprecated settings replaced in table configuration. Made configuration of of TCA wizards compatible with TYPO3 version 6.2 and newer. (Dirk Wenzel)
+2016-12-29 ec519cb [TASK] fixed error caused by wrong icon type unter TYPO3 version 6.2 (Dirk Wenzel)
+2016-12-29 11fe68f [TASK] new icons for backend modules added. (Dirk Wenzel)
+2016-12-29 299358d [BUGFIX] use correct section name 'main' in templates. (Dirk Wenzel)
+
 2016-12-14         [RELEASE] Release of t3events_course 0.7.0 (Dirk Wenzel)
 2016-12-01 1975c9f [TASK] class constant EXTENSION_KEY and localized strings added. (Dirk Wenzel)
 2016-11-13 8cac7bb [TASK] Invalid argument renderMode removed from flashMessages view helper (Dirk Wenzel)

diff --git a/Configuration/TCA/Overrides/tx_t3events_domain_model_event.php b/Configuration/TCA/Overrides/tx_t3events_domain_model_event.php
@@ -59,7 +59,8 @@
 		'label' => $ll . 'tx_t3eventscourse_domain_model_event.degree_type',
 		'config' => [
 			'type' => 'select',
-			'items' => [
+            'renderType' => 'selectSingle',
+            'items' => [
 				[$ll . 'tx_t3eventscourse_domain_model_event.degree_type.0', 0],
 				[$ll . 'tx_t3eventscourse_domain_model_event.degree_type.1', 1],
 				[$ll . 'tx_t3eventscourse_domain_model_event.degree_type.2', 2],
@@ -74,6 +75,7 @@
 		'label' => $ll . 'tx_t3eventscourse_domain_model_event.mode_instruction_form',
 		'config' => [
 			'type' => 'select',
+            'renderType' => 'selectSingle',
 			'size' => 1,
 			'minitems' => 0,
 			'maxitems' => 1,
@@ -98,15 +100,16 @@
 				[$ll . '', '--div--'],
 				[$ll . 'tx_t3eventscourse_domain_model_event.mode_instruction_form.4', 4], // Fernunterricht/Fernstudium
 			],
-			'noIconsBelowSelect' => 1,
+			'showIconTable' => false,
 		]
 	],
 	'certificate' => [
 		'exclude' => 1,
 		'label' => $ll . 'tx_t3eventscourse_domain_model_event.certificate',
 		'config' => [
 			'type' => 'select',
-			'size' => 6,
+            'renderType' => 'selectMultipleSideBySide',
+            'size' => 6,
 			'minitems' => 0,
 			'maxitems' => 1000,
 			'foreign_table' => 'tx_t3eventscourse_domain_model_certificate',
@@ -121,7 +124,8 @@
 		'config' => [
 			'label' => $ll . 'tx_t3events_domain_model_event.tx_extbase_type',
 			'type' => 'select',
-			'items' => [
+            'renderType' => 'selectSingle',
+            'items' => [
 				[$ll. 'label.tx_extbase_type.default', '1'],
 				[$ll . 'label.tx_extbase_type.Tx_T3eventsCourse_Course', $extbaseType]
 			],

diff --git a/Configuration/TCA/Overrides/tx_t3events_domain_model_performance.php b/Configuration/TCA/Overrides/tx_t3events_domain_model_performance.php
@@ -43,7 +43,8 @@ class_time,event_location,status,
 		'config' => [
 			'label' => $ll . 'label.tx_extbase_type',
 			'type' => 'select',
-			'items' => [
+            'renderType' => 'selectSingle',
+            'items' => [
 				[$ll. 'label.tx_extbase_type.default', ''],
 				[$ll. 'label.tx_extbase_type.Tx_T3eventsCourse_Schedule', 'Tx_T3eventsCourse_Schedule']
 			],

diff --git a/Configuration/TCA/tx_t3eventscourse_domain_model_certificate.php b/Configuration/TCA/tx_t3eventscourse_domain_model_certificate.php
@@ -4,6 +4,36 @@
 	die ('Access denied.');
 }
 $ll = 'LLL:EXT:t3events_course/Resources/Private/Language/locallang_db.xml:';
+$rteWizardIconPath = 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_rte.gif';
+$linkWizardConfig = [
+    'type' => 'popup',
+    'title' => $ll . 'button.openLinkWizard',
+    'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif',
+    'module' => [
+        'name' => 'wizard_link',
+        'urlParameters' => [
+            'mode' => 'wizard'
+        ],
+    ],
+    'JSopenParams' => 'height=600,width=500,status=0,menubar=0,scrollbars=1'
+];
+
+$versionNumber = \TYPO3\CMS\Core\Utility\VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version);
+if ($versionNumber < 7000000) {
+    $rteWizardIconPath = 'wizard_rte2.gif';
+    $linkWizardConfig = [
+        'type' => 'popup',
+        'title' => 'LLL:EXT:cms/locallang_ttc.xlf:header_link_formlabel',
+        'icon' => 'link_popup.gif',
+        'module' => [
+            'name' => 'wizard_element_browser',
+            'urlParameters' => [
+                'mode' => 'wizard'
+            ]
+        ],
+        'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1'
+    ];
+}
 
 return [
 	'ctrl' => [
@@ -16,23 +46,21 @@
 		'sortby' => 'sorting',
 		'versioningWS' => 2,
 		'versioning_followPages' => TRUE,
-
 		'languageField' => 'sys_language_uid',
 		'transOrigPointerField' => 'l10n_parent',
 		'transOrigDiffSourceField' => 'l10n_diffsource',
 		'delete' => 'deleted',
 		'enablecolumns' => [
 			'disabled' => 'hidden',
-
 		],
 		'searchFields' => 'title,description,',
-		'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('t3events_course')
-			. 'Resources/Public/Icons/tx_t3eventscourse_domain_model_certificate.gif'
-	], 'interface' => [
+		'iconfile' => 'EXT:t3events_course/Resources/Public/Icons/tx_t3eventscourse_domain_model_certificate.gif'
+	],
+    'interface' => [
 		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, title,type, description',
 	],
 	'types' => [
-		'1' => ['showitem' => 'sys_language_uid;;;;1-1-1, l10n_parent, l10n_diffsource, hidden;;1, title ,type, short_pas1045, short_qcat, link, description;;;richtext:rte_transform[mode=ts_links], '],
+		'1' => ['showitem' => 'sys_language_uid,l10n_parent, l10n_diffsource, hidden, --palette--;;1, title ,type, short_pas1045, short_qcat, link, description,richtext:rte_transform[mode=ts_links], '],
 	],
 	'palettes' => [
 		'1' => ['showitem' => ''],
@@ -44,7 +72,8 @@
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.language',
 			'config' => [
 				'type' => 'select',
-				'foreign_table' => 'sys_language',
+                'renderType' => 'selectSingle',
+                'foreign_table' => 'sys_language',
 				'foreign_table_where' => 'ORDER BY sys_language.title',
 				'items' => [
 					['LLL:EXT:lang/locallang_general.xlf:LGL.allLanguages', -1],
@@ -58,7 +87,8 @@
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.l18n_parent',
 			'config' => [
 				'type' => 'select',
-				'items' => [
+                'renderType' => 'selectSingle',
+                'items' => [
 					['', 0],
 				],
 				'foreign_table' => 'tx_t3eventscourse_domain_model_certificate',
@@ -91,10 +121,11 @@
 			'label' => $ll . 'tx_t3eventscourse_domain_model_certificate.type',
 			'config' => [
 				'type' => 'select',
-				'foreign_table' => 'tx_t3eventscourse_domain_model_certificatetype',
+                'renderType' => 'selectSingle',
+                'foreign_table' => 'tx_t3eventscourse_domain_model_certificatetype',
 				'minitems' => 0,
 				'maxitems' => 1,
-				'noIconsBelowSelect' => TRUE,
+				'showIconTable' => false,
 			]
 		],
 		'title' => [
@@ -134,18 +165,7 @@
 				'softref' => 'typolink',
 				'wizards' => [
 					'_PADDING' => 2,
-					'link' => [
-						'type' => 'popup',
-						'title' => 'Link',
-						'icon' => 'link_popup.gif',
-						'module' => [
-							'name' => 'wizard_element_browser',
-							'urlParameters' => [
-								'mode' => 'wizard'
-							]
-						],
-						'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1'
-					]
+					'link' => $linkWizardConfig
 				]
 			],
 		],
@@ -159,7 +179,7 @@
 				'eval' => 'trim',
 				'wizards' => [
 					'RTE' => [
-						'icon' => 'wizard_rte2.gif',
+						'icon' => $rteWizardIconPath,
 						'notNewRecords' => 1,
 						'RTEonly' => 1,
 						'module' => [
@@ -171,6 +191,5 @@
 				]
 			],
 		],
-
 	],
 ];
diff --git a/Configuration/TCA/tx_t3eventscourse_domain_model_certificatetype.php b/Configuration/TCA/tx_t3eventscourse_domain_model_certificatetype.php
@@ -4,6 +4,36 @@
 	die ('Access denied.');
 }
 $ll = 'LLL:EXT:t3events_course/Resources/Private/Language/locallang_db.xml:';
+$rteWizardIconPath = 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_rte.gif';
+$linkWizardConfig = [
+    'type' => 'popup',
+    'title' => $ll . 'button.openLinkWizard',
+    'icon' => 'EXT:backend/Resources/Public/Images/FormFieldWizard/wizard_link.gif',
+    'module' => [
+        'name' => 'wizard_link',
+        'urlParameters' => [
+            'mode' => 'wizard'
+        ],
+    ],
+    'JSopenParams' => 'height=600,width=500,status=0,menubar=0,scrollbars=1'
+];
+
+$versionNumber = \TYPO3\CMS\Core\Utility\VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version);
+if ($versionNumber < 7000000) {
+    $rteWizardIconPath = 'wizard_rte2.gif';
+    $linkWizardConfig = [
+        'type' => 'popup',
+        'title' => 'LLL:EXT:cms/locallang_ttc.xlf:header_link_formlabel',
+        'icon' => 'link_popup.gif',
+        'module' => [
+            'name' => 'wizard_element_browser',
+            'urlParameters' => [
+                'mode' => 'wizard'
+            ]
+        ],
+        'JSopenParams' => 'height=300,width=500,status=0,menubar=0,scrollbars=1'
+    ];
+}
 
 return [
 	'ctrl' => [
@@ -16,23 +46,20 @@
 		'sortby' => 'sorting',
 		'versioningWS' => 2,
 		'versioning_followPages' => TRUE,
-
 		'languageField' => 'sys_language_uid',
 		'transOrigPointerField' => 'l10n_parent',
 		'transOrigDiffSourceField' => 'l10n_diffsource',
 		'delete' => 'deleted',
 		'enablecolumns' => [
 			'disabled' => 'hidden',
-
 		],
 		'searchFields' => 'title,description,',
-		'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('t3events_course')
-			. 'Resources/Public/Icons/tx_t3eventscourse_domain_model_certificatetype.gif'
+		'iconfile' => 'EXT:t3events_course/Resources/Public/Icons/tx_t3eventscourse_domain_model_certificatetype.gif'
 	], 'interface' => [
 		'showRecordFieldList' => 'sys_language_uid, l10n_parent, l10n_diffsource, hidden, title, description',
 	],
 	'types' => [
-		'1' => ['showitem' => 'sys_language_uid;;;;1-1-1, l10n_parent, l10n_diffsource, hidden;;1, title, description;;;richtext:rte_transform[mode=ts_links], '],
+		'1' => ['showitem' => 'sys_language_uid,l10n_parent, l10n_diffsource, hidden, --palette--;;1, title, description,richtext:rte_transform[mode=ts_links], '],
 	],
 	'palettes' => [
 		'1' => ['showitem' => ''],
@@ -44,7 +71,8 @@
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.language',
 			'config' => [
 				'type' => 'select',
-				'foreign_table' => 'sys_language',
+                'renderType' => 'selectSingle',
+                'foreign_table' => 'sys_language',
 				'foreign_table_where' => 'ORDER BY sys_language.title',
 				'items' => [
 					['LLL:EXT:lang/locallang_general.xlf:LGL.allLanguages', -1],
@@ -58,7 +86,8 @@
 			'label' => 'LLL:EXT:lang/locallang_general.xlf:LGL.l18n_parent',
 			'config' => [
 				'type' => 'select',
-				'items' => [
+                'renderType' => 'selectSingle',
+                'items' => [
 					['', 0],
 				],
 				'foreign_table' => 'tx_t3eventscourse_domain_model_certificatetype',
@@ -104,7 +133,7 @@
 				'eval' => 'trim',
 				'wizards' => [
 					'RTE' => [
-						'icon' => 'wizard_rte2.gif',
+						'icon' => $rteWizardIconPath,
 						'notNewRecords' => 1,
 						'RTEonly' => 1,
 						'module' => [
@@ -116,6 +145,5 @@
 				]
 			],
 		],
-
 	],
 ];
diff --git a/Resources/Private/Layouts/Backend/Course.html b/Resources/Private/Layouts/Backend/Course.html
@@ -25,7 +25,7 @@
 		</div>
 		<div id="typo3-docbody">
 			<div id="typo3-inner-docbody">
-				<f:render section="content" />
+				<f:render section="main" />
 			</div>
 		</div>
 	</div>

diff --git a/Resources/Private/Layouts/Backend/Lessons.html b/Resources/Private/Layouts/Backend/Lessons.html
@@ -20,7 +20,7 @@
 		</div>
 		<div id="typo3-docbody">
 			<div id="typo3-inner-docbody">
-				<f:render section="content" />
+				<f:render section="main" />
 			</div>
 		</div>
 	</div>

diff --git a/Resources/Private/Layouts/Backend/Participant.html b/Resources/Private/Layouts/Backend/Participant.html
@@ -22,7 +22,7 @@
 		</div>
 		<div id="typo3-docbody">
 			<div id="typo3-inner-docbody">
-				<f:render section="content" />
+				<f:render section="main" />
 			</div>
 		</div>
 	</div>

diff --git a/Resources/Private/Templates/Backend/ScheduleBackend/Edit.html b/Resources/Private/Templates/Backend/ScheduleBackend/Edit.html
@@ -11,7 +11,7 @@
 
 Otherwise your changes will be overwritten the next time you save the extension in the extension builder
 
-<f:section name="content">
+<f:section name="main">
 	<h1>Reservierung bearbeiten</h1>
 
 	<f:flashMessages />

diff --git a/Resources/Private/Templates/Backend/ScheduleBackend/List.html b/Resources/Private/Templates/Backend/ScheduleBackend/List.html
@@ -4,7 +4,7 @@
 <f:layout name="Default"/>
 
 <f:comment>Content</f:comment>
-<f:section name="content">
+<f:section name="main">
     <f:comment>
         <f:debug inline="true">{filterOptions}</f:debug>
         <f:debug inline="true">{performances}</f:debug>

diff --git a/Resources/Private/Templates/Backend/ScheduleBackend/New.html b/Resources/Private/Templates/Backend/ScheduleBackend/New.html
@@ -11,7 +11,7 @@
 
 Otherwise your changes will be overwritten the next time you save the extension in the extension builder
 
-<f:section name="content">
+<f:section name="main">
 	<h1>New Reservation</h1>
 
 	<f:flashMessages />

diff --git a/Resources/Private/Templates/Backend/ScheduleBackend/Show.html b/Resources/Private/Templates/Backend/ScheduleBackend/Show.html
@@ -1,5 +1,5 @@
 <f:layout name="Default" />
-<f:section name="content">
+<f:section name="main">
 	<h1>Details</h1>
 
 	<f:flashMessages />

diff --git a/composer.json b/composer.json
@@ -25,13 +25,12 @@
   ],
   "require": {
     "typo3/cms-core": ">=6.2.0,<8.4",
-    "dwenzel/t3events": "^0.30.0"
+    "dwenzel/t3events": "^0.31.0"
   },
   "require-dev": {
     "mikey179/vfsStream": "1.4.*@dev",
     "phpunit/phpunit": "~4.8.0",
-    "satooshi/php-coveralls": "dev-master",
-    "dwenzel/t3events": "dev-develop"
+    "satooshi/php-coveralls": "dev-master"
   },
   "autoload": {
     "psr-4": {