From 28a16e1ea57c32ea81e823fbfbb584a01bcdea03 Mon Sep 17 00:00:00 2001 From: tvluke <tvluke@chaotikum.org> Date: Tue, 12 Dec 2023 16:49:46 +0100 Subject: [PATCH] better line breaks? --- _layouts/frab.xml | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/_layouts/frab.xml b/_layouts/frab.xml index 25ce4a21..374d8a62 100644 --- a/_layouts/frab.xml +++ b/_layouts/frab.xml @@ -298,34 +298,35 @@ Finding the first and last talk to establish the variables "earliest" and "lates <language>de</language> {% endif -%} <abstract/> - {% capture content %}{{video.content | strip | strip_html | xml_escape | remove: '</p>' | strip }}{% endcapture -%} - {% if content and content != '' -%} - <description>{{content}} - {% for conf in video.conferences -%} + {% capture ccontent %}{{video.content | strip_html | xml_escape }}{% endcapture -%} + {% if ccontent and ccontent != '' -%} + <description>{{ccontent}} 
 + {% for conf in video.conferences %} {% for c in site.conferences -%} {% if conf == c.acronym and c.content != '' -%} - {{c.content| xml_escape| markdownify | strip_html | markdownify | xml_escape | remove: '</p>'}} + {{c.content | strip_html | xml_escape }} 
 + {% endif -%} {% endfor -%} - {% endfor -%} + {% endfor %} {% if video.licence and video.licence != '' -%} - {{video.licence | xml_escape | markdownify | strip_html | markdownify| xml_escape | remove: '</p>'}} + {{video.licence | strip_html | xml_escape }} {% else -%} This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License (CC BY NC ND 4.0). https://creativecommons.org/licenses/by-nc-nd/4.0/ {% endif -%}</description> {% else -%} {% if eventpost and eventpost != '' -%} - {% capture content %}{{eventpost.content | strip | strip_html | xml_escape | remove: '</p>' | strip }}{% endcapture -%} - <description>{{content}} + {% capture ccontent %}{{eventpost.content | strip_html | xml_escape }}{% endcapture -%} + <description>{{ccontent}} 
 {% for conf in video.conferences -%} {% for c in site.conferences -%} {% if conf == c.acronym and c.content != '' -%} - {{c.content| xml_escape| markdownify | strip_html | markdownify | xml_escape | remove: '</p>'}} + {{c.content | strip_html | xml_escape}} 
 {% endif -%} {% endfor -%} {% endfor -%} {% if video.licence and video.licence != '' -%} - {{video.licence | xml_escape | markdownify | strip_html | markdownify| xml_escape | remove: '</p>'}} + {{video.licence | strip_html | xml_escape }} {% else -%} This work is licensed under a Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License (CC BY NC ND 4.0). https://creativecommons.org/licenses/by-nc-nd/4.0/ {% endif -%}</description> @@ -340,7 +341,18 @@ Finding the first and last talk to establish the variables "earliest" and "lates {% endfor -%} </persons> <links/> - <attachments/> + {% if video.slides or video.closedcaption -%} + <attachments> + {% if video.slides and video.slides != '' -%} + <attachment href="{{video.slides}}">Slides</attachment> + {% endif -%} + {% if video.closedcaption and video.closedcaption != '' -%} + <attachment href="{{video.closedcaption}}">Closed Captions</attachment> + {% endif -%} + </attachments> + {% else -%} + <attachments/> + {% endif -%} {% if video.file and video.file != '' -%} <video_download_url>{{video.file | xml_escape}}</video_download_url> {% endif -%} -- GitLab