show HTML in media description (with galleria), fix #521

saimn · Jul 8, 2024 · c467193 · c467193
1 parent cf15fcc
commit c467193
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/sigal/themes/galleria/templates/album_items.html b/src/sigal/themes/galleria/templates/album_items.html
@@ -20,7 +20,7 @@
     {% macro img_description(media) -%}
       {%- if media.big -%}<a href='{{ media.big_url }}'>Full size</a>{%- endif -%}
       {# clean up tags and whitespace, including newlines, in the description #}
-      {%- if media.description -%}<br>{{ media.description | striptags }}{%- endif -%}
+      {%- if media.description -%}<br>{{ media.description }}{%- endif -%}
       {%- if media.exif -%}
         <div class='film-meta'>
         {%- if media.exif.iso -%}<abbr title='film speed'>{{ media.exif.iso }}</abbr> {%- endif -%}

diff --git a/src/sigal/utils.py b/src/sigal/utils.py
@@ -124,8 +124,11 @@ def read_markdown(filename):
         # will be available, this can be removed.
         MD.Meta = {}
 
+    html = MD.convert(text)
+    # remove remaining linebreaks
+    html = "".join(html.splitlines())
     # Mark HTML with Markup to prevent jinja2 autoescaping
-    output = {"description": Markup(MD.convert(text))}
+    output = {"description": Markup(html)}
 
     try:
         meta = MD.Meta.copy()

diff --git a/tests/sample/pictures/dir1/test1/11.md b/tests/sample/pictures/dir1/test1/11.md
@@ -1,4 +1,10 @@
 Title: Foo Bar
 Location: Bavaria
 
-This is a funny description of this image
+This is a *funny* **description** of this image
+
+With a nice list
+
+* item 1
+* item 2
+* item 3