style: remove pinboard outer padding

composer.json

@@ -1,5 +1,5 @@
 {
-  "name": "eiswurm/contao-pinboard-bundle",
+  "name": "mummert/pinboard-bundle",
   "description": "Pinboard bundle for Contao 5.7",
   "type": "contao-bundle",
   "license": "proprietary",

contao/dca/tl_pinnwand.php

@@ -4,7 +4,9 @@ declare(strict_types=1);
 
 use Contao\DataContainer;
 use Contao\Database;
+use Contao\FilesModel;
 use Contao\Input;
+use Contao\System;
 
 $GLOBALS['TL_DCA']['tl_pinnwand'] = [
     'config' => [
@@ -26,7 +28,7 @@ $GLOBALS['TL_DCA']['tl_pinnwand'] = [
             'panelLayout' => 'filter;sort,search,limit',
         ],
         'label' => [
-            'fields' => ['ueberschrift', 'dateAdded', 'dateModified'],
+            'fields' => ['bild', 'ueberschrift', 'dateAdded', 'dateModified'],
             'showColumns' => true,
         ],
         'global_operations' => [
@@ -61,7 +63,12 @@ $GLOBALS['TL_DCA']['tl_pinnwand'] = [
         ],
     ],
     'palettes' => [
-        'default' => '{title_legend},ueberschrift,text,link,bild;{meta_legend},dateAdded,dateModified;{publish_legend},published,hervorgehoben',
+        '__selector__' => ['contentType'],
+        'default' => '{title_legend},contentType;{meta_legend},dateAdded,dateModified;{publish_legend},published,hervorgehoben',
+    ],
+    'subpalettes' => [
+        'contentType_image' => 'bild',
+        'contentType_textImage' => 'ueberschrift,text,link,bild',
     ],
     'fields' => [
         'id' => [
@@ -70,6 +77,14 @@ $GLOBALS['TL_DCA']['tl_pinnwand'] = [
         'tstamp' => [
             'sql' => 'int(10) unsigned NOT NULL default 0',
         ],
+        'contentType' => [
+            'exclude' => true,
+            'inputType' => 'radio',
+            'options' => ['image', 'textImage'],
+            'reference' => &$GLOBALS['TL_LANG']['tl_pinnwand']['contentType_options'],
+            'eval' => ['mandatory' => true, 'submitOnChange' => true, 'tl_class' => 'w50 clr'],
+            'sql' => "varchar(16) NOT NULL default 'textImage'",
+        ],
         'ueberschrift' => [
             'exclude' => true,
             'search' => true,
@@ -82,7 +97,7 @@ $GLOBALS['TL_DCA']['tl_pinnwand'] = [
             'exclude' => true,
             'search' => true,
             'inputType' => 'textarea',
-            'eval' => ['mandatory' => true, 'maxlength' => 3000, 'tl_class' => 'clr'],
+            'eval' => ['mandatory' => false, 'maxlength' => 3000, 'tl_class' => 'clr'],
             'sql' => 'text NULL',
         ],
         'link' => [
@@ -119,6 +134,7 @@ $GLOBALS['TL_DCA']['tl_pinnwand'] = [
             'filter' => true,
             'toggle' => true,
             'inputType' => 'checkbox',
+            'default' => '1',
             'eval' => ['doNotCopy' => true, 'tl_class' => 'w50 m12'],
             'sql' => "char(1) NOT NULL default ''",
         ],
@@ -181,3 +197,43 @@ $GLOBALS['TL_DCA']['tl_pinnwand']['fields']['dateModified']['load_callback'][] =
 
     return $timestamp > 0 ? $timestamp : time();
 };
+
+$GLOBALS['TL_DCA']['tl_pinnwand']['fields']['bild']['save_callback'][] = static function (mixed $value, DataContainer $dataContainer): mixed {
+    $contentType = (string) Input::post('contentType');
+
+    if ('' === $contentType && null !== $dataContainer->activeRecord) {
+        $contentType = (string) ($dataContainer->activeRecord->contentType ?? 'textImage');
+    }
+
+    if ('image' === $contentType && empty($value)) {
+        throw new \RuntimeException($GLOBALS['TL_LANG']['tl_pinnwand']['imageRequired'] ?? 'Bitte wählen Sie ein Bild für den Pinnwandeintrag aus.');
+    }
+
+    return $value;
+};
+
+$GLOBALS['TL_DCA']['tl_pinnwand']['list']['label']['label_callback'] = static function (array $row, string $label, DataContainer $dc, array $args): array {
+    $args[0] = '';
+
+    if (empty($row['bild'])) {
+        return $args;
+    }
+
+    $fileModel = FilesModel::findByUuid($row['bild']);
+
+    if (null === $fileModel) {
+        return $args;
+    }
+
+    $staticUrl = (string) System::getContainer()->get('contao.assets.files_context')->getStaticUrl();
+    $src = $staticUrl . System::urlEncode($fileModel->path);
+    $alt = htmlspecialchars((string) ($row['ueberschrift'] ?: 'Pinnwandbild'), \ENT_QUOTES | \ENT_SUBSTITUTE, 'UTF-8');
+
+    $args[0] = sprintf(
+        '<img src="%s" alt="%s" style="max-width:64px;max-height:64px;width:auto;height:auto;display:block;" loading="lazy">',
+        $src,
+        $alt
+    );
+
+    return $args;
+};

contao/languages/de/tl_pinnwand.php

@@ -6,10 +6,14 @@ $GLOBALS['TL_LANG']['tl_pinnwand']['ueberschrift'] = ['Überschrift', 'Die Über
 $GLOBALS['TL_LANG']['tl_pinnwand']['text'] = ['Text', 'Inhalt des Pinnwandeintrags (maximal 3000 Zeichen).'];
 $GLOBALS['TL_LANG']['tl_pinnwand']['link'] = ['Link', 'Optionaler Link zum Eintrag.'];
 $GLOBALS['TL_LANG']['tl_pinnwand']['bild'] = ['Bild', 'Optionales Bild für den Pinnwandeintrag.'];
+$GLOBALS['TL_LANG']['tl_pinnwand']['contentType'] = ['Inhaltstyp', 'Wählen Sie, ob der Eintrag nur aus einem Bild oder aus Text mit optionalem Bild besteht.'];
+$GLOBALS['TL_LANG']['tl_pinnwand']['contentType_options']['image'] = 'Bild';
+$GLOBALS['TL_LANG']['tl_pinnwand']['contentType_options']['textImage'] = 'Text mit optionalem Bild';
+$GLOBALS['TL_LANG']['tl_pinnwand']['imageRequired'] = 'Bitte wählen Sie ein Bild für den Pinnwandeintrag aus.';
 $GLOBALS['TL_LANG']['tl_pinnwand']['dateAdded'] = ['Erstellt am', 'Datum/Uhrzeit der Erstellung.'];
 $GLOBALS['TL_LANG']['tl_pinnwand']['dateModified'] = ['Geändert am', 'Datum/Uhrzeit der letzten Änderung.'];
 $GLOBALS['TL_LANG']['tl_pinnwand']['published'] = ['Veröffentlicht', 'Nur veröffentlichte Einträge erscheinen im Frontend.'];
-$GLOBALS['TL_LANG']['tl_pinnwand']['hervorgehoben'] = ['Hervorgehoben', 'Hervorgehobene Einträge liegen im Frontend immer oben.'];
+$GLOBALS['TL_LANG']['tl_pinnwand']['hervorgehoben'] = ['Hervorgehoben', 'Hervorgehobene Einträge hängen an der Pinnwand immer ganz oben.'];
 
 $GLOBALS['TL_LANG']['tl_pinnwand']['title_legend'] = 'Inhalt';
 $GLOBALS['TL_LANG']['tl_pinnwand']['meta_legend'] = 'Metadaten';

contao/templates/frontend/pinnwand.html.twig

@@ -1,31 +1,39 @@
 {% use '@Contao/component/_figure.html.twig' %}
 
-<link rel="stylesheet" href="{{ asset('bundles/contaopinboard/css/pinboard.css') }}">
+<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 %}
+      {% set isImageOnly = entry.imageFigure and not entry.headline and not entry.text and not entry.link %}
       <article
-        class="pin-note{% if entry.highlighted %} is-highlighted{% endif %}"
+        class="pin-note{% if entry.highlighted %} is-highlighted{% endif %}{% if isImageOnly %} pin-note--image-only{% endif %}"
         data-pin-note
         data-highlighted="{{ entry.highlighted ? '1' : '0' }}"
         data-seed="{{ entry.id }}"
         aria-label="{{ entry.headline }}"
       >
+        <div class="pin-note__inner" data-pin-note-inner>
+          {% if entry.headline %}
+            <h3 class="pin-note__headline">{{ entry.headline }}</h3>
+          {% endif %}
+
+          {% if entry.text %}
+            <div class="pin-note__text">{{ entry.text|e|nl2br }}</div>
+          {% endif %}
+
           {% 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 %}
+        </div>
       </article>
     {% else %}
       <p class="pinboard__empty">Keine veröffentlichten Pinnwandeinträge vorhanden.</p>
@@ -33,4 +41,5 @@
   </div>
 </section>
 
-<script src="{{ asset('bundles/contaopinboard/js/pinboard.js') }}" defer></script>
+<script src="https://cdn.jsdelivr.net/npm/muuri@0.9.5/dist/muuri.min.js" defer></script>
+<script src="{{ asset('bundles/contaopinboard/assets/pinboard.js') }}" defer></script>

public/assets/pinboard.css

@@ -2,38 +2,56 @@
   width: 100%;
   max-width: 1400px;
   margin: 0 auto;
-  padding: 1.5rem;
+  padding: 0;
+  box-sizing: border-box;
+}
+
+.pinboard {
+  --pin-gap: 1.25rem;
+  margin-top: -80px;
+  position: relative;
+  z-index: 1;
 }
 
 .pinboard__surface {
   position: relative;
   min-height: 42rem;
-  border-radius: 1.2rem;
+  padding: 1.2rem;
+  border: 30px solid #cba888;
+  border-radius: 0.7rem;
   overflow: hidden;
   background:
-    radial-gradient(circle at 20% 10%, rgba(255, 255, 255, 0.25), transparent 42%),
+    radial-gradient(circle at 20% 10%, rgba(255, 255, 255, 0.18), transparent 42%),
-    radial-gradient(circle at 80% 90%, rgba(50, 30, 10, 0.2), transparent 36%),
+    radial-gradient(circle at 80% 90%, rgba(40, 22, 10, 0.16), 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),
+    url('/bundles/contaopinboard/assets/wood_0011_color_1k.jpg') center/cover no-repeat;
-    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);
+  width: 320px;
+  min-height: 230px;
+  padding: 1.5em;
+  box-sizing: border-box;
+  overflow: visible;
+}
+
+.pin-note__inner {
+  position: relative;
   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;
+  cursor: pointer;
   user-select: none;
-  touch-action: none;
+  touch-action: auto;
-  transition: box-shadow 160ms ease, transform 160ms ease;
+  transform: translate(0, 0) rotate(0deg);
+  transition: box-shadow 160ms ease;
 }
 
-.pin-note::before {
+.pin-note__inner::before {
   content: '';
   position: absolute;
   top: -9px;
@@ -41,17 +59,17 @@
   width: 18px;
   height: 18px;
   transform: translateX(-50%);
+  z-index: 1;
   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 {
+.pin-note.is-highlighted .pin-note__inner {
   background: linear-gradient(160deg, #ffd99b 0%, #f7c46f 100%);
 }
 
-.pin-note.is-dragging {
+.pin-note.is-front .pin-note__inner {
-  cursor: grabbing;
   box-shadow: 0 18px 34px rgba(20, 10, 5, 0.46);
 }
 
@@ -59,6 +77,26 @@
   margin: 0 0 0.7rem;
 }
 
+.pin-note--image-only .pin-note__inner {
+  min-height: 0;
+  padding: 0;
+  background: transparent;
+  box-shadow: none;
+}
+
+.pin-note--image-only .pin-note__image-wrap {
+  margin: 0;
+}
+
+.pin-note--image-only .pin-note__image-wrap img,
+.pin-note--image-only .pin-note__image {
+  display: block;
+  width: 100%;
+  height: auto;
+  border-radius: 0.3rem;
+  box-shadow: 0 10px 22px rgba(20, 10, 5, 0.34);
+}
+
 .pin-note__image {
   display: block;
   width: 100%;
@@ -66,6 +104,10 @@
   border-radius: 0.25rem;
 }
 
+figure.pin-note__image-wrap a:hover img {
+  transform: none;
+}
+
 .pin-note__headline {
   margin: 0 0 0.5rem;
   font-size: 1.1rem;
@@ -97,14 +139,10 @@
 
 @media (max-width: 768px) {
   .pinboard {
-    padding: 0.8rem;
+    padding: 2em;
   }
 
   .pinboard__surface {
     min-height: 36rem;
   }
-
-  .pin-note {
-    width: min(84vw, 290px);
-  }
 }

public/assets/pinboard.js

@@ -0,0 +1,87 @@
+(() => {
+  const board = document.querySelector('[data-pinboard-surface]');
+
+  if (!board) {
+    return;
+  }
+
+  if (typeof Muuri === 'undefined') {
+    return;
+  }
+
+  const notes = Array.from(board.querySelectorAll('[data-pin-note]'));
+
+  if (!notes.length) {
+    return;
+  }
+
+  let zCounter = 500;
+
+  const highlighted = notes.filter((note) => note.dataset.highlighted === '1');
+  const normal = notes.filter((note) => note.dataset.highlighted !== '1');
+  const ordered = [...highlighted, ...normal];
+
+  ordered.forEach((note) => {
+    board.appendChild(note);
+  });
+
+  ordered.forEach((note, index) => {
+    const isHighlighted = note.dataset.highlighted === '1';
+    note.style.zIndex = String(isHighlighted ? 300 + index : 100 + index);
+  });
+
+  const grid = new Muuri(board, {
+    items: '.pin-note',
+    dragEnabled: false,
+    layout: {
+      fillGaps: false,
+      horizontal: false,
+      alignRight: false,
+      alignBottom: false,
+      rounding: false,
+    },
+    layoutDuration: 250,
+    layoutEasing: 'ease',
+  });
+
+  const toPx = (value) => {
+    const parsed = Number.parseFloat(value);
+    return Number.isNaN(parsed) ? 0 : parsed;
+  };
+
+  const updateItemWidths = () => {
+    const boardStyles = window.getComputedStyle(board);
+    const boardWidth = board.clientWidth;
+    const gap = toPx(boardStyles.getPropertyValue('--pin-gap')) || 20;
+    const minItemWidth = 260;
+
+    const columns = Math.max(1, Math.floor((boardWidth + gap) / (minItemWidth + gap)));
+    const itemWidth = Math.max(220, Math.floor((boardWidth - (columns - 1) * gap) / columns));
+
+    ordered.forEach((note) => {
+      note.style.width = `${itemWidth}px`;
+    });
+  };
+
+  const bringToFront = (note) => {
+    zCounter += 1;
+    note.style.zIndex = String(zCounter);
+
+    ordered.forEach((item) => item.classList.remove('is-front'));
+    note.classList.add('is-front');
+  };
+
+  ordered.forEach((note) => {
+    note.addEventListener('pointerdown', () => {
+      bringToFront(note);
+    });
+  });
+
+  const relayout = () => {
+    updateItemWidths();
+    grid.refreshItems().layout();
+  };
+
+  relayout();
+  window.addEventListener('resize', relayout);
+})();

src/Controller/FrontendModule/PinboardController.php

@@ -6,6 +6,7 @@ namespace Eiswurm\ContaoPinboardBundle\Controller\FrontendModule;
 
 use Contao\CoreBundle\Controller\FrontendModule\AbstractFrontendModuleController;
 use Contao\CoreBundle\Image\Studio\Studio;
+use Contao\CoreBundle\InsertTag\InsertTagParser;
 use Contao\CoreBundle\Twig\FragmentTemplate;
 use Contao\FilesModel;
 use Contao\ModuleModel;
@@ -18,6 +19,7 @@ final class PinboardController extends AbstractFrontendModuleController
 {
     public function __construct(
         private readonly Studio $studio,
+        private readonly InsertTagParser $insertTagParser,
     ) {
     }
 
@@ -59,8 +61,8 @@ final class PinboardController extends AbstractFrontendModuleController
                 $notes[] = [
                     'id' => (int) $entry->id,
                     'headline' => (string) $entry->ueberschrift,
-                    'text' => (string) $entry->text,
+                    'text' => StringUtil::decodeEntities((string) $entry->text),
-                    'link' => (string) $entry->link,
+                    'link' => $this->resolveLink((string) $entry->link),
                     'dateAdded' => (int) $entry->dateAdded,
                     'dateModified' => (int) $entry->dateModified,
                     'imageFigure' => $imageFigure,
@@ -74,4 +76,15 @@ final class PinboardController extends AbstractFrontendModuleController
 
         return $template->getResponse();
     }
+
+    private function resolveLink(string $link): string
+    {
+        $link = trim($link);
+
+        if ('' === $link) {
+            return '';
+        }
+
+        return html_entity_decode($this->insertTagParser->replaceInline($link), \ENT_QUOTES | \ENT_HTML5);
+    }
 }

src/Resources/public/js/pinboard.js

@@ -1,125 +0,0 @@
-(() => {
-  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();
-  });
-})();