Merge pull request #119 from jweiland-net/addPluginPreview

Add plugin preview
jweiland-net · Mar 21, 2023 · 5b2e1be · 5b2e1be
2 parents e851e41 + 3f30df5
commit 5b2e1be
Show file tree

Hide file tree

Showing 9 changed files with 138 additions and 23 deletions.
diff --git a/Classes/Service/DataTablesService.php b/Classes/Service/DataTablesService.php
@@ -20,23 +20,18 @@ class DataTablesService
     /**
      * Get configuration for DataTables config array. Assign it to the frontend.
      *
-     * @return array|string[][]
+     * @return array|string[]
      */
     public function getConfiguration(): array
     {
-        $url = LocalizationUtility::translate('datatables.languageFile', 'reserve');
-        if (empty($url)) {
-            $url = PathUtility::getAbsoluteWebPath(
-                GeneralUtility::getFileAbsFileName(
-                    LocalizationUtility::translate('datatables.languageFile', 'reserve')
-                )
-            );
+        $configuration = [];
+
+        if ($url = LocalizationUtility::translate('datatables.languageFile', 'reserve')) {
+            $configuration['language'] = [
+                'url' => PathUtility::getAbsoluteWebPath(GeneralUtility::getFileAbsFileName($url)),
+            ];
         }
 
-        return [
-            'language' => [
-                'url' => (string)$url,
-            ],
-        ];
+        return $configuration;
     }
 }
diff --git a/Configuration/TSconfig/ContentElementWizard.tsconfig b/Configuration/TSconfig/ContentElementWizard.tsconfig
@@ -0,0 +1,26 @@
+mod.wizards.newContentElement.wizardItems.plugins {
+  elements {
+    reserve_reservation {
+      iconIdentifier = ext-reserve-wizard-icon
+      title = LLL:EXT:reserve/Resources/Private/Language/locallang_db.xlf:plugin.reserve_reservation.title
+      description = LLL:EXT:reserve/Resources/Private/Language/locallang_db.xlf:plugin.reserve_reservation.description
+      tt_content_defValues {
+        CType = list
+        list_type = reserve_reservation
+      }
+    }
+    reserve_management {
+      iconIdentifier = ext-reserve-wizard-icon
+      title = LLL:EXT:reserve/Resources/Private/Language/locallang_db.xlf:plugin.reserve_management.title
+      description = LLL:EXT:reserve/Resources/Private/Language/locallang_db.xlf:plugin.reserve_management.description
+      tt_content_defValues {
+        CType = list
+        list_type = reserve_management
+      }
+    }
+  }
+}
+
+# Add CType Preview
+mod.web_layout.tt_content.preview.list.reserve_reservation = EXT:reserve/Resources/Private/Templates/PluginPreview/Reservation.html
+mod.web_layout.tt_content.preview.list.reserve_management = EXT:reserve/Resources/Private/Templates/PluginPreview/Management.html
diff --git a/Documentation/Changelog/Index.rst b/Documentation/Changelog/Index.rst
@@ -10,6 +10,21 @@ Changelog
 Version 2.1.0
 =============
 
+2023-03-21 Add better structure to DataTablesService (Commit 821e7de by Stefan Froemken)
+2023-03-21 Remove spaces from scanner link list (Commit c4071ff by Stefan Froemken)
+2023-03-21 Add entry for newContentElementWizard (Commit 4774955 by Stefan Froemken)
+2023-03-21 Merge pull request #118 from jweiland-net/applyNewPhpCsFixerConfiguration (Commit e851e41 by Stefan Frömken)
+2023-03-21 Split two GitHub actions by enter (Commit 7513aba by Stefan Froemken)
+2023-03-21 Repair tests (Commit 98e8777 by Stefan Froemken)
+2023-03-21 Inject Dispatcher as SingletonInterface (Commit ff1aa85 by Stefan Froemken)
+2023-03-21 Repair tests (Commit a0bbba0 by Stefan Froemken)
+2023-03-21 Apply php-cs-fixer format to Test files (Commit f7705e4 by Stefan Froemken)
+2023-03-21 Do not modernize strpos in php-cs-fixer because of PHP 7 support (Commit 8943eb3 by Stefan Froemken)
+2023-03-21 Remove tests against PHP 7.3 (Commit 3509bcb by Stefan Froemken)
+2023-03-21 Add missing caret to TYPO3 version in composer.json (Commit c1faddf by Stefan Froemken)
+2023-03-21 Update version to 2.1.0 (Commit 6807fcc by Stefan Froemken)
+2023-03-21 Update installation documentation (Commit 63d9795 by Stefan Froemken)
+2023-03-21 Update ChangeLog (Commit 958eee6 by Stefan Froemken)
 2023-03-21 Get translations from core instead of EXT:lang (Commit 9c3706d by Stefan Froemken)
 2023-03-21 Move QueryBuilder instanciation into own methods (Commit 0da8dee by Stefan Froemken)
 2023-03-21 Use logicalAnd with array (Commit 37efb12 by Stefan Froemken)

diff --git a/Resources/Private/Language/de.locallang_db.xlf b/Resources/Private/Language/de.locallang_db.xlf
@@ -3,6 +3,19 @@
 	<file t3:id="1589355594067" source-language="en" target-language="de" datatype="plaintext">
 		<header/>
 		<body>
+			<trans-unit id="plugin.reserve_reservation.title">
+				<target>Reserve: Reservierung</target>
+			</trans-unit>
+			<trans-unit id="plugin.reserve_reservation.description">
+				<target>Zeitblöcke anzeigen und reservieren</target>
+			</trans-unit>
+			<trans-unit id="plugin.reserve_management.title">
+				<target>Reserve: Verwaltung</target>
+			</trans-unit>
+			<trans-unit id="plugin.reserve_management.description">
+				<target>Verwalte Reservierungen und scanne Reservierungscodes</target>
+			</trans-unit>
+
 			<trans-unit id="tx_reserve_domain_model_facility">
 				<target>Einrichtung</target>
 			</trans-unit>

diff --git a/Resources/Private/Language/locallang_db.xlf b/Resources/Private/Language/locallang_db.xlf
@@ -3,6 +3,19 @@
 	<file t3:id="1589355594067" source-language="en" datatype="plaintext">
 		<header/>
 		<body>
+			<trans-unit id="plugin.reserve_reservation.title">
+				<source>Reserve: Reservation</source>
+			</trans-unit>
+			<trans-unit id="plugin.reserve_reservation.description">
+				<source>Display and reserve periods</source>
+			</trans-unit>
+			<trans-unit id="plugin.reserve_management.title">
+				<source>Reserve: Management</source>
+			</trans-unit>
+			<trans-unit id="plugin.reserve_management.description">
+				<source>Manage reservations and scan reservation codes</source>
+			</trans-unit>
+
 			<trans-unit id="tx_reserve_domain_model_facility">
 				<source>Facility</source>
 			</trans-unit>

diff --git a/Resources/Private/Templates/Management/Overview.html b/Resources/Private/Templates/Management/Overview.html
@@ -51,15 +51,9 @@
                 <f:if condition="{period.countActiveReservations}">
                     <f:then>
                         <td>
-                            <f:link.action action="scanner" arguments="{period: period}">
-                                Scanner
-                            </f:link.action>
-                            <f:link.action action="period" arguments="{period: period}">
-                                <f:translate key="list"/>
-                            </f:link.action>
-                            <f:link.action action="periodsOnSameDay" arguments="{period: period}">
-                                <f:translate key="day_list"/>
-                            </f:link.action>
+                            <f:link.action action="scanner" arguments="{period: period}">Scanner</f:link.action>
+                            <f:link.action action="period" arguments="{period: period}"><f:translate key="list"/></f:link.action>
+                            <f:link.action action="periodsOnSameDay" arguments="{period: period}"><f:translate key="day_list"/></f:link.action>
                         </td>
                     </f:then>
                     <f:else>

diff --git a/Resources/Private/Templates/PluginPreview/Management.html b/Resources/Private/Templates/PluginPreview/Management.html
@@ -0,0 +1,23 @@
+<html lang="en"
+      xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
+      data-namespace-typo3-fluid="true">
+
+<table class="table">
+    <thead>
+    <tr>
+        <th>Config</th>
+        <th>Value</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+        <td><strong>Plugin</strong></td>
+        <td>Management</td>
+    </tr>
+    <tr>
+        <td><strong>Facility</strong></td>
+        <td>{pi_flexform_transformed.settings.facility}</td>
+    </tr>
+    </tbody>
+</table>
+</html>
diff --git a/Resources/Private/Templates/PluginPreview/Reservation.html b/Resources/Private/Templates/PluginPreview/Reservation.html
@@ -0,0 +1,27 @@
+<html lang="en"
+      xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers"
+      data-namespace-typo3-fluid="true">
+
+<table class="table">
+    <thead>
+    <tr>
+        <th>Config</th>
+        <th>Value</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr>
+        <td><strong>Plugin</strong></td>
+        <td>Reservation</td>
+    </tr>
+    <tr>
+        <td><strong>Facility</strong></td>
+        <td>{pi_flexform_transformed.settings.facility}</td>
+    </tr>
+    <tr>
+        <td><strong>Order PID</strong></td>
+        <td>{pi_flexform_transformed.settings.orderPid}</td>
+    </tr>
+    </tbody>
+</table>
+</html>
diff --git a/ext_localconf.php b/ext_localconf.php
@@ -49,7 +49,16 @@
             ['source' => 'EXT:reserve/Resources/Public/Icons/' . $identifier . '.svg']
         );
     }
-    unset($icons, $iconRegistry);
+    $iconRegistry->registerIcon(
+        'ext-reserve-wizard-icon',
+        \TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider::class,
+        ['source' => 'EXT:reserve/Resources/Public/Icons/Extension.svg']
+    );
+
+    // Add reserve plugin to new element wizard
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig(
+        '<INCLUDE_TYPOSCRIPT: source="FILE:EXT:reserve/Configuration/TSconfig/ContentElementWizard.tsconfig">'
+    );
 
     $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass'][]
         = \JWeiland\Reserve\Hooks\DataHandler::class;