Switch to new directory structure

.editorconfig

@@ -13,6 +13,10 @@ trim_trailing_whitespace = true
 indent_style = space
 indent_size = 4
 
+[*.{xlf}]
+indent_style = space
+indent_size = 2
+
 [*.{html5,svg,min.css,min.js}]
 insert_final_newline = false
 
@@ -21,4 +25,4 @@ indent_style = tab
 
 [*/src/Resources/contao/**.html5]
 indent_style = space
-indent_size = 2
+indent_size = 2

composer.json

@@ -11,7 +11,7 @@
   ],
   "require": {
     "php": "^7.4 || ^8.0",
-    "contao/core-bundle": "^4.9",
+    "contao/core-bundle": "^4.13",
     "contao/calendar-bundle": "^4.9",
     "markocupic/export_table": "^5.1",
     "ramsey/uuid": "^3.0 || ^4.0",
@@ -24,17 +24,7 @@
   "autoload": {
     "psr-4": {
       "Markocupic\\CalendarEventBookingBundle\\": "src/"
-    },
-    "classmap": [
-      "src/Resources/contao"
-    ],
-    "exclude-from-classmap": [
-      "src/Resources/contao/assets",
-      "src/Resources/contao/config",
-      "src/Resources/contao/dca",
-      "src/Resources/contao/languages",
-      "src/Resources/contao/templates"
-    ]
+    }
   },
   "extra": {
     "contao-manager-plugin": "Markocupic\\CalendarEventBookingBundle\\ContaoManager\\Plugin"

src/Resources/config/services.yml → config/services.yml

@@ -7,5 +7,5 @@ services:
             $projectDir: '%kernel.project_dir%'
 
     Markocupic\CalendarEventBookingBundle\:
-        resource: ../../
-        exclude: ../../{Event,Model,DependencyInjection,Resources}
+        resource: ../src/
+        exclude: ../src/{Event,Model,DependencyInjection}

src/Resources/contao/config/config.php → contao/config/config.php

@@ -17,11 +17,6 @@
 // Add child table tl_calendar_events_member to tl_calendar_events
 $GLOBALS['BE_MOD']['content']['calendar']['tables'][] = 'tl_calendar_events_member';
 
-if (TL_MODE === 'BE') {
-    // Add Backend CSS
-    $GLOBALS['TL_CSS'][] = 'bundles/markocupiccalendareventbooking/css/be_stylesheet.css';
-}
-
 // Register custom models
 $GLOBALS['TL_MODELS']['tl_calendar_events_member'] = CalendarEventsMemberModel::class;
 

src/Resources/contao/dca/tl_calendar_events.php → contao/dca/tl_calendar_events.php

@@ -13,14 +13,14 @@
  */
 
 use Contao\CoreBundle\DataContainer\PaletteManipulator;
-use Markocupic\CalendarEventBookingBundle\Contao\Dca\TlCalendarEvents;
+use Markocupic\CalendarEventBookingBundle\DataContainer\CalendarEvents;
 
 // Table config
 $GLOBALS['TL_DCA']['tl_calendar']['config']['ctable'][] = 'tl_calendar_events_member';
 
 // Overwrite child record callback
 $GLOBALS['TL_DCA']['tl_calendar_events']['list']['sorting']['child_record_callback'] = [
-    'Markocupic\CalendarEventBookingBundle\Contao\Dca\TlCalendarEvents',
+    CalendarEvents::class,
     'listEvents',
 ];
 
@@ -51,7 +51,7 @@
 
 // Callbacks
 $GLOBALS['TL_DCA']['tl_calendar_events']['config']['onsubmit_callback'][] = [
-    TlCalendarEvents::class,
+    CalendarEvents::class,
     'adjustBookingDate',
 ];
 
@@ -290,7 +290,7 @@
     'inputType'     => 'text',
     'save_callback' => [
         [
-            TlCalendarEvents::class,
+            CalendarEvents::class,
             'saveUnsubscribeLimitTstamp',
         ],
     ],

src/Resources/contao/dca/tl_calendar_events_member.php → contao/dca/tl_calendar_events_member.php

@@ -12,10 +12,10 @@
  * @link https://github.com/markocupic/calendar-event-booking-bundle
  */
 
-use Markocupic\CalendarEventBookingBundle\Contao\Dca\TlCalendarEventsMember;
-use Ramsey\Uuid\Uuid;
 use Contao\DataContainer;
 use Contao\DC_Table;
+use Markocupic\CalendarEventBookingBundle\DataContainer\CalendarEventsMember;
+use Ramsey\Uuid\Uuid;
 
 $GLOBALS['TL_DCA']['tl_calendar_events_member'] = [
     // Config
@@ -26,8 +26,8 @@
         'onsubmit_callback' => [],
         'onload_callback'   => [
             [
-                TlCalendarEventsMember::class,
-                'downloadRegistrationList',
+                CalendarEventsMember::class,
+                'downloadEventRegistrations',
             ],
         ],
         'ondelete_callback' => [],
@@ -63,10 +63,10 @@
                 'class'      => 'header_edit_all',
                 'attributes' => 'onclick="Backend.getScrollOffset()" accesskey="e"',
             ],
-            'downloadRegistrationList' => [
-                'label'      => &$GLOBALS['TL_LANG']['tl_calendar_events_member']['downloadRegistrationList'],
-                'href'       => 'action=downloadRegistrationList',
-                'class'      => 'download_booking_list',
+            'downloadEventRegistrations' => [
+                'label'      => &$GLOBALS['TL_LANG']['tl_calendar_events_member']['downloadEventRegistrations'],
+                'href'       => 'action=downloadEventRegistrations',
+                'class'      => 'download_registration_list',
                 'icon'       => 'bundles/markocupiccalendareventbooking/icons/excel.png',
                 'attributes' => 'onclick="Backend.getScrollOffset()" accesskey="e"',
             ],

src/Resources/contao/dca/tl_module.php → contao/dca/tl_module.php

@@ -15,6 +15,7 @@
 use Markocupic\CalendarEventBookingBundle\Controller\FrontendModule\CalendarEventBookingEventBookingModuleController;
 use Markocupic\CalendarEventBookingBundle\Controller\FrontendModule\CalendarEventBookingMemberListModuleController;
 use Markocupic\CalendarEventBookingBundle\Controller\FrontendModule\CalendarEventBookingUnsubscribeFromEventModuleController;
+use Markocupic\CalendarEventBookingBundle\DataContainer\Module;
 
 // Palettes
 $GLOBALS['TL_DCA']['tl_module']['palettes'][CalendarEventBookingEventBookingModuleController::TYPE] = '{title_legend},name,headline,type;{form_legend},form;{notification_center_legend:hide},enableNotificationCenter;{template_legend:hide},customTpl;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID';
@@ -46,7 +47,7 @@
     'exclude'          => true,
     'inputType'        => 'select',
     'options_callback' => [
-        'Markocupic\CalendarEventBookingBundle\Contao\Dca\TlModule',
+        Module::class,
         'getCalendarEventBookingMemberListPartialTemplate',
     ],
     'sql'              => "varchar(128) NOT NULL default 'calendar_event_booking_member_list_partial'",

src/Resources/contao/languages/de/default.xlf → contao/languages/de/default.xlf

@@ -43,8 +43,8 @@
         <target>Ihre Anmeldung zu Event "%s" wurde erfolgreich storniert.</target>
       </trans-unit>
       <trans-unit id="MSC.unsubscribeConfirm">
-        <source>Dear &amp;lt;span class="event-member-name"&gt;%s %s&amp;lt;/span&gt;&amp;lt;br&gt;Are you sure you want to unsubscribe from event "%s"?</source>
-        <target>Liebe(r) &amp;lt;span class="event-member-name"&gt;%s %s&amp;lt;/span&gt;{{br}}Möchten Sie Ihre Anmeldung zu Event "%s" stornieren?</target>
+        <source><![CDATA[Dear <span class="event-member-name">%s %s</span>{{br}}Are you sure you want to unsubscribe from event "%s"?]]>></source>
+        <target><![CDATA[Liebe(r) <span class="event-member-name">%s %s</span>{{br}}Möchten Sie Ihre Anmeldung zu Event "%s" stornieren?]]></target>
       </trans-unit>
       <trans-unit id="BTN.slabelUnsubscribeFromEvent">
         <source>Unsubscribe from event</source>

src/Resources/contao/languages/de/tl_calendar_events_member.xlf → contao/languages/de/tl_calendar_events_member.xlf

@@ -7,40 +7,48 @@
         <target>Neu</target>
       </trans-unit>
       <trans-unit id="tl_calendar_events_member.new.1">
-        <source>Add a new member.</source>
-        <target>Neuen Teilnehmer anlegen.</target>
+        <source>Add a new registration.</source>
+        <target>Neuen Registrierung anlegen.</target>
       </trans-unit>
-      <trans-unit id="tl_calendar_events_member.downloadRegistrationList.0">
-        <source>Memberlist</source>
-        <target>Teilnehmerliste</target>
+      <trans-unit id="tl_calendar_events_member.downloadEventRegistrations.0">
+        <source>Event registrations</source>
+        <target>Registrierungen</target>
       </trans-unit>
-      <trans-unit id="tl_calendar_events_member.downloadRegistrationList.1">
-        <source>Download memberlist.</source>
-        <target>Teilnehmerliste herunterladen.</target>
+      <trans-unit id="tl_calendar_events_member.downloadEventRegistrations.1">
+        <source>Download event registrations.</source>
+        <target>Event Registrierungen herunterladen.</target>
       </trans-unit>
       <trans-unit id="tl_calendar_events_member.edit.0">
         <source>Edit</source>
         <target>Bearbeiten</target>
       </trans-unit>
       <trans-unit id="tl_calendar_events_member.edit.1">
-        <source>Edit member with ID %s.</source>
-        <target>Teilnehmer mit ID %s bearbeiten.</target>
+        <source>Edit registration with ID %s.</source>
+        <target>Registrierung mit ID %s bearbeiten.</target>
+      </trans-unit>
+      <trans-unit id="tl_calendar_events_member.copy.0">
+        <source>Copy</source>
+        <target>Kopieren</target>
+      </trans-unit>
+      <trans-unit id="tl_calendar_events_member.copy.1">
+        <source>Copy registration with ID %s.</source>
+        <target>Registrierung mit ID %s kopieren.</target>
       </trans-unit>
       <trans-unit id="tl_calendar_events_member.delete.0">
         <source>Delete</source>
         <target>Löschen</target>
       </trans-unit>
       <trans-unit id="tl_calendar_events_member.delete.1">
-        <source>Delete member with ID %s.</source>
-        <target>Teilnehmer mit ID %s löschen.</target>
+        <source>Delete registration with ID %s.</source>
+        <target>Registrierung mit ID %s löschen.</target>
       </trans-unit>
       <trans-unit id="tl_calendar_events_member.show.0">
         <source>Show</source>
         <target>Anzeigen</target>
       </trans-unit>
       <trans-unit id="tl_calendar_events_member.show.1">
-        <source>Show member with ID %s.</source>
-        <target>Teilnehmer mit ID %s anzeigen.</target>
+        <source>Show registration with ID %s.</source>
+        <target>Registrierung mit ID %s anzeigen.</target>
       </trans-unit>
       <trans-unit id="tl_calendar_events_member.salutation_male">
         <source>Mr</source>

src/Resources/contao/languages/en/default.xlf → contao/languages/en/default.xlf

@@ -33,7 +33,7 @@
         <source>You've been successfully unsubscribed from event "%s".</source>
       </trans-unit>
       <trans-unit id="MSC.unsubscribeConfirm">
-        <source>Dear &amp;lt;span class="event-member-name"&gt;%s %s&amp;lt;/span&gt;&amp;lt;br&gt;Are you sure you want to unsubscribe from event "%s"?</source>
+        <source><![CDATA[Dear <span class="event-member-name">%s %s</span>{{br}}Are you sure you want to unsubscribe from event "%s"?]]>></source>
       </trans-unit>
       <trans-unit id="BTN.slabelUnsubscribeFromEvent">
         <source>Unsubscribe from event</source>

src/Resources/contao/languages/en/tl_calendar_events_member.php → contao/languages/en/tl_calendar_events_member.php

@@ -13,13 +13,14 @@
  */
 
 // Global operations
-$GLOBALS['TL_LANG']['tl_calendar_events_member']['new'] = ['New', 'Add a new member.'];
-$GLOBALS['TL_LANG']['tl_calendar_events_member']['downloadRegistrationList'] = ['Memberlist', 'Download memberlist.'];
+$GLOBALS['TL_LANG']['tl_calendar_events_member']['new'] = ['New', 'Add a new registration.'];
+$GLOBALS['TL_LANG']['tl_calendar_events_member']['downloadEventRegistrations'] = ['Event registrations', 'Download event registrations.'];
 
 // Operations
-$GLOBALS['TL_LANG']['tl_calendar_events_member']['edit'] = ['Edit', 'Edit member with ID %s.'];
-$GLOBALS['TL_LANG']['tl_calendar_events_member']['delete'] = ['Delete', 'Delete member with ID %s.'];
-$GLOBALS['TL_LANG']['tl_calendar_events_member']['show'] = ['Show', 'Show member with ID %s.'];
+$GLOBALS['TL_LANG']['tl_calendar_events_member']['edit'] = ['Edit', 'Edit registration with ID %s.'];
+$GLOBALS['TL_LANG']['tl_calendar_events_member']['copy'] = ['Copy', 'Copy registration with ID %s.'];
+$GLOBALS['TL_LANG']['tl_calendar_events_member']['delete'] = ['Delete', 'Delete registration with ID %s.'];
+$GLOBALS['TL_LANG']['tl_calendar_events_member']['show'] = ['Show', 'Show registration with ID %s.'];
 
 // References
 $GLOBALS['TL_LANG']['tl_calendar_events_member']['salutation_male'] = 'Mr';