Merge branch 'dev' into snow-fix

assets/scss/base/_content.scss

@@ -579,6 +579,10 @@ td {
     display: contents;  /* overrides katex.css that creates display:inline-block and generate bad box */
 }
 
+.math-display {
+    font-size: $font-size-9;
+}
+
 .inlineMathDouble .katex {
     max-width: 100%;
     overflow-x: auto;

package.json

@@ -25,12 +25,12 @@
   },
   "homepage": "https://github.com/zestedesavoir/zds-site",
   "dependencies": {
-    "autoprefixer": "10.4.8",
+    "autoprefixer": "10.4.13",
     "chart.js": "3.9.1",
-    "chartjs-adapter-moment": "1.0.0",
-    "cssnano": "5.1.13",
+    "chartjs-adapter-moment": "1.0.1",
+    "cssnano": "5.1.14",
     "del": "6.1.1",
-    "easymde": "2.17.0",
+    "easymde": "2.18.0",
     "gulp": "4.0.2",
     "gulp-concat": "2.6.1",
     "gulp-dart-sass": "1.0.2",
@@ -40,18 +40,18 @@
     "gulp-postcss": "9.0.1",
     "gulp-terser-js": "5.2.2",
     "gulp.spritesmith": "6.13.0",
-    "jquery": "3.6.1",
+    "jquery": "3.6.3",
     "moment": "2.29.4",
     "normalize.css": "8.0.1",
-    "postcss": "8.4.16"
+    "postcss": "8.4.21"
   },
   "devDependencies": {
-    "eslint": "8.23.0",
+    "eslint": "8.31.0",
     "eslint-config-standard": "17.0.0",
     "eslint-plugin-import": "2.26.0",
-    "eslint-plugin-jsdoc": "39.3.6",
-    "eslint-plugin-n": "15.2.5",
-    "eslint-plugin-promise": "6.0.1"
+    "eslint-plugin-jsdoc": "39.6.4",
+    "eslint-plugin-n": "15.6.1",
+    "eslint-plugin-promise": "6.1.1"
   },
   "browserslist": [
     "last 2 versions",

templates/tutorialv2/includes/categories.part.html

@@ -0,0 +1,12 @@
+{% load i18n %}
+
+<p>
+    {% trans "Catégorie" %}{{ categories|pluralize }} :
+
+    {# Warning: whitespace in the lines below is crucial for rendering, despite ruining legibility. Change with care. #}
+    {% for category in categories %}{% if forloop.first %}{% elif forloop.last %} {% trans "et" %}{% else %},{% endif %}
+        {% if content.is_opinion %}
+            <a href="{% url 'opinion:list' %}?category={{ category.slug }}">{{ category.title }}</a>
+        {% else %}
+            <a href="{% url 'publication:list' %}?subcategory={{ category.slug }}">{{ category.title }}</a>{% endif %}{% endfor %}
+</p>

templates/tutorialv2/includes/goals.part.html

@@ -0,0 +1,12 @@
+{% load i18n %}
+
+{% if goals %}
+    <p>
+        {% trans "Objectif" %}{{ goals|pluralize }}{%trans " :" %}
+        {% comment %}
+            Warning: whitespace in the loop below is crucial to ensure correct rendering.
+            That's why it is written as a one-liner. Take care when modifying it.
+        {% endcomment %}
+        {% for goal in goals %}{% if not forloop.first %}, {% endif %}<a href="{% url "content:view-goals" %}?objectif_{{ goal.id }}">{{ goal }}</a>{% endfor %}
+    </p>
+{% endif %}

templates/tutorialv2/includes/tags_authors.part.html

@@ -55,18 +55,9 @@
             {% endif %}
         {% endwith %}
 
-        <p>
-            {% trans "Catégorie" %}{{ content.subcategory.all|pluralize }} :
+        {% include "tutorialv2/includes/categories.part.html" with categories=content.subcategory.all %}
 
-            {% for category in content.subcategory.all %}
-                {% if forloop.first %}{% elif forloop.last %} {% trans "et" %}{% else %},{% endif %}
-                {% if content.is_opinion %}
-                    <a href="{% url 'opinion:list' %}?category={{ category.slug }}">{{ category.title }}</a>
-                {% else %}
-                    <a href="{% url 'publication:list' %}?subcategory={{ category.slug }}">{{ category.title }}</a>
-                {% endif %}
-            {% endfor %}
-        </p>
+        {% include "tutorialv2/includes/goals.part.html" with goals=publishablecontent.goals.all %}
 
         {% if online and not is_part_or_chapter %}
             <p>{% blocktrans with reading_time=reading_time|humanize_duration %}Temps de lecture estimé à {{ reading_time }}.{% endblocktrans %}</p>