2 Commits

Author SHA1 Message Date
Jürgen Mummert
980a6d83dd Include twig root marker and pending pinnwand DCA/template fixes 2026-03-04 17:39:48 +01:00
Jürgen Mummert
4ef0608d64 Ensure pinnwand module palette exposes imgSize reliably 2026-03-04 17:35:08 +01:00
5 changed files with 30 additions and 7 deletions

View File

@@ -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';

5
contao/dca/tl_module.php Normal file
View File

@@ -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';

View File

@@ -102,14 +102,16 @@ $GLOBALS['TL_DCA']['tl_pinnwand'] = [
'sorting' => true,
'flag' => 6,
'inputType' => 'text',
'eval' => ['rgxp' => 'datim', 'datepicker' => true, 'mandatory' => true, 'default' => time(), 'tl_class' => 'w50 wizard'],
'default' => time(),
'eval' => ['rgxp' => 'datim', 'datepicker' => true, 'mandatory' => true, 'tl_class' => 'w50 wizard'],
'sql' => 'int(10) unsigned NOT NULL default 0',
],
'dateModified' => [
'sorting' => true,
'flag' => 6,
'inputType' => 'text',
'eval' => ['rgxp' => 'datim', 'readonly' => true, 'default' => time(), 'tl_class' => 'w50'],
'default' => time(),
'eval' => ['rgxp' => 'datim', 'readonly' => true, 'tl_class' => 'w50'],
'sql' => 'int(10) unsigned NOT NULL default 0',
],
'published' => [
@@ -145,14 +147,14 @@ $GLOBALS['TL_DCA']['tl_pinnwand']['fields']['ueberschrift']['save_callback'][] =
$start = 2;
$base = $baseHeadline;
if (preg_match('/^(.*)\s-\s(\d+)$/', $baseHeadline, $matches)) {
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);
$candidate = sprintf('%s (%d)', $base, $number);
do {
$exists = Database::getInstance()
@@ -164,6 +166,18 @@ $GLOBALS['TL_DCA']['tl_pinnwand']['fields']['ueberschrift']['save_callback'][] =
}
++$number;
$candidate = sprintf('%s - %d', $base, $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();
};

View File

View File

@@ -1,3 +1,5 @@
{% use '@Contao/component/_figure.html.twig' %}
<link rel="stylesheet" href="{{ asset('bundles/contaopinboard/css/pinboard.css') }}">
<section class="pinboard" data-pinboard>
@@ -10,9 +12,9 @@
data-seed="{{ entry.id }}"
aria-label="{{ entry.headline }}"
>
{% if entry.imagePath %}
{% if entry.imageFigure %}
<figure class="pin-note__image-wrap">
<img src="{{ asset(entry.imagePath) }}" alt="" class="pin-note__image">
{% with {figure: entry.imageFigure} %}{{ block('figure_component') }}{% endwith %}
</figure>
{% endif %}