From 8b79d9db52f45132ed94962d9dde04e0447d41bc Mon Sep 17 00:00:00 2001 From: Benjamin Jones Date: Wed, 23 Sep 2020 17:03:45 +0200 Subject: [PATCH] =?UTF-8?q?all=20those=20last=20min=20changes=20?= =?UTF-8?q?=F0=9F=98=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 3 +- _data/menu-variants.yml | 95 +++++++++++++++++++ _data/menu.yml | 42 -------- _data/rf2020/events.yml | 16 +++- _data/watch-menu.yml | 14 --- _includes/common/clock.html | 2 +- _includes/common/header-collapsed.html | 2 +- _includes/common/navigation.html | 6 +- _includes/common/watch-panel.html | 2 +- _includes/embeds/twitch.html | 4 +- _includes/program/full-program.html | 13 --- _includes/program/program-day.html | 3 +- _includes/rf2020/nod.html | 1 + _includes/text/fr/main-text.md | 3 +- _layouts/event.html | 20 +++- _layouts/watch.html | 32 +++---- _sass/includes/banner.scss | 8 ++ _sass/includes/clock.scss | 13 +-- _sass/includes/watch-panel.scss | 9 +- _sass/layouts/watch.scss | 36 +++++++ _sass/pages/gallery.scss | 19 ++++ _sass/pages/watch.scss | 34 +++---- assets/css/index.scss | 2 + assets/js/index.js | 94 ++++++++++++++---- assets/js/index.js.map | 2 +- .../index.md | 0 fr/index.html | 22 +---- fr/rf2020/watch/index.html | 24 +++++ fr/watch/index.html | 8 -- package.json | 8 +- rf2020/gallery/index.html | 23 +++++ rf2020/gallery/nod.html | 19 ++++ rf2020/watch/index.html | 24 +++++ src/modules/clock.js | 7 +- src/modules/countdown.js | 5 +- src/modules/watch.js | 87 ++++++++++++++--- watch/index.html | 8 -- 37 files changed, 497 insertions(+), 213 deletions(-) create mode 100644 _data/menu-variants.yml delete mode 100644 _data/menu.yml delete mode 100644 _data/watch-menu.yml create mode 100644 _includes/rf2020/nod.html create mode 100644 _sass/layouts/watch.scss create mode 100644 _sass/pages/gallery.scss rename code-of-conduct.md => code-of-conduct/index.md (100%) create mode 100644 fr/rf2020/watch/index.html delete mode 100644 fr/watch/index.html create mode 100644 rf2020/gallery/index.html create mode 100644 rf2020/gallery/nod.html create mode 100644 rf2020/watch/index.html delete mode 100644 watch/index.html diff --git a/.vscode/settings.json b/.vscode/settings.json index a8219b4..daaebd7 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -11,5 +11,6 @@ "titleBar.inactiveForeground": "#3cafb3", "titleBar.activeForeground": "#0ac2c9", "titleBar.inactiveBackground": "#20232e" - } + }, + "eslint.enable": true } diff --git a/_data/menu-variants.yml b/_data/menu-variants.yml new file mode 100644 index 0000000..1dd4d8c --- /dev/null +++ b/_data/menu-variants.yml @@ -0,0 +1,95 @@ +main: + - conference: + en: + name: conference 2020 + fr: + name: conference 2020 + items: + - program: + en: + name: program + url: "/rf2020/program" + fr: + name: programme + url: /rf2020/programme + - participants: + en: + name: participants + url: "/rf2020/participants" + fr: + name: intervenant·e·x + url: /rf2020/participants + - participants: + en: + name: gallery + url: "/rf2020/gallery" + fr: + name: gallery + url: /rf2020/gallery + - participants: + en: + name: watch + url: "/rf2020/watch" + fr: + name: watch + url: /rf2020/watch + - about: + en: + name: about + url: /about + fr: + name: à propos + url: /a-propos + + - donate: + en: + name: donate + url: "/donate" + fr: + name: faire un don + url: /donate + +watch: + - program: + en: + name: program + url: "#program" + fr: + name: programme + url: "#program" + - gallery: + en: + name: gallery + url: "/rf2020/gallery" + fr: + name: gallery + url: "/rf2020/gallery" + - donate: + en: + name: donate + url: "/donate" + fr: + name: faire un don + url: "/donate" +gallery: + - watch: + en: + name: watch + url: "/rf2020/watch" + fr: + name: watch + url: "/rf2020/watch" + - program: + en: + name: program + url: "/rf2020/program" + fr: + name: programme + url: /rf2020/programme + - donate: + en: + name: donate + url: "/donate" + fr: + name: faire un don + url: "/donate" \ No newline at end of file diff --git a/_data/menu.yml b/_data/menu.yml deleted file mode 100644 index bd59062..0000000 --- a/_data/menu.yml +++ /dev/null @@ -1,42 +0,0 @@ -- conference: - en: - name: conference 2020 - fr: - name: conference 2020 - items: - - program: - en: - name: program - url: "/rf2020/program" - fr: - name: programme - url: /rf2020/programme - - participants: - en: - name: participants - url: "/rf2020/participants" - fr: - name: intervenant·e·x - url: /rf2020/participants - # - discord: - # en: - # name: RF community (discord) - # url: "https://discord.gg/3yaUwg3" - # fr: - # name: RF community (discord) - # url: "https://discord.gg/3yaUwg3" -- about: - en: - name: about - url: /about - fr: - name: à propos - url: /a-propos - -- donate: - en: - name: donate - url: "/donate" - fr: - name: faire un don - url: /donate diff --git a/_data/rf2020/events.yml b/_data/rf2020/events.yml index 8113dca..1e4d39a 100644 --- a/_data/rf2020/events.yml +++ b/_data/rf2020/events.yml @@ -109,7 +109,7 @@ - id : 7 title_ : personal archive / public action III lang_ : EN - format: Talk + format: performance ref : personal-archive-public date : 2020-09-19 19:40 description: | @@ -339,10 +339,12 @@ participants: [22] - id : 23 - title_ : lookingGlass + title_ : lookingGlass — Play-along session and artist Q&A lang_ : EN format: Artwork ref : looking-glass + date : 2020-09-20 18:50 + endDate : 2020-09-20 19:50 description: | lookingGlass: A Digital Immersive Theatre and Gaming Experience @@ -363,7 +365,7 @@ lang_ : EN format: Talk ref : identifying-digital-coercion - date : 2020-09-20 00:00 + date : 2020-09-20 13:45 description: | In the last decade, several public stories have hit the headlines, underlining the necessity to rethink our relation to digital technologies and our behavior with regard to privacy. Whether it be Snowden’s revelations, Cambridge Analytica, or Facebook political advertising, all of these narratives seem to turn public opinion towards skepticism and defiance. However, they also seem to dissimulate the more subtle means of coercion existing in the digital realm, both technical and psycho-sociological aspects. In 2018, Sir Tim Berners-Lee, who invented what is now known as the World Wide Web, gave an interview in which he admits that “the web has failed instead of served humanity, as it was supposed to have done, and failed in many places”. He had envisioned a system that would provide means of empowerment to its users. He thought, as some still do, that a standardized platform in which people would be able to participate openly in the elaboration of a common interest could provide a radical shift from a centralized capitalist political system. Nonetheless, this has proven to be a failure. By his own admission, the web has become quite the opposite : centralization has brought monopoly to only a handful of services, hiding behind a Utopian vision embodied in personalized services and recommendations. We think that this failure also illustrates the lack of understanding the public has of the implicit technical dogma guiding online services and their technical interdependence. How can we accurately identify coercion and the potential means of re-decentralizing ? We propose to analyze this re-decentralization via these talking points : 1) the psycho-sociological analysis of the relation between one’s opinion and the tools of capitalist coercion, 2) the technical aspects of the dissimulated interdependence of various services, notably privately owned and/or controlled APIs. participants: [24] @@ -445,21 +447,25 @@ participants: [27] - id : 18 - title_ : NOD (Neural Optimal Decisor) + title_ : NOD (Neural Optimal Decisor) - Play-along and Artist Q&A lang_ : EN format: Artwork ref : nod + date : 2020-09-20 17:35 + endDate : 2020-09-20 18:35 description: | NOD is an acronym for Neural Optimal Decisor, a subcomponent of a big artificial supreme entity in charge of monitoring and analyzing massive amounts of data from people who agreed to delegate personal life to this ubiquitous organism. This Artificial Intelligence takes advantage of every device connected to the vast network, and it obtains real-time biometric and social information from users. People do not need to handle struggle situations because data collected by each NOD will be a valuable asset to optimize human decisions by them. NODs will enhance people's lives supported by reliable information and probabilistic evidence. The experience drives the player into the NOD perspective in charge of improving human lives. In this sense, players can track people's actions, communications, and variables through devices connected to the internet. Smartphones, smartwatches, and other devices become interfaces to take an in-depth look at people's private life. A simple game mechanic allows players to identify people as metadata of their physical dimension, accompanied by lectures that label people's current status. The NOD must make decisions by humans based on their probabilistic measurements of well- being. However, for better or worse, humans seem to want to run away from predictability. The game arises from a series of questions. What range of options do we have to make a decision? Is our identity being demarcated by algorithms? Are we an extension or part of a kind of digital monoculture? Do we govern our lives, or are these driven by the influence of data presented to us in seemingly harmless and casual ways? participants: [28] + event-link: https://reclaimfutures.whereby.com/nod + gallery-link: /rf2020/gallery/nod.html links: - https://simmer.io/@materianstbl/nod - id : 19 - title_ : RF introdcution & opening remarks + title_ : RF introduction & opening remarks lang_ : EN format: misc date : 2020-09-18 10:45 diff --git a/_data/watch-menu.yml b/_data/watch-menu.yml deleted file mode 100644 index 40383da..0000000 --- a/_data/watch-menu.yml +++ /dev/null @@ -1,14 +0,0 @@ -- program: - en: - name: program - url: "#program" - fr: - name: programme - url: "#program" -- donate: - en: - name: donate - url: "/donate" - fr: - name: faire un don - url: "/donate" diff --git a/_includes/common/clock.html b/_includes/common/clock.html index 1939dcd..37c2b9b 100644 --- a/_includes/common/clock.html +++ b/_includes/common/clock.html @@ -1 +1 @@ -

\ No newline at end of file +
\ No newline at end of file diff --git a/_includes/common/header-collapsed.html b/_includes/common/header-collapsed.html index 34d8905..cf3f27f 100644 --- a/_includes/common/header-collapsed.html +++ b/_includes/common/header-collapsed.html @@ -1,5 +1,5 @@
- {% include common/navigation.html menu=site.data.watch-menu clock=true %} + {% include common/navigation.html clock=true %} {% if page.parentEn %} diff --git a/_includes/common/navigation.html b/_includes/common/navigation.html index 5045fc2..8a06888 100644 --- a/_includes/common/navigation.html +++ b/_includes/common/navigation.html @@ -1,7 +1,9 @@ -{% if include.menu %} +{% if page.menu-variant %} + {% assign menu = site.data.menu-variants[page.menu-variant] %} +{% elsif include.menu %} {% assign menu = include.menu %} {% else %} - {% assign menu = site.data.menu %} + {% assign menu = site.data.menu-variants.main %} {% endif %} diff --git a/_includes/common/watch-panel.html b/_includes/common/watch-panel.html index 49e6cc3..22f27d4 100644 --- a/_includes/common/watch-panel.html +++ b/_includes/common/watch-panel.html @@ -11,6 +11,6 @@
- +
\ No newline at end of file diff --git a/_includes/embeds/twitch.html b/_includes/embeds/twitch.html index 15dc64c..6d0888c 100644 --- a/_includes/embeds/twitch.html +++ b/_includes/embeds/twitch.html @@ -1,11 +1,11 @@
- + -