From a947740c636a7a2d3810c52b0be88a23655419fc Mon Sep 17 00:00:00 2001 From: Anders Einar Hilden Date: Tue, 2 Aug 2022 20:00:48 +0200 Subject: [PATCH 1/6] Split events into upcoming and past. Improve design. --- config.toml | 14 ++- content/events.md | 112 ++++++++++---------- content/past-events.md | 227 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 296 insertions(+), 57 deletions(-) create mode 100755 content/past-events.md diff --git a/config.toml b/config.toml index 98f0e58..b61183f 100644 --- a/config.toml +++ b/config.toml @@ -107,27 +107,33 @@ baseName= "feed" weight = 60 [[menu.main]] - name = "Events" + name = "Upcoming events" url = "/events/" weight = 1 parent = "menu.events" +[[menu.main]] + name = "Past events" + url = "/past-events/" + weight = 2 + parent = "menu.events" + [[menu.main]] name = "Webinars" url = "/events-webinar/" - weight = 2 + weight = 3 parent = "menu.events" [[menu.main]] name = "Hackathon" url = "/hackathon/" - weight = 3 + weight = 4 parent = "menu.events" [[menu.main]] name = "MISP Summit" url = "/misp-summit/" - weight = 4 + weight = 5 parent = "menu.events" diff --git a/content/events.md b/content/events.md index f0916ff..477f519 100755 --- a/content/events.md +++ b/content/events.md @@ -1,6 +1,6 @@ --- layout: page -title: Events around MISP +title: MISP-related events permalink: /events/ toc: true --- @@ -9,70 +9,76 @@ toc: true Want to join us at an event, discuss opportunities or projects around the MISP project, share your experience about threat intelligence or discuss how MISP could be improved to support security professionals? -### MISP hackathon +### MISP Hackathon -The date of the next hackathon will be shared soon. +The previous Hackaton was in October 2021: [Open Source Security Hackathon](/hackathon/) -### Conferences featuring MISP core members talking about MISP and/or threat intelligence +*The date of the next hackathon will be shared soon.* -- [Cyber and Threat Intelligence Summit (CTIS-2022)](https://cti-summit.org) - October 19th - 20th 2022 in Luxembourg -- [2022 FIRST Cyber Threat Intelligence Symposium | #FIRSTCTI22](https://www.first.org/events/symposium/berlin2022/program) - November 1st - 3rd 2022 in Berlin +### Conferences +Conferences featuring MISP core members talking about MISP and/or threat intelligence -### Upcoming public MISP trainings +- #### Cyber and Threat Intelligence Summit (CTIS-2022) + + *When:* October 19th - 20th 2022 -A participation of 10 EUR is asked per remote training session. + *Where:* Luxembourg -#### MISP Training - Threat Intelligence Introduction for Analysts and Security Professionals - 13th September 2022 14:00-17:00 - Remote + *Event link:* [Cyber and Threat Intelligence Summit (CTIS-2022)](https://cti-summit.org) - +- #### 2022 FIRST Cyber Threat Intelligence Symposium -#### MISP Training - Administration and Deployment of MISP software - 14th September 2022 14:00-17:00 - Remote + *When:* November 1st - 3rd 2022 - + *Where:* Berlin -#### MISP Training - Advanced Developer session from API to MISP internals -15th September 2022 14:00-17:00 - Remote + *Event link:* [2022 FIRST Cyber Threat Intelligence Symposium | #FIRSTCTI22](https://www.first.org/events/symposium/berlin2022/program) - +### Public MISP trainings -### (some) Past MISP Trainings +- #### MISP Training - Threat Intelligence Introduction for Analysts and Security Professionals + *When:* 13th September 2022 14:00-17:00 UTC -- [Open Source Security Hackathon](/hackathon/) - pen Source Security hackathon - Monday 25th October 2021 and Tuesday 26th October 2021 -- (FULL) Thursday 25th February 2021 - Online MISP Training - Introduction to CTI (French) - [Registration](https://www.xing-events.com/TFHIOJQ) -- Tuesday 2nd March 2021 - Online MISP Training - MISP - Threat Intelligence Introduction for Analysts - [Registration](https://www.xing.com/events/misp-threat-intelligence-introduction-analysts-3315431) -- Wednesday 3rd March 2021 - Online MISP Training - MISP - Threat Intelligence for Administrators and Building Information Sharing Communities - [Registration](https://www.xing-events.com/WZGDMOP) -- [MISP Covid training](https://bbb.secin.lu/b/ale-q6v-ecn) Remote on how to use MISP in the scope of sharing information about COVID-19 - 27 March 2020 at 14:00 CET (2 hours) -- [MISP Training - Hands-on workshop for analysts and MISP users](https://www.xing-events.com/DLCMDJY.html) in Luxembourg, February 19, 2020 -- [MISP Training - Threat Intelligence Introduction for Analysts and Administrators](https://www.xing-events.com/UXMOBFA.html) in Luxembourg, February 18, 2020 -- [MISP Training (Slovenia)](https://www.first.org/events/colloquia/ljubljana2019/program) in Ljubljana 2019 FIRST Technical Colloquium, November 13–14, 2019 -- [MISP Training - Threat Intelligence Introduction for Analysts and Administrators](https://en.xing-events.com/AOMYCCV.html) in Luxembourg, December 03, 2019 -- [MISP Training - Hands-on workshop for analysts and MISP users](https://en.xing-events.com/JSUSQIV.html) in Luxembourg, December 04, 2019 -- [MISP Training - Advanced developers session, including MISP core](https://en.xing-events.com/WBFKUVK.html) in Luxembourg, December 05, 2019 -- [MISP Training (Norway)](https://www.first.org/events/colloquia/oslo2019/) in Oslo, October 15-17th 2019 -- [MISP Training (Slovenia)](https://www.first.org/events/colloquia/ljubljana2019/program) in Ljubljana 2019 FIRST Technical Colloquium, November 13–14, 2019 -- [MISP Training - Threat Intelligence Introduction for Analysts and Administrators](https://en.xing-events.com/AOMYCCV.html) in Luxembourg, December 03, 2019 -- [MISP Training - Hands-on workshop for analysts and MISP users](https://en.xing-events.com/JSUSQIV.html) in Luxembourg, December 04, 2019 -- [MISP Training - Advanced developers session, including MISP core](https://en.xing-events.com/WBFKUVK.html) in Luxembourg, December 05, 2019 -- [MISP Training (Prague) - Threat Intelligence Analyst and Administrators](https://en.xing-events.com/XDMSLUO) - in Prague - 17th September 2019 -- [MISP Training (Prague) - Developers session - API and Extensions](https://en.xing-events.com/ULBAHVN) - in Prague - 18th September 2019 -- [MISP Training - Threat Intelligence Analyst and Administrators](https://en.xing-events.com/EJKDRZP) - at CIRCL Luxembourg - 24th September 2019 -- [MISP Training - MISP Training - Hands-on workshop](https://en.xing-events.com/UEXXGRO) - at CIRCL Luxembourg - 25th September 2019 -- [MISP Training - MISP Training - Advanced developers session, including MISP core](https://en.xing-events.com/CQYGYJQ) - at CIRCL Luxembourg - 26th September 2019 -- [MISP Training (Luxembourg) - Threat Intelligence for Analyst and Administrators](https://en.xing-events.com/QPILZTS.html) - at CIRCL Luxembourg - 25th March 2019 -- [MISP Training (Luxembourg) - Threat Intelligence for Analyst and Administrators](https://en.xing-events.com/YXNNPWD) - at CIRCL Luxembourg - 26th March 2019 -- [MISP Training (Luxembourg) - Developers session - API and Extensions](https://en.xing-events.com/IHSBNTB) - at CIRCL Luxembourg - 27th March 2019 -- [MISP Training (CERN) - Threat Intelligence for Analyst and Administrators (with a focus on NIDS such as Bro/Zeek](https://indico.cern.ch/event/787173/) - at CERN - 11-12 April 2019 -- [MISP Training (SIGS/Zurich) - Threat Intelligence for Analyst and Administrators](https://www.sig-switzerland.ch/misp_training/) - at SWITCH (Zurich) - 2nd May 2019 -- [MISP Training (SIGS/Zurich) - Threat Intelligence for Analyst and Administrators](https://www.sig-switzerland.ch/misp_training/) - at SWITCH (Zurich) - 3rd May 2019 -- [MISP Training (Prague) - Threat Intelligence Analyst and Administrators ](https://en.xing-events.com/XDMSLUO.html) - at SPCSS Prague, Conference center GreenPoint, s. r. o. - 17 Sep 2019 -- [MISP Training (Prague) - Developers session](https://en.xing-events.com/ULBAHVN.html) - at SPCSS Prague, Conference center GreenPoint, s. r. o. - 18 Sep 2019 + *Where:* Remote (Zoom and online MISP traning instance) -### Conferences featuring MISP core members talking about MISP and/or threat intelligence + *Price:* A participation fee of 10 EUR is asked per remote training session -- [Fundamentals MISP given FIRSTdotOrg 2021 Virtual Symposium African and Arab regions](https://www.youtube.com/watch?v=00jq7Gbqdz8) - 18th December 2021 -- [MISP General Usage Training - Part 1 of 2](https://www.youtube.com/watch?v=-NuODyh1YJE) -- [MISP General Usage Training - Part 2 of 2](https://www.youtube.com/watch?v=LlKnh5b0bgw) -- [MISP Training Usage - Training given the 2nd March 2021 - 2h50 min](https://cra.circl.lu/videos/MISP-Usage-Training-20210302.mp4) -- [MISP Training Administration and Building Communities- Training given the 3rd March 2021 - 2h56min](https://cra.circl.lu/videos/MISP-Administration-and-Building-Communities-20210303.mp4) -- [MISP Training Module 1 - An Introduction to Cybersecurity Information Sharing](https://www.youtube.com/watch?v=aM7czPsQyaI) -- [MISP Training Module 2 - General usage of MISP](https://www.youtube.com/watch?v=Jqp8CVHtNVk) -- [MISP covid-19 sharing community - introduction](https://peertube.opencloud.lu/videos/watch/4f7acd4c-a909-4315-87aa-38ba95cceaf2) + *Summary agenda:* + - General usage + - Encoding a report + - Making use of the various tools in MISP from an analyst perspective + + *Event link:* [Register for this event](https://IMKNUTR.xing-events.com/IMKNUTR.html?viewType=iframe&distributionChannel=CHANNEL_IFRAME&language=en&resizeIFrame=true) + +- #### MISP Training - Administration and Deployment of MISP software + *When:* 14th September 2022 14:00-17:00 UTC + + *Where:* Remote (Zoom and online MISP traning instance) + + *Price:* A participation fee of 10 EUR is asked per remote training session + + *Summary agenda:* + - Deploying / running your MISP, i.e. + - Configuration + - Installation + - Community management + + *Event link:* [Register for this event](https://BVJBEEU.xing-events.com/BVJBEEU.html?viewType=iframe&distributionChannel=CHANNEL_IFRAME&language=en&resizeIFrame=true) + +- #### MISP Training - Advanced Developer session from API to MISP internals + *When:* 15th September 2022 14:00-17:00 UTC + + *Where:* Remote (Zoom and online MISP traning instance) + + *Price:* A participation fee of 10 EUR is asked per remote training session + + *Summary agenda:* + - Intro to API usage + - Supporting dev libraries + - Session on development of MISP internals + + *Event link:* [Register for this event](https://IMGQRQQ.xing-events.com/IMGQRQQ.html?viewType=iframe&distributionChannel=CHANNEL_IFRAME&language=en&resizeIFrame=true) + +### Past events + +You can find past events [here](/past-events/). diff --git a/content/past-events.md b/content/past-events.md new file mode 100755 index 0000000..ff69ca4 --- /dev/null +++ b/content/past-events.md @@ -0,0 +1,227 @@ +--- +layout: page +title: Past MISP-related events +permalink: /past-events/ +toc: true +--- + +## Past conferences +Past conferences featuring MISP core members talking about MISP and/or threat intelligence + +### 2021 +- [MISP Fundamentals](https://www.youtube.com/watch?v=00jq7Gbqdz8) + + *When:* 18th December 2021 (3h43m) + + *Event:* FIRSTdotOrg 2021 Virtual Symposium African and Arab regions + +- [MISP General Usage Training - Part 1 of 2](https://www.youtube.com/watch?v=-NuODyh1YJE) + + *When:* 12th April 2021 (3h42m) + +- [MISP General Usage Training - Part 2 of 2](https://www.youtube.com/watch?v=LlKnh5b0bgw) + + *When:* 12th April 2021 (3h40m) + +- [MISP Training Usage](https://cra.circl.lu/videos/MISP-Usage-Training-20210302.mp4) + + *When:* 2nd March 2021 (2h50m) + +- [MISP Training Administration and Building Communities](https://cra.circl.lu/videos/MISP-Administration-and-Building-Communities-20210303.mp4) + + *When:* 3rd March 2021 (2h56m) + +### 2020 + +- [MISP covid-19 sharing community - introduction](https://peertube.opencloud.lu/videos/watch/4f7acd4c-a909-4315-87aa-38ba95cceaf2) + + *When:* 28th March 2020 (1h40m) + +### 2018 + +- [MISP Training Module 1 - An Introduction to Cybersecurity Information Sharing](https://www.youtube.com/watch?v=aM7czPsQyaI) + + *When:* 6th November 2018 (1h6m) + +- [MISP Training Module 2 - General usage of MISP](https://www.youtube.com/watch?v=Jqp8CVHtNVk) + + *When:* 6th November 2018 (1h8m) + + +## Past MISP Trainings +### 2021 +- #### Open Source Security Hackathon + + *When:* Monday 25th October 2021 and Tuesday 26th October 2021 + + *Event:* [Open Source Security Hackathon](/hackathon/) + +- #### Online MISP Training - Introduction to CTI (French) + + *When:* Thursday 25th February 2021 / ~~[Registration](https://www.xing-events.com/TFHIOJQ)~~ + +- #### Online MISP Training - MISP - Threat Intelligence Introduction for Analysts + + *When:* Tuesday 2nd March 2021 / ~~[Registration](https://www.xing.com/events/misp-threat-intelligence-introduction-analysts-3315431)~~ + +- #### Online MISP Training - MISP - Threat Intelligence for Administrators and Building Information Sharing Communities + + *When:* Wednesday 3rd March 2021 / ~~[Registration](https://www.xing-events.com/WZGDMOP)~~ + +### 2020 + +- #### MISP Covid training - How to use MISP in the scope of sharing information about COVID-19 + + *When:* 27 March 2020 at 14:00 CET (1h40m) + + *Where:* Remote + + *Event link:* [MISP Covid training](https://bbb.secin.lu/b/ale-q6v-ecn) + +- #### MISP Training - Hands-on workshop for analysts and MISP users + + *When:* February 19, 2020 / ~~[Registration](https://www.xing-events.com/DLCMDJY.html)~~ + + *Where:* Luxembourg + +- #### MISP Training - Threat Intelligence Introduction for Analysts and Administrators + + *When:* February 18, 2020 / ~~[Registration](https://www.xing-events.com/UXMOBFA.html)~~ + + *Where*: Luxembourg + +### 2019 + +- #### MISP Training (Slovenia) + + *When:* November 13–14, 2019 / ~~[Registration](https://www.first.org/events/colloquia/ljubljana2019/program)~~ + + *Where*: Ljubljana 2019 FIRST Technical Colloquium + +- #### MISP Training - Threat Intelligence Introduction for Analysts and Administrators + + *When:* December 03, 2019 / ~~[Registration](https://en.xing-events.com/AOMYCCV.html)~~ + + *Where*: Luxembourg + +- #### MISP Training - Hands-on workshop for analysts and MISP users + + *When:* December 04, 2019 / ~~[Registration](https://en.xing-events.com/JSUSQIV.html)~~ + + *Where*: Luxembourg + +- #### MISP Training - Advanced developers session, including MISP core + + *When:* December 05, 2019 / ~~[Registration](https://en.xing-events.com/WBFKUVK.html)~~ + + *Where*: Luxembourg + +- #### MISP Training (Norway) + + *When:* October 15-17th 2019 / ~~[Registration](https://www.first.org/events/colloquia/oslo2019/)~~ + + *Where*: Oslo + +- #### MISP Training (Slovenia) + + *When:* November 13–14, 2019 / ~~[Registration](https://www.first.org/events/colloquia/ljubljana2019/program)~~ + + *Where*: Ljubljana 2019 FIRST Technical Colloquium + +- #### MISP Training - Threat Intelligence Introduction for Analysts and Administrators + + *When:* December 03, 2019 / ~~[Registration](https://en.xing-events.com/AOMYCCV.html)~~ + + *Where*: Luxembourg + +- #### MISP Training - Hands-on workshop for analysts and MISP users + + *When:* December 04, 2019 / ~~[Registration](https://en.xing-events.com/JSUSQIV.html)~~ + + *Where*: Luxembourg + +- #### MISP Training - Advanced developers session, including MISP core + + *When:* December 05, 2019 / ~~[Registration](https://en.xing-events.com/WBFKUVK.html)~~ + + *Where*: Luxembourg + +- #### MISP Training (Prague) - Threat Intelligence Analyst and Administrators + + *When:* 17th September 2019 / ~~[Registration](https://en.xing-events.com/XDMSLUO)~~ + + *Where*: Prague + +- #### MISP Training (Prague) - Developers session - API and Extensions + + *When:* 18th September 2019 / ~~[Registration](https://en.xing-events.com/ULBAHVN)~~ + + *Where*: CIRCL Luxembourg + +- #### MISP Training - Threat Intelligence Analyst and Administrators + + *When:* 24th September 2019 / ~~[Registration](https://en.xing-events.com/EJKDRZP)~~ + + *Where*: CIRCL Luxembourg + +- #### MISP Training - MISP Training - Hands-on workshop + + *When:* 25th September 2019 / ~~[Registration](https://en.xing-events.com/UEXXGRO)~~ + + *Where*: CIRCL Luxembourg + +- #### MISP Training - MISP Training - Advanced developers session, including MISP core + + *When:* 26th September 2019 / ~~[Registration](https://en.xing-events.com/CQYGYJQ)~~ + + *Where*: CIRCL Luxembourg + +- #### MISP Training (Luxembourg) - Threat Intelligence for Analyst and Administrators + + *When:* 25th March 2019 / ~~[Registration](https://en.xing-events.com/QPILZTS.html)~~ + + *Where*: CIRCL Luxembourg + +- #### MISP Training (Luxembourg) - Threat Intelligence for Analyst and Administrators + + *When:* 26th March 2019 / ~~[Registration](https://en.xing-events.com/YXNNPWD)~~ + + *Where*: CIRCL Luxembourg + +- #### MISP Training (Luxembourg) - Developers session - API and Extensions + + *When:* 27th March 2019 / ~~[Registration](https://en.xing-events.com/IHSBNTB)~~ + + *Where*: CIRCL Luxembourg + +- #### MISP Training (CERN) - Threat Intelligence for Analyst and Administrators (with a focus on NIDS such as Bro/Zeek + + *When:* 11-12 April 2019 / ~~[Registration](https://indico.cern.ch/event/787173/)~~ + + *Where*: CERN + +- #### MISP Training (SIGS/Zurich) - Threat Intelligence for Analyst and Administrators + + *When:* 2nd May 2019 / ~~[Registration](https://www.sig-switzerland.ch/misp_training/)~~ + + *Where*: SWITCH (Zurich) + +- #### MISP Training (SIGS/Zurich) - Threat Intelligence for Analyst and Administrators + + *When:* 3rd May 2019 / ~~[Registration](https://www.sig-switzerland.ch/misp_training/)~~ + + *Where*: SWITCH (Zurich) + +- #### MISP Training (Prague) - Threat Intelligence Analyst and Administrators + + *When:* 17 Sep 2019 / ~~[Registration](https://en.xing-events.com/XDMSLUO.html)~~ + + *Where*: SPCSS Prague, Conference center GreenPoint, s. r. o. + +- #### MISP Training (Prague) - Developers session + + *When:* 18 Sep 2019 / ~~[Registration](https://en.xing-events.com/ULBAHVN.html)~~ + + *Where*: SPCSS Prague, Conference center GreenPoint, s. r. o. + + From bde902957580ddd0169c6df93cc9be91966ae146 Mon Sep 17 00:00:00 2001 From: Anders Einar Hilden Date: Tue, 2 Aug 2022 20:01:47 +0200 Subject: [PATCH 2/6] Add 10px to bottom margin of ul ul to improve event page render. --- static/css/custom.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/static/css/custom.css b/static/css/custom.css index 5b17f7c..42f6f59 100644 --- a/static/css/custom.css +++ b/static/css/custom.css @@ -71,3 +71,7 @@ details[open]>summary:before, details.open>summary:before { .box-simple { min-height: 230px; } + +ul ul { + margin-bottom: 10px; +} From 7e411eb5c26b564b037d66b54975bf8f89e7b535 Mon Sep 17 00:00:00 2001 From: Anders Einar Hilden Date: Tue, 2 Aug 2022 21:33:17 +0200 Subject: [PATCH 3/6] Xing event iframes looked bad on their own, implemented collapsible shortcode using Bootstrap and timeanddate-event-link-shortcode. --- content/events.md | 23 ++++++++++++++------- layouts/shortcodes/collapse-event.html | 18 ++++++++++++++++ layouts/shortcodes/time-and-date-event.html | 13 ++++++++++++ 3 files changed, 47 insertions(+), 7 deletions(-) create mode 100644 layouts/shortcodes/collapse-event.html create mode 100644 layouts/shortcodes/time-and-date-event.html diff --git a/content/events.md b/content/events.md index 477f519..5daa83c 100755 --- a/content/events.md +++ b/content/events.md @@ -35,9 +35,11 @@ Conferences featuring MISP core members talking about MISP and/or threat intelli *Event link:* [2022 FIRST Cyber Threat Intelligence Symposium | #FIRSTCTI22](https://www.first.org/events/symposium/berlin2022/program) ### Public MISP trainings + - #### MISP Training - Threat Intelligence Introduction for Analysts and Security Professionals - *When:* 13th September 2022 14:00-17:00 UTC + + *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` >}} *Where:* Remote (Zoom and online MISP traning instance) @@ -48,10 +50,13 @@ 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:* [Register for this event](https://IMKNUTR.xing-events.com/IMKNUTR.html?viewType=iframe&distributionChannel=CHANNEL_IFRAME&language=en&resizeIFrame=true) + *Event link:* {{< collapse-event `MISP Training - Threat Intelligence Introduction for Analysts and Security Professionals` >}} + + {{< /collapse-event >}} - #### MISP Training - Administration and Deployment of MISP software - *When:* 14th September 2022 14:00-17:00 UTC + *When:* {{< time-and-date-event `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) @@ -61,12 +66,14 @@ Conferences featuring MISP core members talking about MISP and/or threat intelli - Deploying / running your MISP, i.e. - Configuration - Installation - - Community management + - Community management - *Event link:* [Register for this event](https://BVJBEEU.xing-events.com/BVJBEEU.html?viewType=iframe&distributionChannel=CHANNEL_IFRAME&language=en&resizeIFrame=true) + *Event link:* {{< collapse-event `MISP Training - Administration and Deployment of MISP software` >}} + + {{< /collapse-event >}} - #### MISP Training - Advanced Developer session from API to MISP internals - *When:* 15th September 2022 14:00-17:00 UTC + *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` >}} *Where:* Remote (Zoom and online MISP traning instance) @@ -77,7 +84,9 @@ Conferences featuring MISP core members talking about MISP and/or threat intelli - Supporting dev libraries - Session on development of MISP internals - *Event link:* [Register for this event](https://IMGQRQQ.xing-events.com/IMGQRQQ.html?viewType=iframe&distributionChannel=CHANNEL_IFRAME&language=en&resizeIFrame=true) + *Event link:* {{< collapse-event `MISP Training - Advanced Developer session from API to MISP internals` >}} + + {{< /collapse-event >}} ### Past events diff --git a/layouts/shortcodes/collapse-event.html b/layouts/shortcodes/collapse-event.html new file mode 100644 index 0000000..909ea68 --- /dev/null +++ b/layouts/shortcodes/collapse-event.html @@ -0,0 +1,18 @@ +{{/* + 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/time-and-date-event.html new file mode 100644 index 0000000..7d1fe25 --- /dev/null +++ b/layouts/shortcodes/time-and-date-event.html @@ -0,0 +1,13 @@ +{{/* + Parameters: + Parameter 0: Human readable time and date + Parameter 1: Title of event + Parameter 2: ISO time for event (UTC), i.e 20220802T21 + Parameter 3: Duration (optional) + + Example usage: + + {{< 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 }} From d809dbe0db95bffb63ffdecd36a2d830a543a3bd Mon Sep 17 00:00:00 2001 From: Anders Einar Hilden Date: Wed, 3 Aug 2022 13:05:13 +0200 Subject: [PATCH 4/6] 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 }} + +
+
From 3bd6bf32d69cc107d3fdfe739570be58283ccaf4 Mon Sep 17 00:00:00 2001 From: Anders Einar Hilden Date: Wed, 3 Aug 2022 13:05:29 +0200 Subject: [PATCH 5/6] Ignore vim .swp --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 56af776..8ee5a48 100755 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ public/ *.lock +*.swp From 1665a69b10475e5f0c3351ec8f10ac9dfddd38b5 Mon Sep 17 00:00:00 2001 From: Anders Einar Hilden Date: Wed, 3 Aug 2022 13:17:39 +0200 Subject: [PATCH 6/6] Add noopener/noreferrer as suggested by linter, also remove stray asterix --- layouts/shortcodes/fixedtime.html | 2 +- layouts/shortcodes/xing-collapse-iframe.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/layouts/shortcodes/fixedtime.html b/layouts/shortcodes/fixedtime.html index bca26f5..451a6f9 100644 --- a/layouts/shortcodes/fixedtime.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 index 40624da..79512ac 100644 --- a/layouts/shortcodes/xing-collapse-iframe.html +++ b/layouts/shortcodes/xing-collapse-iframe.html @@ -13,7 +13,7 @@
{{ if (len (.Get 3)) }}{{ .Get 3 }}{{ else }}Register for {{ .Get 1 }}{{ end }}