From d809dbe0db95bffb63ffdecd36a2d830a543a3bd Mon Sep 17 00:00:00 2001 From: Anders Einar Hilden Date: Wed, 3 Aug 2022 13:05:13 +0200 Subject: [PATCH] time-and-date-event => fixedtime, collapse-event => xing-collapse-iframe with more features --- content/events.md | 19 ++++++------------- layouts/shortcodes/collapse-event.html | 18 ------------------ ...ime-and-date-event.html => fixedtime.html} | 2 +- layouts/shortcodes/xing-collapse-iframe.html | 19 +++++++++++++++++++ 4 files changed, 26 insertions(+), 32 deletions(-) delete mode 100644 layouts/shortcodes/collapse-event.html rename layouts/shortcodes/{time-and-date-event.html => fixedtime.html} (93%) create mode 100644 layouts/shortcodes/xing-collapse-iframe.html diff --git a/content/events.md b/content/events.md index 5daa83c..11e0a9e 100755 --- a/content/events.md +++ b/content/events.md @@ -39,7 +39,7 @@ Conferences featuring MISP core members talking about MISP and/or threat intelli - #### MISP Training - Threat Intelligence Introduction for Analysts and Security Professionals - *When:* {{< time-and-date-event `13th September 2022 14:00-17:00 UTC` `MISP Training - Threat Intelligence Introduction for Analysts and Security Professionals` `20220913T14` `3` >}} + *When:* {{< fixedtime `13th September 2022 14:00-17:00 UTC` `MISP Training - Threat Intelligence Introduction for Analysts and Security Professionals` `20220913T14` `3` >}} *Where:* Remote (Zoom and online MISP traning instance) @@ -50,13 +50,10 @@ Conferences featuring MISP core members talking about MISP and/or threat intelli - Encoding a report - Making use of the various tools in MISP from an analyst perspective - *Event link:* {{< collapse-event `MISP Training - Threat Intelligence Introduction for Analysts and Security Professionals` >}} - - {{< /collapse-event >}} + *Event link:* {{< xing-collapse-iframe `IMKNUTR` `MISP Training - Threat Intelligence Introduction for Analysts and Security Professionals` >}} - #### MISP Training - Administration and Deployment of MISP software - *When:* {{< time-and-date-event `14th September 2022 14:00-17:00 UTC` `MISP Training - Administration and Deployment of MISP software` `20220914T14` `3` >}} + *When:* {{< fixedtime `14th September 2022 14:00-17:00 UTC` `MISP Training - Administration and Deployment of MISP software` `20220914T14` `3` >}} *Where:* Remote (Zoom and online MISP traning instance) @@ -68,12 +65,10 @@ Conferences featuring MISP core members talking about MISP and/or threat intelli - Installation - Community management - *Event link:* {{< collapse-event `MISP Training - Administration and Deployment of MISP software` >}} - - {{< /collapse-event >}} + *Event link:* {{< xing-collapse-iframe `BVJBEEU` `MISP Training - Administration and Deployment of MISP software` >}} - #### MISP Training - Advanced Developer session from API to MISP internals - *When:* {{< time-and-date-event `15th September 2022 14:00-17:00 UTC` `MISP Training - Advanced Developer session from API to MISP internals` `20220915T14` `3` >}} + *When:* {{< fixedtime `15th September 2022 14:00-17:00 UTC` `MISP Training - Advanced Developer session from API to MISP internals` `20220915T14` `3` >}} *Where:* Remote (Zoom and online MISP traning instance) @@ -84,9 +79,7 @@ Conferences featuring MISP core members talking about MISP and/or threat intelli - Supporting dev libraries - Session on development of MISP internals - *Event link:* {{< collapse-event `MISP Training - Advanced Developer session from API to MISP internals` >}} - - {{< /collapse-event >}} + *Event link:* {{< xing-collapse-iframe `IMGQRQQ` `MISP Training - Advanced Developer session from API to MISP internals` >}} ### Past events diff --git a/layouts/shortcodes/collapse-event.html b/layouts/shortcodes/collapse-event.html deleted file mode 100644 index 909ea68..0000000 --- a/layouts/shortcodes/collapse-event.html +++ /dev/null @@ -1,18 +0,0 @@ -{{/* - Parameters: - Parameter 0: Will be used to render "Register for <0>" - Parameter 1: Will replace the link text "Register for this event" - Parameter 2: Will replace the whole "Register for " header. Parameter 0 is thus void. - Example usage: - - {{< collapse-event `MISP Training - Advanced Developer session from API to MISP internals` >}} - < insert xing iframe code here > - {{< /collapse-event >}} - -*/}}{{ $collapse_id := md5 .Inner }} -
-
- {{ if (len (.Get 2)) }}{{ .Get 2 }}{{ else }}Register for {{ .Get 0 }}{{ end }} - {{ .Inner }} -
-
diff --git a/layouts/shortcodes/time-and-date-event.html b/layouts/shortcodes/fixedtime.html similarity index 93% rename from layouts/shortcodes/time-and-date-event.html rename to layouts/shortcodes/fixedtime.html index 7d1fe25..bca26f5 100644 --- a/layouts/shortcodes/time-and-date-event.html +++ b/layouts/shortcodes/fixedtime.html @@ -10,4 +10,4 @@ {{< time-and-date-event `15th September 2022 14:00-17:00 UTC` `MISP Training - Advanced Developer session from API to MISP internals` `20220915T14` `3` >}} */}} -{{ .Get 0 }} +{{ .Get 0 }} * diff --git a/layouts/shortcodes/xing-collapse-iframe.html b/layouts/shortcodes/xing-collapse-iframe.html new file mode 100644 index 0000000..40624da --- /dev/null +++ b/layouts/shortcodes/xing-collapse-iframe.html @@ -0,0 +1,19 @@ +{{/* + Parameters: + Parameter 0: XING Event code + Parameter 1: Event title + Parameter 2: (optional) Will replace the link text "Register for this event" + Parameter 3: (Optional) Will replace the whole "Register for " header. Parameter 1 is thus void. + Example usage: + + {{< collapse-event `IMKNUTR` `MISP Training - Advanced Developer session from API to MISP internals` >}} + +*/}}{{ $collapse_id := .Get 0 }} +
+
+ {{ if (len (.Get 3)) }}{{ .Get 3 }}{{ else }}Register for {{ .Get 1 }}{{ end }} + +
+