From 469e1308879f3a7be183bd5c2f2afe96063f96f5 Mon Sep 17 00:00:00 2001
From: Kester Mielke <mail@kester-mielke.de>
Date: Tue, 18 Aug 2020 16:21:26 +0200
Subject: [PATCH] =?UTF-8?q?Fix=20f=C3=BCr=20#38?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contao/dca/tl_calendar_events.php         | 38 ++++++++++-
 .../contao/templates/cal_timetable.xhtml      | 66 -------------------
 .../contao/templates/cal_yearview.xhtml       | 44 -------------
 .../templates/mod_fc_fullcalendar.xhtml       |  7 --
 4 files changed, 37 insertions(+), 118 deletions(-)
 delete mode 100644 src/Resources/contao/templates/cal_timetable.xhtml
 delete mode 100644 src/Resources/contao/templates/cal_yearview.xhtml
 delete mode 100644 src/Resources/contao/templates/mod_fc_fullcalendar.xhtml

diff --git a/src/Resources/contao/dca/tl_calendar_events.php b/src/Resources/contao/dca/tl_calendar_events.php
index aac5dd7..290c68f 100644
--- a/src/Resources/contao/dca/tl_calendar_events.php
+++ b/src/Resources/contao/dca/tl_calendar_events.php
@@ -36,6 +36,24 @@
         '{location_legend},location_name,location_str,location_plz,location_ort;{contact_legend},location_link,location_contact,location_mail;{regform_legend},useRegistration;{recurring_legend},recurring;{recurring_legend_ext},recurringExt;{repeatFixedDates_legend},repeatFixedDates;{exception_legend},useExceptions;',
         $GLOBALS['TL_DCA']['tl_calendar_events']['palettes']['default']
     );
+    $GLOBALS['TL_DCA']['tl_calendar_events']['palettes']['article'] = str_replace
+    (
+        '{recurring_legend},recurring;',
+        '{location_legend},location_name,location_str,location_plz,location_ort;{contact_legend},location_link,location_contact,location_mail;{regform_legend},useRegistration;{recurring_legend},recurring;{recurring_legend_ext},recurringExt;{repeatFixedDates_legend},repeatFixedDates;{exception_legend},useExceptions;',
+        $GLOBALS['TL_DCA']['tl_calendar_events']['palettes']['article']
+    );
+    $GLOBALS['TL_DCA']['tl_calendar_events']['palettes']['internal'] = str_replace
+    (
+        '{recurring_legend},recurring;',
+        '{location_legend},location_name,location_str,location_plz,location_ort;{contact_legend},location_link,location_contact,location_mail;{regform_legend},useRegistration;{recurring_legend},recurring;{recurring_legend_ext},recurringExt;{repeatFixedDates_legend},repeatFixedDates;{exception_legend},useExceptions;',
+        $GLOBALS['TL_DCA']['tl_calendar_events']['palettes']['internal']
+    );
+    $GLOBALS['TL_DCA']['tl_calendar_events']['palettes']['external'] = str_replace
+    (
+        '{recurring_legend},recurring;',
+        '{location_legend},location_name,location_str,location_plz,location_ort;{contact_legend},location_link,location_contact,location_mail;{regform_legend},useRegistration;{recurring_legend},recurring;{recurring_legend_ext},recurringExt;{repeatFixedDates_legend},repeatFixedDates;{exception_legend},useExceptions;',
+        $GLOBALS['TL_DCA']['tl_calendar_events']['palettes']['external']
+    );
 } else {
     $GLOBALS['TL_DCA']['tl_calendar_events']['palettes']['default'] = str_replace
     (
@@ -43,6 +61,24 @@
         '{location_legend},location_name,location_str,location_plz,location_ort;{contact_legend},location_link,location_contact,location_mail;{recurring_legend},recurring;{recurring_legend_ext},recurringExt;{repeatFixedDates_legend},repeatFixedDates;{exception_legend},useExceptions;',
         $GLOBALS['TL_DCA']['tl_calendar_events']['palettes']['default']
     );
+    $GLOBALS['TL_DCA']['tl_calendar_events']['palettes']['article'] = str_replace
+    (
+        '{recurring_legend},recurring;',
+        '{location_legend},location_name,location_str,location_plz,location_ort;{contact_legend},location_link,location_contact,location_mail;{recurring_legend},recurring;{recurring_legend_ext},recurringExt;{repeatFixedDates_legend},repeatFixedDates;{exception_legend},useExceptions;',
+        $GLOBALS['TL_DCA']['tl_calendar_events']['palettes']['article']
+    );
+    $GLOBALS['TL_DCA']['tl_calendar_events']['palettes']['internal'] = str_replace
+    (
+        '{recurring_legend},recurring;',
+        '{location_legend},location_name,location_str,location_plz,location_ort;{contact_legend},location_link,location_contact,location_mail;{recurring_legend},recurring;{recurring_legend_ext},recurringExt;{repeatFixedDates_legend},repeatFixedDates;{exception_legend},useExceptions;',
+        $GLOBALS['TL_DCA']['tl_calendar_events']['palettes']['internal']
+    );
+    $GLOBALS['TL_DCA']['tl_calendar_events']['palettes']['external'] = str_replace
+    (
+        '{recurring_legend},recurring;',
+        '{location_legend},location_name,location_str,location_plz,location_ort;{contact_legend},location_link,location_contact,location_mail;{recurring_legend},recurring;{recurring_legend_ext},recurringExt;{repeatFixedDates_legend},repeatFixedDates;{exception_legend},useExceptions;',
+        $GLOBALS['TL_DCA']['tl_calendar_events']['palettes']['external']
+    );
 }
 
 // change the default palettes
@@ -1340,4 +1376,4 @@ public function listRegForms($a)
         return $return;
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/Resources/contao/templates/cal_timetable.xhtml b/src/Resources/contao/templates/cal_timetable.xhtml
deleted file mode 100644
index e3d34ef..0000000
--- a/src/Resources/contao/templates/cal_timetable.xhtml
+++ /dev/null
@@ -1,66 +0,0 @@
-<div class="timetable">
-
-    <?php if ($this->use_navigation): ?>
-    <div class="timetable_navi">
-        <?php if ($this->linkCurrent): ?>
-        <div class="head current"><a href="<?php echo $this->currHref; ?>" title="<?php echo $this->currTitle; ?>"><?php echo $this->currLink; ?></a></div>
-        <?php endif; ?>
-        <div class="head previous"><a href="<?php echo $this->prevHref; ?>" title="<?php echo $this->prevTitle; ?>"><?php echo $this->prevLink; ?></a></div>
-        <div class="head current"><?php echo $this->current; ?></div>
-        <div class="head next"><a href="<?php echo $this->nextHref; ?>" title="<?php echo $this->nextTitle; ?>"><?php echo $this->nextLink; ?></a></div>
-    </div>
-    <?php endif; ?>
-
-    <div class="timetable_body" style="position:relative;">
-        <table cellspacing="0" cellpadding="0" border="1" class="timetable_body full" summary="Timetable">
-            <tr class="timetable_days">
-                <?php if ($this->cal_times): ?>
-                <td valing="bottom" class="time">Zeit</td>
-                <?php endif; ?>
-                <?php foreach ($this->weekday as $i => $day): ?>
-                <td class="<?php echo $day['class']; ?>">
-                    <div class="head"><?php echo $day['label']; ?></div>
-                </td>
-                <?php endforeach; ?>
-            </tr>
-
-            <tr class="timetable_events">
-                <?php if ($this->cal_times): ?>
-                <td>
-                    <div class="times" style="position:relative;">
-                        <?php foreach ($this->times as $i => $time): ?>
-                        <div class="time <?php echo $time['class']; ?>" style="<?php echo $time['style']; ?>"><?php echo $time['label']; ?></div>
-                        <?php endforeach; ?>
-                    </div>
-                </td>
-                <?php endif; ?>
-                <?php foreach ($this->weekday as $i => $day): ?>
-                <td class="<?php echo $day['class']; ?>">
-                    <div class="events" style="position:relative;">
-                        <?php foreach ($day['events'] as $i => $event): ?>
-                        <?php if ($event): ?>
-                        <div class="event<?php if ($event['class']): echo $event['class']; endif; ?>" style="overflow:hidden;<?php echo $event['bgstyle']; ?><?php if ($event['style']): echo $event['style']; endif; ?>" title="<?php echo $event['title']; ?>">
-                            <div class="event_title <?php echo $event['fgstyle']; ?>">
-                                <a style="<?php echo $event['fgstyle']; ?>" href="<?php echo $event['href']; ?>" title="<?php echo $event['title']; ?> (<?php if ($event['day']): echo $event['day']; ?>, <?php endif; echo $event['date']; if ($event['time']): ?>, <?php echo $event['time']; endif; ?>)"<?php echo $event['target']; ?>><?php echo $event['link']; ?></a>
-                            </div>
-                            <div class="event_time">
-                                <?php if ($event['time']): ?>
-                                <?php echo $event['time']; ?><br/>
-                                <?php endif; ?>
-                            </div>
-                            <div class="event_body">
-                                <?php if ($event['teaser']): ?>
-                                <?php echo $event['teaser']; ?>
-                                <?php endif; ?>
-                            </div>
-                        </div>
-                        <?php endif; ?>
-                        <?php endforeach; ?>
-                    </div>
-                </td>
-                <?php endforeach; ?>
-            </tr>
-
-        </table>
-    </div>
-</div>
\ No newline at end of file
diff --git a/src/Resources/contao/templates/cal_yearview.xhtml b/src/Resources/contao/templates/cal_yearview.xhtml
deleted file mode 100644
index daa14f3..0000000
--- a/src/Resources/contao/templates/cal_yearview.xhtml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-<div class="yearview" class="full>
-
-	<?php if ($this->use_navigation): ?>
-		<div class="yearview_navi">
-			<?php if ($this->linkCurrent): ?>
-	    		<div class="head current"><a href="<?php echo $this->currHref; ?>" title="<?php echo $this->currTitle; ?>"><?php echo $this->currLink; ?></a></div>
-        <?php endif; ?>
-<div class="head previous"><a href="<?php echo $this->prevHref; ?>" title="<?php echo $this->prevTitle; ?>"><?php echo $this->prevLink; ?></a></div>
-<div class="head current"><?php echo $this->current; ?></div>
-<div class="head next"><a href="<?php echo $this->nextHref; ?>" title="<?php echo $this->nextTitle; ?>"><?php echo $this->nextLink; ?></a></div>
-        </div>
-        <?php endif; ?>
-
-<table cellspacing="0" cellpadding="0" border="0" class="yearview_body full" summary="Yearview">
-<tr class="yearview_days">
-    <?php foreach ($this->months as $i => $day): ?>
-    <td colspan="2" class="<?php echo $day['class']; ?>">
-        <div class="head"><?php echo $day['label']; ?></div>
-    </td>
-    <?php endforeach; ?>
-</tr>
-
-<?php foreach ($this->yeardays as $d => $days): ?>
-<tr class="yearview_events">
-    <?php foreach ($days as $dd => $day): ?>
-    <td nowrap valign="top" class="<?php echo $day['class']; ?>"><?php echo $day['label']; ?></td>
-    <td class="<?php echo $day['class']; ?>">
-        <?php foreach ($day['events'] as $e => $event): ?>
-        <?php if ($event): ?>
-        <div class="event<?php if ($event['class']): echo $event['class']; endif; ?>" style="<?php echo $event['bgstyle']; ?>" title="<?php echo $event['title']; ?>">
-            <div class="event_title <?php echo $event['fgstyle']; ?>" title="<?php echo $event['time']; ?>">
-                <?php echo $event['title']; ?>
-            </div>
-        </div>
-        <?php endif; ?>
-        <?php endforeach; ?>
-    </td>
-    <?php endforeach; ?>
-</tr>
-<?php endforeach; ?>
-
-</table>
-</div>
diff --git a/src/Resources/contao/templates/mod_fc_fullcalendar.xhtml b/src/Resources/contao/templates/mod_fc_fullcalendar.xhtml
deleted file mode 100644
index 50f1bb8..0000000
--- a/src/Resources/contao/templates/mod_fc_fullcalendar.xhtml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php $this->extend('block_unsearchable'); ?>
-
-<?php $this->block('content'); ?>
-
-<?= $this->fullcalendar ?>
-
-<?php $this->endblock(); ?>