From 1a6e95c7836c7598e0c73d31faa1b4d73d9a64d9 Mon Sep 17 00:00:00 2001
From: "Ph. SW." <philippe.milink@gmx.fr>
Date: Tue, 22 Oct 2024 21:31:06 +0200
Subject: [PATCH] Restaure les itemprop perdus avec c29c53fb7 (#6672)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- le bloc article_schema n'est redéfinit nul part, donc autant le
  supprimer et utiliser directement sa valeur
- personne ne définit de bloc article_centent_schema ou
  article_content_schema (sans la typo), donc suppression également

Ce commit restaure juste les attributs schema.org perdus avec
c29c53fb70a5bb5e07a234891bd9d66b27d4a1f4, mais il faudrait sans doute
refaire une passe complète sur ces attributs.

Fix #6604
---
 templates/base_content_page.html                         | 4 ++--
 templates/tutorialv2/base_online.html                    | 6 ------
 templates/tutorialv2/includes/headline/licence.part.html | 2 +-
 templates/tutorialv2/includes/headline/title.part.html   | 4 ++--
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/templates/base_content_page.html b/templates/base_content_page.html
index 64815b5a51..0c68a182b2 100644
--- a/templates/base_content_page.html
+++ b/templates/base_content_page.html
@@ -9,12 +9,12 @@
 
 
 {% block content_out %}
-    <article class="content-wrapper" {% block article_schema %}{% endblock %}>
+    <article class="content-wrapper" itemscope itemtype="http://schema.org/Article">
         <header>
             {% block headline %}{% endblock %}
         </header>
         {% block content_page %}
-            <section class="article-content" {% block article_centent_schema %}{% endblock %}>
+            <section class="article-content">
                 {% block content %}{% endblock %}
             </section>
         {% endblock %}
diff --git a/templates/tutorialv2/base_online.html b/templates/tutorialv2/base_online.html
index 51d4b3dffc..56f59e8f73 100644
--- a/templates/tutorialv2/base_online.html
+++ b/templates/tutorialv2/base_online.html
@@ -46,9 +46,3 @@
         </a>
     </li>
 {% endblock %}
-
-
-
-{% block article_schema %}
-    itemscope itemtype="http://schema.org/Article"
-{% endblock %}
diff --git a/templates/tutorialv2/includes/headline/licence.part.html b/templates/tutorialv2/includes/headline/licence.part.html
index 8426f450a5..9e49fe381e 100644
--- a/templates/tutorialv2/includes/headline/licence.part.html
+++ b/templates/tutorialv2/includes/headline/licence.part.html
@@ -17,5 +17,5 @@
 
     {% crispy form %}
 {% elif licence %}
-    <span class="license">{{ licence }}</span>
+    <span class="license" itemprop="license">{{ licence }}</span>
 {% endif %}
diff --git a/templates/tutorialv2/includes/headline/title.part.html b/templates/tutorialv2/includes/headline/title.part.html
index 8ec2bfdeac..a8074eb970 100644
--- a/templates/tutorialv2/includes/headline/title.part.html
+++ b/templates/tutorialv2/includes/headline/title.part.html
@@ -23,7 +23,7 @@
     <div class="content-title-and-subtitle-group">
         <div class="content-title-group">
             {% spaceless %}
-            <h1 class="title">{{ title }}</h1>
+            <h1 class="title" itemprop="name">{{ title }}</h1>
             {% if show_form %}
                 <a href="#edit-title" class="open-modal edit-button" title="{% trans "Modifier le titre" %}">
                     <span class="visuallyhidden">{% trans "Modifier le titre" %}</span>
@@ -48,7 +48,7 @@ <h1 class="title">{{ title }}</h1>
                 {% endif %}
                 {% crispy form_subtitle %}
             {% else %}
-                <p class="subtitle">{{ subtitle }}</p>
+                <h2 class="subtitle" itemprop="description">{{ subtitle }}</h2>
             {% endif %}
             {% endspaceless %}
         </div>