Align pinboard assets with /assets path convention

contao/config/config.php

@@ -9,3 +9,5 @@ $GLOBALS['BE_MOD']['content']['pinnwand'] = [
 ];
 
 $GLOBALS['TL_MODELS']['tl_pinnwand'] = PinboardModel::class;
+
+$GLOBALS['TL_DCA']['tl_module']['palettes']['pinnwand'] = '{title_legend},name,headline,type;{image_legend},imgSize;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID';

contao/config/services.yaml

@@ -15,8 +15,8 @@ services:
         name: contao.frontend_module
         category: application
         type: pinnwand
-        template: frontend_module/pinnwand
+        template: frontend/pinnwand
 
   Eiswurm\ContaoPinboardBundle\EventListener\DataContainer\PinboardTimestampListener:
     tags:
-      - { name: contao.callback, table: tl_pinnwand, target: config.onsubmit }
+      - { name: contao.callback, table: tl_pinnwand, target: config.onbeforesubmit, method: onBeforeSubmit }

contao/dca/tl_module.php

@@ -0,0 +1,5 @@
+<?php
+
+declare(strict_types=1);
+
+$GLOBALS['TL_DCA']['tl_module']['palettes']['pinnwand'] = '{title_legend},name,headline,type;{image_legend},imgSize;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID';

contao/dca/tl_pinnwand.php

@@ -2,6 +2,10 @@
 
 declare(strict_types=1);
 
+use Contao\DataContainer;
+use Contao\Database;
+use Contao\Input;
+
 $GLOBALS['TL_DCA']['tl_pinnwand'] = [
     'config' => [
         'dataContainer' => Contao\DC_Table::class,
@@ -22,8 +26,8 @@ $GLOBALS['TL_DCA']['tl_pinnwand'] = [
             'panelLayout' => 'filter;sort,search,limit',
         ],
         'label' => [
-            'fields' => ['ueberschrift', 'dateAdded'],
-            'format' => '%s <span style="color:#999;padding-left:3px">[%s]</span>',
+            'fields' => ['ueberschrift', 'dateAdded', 'dateModified'],
+            'showColumns' => true,
         ],
         'global_operations' => [
             'all' => [
@@ -46,6 +50,10 @@ $GLOBALS['TL_DCA']['tl_pinnwand'] = [
                 'icon' => 'delete.svg',
                 'attributes' => 'onclick="if(!confirm(\'' . ($GLOBALS['TL_LANG']['MSC']['deleteConfirm'] ?? 'Möchten Sie den Eintrag wirklich löschen?') . '\'))return false;Backend.getScrollOffset()"',
             ],
+            'toggle' => [
+                'href' => 'act=toggle&amp;field=published',
+                'icon' => 'visible.svg',
+            ],
             'show' => [
                 'href' => 'act=show',
                 'icon' => 'show.svg',
@@ -74,7 +82,7 @@ $GLOBALS['TL_DCA']['tl_pinnwand'] = [
             'exclude' => true,
             'search' => true,
             'inputType' => 'textarea',
-            'eval' => ['mandatory' => true, 'maxlength' => 3000, 'rte' => 'tinyMCE', 'allowHtml' => true, 'tl_class' => 'clr'],
+            'eval' => ['mandatory' => true, 'maxlength' => 3000, 'tl_class' => 'clr'],
             'sql' => 'text NULL',
         ],
         'link' => [
@@ -94,6 +102,7 @@ $GLOBALS['TL_DCA']['tl_pinnwand'] = [
             'sorting' => true,
             'flag' => 6,
             'inputType' => 'text',
+            'default' => time(),
             'eval' => ['rgxp' => 'datim', 'datepicker' => true, 'mandatory' => true, 'tl_class' => 'w50 wizard'],
             'sql' => 'int(10) unsigned NOT NULL default 0',
         ],
@@ -101,7 +110,8 @@ $GLOBALS['TL_DCA']['tl_pinnwand'] = [
             'sorting' => true,
             'flag' => 6,
             'inputType' => 'text',
-            'eval' => ['rgxp' => 'datim', 'readonly' => true, 'disabled' => true, 'tl_class' => 'w50'],
+            'default' => time(),
+            'eval' => ['rgxp' => 'datim', 'readonly' => true, 'tl_class' => 'w50'],
             'sql' => 'int(10) unsigned NOT NULL default 0',
         ],
         'published' => [
@@ -122,3 +132,52 @@ $GLOBALS['TL_DCA']['tl_pinnwand'] = [
         ],
     ],
 ];
+
+$GLOBALS['TL_DCA']['tl_pinnwand']['fields']['ueberschrift']['save_callback'][] = static function (string $value, DataContainer $dataContainer): string {
+    if ('copy' !== Input::get('act')) {
+        return $value;
+    }
+
+    $baseHeadline = trim($value);
+
+    if ('' === $baseHeadline) {
+        return $value;
+    }
+
+    $start = 2;
+    $base = $baseHeadline;
+
+    if (preg_match('/^(.*)\s\((\d+)\)$/', $baseHeadline, $matches)) {
+        $base = trim($matches[1]);
+        $start = (int) $matches[2] + 1;
+    }
+
+    $id = (int) ($dataContainer->id ?? 0);
+    $number = max(2, $start);
+    $candidate = sprintf('%s (%d)', $base, $number);
+
+    do {
+        $exists = Database::getInstance()
+            ->prepare('SELECT id FROM tl_pinnwand WHERE ueberschrift=? AND id!=?')
+            ->execute($candidate, $id);
+
+        if ($exists->numRows < 1) {
+            return $candidate;
+        }
+
+        ++$number;
+        $candidate = sprintf('%s (%d)', $base, $number);
+    } while (true);
+};
+
+$GLOBALS['TL_DCA']['tl_pinnwand']['fields']['dateAdded']['load_callback'][] = static function (mixed $value): int {
+    $timestamp = (int) $value;
+
+    return $timestamp > 0 ? $timestamp : time();
+};
+
+$GLOBALS['TL_DCA']['tl_pinnwand']['fields']['dateModified']['load_callback'][] = static function (mixed $value): int {
+    $timestamp = (int) $value;
+
+    return $timestamp > 0 ? $timestamp : time();
+};

contao/languages/de/modules.php

@@ -2,5 +2,5 @@
 
 declare(strict_types=1);
 
-$GLOBALS['TL_LANG']['MOD']['pinnwand'] = ['Pinwand', 'Pinnwandeinträge verwalten'];
-$GLOBALS['TL_LANG']['FMD']['pinnwand'] = ['Pinwand', 'Zeigt veröffentlichte Pinnwandeinträge als frei angeordnete Notizzettel an'];
+$GLOBALS['TL_LANG']['MOD']['pinnwand'] = ['Pinnwand', 'Pinnwandeinträge verwalten'];
+$GLOBALS['TL_LANG']['FMD']['pinnwand'] = ['Pinnwand', 'Zeigt veröffentlichte Pinnwandeinträge als frei angeordnete Notizzettel an'];

contao/templates/frontend/pinnwand.html.twig

@@ -0,0 +1,36 @@
+{% use '@Contao/component/_figure.html.twig' %}
+
+<link rel="stylesheet" href="{{ asset('bundles/contaopinboard/assets/pinboard.css') }}">
+
+<section class="pinboard" data-pinboard>
+  <div class="pinboard__surface" data-pinboard-surface>
+    {% for entry in entries %}
+      <article
+        class="pin-note{% if entry.highlighted %} is-highlighted{% endif %}"
+        data-pin-note
+        data-highlighted="{{ entry.highlighted ? '1' : '0' }}"
+        data-seed="{{ entry.id }}"
+        aria-label="{{ entry.headline }}"
+      >
+        {% if entry.imageFigure %}
+          <figure class="pin-note__image-wrap">
+            {% with {figure: entry.imageFigure} %}{{ block('figure_component') }}{% endwith %}
+          </figure>
+        {% endif %}
+
+        <h3 class="pin-note__headline">{{ entry.headline }}</h3>
+        <div class="pin-note__text">{{ entry.text|e|nl2br }}</div>
+
+        {% if entry.link %}
+          <p class="pin-note__link-wrap">
+            <a href="{{ entry.link }}" class="pin-note__link" target="_blank" rel="noopener">Mehr erfahren</a>
+          </p>
+        {% endif %}
+      </article>
+    {% else %}
+      <p class="pinboard__empty">Keine veröffentlichten Pinnwandeinträge vorhanden.</p>
+    {% endfor %}
+  </div>
+</section>
+
+<script src="{{ asset('bundles/contaopinboard/assets/pinboard.js') }}" defer></script>

src/ContaoPinboardBundle.php

@@ -8,4 +8,8 @@ use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 final class ContaoPinboardBundle extends Bundle
 {
+	public function getPath(): string
+	{
+		return dirname(__DIR__);
+	}
 }

src/Controller/FrontendModule/PinboardController.php

@@ -5,16 +5,23 @@ declare(strict_types=1);
 namespace Eiswurm\ContaoPinboardBundle\Controller\FrontendModule;
 
 use Contao\CoreBundle\Controller\FrontendModule\AbstractFrontendModuleController;
+use Contao\CoreBundle\Image\Studio\Studio;
+use Contao\CoreBundle\Twig\FragmentTemplate;
 use Contao\FilesModel;
 use Contao\ModuleModel;
-use Contao\Template;
+use Contao\StringUtil;
 use Eiswurm\ContaoPinboardBundle\Model\PinboardModel;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
 final class PinboardController extends AbstractFrontendModuleController
 {
-    protected function getResponse(Template $template, ModuleModel $model, Request $request): Response
+    public function __construct(
+        private readonly Studio $studio,
+    ) {
+    }
+
+    protected function getResponse(FragmentTemplate $template, ModuleModel $model, Request $request): Response
     {
         $collection = PinboardModel::findBy(
             ['published = ?'],
@@ -26,11 +33,27 @@ final class PinboardController extends AbstractFrontendModuleController
 
         if (null !== $collection) {
             foreach ($collection as $entry) {
-                $imagePath = null;
+                $imageFigure = null;
 
                 if ($entry->bild) {
                     $fileModel = FilesModel::findByUuid($entry->bild);
-                    $imagePath = $fileModel?->path;
+
+                    if (null !== $fileModel) {
+                        $figureBuilder = $this->studio
+                            ->createFigureBuilder()
+                            ->fromFilesModel($fileModel)
+                            ->enableLightbox()
+                            ->setLightboxGroupIdentifier('pinnwand-'.$model->id)
+                        ;
+
+                        $imageSize = StringUtil::deserialize($model->imgSize, true);
+
+                        if ([] !== $imageSize) {
+                            $figureBuilder->setSize($imageSize);
+                        }
+
+                        $imageFigure = $figureBuilder->buildIfResourceExists();
+                    }
                 }
 
                 $notes[] = [
@@ -40,15 +63,15 @@ final class PinboardController extends AbstractFrontendModuleController
                     'link' => (string) $entry->link,
                     'dateAdded' => (int) $entry->dateAdded,
                     'dateModified' => (int) $entry->dateModified,
-                    'imagePath' => $imagePath,
+                    'imageFigure' => $imageFigure,
                     'highlighted' => '1' === $entry->hervorgehoben,
                 ];
             }
         }
 
-        return $this->render('@Contao/frontend_module/pinnwand.html.twig', [
-            'entries' => $notes,
-            'module' => $model,
-        ]);
+        $template->set('entries', $notes);
+        $template->set('module', $model);
+
+        return $template->getResponse();
     }
 }

src/DependencyInjection/ContaoPinboardExtension.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Eiswurm\ContaoPinboardBundle\DependencyInjection;
+
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+
+final class ContaoPinboardExtension extends Extension
+{
+    public function load(array $configs, ContainerBuilder $container): void
+    {
+        $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../../contao/config'));
+        $loader->load('services.yaml');
+    }
+}

src/EventListener/DataContainer/PinboardTimestampListener.php

@@ -5,31 +5,30 @@ declare(strict_types=1);
 namespace Eiswurm\ContaoPinboardBundle\EventListener\DataContainer;
 
 use Contao\DataContainer;
-use Contao\Database;
+use Contao\Input;
 
 final class PinboardTimestampListener
 {
-    public function __invoke(DataContainer $dataContainer): void
+    /**
+     * @param array<string, mixed> $values
+     *
+     * @return array<string, mixed>
+     */
+    public function onBeforeSubmit(array $values, DataContainer|null $dataContainer = null): array
     {
-        if (null === $dataContainer->id) {
-            return;
-        }
-
         $timestamp = time();
+        $isCopyAction = 'copy' === Input::get('act');
 
-        $record = Database::getInstance()
-            ->prepare('SELECT dateAdded FROM tl_pinnwand WHERE id = ?')
-            ->limit(1)
-            ->execute($dataContainer->id);
-
-        if (!$record->numRows) {
-            return;
+        if ($isCopyAction || empty($values['dateAdded'])) {
+            $values['dateAdded'] = $timestamp;
         }
 
-        $dateAdded = (int) $record->dateAdded;
+        if ($isCopyAction || empty($values['dateModified'])) {
+            $values['dateModified'] = $timestamp;
+        }
 
-        Database::getInstance()
-            ->prepare('UPDATE tl_pinnwand SET dateAdded = ?, dateModified = ?, tstamp = ? WHERE id = ?')
-            ->execute($dateAdded > 0 ? $dateAdded : $timestamp, $timestamp, $timestamp, $dataContainer->id);
+        $values['tstamp'] = $timestamp;
+
+        return $values;
     }
 }

src/Model/PinboardModel.php

@@ -8,5 +8,5 @@ use Contao\Model;
 
 final class PinboardModel extends Model
 {
-    protected static string $strTable = 'tl_pinnwand';
+    protected static $strTable = 'tl_pinnwand';
 }

src/Resources/public/assets/pinboard.css

@@ -0,0 +1,110 @@
+.pinboard {
+  width: 100%;
+  max-width: 1400px;
+  margin: 0 auto;
+  padding: 1.5rem;
+}
+
+.pinboard__surface {
+  position: relative;
+  min-height: 42rem;
+  border-radius: 1.2rem;
+  overflow: hidden;
+  background:
+    radial-gradient(circle at 20% 10%, rgba(255, 255, 255, 0.25), transparent 42%),
+    radial-gradient(circle at 80% 90%, rgba(50, 30, 10, 0.2), transparent 36%),
+    repeating-linear-gradient(35deg, rgba(75, 40, 15, 0.18), rgba(75, 40, 15, 0.18) 3px, rgba(93, 52, 23, 0.12) 3px, rgba(93, 52, 23, 0.12) 9px),
+    linear-gradient(145deg, #b77944 0%, #a66a38 45%, #8d552a 100%);
+  box-shadow: inset 0 0 0 1px rgba(65, 33, 12, 0.25), inset 0 0 18px rgba(45, 22, 8, 0.35);
+}
+
+.pin-note {
+  position: absolute;
+  width: clamp(220px, 28vw, 340px);
+  min-height: 190px;
+  padding: 1rem 1rem 1.25rem;
+  border-radius: 0.3rem;
+  background: linear-gradient(160deg, #fff8a8 0%, #f5eb85 100%);
+  color: #2a241c;
+  box-shadow: 0 10px 22px rgba(20, 10, 5, 0.34);
+  cursor: grab;
+  user-select: none;
+  touch-action: none;
+  transition: box-shadow 160ms ease, transform 160ms ease;
+}
+
+.pin-note::before {
+  content: '';
+  position: absolute;
+  top: -9px;
+  left: 50%;
+  width: 18px;
+  height: 18px;
+  transform: translateX(-50%);
+  border-radius: 50%;
+  background: radial-gradient(circle at 35% 35%, #f2f2f2, #979797 68%, #707070 100%);
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.35);
+}
+
+.pin-note.is-highlighted {
+  background: linear-gradient(160deg, #ffd99b 0%, #f7c46f 100%);
+}
+
+.pin-note.is-dragging {
+  cursor: grabbing;
+  box-shadow: 0 18px 34px rgba(20, 10, 5, 0.46);
+}
+
+.pin-note__image-wrap {
+  margin: 0 0 0.7rem;
+}
+
+.pin-note__image {
+  display: block;
+  width: 100%;
+  height: auto;
+  border-radius: 0.25rem;
+}
+
+.pin-note__headline {
+  margin: 0 0 0.5rem;
+  font-size: 1.1rem;
+  line-height: 1.25;
+}
+
+.pin-note__text {
+  font-size: 0.96rem;
+  line-height: 1.45;
+  max-height: 14rem;
+  overflow: hidden;
+}
+
+.pin-note__link-wrap {
+  margin: 0.8rem 0 0;
+}
+
+.pin-note__link {
+  color: inherit;
+  font-weight: 600;
+}
+
+.pinboard__empty {
+  margin: 0;
+  padding: 1.5rem;
+  color: #fff;
+  font-weight: 600;
+}
+
+@media (max-width: 768px) {
+  .pinboard {
+    padding: 0.8rem;
+  }
+
+  .pinboard__surface {
+    min-height: 36rem;
+  }
+
+  .pin-note {
+    width: min(84vw, 290px);
+  }
+}

src/Resources/public/assets/pinboard.js

@@ -0,0 +1,125 @@
+(() => {
+  const board = document.querySelector('[data-pinboard-surface]');
+
+  if (!board) {
+    return;
+  }
+
+  const notes = Array.from(board.querySelectorAll('[data-pin-note]'));
+
+  if (!notes.length) {
+    return;
+  }
+
+  let zCounter = 200;
+
+  const randomBetween = (min, max) => Math.random() * (max - min) + min;
+
+  const placeNotes = () => {
+    const boardRect = board.getBoundingClientRect();
+    const maxXBase = Math.max(24, boardRect.width - 300);
+    const maxYBase = Math.max(24, boardRect.height - 220);
+
+    notes.forEach((note, index) => {
+      const maxX = Math.max(16, maxXBase - note.offsetWidth * 0.2);
+      const maxY = Math.max(16, maxYBase - note.offsetHeight * 0.2);
+
+      const x = randomBetween(12, maxX);
+      const y = randomBetween(12, maxY);
+      const rotation = randomBetween(-7, 7);
+      const highlighted = note.dataset.highlighted === '1';
+      const level = highlighted ? 1000 + index : 100 + index;
+
+      note.dataset.baseRotation = String(rotation);
+      note.dataset.x = String(x);
+      note.dataset.y = String(y);
+      note.style.zIndex = String(level);
+      note.style.transform = `translate(${x}px, ${y}px) rotate(${rotation}deg)`;
+    });
+  };
+
+  const clampToBoard = (note, x, y) => {
+    const boardRect = board.getBoundingClientRect();
+    const noteRect = note.getBoundingClientRect();
+    const maxX = Math.max(0, boardRect.width - noteRect.width);
+    const maxY = Math.max(0, boardRect.height - noteRect.height);
+
+    return {
+      x: Math.min(Math.max(0, x), maxX),
+      y: Math.min(Math.max(0, y), maxY),
+    };
+  };
+
+  const enableDrag = (note) => {
+    let dragging = false;
+    let pointerId = null;
+    let offsetX = 0;
+    let offsetY = 0;
+
+    note.addEventListener('pointerdown', (event) => {
+      if (event.target instanceof Element && event.target.closest('a, button, input, select, textarea, label')) {
+        return;
+      }
+
+      dragging = true;
+      pointerId = event.pointerId;
+      note.setPointerCapture(pointerId);
+      note.classList.add('is-dragging');
+      note.style.zIndex = String(++zCounter + 2000);
+
+      const startX = Number.parseFloat(note.dataset.x ?? '0');
+      const startY = Number.parseFloat(note.dataset.y ?? '0');
+      offsetX = event.clientX - startX;
+      offsetY = event.clientY - startY;
+    });
+
+    note.addEventListener('pointermove', (event) => {
+      if (!dragging || event.pointerId !== pointerId) {
+        return;
+      }
+
+      const baseRotation = Number.parseFloat(note.dataset.baseRotation ?? '0');
+      const nextX = event.clientX - offsetX;
+      const nextY = event.clientY - offsetY;
+      const clamped = clampToBoard(note, nextX, nextY);
+
+      note.dataset.x = String(clamped.x);
+      note.dataset.y = String(clamped.y);
+      note.style.transform = `translate(${clamped.x}px, ${clamped.y}px) rotate(${baseRotation}deg)`;
+    });
+
+    const releaseDrag = (event) => {
+      if (!dragging || event.pointerId !== pointerId) {
+        return;
+      }
+
+      dragging = false;
+      note.classList.remove('is-dragging');
+      note.releasePointerCapture(pointerId);
+      pointerId = null;
+    };
+
+    note.addEventListener('pointerup', releaseDrag);
+    note.addEventListener('pointercancel', releaseDrag);
+  };
+
+  const adjustBoardHeight = () => {
+    let requiredHeight = 620;
+
+    notes.forEach((note) => {
+      const y = Number.parseFloat(note.dataset.y ?? '0');
+      requiredHeight = Math.max(requiredHeight, y + note.offsetHeight + 36);
+    });
+
+    board.style.minHeight = `${Math.ceil(requiredHeight)}px`;
+  };
+
+  placeNotes();
+  notes.forEach(enableDrag);
+  adjustBoardHeight();
+
+  window.addEventListener('resize', () => {
+    placeNotes();
+    adjustBoardHeight();
+  });
+})();

src/Resources/public/js/pinboard.js

@@ -57,6 +57,10 @@
     let offsetY = 0;
 
     note.addEventListener('pointerdown', (event) => {
+      if (event.target instanceof Element && event.target.closest('a, button, input, select, textarea, label')) {
+        return;
+      }
+
       dragging = true;
       pointerId = event.pointerId;
       note.setPointerCapture(pointerId);

templates/frontend_module/pinnwand.html.twig

@@ -1,38 +0,0 @@
-{% extends '@Contao/frontend_module/_base.html.twig' %}
-
-{% block content %}
-  <link rel="stylesheet" href="{{ asset('bundles/contaopinboard/css/pinboard.css') }}">
-
-  <section class="pinboard" data-pinboard>
-    <div class="pinboard__surface" data-pinboard-surface>
-      {% for entry in entries %}
-        <article
-          class="pin-note{% if entry.highlighted %} is-highlighted{% endif %}"
-          data-pin-note
-          data-highlighted="{{ entry.highlighted ? '1' : '0' }}"
-          data-seed="{{ entry.id }}"
-          aria-label="{{ entry.headline }}"
-        >
-          {% if entry.imagePath %}
-            <figure class="pin-note__image-wrap">
-              <img src="{{ asset(entry.imagePath) }}" alt="" class="pin-note__image">
-            </figure>
-          {% endif %}
-
-          <h3 class="pin-note__headline">{{ entry.headline }}</h3>
-          <div class="pin-note__text">{{ entry.text|raw }}</div>
-
-          {% if entry.link %}
-            <p class="pin-note__link-wrap">
-              <a href="{{ entry.link }}" class="pin-note__link" target="_blank" rel="noopener">Mehr erfahren</a>
-            </p>
-          {% endif %}
-        </article>
-      {% else %}
-        <p class="pinboard__empty">Keine veröffentlichten Pinnwandeinträge vorhanden.</p>
-      {% endfor %}
-    </div>
-  </section>
-
-  <script src="{{ asset('bundles/contaopinboard/js/pinboard.js') }}" defer></script>
-{% endblock %}