style: adjust pinboard positioning and radius

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

@@ -5,23 +5,29 @@
 <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>

public/assets/pinboard.css

@@ -8,6 +8,9 @@
 
 .pinboard {
   --pin-gap: 1.25rem;
+  margin-top: -80px;
+  position: relative;
+  z-index: 1;
 }
 
 .pinboard__surface {
@@ -15,7 +18,7 @@
   min-height: 42rem;
   padding: 1.2rem;
   border: 30px solid #cba888;
-  border-radius: 1.2rem;
+  border-radius: 0.7rem;
   overflow: hidden;
   background:
     radial-gradient(circle at 20% 10%, rgba(255, 255, 255, 0.18), transparent 42%),
@@ -56,6 +59,7 @@
   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);
@@ -73,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%;
@@ -80,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;

src/Controller/FrontendModule/PinboardController.php

@@ -61,7 +61,7 @@ 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' => $this->resolveLink((string) $entry->link),
                     'dateAdded' => (int) $entry->dateAdded,
                     'dateModified' => (int) $entry->dateModified,