From 7fe539095cd1941a229310d1ef1807c351358fd8 Mon Sep 17 00:00:00 2001 From: "max.mehl" Date: Wed, 26 Feb 2020 20:35:19 +0100 Subject: [PATCH] use icons for video/audio/slides, rearrange, add 2 events --- content/links.md | 12 ++- data/links.yml | 94 +++++++++++-------- .../layouts/shortcodes/links.html | 6 +- 3 files changed, 69 insertions(+), 43 deletions(-) diff --git a/content/links.md b/content/links.md index 500012e..5399737 100644 --- a/content/links.md +++ b/content/links.md @@ -3,16 +3,18 @@ title: Links page: true --- -A selection of links to [journalistic articles](#media) I wrote or have been quoted in, [audio and video recordings](#av), some of my [scientific papers](#science), and [organisations I volunteer for](#volunteer). - -## Appearance in Media {#media} - -{{< links type="media" >}} +A selection of links to [audio and video recordings](#av), [journalistic articles](#media) I wrote or have been quoted in, some of my [scientific papers](#science), and [organisations I volunteer for](#volunteer). ## Audio/Video Recordings {#av} +A selection of my presentations and radio shows I participated in. Clicking on the respective icons you can watch the video recording, access the slides and listen to the audio recording. The buttons indicate the spoken language as well as the general topic of the talk. + {{< links type="av" >}} +## Appearance in Media {#media} + +{{< links type="media" >}} + ## Scientific Papers {#science} {{< links type="science" >}} diff --git a/data/links.yml b/data/links.yml index 908b25f..5a140c5 100644 --- a/data/links.yml +++ b/data/links.yml @@ -129,14 +129,36 @@ # AUDIO/VIDEO +- desc: '"No IT security without Free Software"' + type: av + date: 2020-02 + links: + - href: https://www.digitale-gesellschaft.ch/kongress/2020/talks/keine_it-sicherheit_ohne_freie_software/ + text: Talk @ Winterkongress DigiGes CH + slides: https://download.fsfe.org/presentations/20200222-mm-Winterkongress-ITSec.de.pdf + tags: + - DE + - itsec + +- desc: '"Go REUSE to license your code"' + type: av + date: 2020-02 + links: + - href: https://fosdem.org/2020/schedule/event/reuse_code_licensing/ + text: Talk @ FOSDEM + video: https://www.youtube.com/watch?v=vyAYKROvTO8 + slides: https://download.fsfe.org/presentations/20200202-mm-FOSDEM-REUSE.en.pdf + tags: + - EN + - reuse + - desc: '"REUSE: Make licensing easy for everyone"' type: av date: 2019-10 links: - href: https://osseu19.sched.com/event/05a3272287d3def1bcb0a62ace00b730 text: Talk @ Open Source Summit Europe - - href: https://download.fsfe.org/presentations/20191028-mm-OSSEU-REUSE.en.pdf - text: Slides + slides: https://download.fsfe.org/presentations/20191028-mm-OSSEU-REUSE.en.pdf tags: - EN - reuse @@ -145,10 +167,10 @@ type: av date: 2019-09 links: - - href: https://www.youtube.com/watch?v=8SWijSFbMhg + - href: https://2k19.balccon.org/events/325.html text: Talk @ BalCCon - - href: https://download.fsfe.org/presentations/20190914-mm-BalCCon-ITSec.en.pdf - text: Slides + video: https://www.youtube.com/watch?v=8SWijSFbMhg + slides: https://download.fsfe.org/presentations/20190914-mm-BalCCon-ITSec.en.pdf tags: - EN - itsec @@ -157,10 +179,10 @@ type: av date: 2019-07 links: - - href: https://passthesalt.ubicast.tv/videos/no-it-security-without-free-software/ + - href: https://2019.pass-the-salt.org/talks/102.html text: Talk @ Pass the SALT - - href: https://download.fsfe.org/presentations/20190703-mm-SALT-ITSec.en.pdf - text: Slides + video: https://www.youtube.com/watch?v=B0qxm331Q8Q + slides: https://download.fsfe.org/presentations/20190703-mm-SALT-ITSec.en.pdf tags: - EN - itsec @@ -169,10 +191,10 @@ type: av date: 2019-04 links: - - href: https://www.youtube.com/watch?v=DOv_5ZPcFZ8 - text: Talk @ Grazer Linuxtage - - href: https://download.fsfe.org/presentations/20190427-mm-Graz-ITSec.de.pdf - text: Slides + - href: https://pretalx.linuxtage.at/glt19/talk/K9YDDN/ + text: Keynote @ Grazer Linuxtage + video: https://www.youtube.com/watch?v=DOv_5ZPcFZ8 + slides: https://download.fsfe.org/presentations/20190427-mm-Graz-ITSec.de.pdf tags: - DE - itsec @@ -181,10 +203,10 @@ type: av date: 2018-09 links: - - href: https://www.youtube.com/watch?v=tEkCnCtoQ60 + - href: https://2k18.balccon.org/events/235.html text: Talk @ BalCCon - - href: https://download.fsfe.org/presentations/20180915-mm-BalCCon-PMPC.en.pdf - text: Slides + video: https://www.youtube.com/watch?v=tEkCnCtoQ60 + slides: https://download.fsfe.org/presentations/20180915-mm-BalCCon-PMPC.en.pdf tags: - EN - publiccode @@ -195,8 +217,7 @@ links: - href: https://www.drupaleurope.org/session/public-code-free-software-modernising-digital-public-infrastructure text: Talk @ DrupalEurope - - href: https://download.fsfe.org/presentations/20180911-mm-DrupalEurope-PMPC.en.pdf - text: Slides + slides: https://download.fsfe.org/presentations/20180911-mm-DrupalEurope-PMPC.en.pdf tags: - EN - publiccode @@ -207,8 +228,7 @@ links: - href: text: Talk @ RMLL/LSM - - href: https://download.fsfe.org/presentations/20180707-mm-RMLL-PMPC.en.pdf - text: Slides + slides: https://download.fsfe.org/presentations/20180707-mm-RMLL-PMPC.en.pdf tags: - EN - publiccode @@ -227,10 +247,10 @@ type: av date: 2018-06 links: - - href: https://www.youtube.com/watch?v=kQGw25xG_5c + - href: https://ow2con18.sched.com/event/EcdE/keynote-public-code-with-free-software-modernising-public-digital-infrastructure text: Keynote @ OW2Con - - href: https://download.fsfe.org/presentations/20180607-mm-OW2Con-PMPC.en.pdf - text: Slides + video: https://www.youtube.com/watch?v=kQGw25xG_5c + slides: https://download.fsfe.org/presentations/20180607-mm-OW2Con-PMPC.en.pdf tags: - EN - publiccode @@ -239,10 +259,9 @@ type: av date: 2017-04 links: - - href: + - href: https://fsfe.org/news/2017/news-20170619-01.html text: Talk @ Legal and Licensing Workshop - - href: https://download.fsfe.org/presentations/20170427-mm-LLW-RadioLockdown_verbose.en.pdf - text: Slides + slides: https://download.fsfe.org/presentations/20170427-mm-LLW-RadioLockdown_verbose.en.pdf tags: - EN - radio lockdown @@ -253,8 +272,8 @@ links: - href: https://chemnitzer.linux-tage.de/2017/en/programm/beitrag/266 text: Talk @ Chemnitzer Linuxtage - - href: https://download.fsfe.org/presentations/20170311-mm-CLT-RadioLockdown.de.pdf - text: Slides + video: https://chemnitzer.linux-tage.de/2017/en/programm/beitrag/266 + slides: https://download.fsfe.org/presentations/20170311-mm-CLT-RadioLockdown.de.pdf tags: - DE - radio lockdown @@ -265,8 +284,8 @@ links: - href: https://archive.fosdem.org/2017/schedule/event/radio_lockdown_directive/ text: Talk @ FOSDEM - - href: https://download.fsfe.org/presentations/20170204-mm-FOSDEM-Radiolockdown.en.pdf - text: Slides + video: https://archive.fosdem.org/2017/schedule/event/radio_lockdown_directive/ + slides: https://download.fsfe.org/presentations/20170204-mm-FOSDEM-Radiolockdown.en.pdf tags: - EN - radio lockdown @@ -275,10 +294,10 @@ type: av date: 2016-12 links: - - href: https://media.ccc.de/v/33c3-8024-routerzwang_und_funkabschottung + - href: https://fahrplan.events.ccc.de/congress/2016/Fahrplan/events/8024.html text: Talk @ 33. Chaos Communication Congress - - href: https://download.fsfe.org/presentations/20161227-mm-33C3-Radio+Router.de.pdf - text: Slides + video: https://media.ccc.de/v/33c3-8024-routerzwang_und_funkabschottung + slides: https://download.fsfe.org/presentations/20161227-mm-33C3-Radio+Router.de.pdf tags: - EN - DE @@ -291,8 +310,7 @@ links: - href: https://www.deutschlandfunk.de/dsl-modem-und-kabelrouter-schluss-mit-dem-routerzwang.772.de.html?dram:article_id=362214 text: Radio Show @ Deutschlandfunk - - href: https://up.mehl.mx/audio/20160901-dlf-routerzwang.ogg - text: Recording + audio: https://up.mehl.mx/audio/20160901-dlf-routerzwang.ogg tags: - DE - router freedom @@ -301,8 +319,9 @@ type: av date: 2016-08 links: - - href: https://www.youtube.com/watch?v=CdRQtaePiIs + - href: https://programm.froscon.de/2016/events/1738.html text: Talk @ FrOSCon + video: https://www.youtube.com/watch?v=CdRQtaePiIs tags: - DE - radio lockdown @@ -312,8 +331,8 @@ type: av date: 2016-04 links: - - href: http://www.living-linux.de/2016/04/16/living-linux-22-die-fsfe-uncut/ - text: Living Linux Podcast + - href: + text: Podcast @ Living Linux tags: - DE @@ -323,6 +342,7 @@ links: - href: https://chemnitzer.linux-tage.de/2016/de/programm/beitrag/177 text: Chemnitzer Linuxtage + video: https://www.youtube.com/watch?v=P5EMZ8VFuME tags: - DE - router freedom diff --git a/themes/hugo-sustain/layouts/shortcodes/links.html b/themes/hugo-sustain/layouts/shortcodes/links.html index d649d4a..4d7bb22 100644 --- a/themes/hugo-sustain/layouts/shortcodes/links.html +++ b/themes/hugo-sustain/layouts/shortcodes/links.html @@ -8,9 +8,13 @@
  • {{.desc}} – {{- $len := (len .links) -}} {{- range $index, $element := .links -}} - {{ with .href }}{{ end }}{{.text}}{{ with .href }}{{end}} + {{ with .href }}{{ end }}{{.text}}{{ with .href }}{{end}} {{- if ne (add $index 1) $len -}}, {{- end -}} {{- end -}} + {{- if or (.video) (.audio) (.slides) }},{{ end -}} + {{ with .video }} {{ end }} + {{ with .audio }} {{ end }} + {{ with .slides }} {{ end }} {{- with .date }} ({{.}}){{ end }} {{ range .tags }}{{ . }} {{ end }}