[TASK] Resolving merge conflicts when merging master

b050dc7d · Kevin Ditscheid · c7ee4006 · 90161a19 · b050dc7d · b050dc7d
Commit b050dc7d authored 6 years ago by Kevin Ditscheid
--- a/Configuration/TsConfig/Page/NewContentElementWizard.tsconfig
+++ b/Configuration/TsConfig/Page/NewContentElementWizard.tsconfig
+mod {
+	wizards.newContentElement.wizardItems.jobs {
+		header = LLL:EXT:sg_jobs/Resources/Private/Language/locallang_backend.xlf:applyPluginLabel
+		elements {
+			jobsapply {
+				iconIdentifier = extension-sg_jobs
+				title = LLL:EXT:sg_jobs/Resources/Private/Language/locallang_backend.xlf:applyPluginTitle
+				description = LLL:EXT:sg_jobs/Resources/Private/Language/locallang_backend.xlf:applyPluginDescription
+				tt_content_defValues {
+					CType = list
+					list_type = sgjobs_jobapplication
+				}
+
+			}
+
+			joblist {
+				iconIdentifier = extension-sg_jobs
+				title = LLL:EXT:sg_jobs/Resources/Private/Language/locallang_backend.xlf:listPluginTitle
+				description = LLL:EXT:sg_jobs/Resources/Private/Language/locallang_backend.xlf:listPluginDescription
+				tt_content_defValues {
+					CType = list
+					list_type = sgjobs_joblist
+				}
+
+			}
+
+			jobteaser {
+				iconIdentifier = extension-sg_jobs
+				title = LLL:EXT:sg_jobs/Resources/Private/Language/locallang_backend.xlf:jobteaserPluginTitle
+				description = LLL:EXT:sg_jobs/Resources/Private/Language/locallang_backend.xlf:teaserPluginDescription
+				tt_content_defValues {
+					CType = list
+					list_type = sgjobs_jobteaser
+				}
+
+			}
+
+		}
+
+		show = *
+
+	}
+
+}
\ No newline at end of file
--- a/Resources/Private/Language/locallang_backend.xlf
+++ b/Resources/Private/Language/locallang_backend.xlf
@@ -9,6 +9,9 @@
 			<authorEmail>fabian@sgalinski.de</authorEmail>
 		</header>
 		<body>
+		<trans-unit id="applyPluginLabel">
+			<source>[SgJobs] Jobs Plugin</source>
+		</trans-unit>
 		<trans-unit id="applyPlugin">
 			<source>[SgJobs] Job Application</source>
 		</trans-unit>
@@ -27,6 +30,24 @@
 		<trans-unit id="teaserPlugin">
 			<source>[SgJobs] Job Teaser</source>
 		</trans-unit>
+		<trans-unit id="listPluginTitle">
+			<source>Joblist</source>
+		</trans-unit>
+		<trans-unit id="applyPluginTitle">
+			<source>Job Application</source>
+		</trans-unit>
+		<trans-unit id="jobteaserPluginTitle">
+			<source>Job Teaser</source>
+		</trans-unit>
+		<trans-unit id="applyPluginDescription">
+			<source>Insert a job application form</source>
+		</trans-unit>
+		<trans-unit id="listPluginDescription">
+			<source>List all jobs</source>
+		</trans-unit>
+		<trans-unit id="teaserPluginDescription">
+			<source>Insert a teaser</source>
+		</trans-unit>
 		</body>
 	</file>
 </xliff>
\ No newline at end of file
--- a/ext_localconf.php
+++ b/ext_localconf.php
@@ -104,5 +104,12 @@ call_user_func(
 		if (version_compare(\TYPO3\CMS\Core\Utility\VersionNumberUtility::getCurrentTypo3Version(), '9.0.0', '>')) {
 			$GLOBALS['TYPO3_CONF_VARS']['SYS']['routing']['aspects']['JobTitleMapper'] = \SGalinski\SgJobs\Routing\Aspect\JobTitleMapper::class;
 		}
+
+		//include Plugin sg_jobs
+		\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig(
+		    '<INCLUDE_TYPOSCRIPT: source="FILE:EXT:' . $extKey . '/Configuration/TsConfig/Page/NewContentElementWizard.tsconfig">'
+		);
 	}, 'sg_jobs'
 );
+
+
--- a/ext_tables.php
+++ b/ext_tables.php
@@ -56,6 +56,16 @@ call_user_func(
 				'labels' => 'LLL:EXT:' . $extKey . '/Resources/Private/Language/locallang_backend.xlf',
 			]
 		);
+
+		//Register Icons
+		$iconRegistry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Imaging\IconRegistry::class);
+		$iconRegistry->registerIcon(
+			'extension-' . $extKey,
+			\TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider::class,
+			['source' => 'EXT:' . $extKey . '/Resources/Public/Icons/module-sgjobs.svg']
+		);
 	}, 'sg_jobs'
 );

+
+