From 344af4c0fe7e6fb52ce43afd8f39b30a7affe2a4 Mon Sep 17 00:00:00 2001 From: antonin gallon Date: Mon, 9 Feb 2026 19:53:17 +0100 Subject: [PATCH 1/6] =?UTF-8?q?modification=20du=20blueprint=20year=20pour?= =?UTF-8?q?=20pouvoir=20s=C3=A9l=C3=A9ctionner=20une=20page=20dans=20une?= =?UTF-8?q?=20autre=20ann=C3=A9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- site/blueprints/pages/texts.yml | 2 +- site/blueprints/pages/year.yml | 8 ++++++++ site/plugins/code-editor/index.php | 12 ++++++------ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/site/blueprints/pages/texts.yml b/site/blueprints/pages/texts.yml index 8a3347b..247d9b3 100644 --- a/site/blueprints/pages/texts.yml +++ b/site/blueprints/pages/texts.yml @@ -15,7 +15,7 @@ tabs: type: pages template: year sortBy: title desc - - width: 1/1 + - width: 1/2 sections: allTextsSection: label: Tous les textes diff --git a/site/blueprints/pages/year.yml b/site/blueprints/pages/year.yml index d0ad42e..75ecd8b 100644 --- a/site/blueprints/pages/year.yml +++ b/site/blueprints/pages/year.yml @@ -24,6 +24,14 @@ tabs: templates: - linear - grid + linkedTextsSection: + type: fields + fields: + linkedTexts: + label: Textes liés + type: pages + query : site.find('textes').grandChildren + help: textes enregistrés à une autre année à inclure aussi dans celle-ci. - width: 2/3 fields: edito: diff --git a/site/plugins/code-editor/index.php b/site/plugins/code-editor/index.php index ba1302a..f4a3250 100644 --- a/site/plugins/code-editor/index.php +++ b/site/plugins/code-editor/index.php @@ -1,15 +1,15 @@ [ + 'options' => array( 'language' => 'css', - 'size' => 'small', - 'lineNumbers' => true, + 'size' => 'small', + 'lineNumbers' => true, 'tabSize' => 4, 'insertSpaces' => true, 'ignoreTabKey' => false, - ], - 'fields' => [ + ), + 'fields' => array( 'code-editor' => require_once __DIR__ . '/lib/fields/code-editor.php', - ], + ), ]); From dee8f94182aa3775856a92b67d9832786f366646 Mon Sep 17 00:00:00 2001 From: antonin gallon Date: Mon, 9 Feb 2026 20:57:56 +0100 Subject: [PATCH 2/6] ajout de la methode allTexts() dans site\models\year.php --- site/models/year.php | 8 ++++++++ site/snippets/nav__texts--collection.php | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 site/models/year.php diff --git a/site/models/year.php b/site/models/year.php new file mode 100644 index 0000000..e9eb907 --- /dev/null +++ b/site/models/year.php @@ -0,0 +1,8 @@ +children()->listed(); + $linked = $this->linkedTexts()->toPages(); + return $texts->merge($linked); + } +} \ No newline at end of file diff --git a/site/snippets/nav__texts--collection.php b/site/snippets/nav__texts--collection.php index cf29a0e..f62e281 100644 --- a/site/snippets/nav__texts--collection.php +++ b/site/snippets/nav__texts--collection.php @@ -18,7 +18,8 @@ class="see-more toggle-btn toggle-btn--left" @click="edito = !edito">Lire