[Semi-rollback] Retrait de la gestion des pictos en mode sombre (#235)

* Revert changes to scheme-dependent SVGs

* update test

* Update version number

config/settings.py

@@ -315,6 +315,7 @@ def show_toolbar(request):
 )
 
 WAGTAILIMAGES_EXTENSIONS = ["gif", "jpg", "jpeg", "png", "webp", "svg"]
+SF_SCHEME_DEPENDENT_SVGS = True if os.getenv("SF_SCHEME_DEPENDENT_SVGS", False) == "True" else False
 
 # Allows for complex Streamfields without completely removing checks
 DATA_UPLOAD_MAX_NUMBER_FIELDS = 10000

content_manager/templates/content_manager/blocks/image_svg_or_raster.html

@@ -1,8 +1,9 @@
-{% load wagtailimages_tags %}
+{% load wagtailimages_tags wagtail_dsfr_tags %}
 
 {% image value.image original as artwork %}
+{% settings_value "SF_SCHEME_DEPENDENT_SVGS" as scheme_dependent_svgs %}
 
-{% if artwork.file.name|slice:"-4:" == ".svg" %}
+{% if scheme_dependent_svgs and artwork.file.name|slice:"-4:" == ".svg" %}
   <div class="fr-responsive-img">
     <svg aria-hidden="true" class="fr-artwork" viewBox="0 0 80 80">
       <use class="fr-artwork-decorative" href="{{ artwork.full_url }}#artwork-decorative"></use>

content_manager/templates/content_manager/blocks/tile.html

@@ -37,8 +37,9 @@
   {% if value.image %}
     <div class="fr-tile__header">
       {% image value.image original as pictogram %}
+      {% settings_value "SF_SCHEME_DEPENDENT_SVGS" as scheme_dependent_svgs %}
 
-      {% if pictogram.file.name|slice:"-4:" == ".svg" %}
+      {% if scheme_dependent_svgs and pictogram.file.name|slice:"-4:" == ".svg" %}
         <div class="fr-tile__pictogram">
           <svg aria-hidden="true"
                class="fr-artwork"

content_manager/tests/test_blocks.py

@@ -1,4 +1,5 @@
 from django.contrib.auth.models import User
+from django.test import override_settings
 from wagtail.models import Page
 from wagtail.rich_text import RichText
 from wagtail.test.utils import WagtailPageTestCase
@@ -322,7 +323,8 @@ def test_tile_with_image_has_div(self):
 
         self.assertContains(response, "fr-tile__header")
 
-    def test_tile_manages_svg_image(self):
+    @override_settings(SF_SCHEME_DEPENDENT_SVGS=True)
+    def test_tile_manages_svg_image_if_setting_allows(self):
         image_file = "static/artwork/technical-error.svg"
         image = import_image(image_file, "Sample image")
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "content-manager"
-version = "1.10.1"
+version = "1.10.2"
 description = "Gestionnaire de contenu permettant de créer et gérer un site internet basé sur le Système de design de l’État, accessible et responsive"
 authors = [
   "Sébastien Reuiller <[email protected]>",