From c3fd1e99f1dda8e6cb91169b2ab21504501faa10 Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Sat, 21 Jan 2023 18:33:28 +0100 Subject: [PATCH 1/8] WIP: Add badge logos and encode Danish badges as YAML --- data/badges/da/badges.yaml | 42 +++++ data/badges/da/status.yaml | 14 ++ static/static/img/badges/anonymous-access.svg | 61 +++++++ static/static/img/badges/backup.svg | 76 ++++++++ .../img/badges/encrypted-data-storage.svg | 63 +++++++ static/static/img/badges/logging.svg | 162 ++++++++++++++++++ .../static/img/badges/secure-connection.svg | 63 +++++++ static/static/img/badges/stable.svg | 46 +++++ static/static/img/badges/zero-knowledge.svg | 62 +++++++ 9 files changed, 589 insertions(+) create mode 100644 data/badges/da/badges.yaml create mode 100644 data/badges/da/status.yaml create mode 100644 static/static/img/badges/anonymous-access.svg create mode 100644 static/static/img/badges/backup.svg create mode 100644 static/static/img/badges/encrypted-data-storage.svg create mode 100644 static/static/img/badges/logging.svg create mode 100644 static/static/img/badges/secure-connection.svg create mode 100644 static/static/img/badges/stable.svg create mode 100644 static/static/img/badges/zero-knowledge.svg diff --git a/data/badges/da/badges.yaml b/data/badges/da/badges.yaml new file mode 100644 index 0000000..d6055ef --- /dev/null +++ b/data/badges/da/badges.yaml @@ -0,0 +1,42 @@ +badges: + + stability: + name: stabilitet + description: Det første badge er som sådan ikke relateret til hvorvidt tjenesten lever op til vores formålsparagraf. Det angiver i stedet hvorvidt tjenesten er stabil nok til at vi vil anbefale almindelige mennesker at bruge den. Vi tilbyder løbende nye tjenester, og der vil være en periode i starten af en tjenestes levetid hvor vi anser den som værende “ustabil”, indtil den har vist sit værd med en mindre skare af brugere der er med på at tjenesten kan være ustabil. Alle er dog stadig velkomne til at benytte sig af tjenesten, så længe de er indforstået med dette forbehold for stabiliteten. + icon: stable.svg + + secure_connection: + name: sikker forbindelse + description: Sikker forbindelse angiver at trafikken over internettet mellem dig og tjenesten er krypteret. Du kender det som regel som en hængelås foran adresselinjen i din browser. Det betyder at ingen andre end dig og tjenesten kan se hvad der bliver sendt frem og tilbage mellem dig og tjenesten. + icon: secure-connection.svg + + encrypted_storage: + name: krypteret opbevaring af data + description: Tjenestens data gemmes krypteret, og er dermed ikke umiddelbart læsbare for andre end tjenesten selv og data.coops systemadministratorer. I tilfælde af at data lækkes (fx ved virtuelt eller fysisk indbrud), kræver det en særlig “hovednøgle” at læse data, som datatyven forhåbentligt ikke er i besiddelse af. + icon: encrypted-data-storage.svg + + zero_knowledge: + name: zero knowledge + description: Data gemmes krypteret, og tjenesten er konstrueret på en måde, så selv ikke data.coops systemadministratorer har mulighed for at tilgå og læse brugernes data. Der findes simpelthen ingen “hovednøgle” som giver fuld datadgang, og det er dermed kun brugerne selv der kan læse deres data. I tilfælde af at data lækkes, er ingen større katastrofe sket, da der heller ikke er risiko for at datatyven også har stjålet hovednøglen, da der ingen hovednøgle er. + icon: zero-knowledge.svg + + backup: + name: Backup + description: | + Der tages løbende backup af tjenestens data, for at minimere skadens omfang i tilfælde af tekniske nedbrud. + + **Bemærk:** Vi tager pt. slet ikke backup af noget, men det står selvfølgelig højt på vores prioritetsliste. + icon: backup.svg + + logging: + name: Logning + description: | + Dette badge er lidt omvendt: Det positive badge tildeles tjenester der ikke foretager logning. + + Logning fungerer på forskellig vis og foretages i større eller mindre grad. Som regel giver logning data.coops systemadministratorer overordnet indsigt i hvordan tjenester bruges, men ikke i det konkrete data tjenesten behandler for brugerne. Fx vil logning afsløre overfor data.coops systemadministratorer, at nogen overfører en fil, men ikke hvad selve filen indeholder eller hvem der overfører filen. + icon: logging.svg + + anonymity: + name: Anonym adgang + description: Tjenester med anonym adgang kan benyttes helt uden at man skal være registreret ved tjenesten. De fleste tjenester kræver en form for registrering af brugerne, da de data tjenesten indeholder knyttes til de enkelte brugere. Nogle tjenester tilbyder anonym læseadgang. Fx kan det kræve registrering at uploade en fil til tjenesten, men andre kan downloade filen at være registreret. + icon: anonymous-access.svg diff --git a/data/badges/da/status.yaml b/data/badges/da/status.yaml new file mode 100644 index 0000000..c470ee2 --- /dev/null +++ b/data/badges/da/status.yaml @@ -0,0 +1,14 @@ +status: + + positive: + name: positiv + description: Tjenesten lever op til kravene til det badget dækker over. + color: "#4c4" + + partial: + name: Delvis + description: Tjenesten lever delvist op til det badget dækker over. Dog i en sådan grad at vi mener det er værd at fremhæve. + + negative: + name: negativ + description: Tjenesten lever ikke op til det badget dækker over. diff --git a/static/static/img/badges/anonymous-access.svg b/static/static/img/badges/anonymous-access.svg new file mode 100644 index 0000000..94935b3 --- /dev/null +++ b/static/static/img/badges/anonymous-access.svg @@ -0,0 +1,61 @@ + +image/svg+xml \ No newline at end of file diff --git a/static/static/img/badges/backup.svg b/static/static/img/badges/backup.svg new file mode 100644 index 0000000..b3f79d3 --- /dev/null +++ b/static/static/img/badges/backup.svg @@ -0,0 +1,76 @@ + +image/svg+xml \ No newline at end of file diff --git a/static/static/img/badges/encrypted-data-storage.svg b/static/static/img/badges/encrypted-data-storage.svg new file mode 100644 index 0000000..589972c --- /dev/null +++ b/static/static/img/badges/encrypted-data-storage.svg @@ -0,0 +1,63 @@ + +image/svg+xml \ No newline at end of file diff --git a/static/static/img/badges/logging.svg b/static/static/img/badges/logging.svg new file mode 100644 index 0000000..31817d5 --- /dev/null +++ b/static/static/img/badges/logging.svg @@ -0,0 +1,162 @@ + +image/svg+xml \ No newline at end of file diff --git a/static/static/img/badges/secure-connection.svg b/static/static/img/badges/secure-connection.svg new file mode 100644 index 0000000..9c200a5 --- /dev/null +++ b/static/static/img/badges/secure-connection.svg @@ -0,0 +1,63 @@ + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/static/static/img/badges/stable.svg b/static/static/img/badges/stable.svg new file mode 100644 index 0000000..bb05433 --- /dev/null +++ b/static/static/img/badges/stable.svg @@ -0,0 +1,46 @@ + +image/svg+xml \ No newline at end of file diff --git a/static/static/img/badges/zero-knowledge.svg b/static/static/img/badges/zero-knowledge.svg new file mode 100644 index 0000000..f0f777e --- /dev/null +++ b/static/static/img/badges/zero-knowledge.svg @@ -0,0 +1,62 @@ + + + + + + image/svg+xml + + + + + + + + + + + From 44d27d1b5a78d377688dd8020b71bb40e57c82e3 Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Sat, 21 Jan 2023 19:44:02 +0100 Subject: [PATCH 2/8] Iterate over status and bagde data --- i18n/da.toml | 33 +++---------------- .../datacoop2020/layouts/partials/badges.html | 26 +++++++++++++++ .../datacoop2020/layouts/services/list.html | 5 +++ 3 files changed, 35 insertions(+), 29 deletions(-) create mode 100644 themes/datacoop2020/layouts/partials/badges.html diff --git a/i18n/da.toml b/i18n/da.toml index 1b0af0e..7d5dd74 100644 --- a/i18n/da.toml +++ b/i18n/da.toml @@ -4,36 +4,11 @@ other = "Home" [generated_date] other = "Generateret med Hugo d. {{ . }}" -[services_status] -other = "Tjeneste Status" +[badges_headline] +other = "Badges" -[service_badges_status_positive] -other = "Positiv" -[service_badges_status_negative] -other = "Negativ" -[service_badges_status_partial] -other = "Delvis" - -[service_badge_stability] -other = "Stabilitet" - -[service_badge_connection_security] -other = "Sikker forbindelse" - -[service_badge_connection_anonymous] -other = "Anonym adgang" - -[service_badge_storage_encrypted] -other = "Krypteret opbevaring af data" - -[service_badge_zero_knowledge] -other = "Zero knowledge" - -[service_badge_storage_backup] -other = "Backup" - -[service_badge_logging] -other = "Logning" +[status_headline] +other = "Status" [tagline] other = "vores data i vores hænder" diff --git a/themes/datacoop2020/layouts/partials/badges.html b/themes/datacoop2020/layouts/partials/badges.html new file mode 100644 index 0000000..3637d45 --- /dev/null +++ b/themes/datacoop2020/layouts/partials/badges.html @@ -0,0 +1,26 @@ +

{{ i18n "badges_headline" }}

+ +
+ +{{ range $badge_key, $badge := $.Site.Data.badges.da.badges.badges }} + +
{{ title .name }}
+ +
{{ markdownify .description }}
+ +{{ end }} + +
+ +

{{ i18n "status_headline" }}

+ +
+{{ range $.Site.Data.badges.da.status.status }} + +
{{ title .name }}
+ +
{{ markdownify .description }}
+ +{{ end }} +
+ diff --git a/themes/datacoop2020/layouts/services/list.html b/themes/datacoop2020/layouts/services/list.html index 218cb26..d0853af 100644 --- a/themes/datacoop2020/layouts/services/list.html +++ b/themes/datacoop2020/layouts/services/list.html @@ -13,5 +13,10 @@ {{ end }} + + +{{ partial "badges.html" . }} {{- end -}} + + From 0f778e4c0c0dc2372d57bae80213cb86ae3fa256 Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Sat, 21 Jan 2023 23:42:43 +0100 Subject: [PATCH 3/8] Adds a very bad and minimal representation of icons --- .../datacoop2020/assets/static/css/style.scss | 4 ++++ .../datacoop2020/layouts/partials/badges.html | 18 +++++++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/themes/datacoop2020/assets/static/css/style.scss b/themes/datacoop2020/assets/static/css/style.scss index ce93395..e1fb7d8 100644 --- a/themes/datacoop2020/assets/static/css/style.scss +++ b/themes/datacoop2020/assets/static/css/style.scss @@ -204,6 +204,10 @@ aside > footer img:hover { opacity : 1; } +.badge-icon { + width: 30px; + height: auto; +} dl.dl-services { display : grid; diff --git a/themes/datacoop2020/layouts/partials/badges.html b/themes/datacoop2020/layouts/partials/badges.html index 3637d45..5364f24 100644 --- a/themes/datacoop2020/layouts/partials/badges.html +++ b/themes/datacoop2020/layouts/partials/badges.html @@ -1,26 +1,22 @@

{{ i18n "badges_headline" }}

-
- {{ range $badge_key, $badge := $.Site.Data.badges.da.badges.badges }} -
{{ title .name }}
+

+ {{ title .name }} + +

-
{{ markdownify .description }}
+ {{ markdownify .description }} {{ end }} -
-

{{ i18n "status_headline" }}

-
{{ range $.Site.Data.badges.da.status.status }} -
{{ title .name }}
+

{{ title .name }}

-
{{ markdownify .description }}
+ {{ markdownify .description }} {{ end }} -
- From 79ff1446c3369bd35131653bc08b9688e565674f Mon Sep 17 00:00:00 2001 From: Rasmus Malver Date: Sun, 22 Jan 2023 16:31:29 +0100 Subject: [PATCH 4/8] Nye ikoner Co-authored-by: Rasmus Malver --- static/static/img/badges_new/decentralised.svg | 1 + static/static/img/badges_new/encryption.svg | 1 + static/static/img/badges_new/no-surveillance.svg | 1 + static/static/img/badges_new/zero-knowledge.svg | 1 + 4 files changed, 4 insertions(+) create mode 100644 static/static/img/badges_new/decentralised.svg create mode 100644 static/static/img/badges_new/encryption.svg create mode 100644 static/static/img/badges_new/no-surveillance.svg create mode 100644 static/static/img/badges_new/zero-knowledge.svg diff --git a/static/static/img/badges_new/decentralised.svg b/static/static/img/badges_new/decentralised.svg new file mode 100644 index 0000000..87d385b --- /dev/null +++ b/static/static/img/badges_new/decentralised.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/static/img/badges_new/encryption.svg b/static/static/img/badges_new/encryption.svg new file mode 100644 index 0000000..16a0c85 --- /dev/null +++ b/static/static/img/badges_new/encryption.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/static/img/badges_new/no-surveillance.svg b/static/static/img/badges_new/no-surveillance.svg new file mode 100644 index 0000000..add35fc --- /dev/null +++ b/static/static/img/badges_new/no-surveillance.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/static/img/badges_new/zero-knowledge.svg b/static/static/img/badges_new/zero-knowledge.svg new file mode 100644 index 0000000..623e306 --- /dev/null +++ b/static/static/img/badges_new/zero-knowledge.svg @@ -0,0 +1 @@ + \ No newline at end of file From 28735d3598844fd7ac1ccc95bd3fcc5f36f88829 Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Mon, 23 Jan 2023 09:52:52 +0100 Subject: [PATCH 5/8] possibly make a distinction between icons being more generally applied and badges having a formal meaning? --- static/static/img/{badges_new => icons}/decentralised.svg | 0 static/static/img/{badges_new => icons}/encryption.svg | 0 static/static/img/{badges_new => icons}/no-surveillance.svg | 0 static/static/img/{badges_new => icons}/zero-knowledge.svg | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename static/static/img/{badges_new => icons}/decentralised.svg (100%) rename static/static/img/{badges_new => icons}/encryption.svg (100%) rename static/static/img/{badges_new => icons}/no-surveillance.svg (100%) rename static/static/img/{badges_new => icons}/zero-knowledge.svg (100%) diff --git a/static/static/img/badges_new/decentralised.svg b/static/static/img/icons/decentralised.svg similarity index 100% rename from static/static/img/badges_new/decentralised.svg rename to static/static/img/icons/decentralised.svg diff --git a/static/static/img/badges_new/encryption.svg b/static/static/img/icons/encryption.svg similarity index 100% rename from static/static/img/badges_new/encryption.svg rename to static/static/img/icons/encryption.svg diff --git a/static/static/img/badges_new/no-surveillance.svg b/static/static/img/icons/no-surveillance.svg similarity index 100% rename from static/static/img/badges_new/no-surveillance.svg rename to static/static/img/icons/no-surveillance.svg diff --git a/static/static/img/badges_new/zero-knowledge.svg b/static/static/img/icons/zero-knowledge.svg similarity index 100% rename from static/static/img/badges_new/zero-knowledge.svg rename to static/static/img/icons/zero-knowledge.svg From ecd87655a5c6b8becd349011e889c9e2027c3f57 Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Mon, 23 Jan 2023 10:20:48 +0100 Subject: [PATCH 6/8] Add icons by @Rasmus --- content/_index.da.md | 21 +++++++++++++++---- .../icons/{encryption.svg => encrypted.svg} | 0 2 files changed, 17 insertions(+), 4 deletions(-) rename static/static/img/icons/{encryption.svg => encrypted.svg} (100%) diff --git a/content/_index.da.md b/content/_index.da.md index 3cd50dc..0616359 100644 --- a/content/_index.da.md +++ b/content/_index.da.md @@ -6,9 +6,22 @@ data.coop er et kooperativ, som ejer og driver en digital infrastruktur for medl Vores kerneprincipper er: -- **Privatlivsbeskyttelse:** Vi er fælles om at beskytte vores data. Vi deler dem ikke for profit. Dine data transmitteres krypteret på nettet. -- **Kryptering**: Vi tilbyder løsninger, der er sikre og grundigt deklarerede. -- **Decentralisering**: Vores services snakker gerne sammen med andre decentrale services på nettet. -- **Zero-knowledge**: Når det er muligt, sørger vi for, at systemadministratorer rent teknisk ikke kan tilgå medlemmernes data. +
    +
  • + + Privatlivsbeskyttelse: Vi er fælles om at beskytte vores data. Vi deler dem ikke for profit. Dine data transmitteres krypteret på nettet.
    • +
  • + + Kryptering: Vi tilbyder løsninger, der er sikre og grundigt deklarerede. +
    • +
  • + + Decentralisering: Vores services snakker gerne sammen med andre decentrale services på nettet. +
    • +
  • + + Zero-knowledge: Når det er muligt, sørger vi for, at systemadministratorer rent teknisk ikke kan tilgå medlemmernes data. +
    • +
Ud fra de kerneprincipper vil vi med tiden udbyde onlinetjenester til medlemmerne. Hovedtanken er, at vi som udgangspunkt stoler mere på hinanden end på "de store" som f.eks. Google, Microsoft eller Facebook. diff --git a/static/static/img/icons/encryption.svg b/static/static/img/icons/encrypted.svg similarity index 100% rename from static/static/img/icons/encryption.svg rename to static/static/img/icons/encrypted.svg From 569b958132a87485fdc8df1d02d1fa05eb8fa4cb Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Mon, 23 Jan 2023 13:08:41 +0100 Subject: [PATCH 7/8] Add badges by @Rasmus :100: --- static/static/img/badges/anonymous-access.svg | 62 +------ static/static/img/badges/backup.svg | 77 +-------- .../img/badges/encrypted-data-storage.svg | 64 +------ static/static/img/badges/logging.svg | 163 +----------------- .../static/img/badges/secure-connection.svg | 64 +------ static/static/img/badges/stable.svg | 47 +---- static/static/img/badges/zero-knowledge.svg | 63 +------ .../datacoop2020/assets/static/css/style.scss | 1 + .../datacoop2020/layouts/partials/badges.html | 5 +- 9 files changed, 12 insertions(+), 534 deletions(-) diff --git a/static/static/img/badges/anonymous-access.svg b/static/static/img/badges/anonymous-access.svg index 94935b3..2540db9 100644 --- a/static/static/img/badges/anonymous-access.svg +++ b/static/static/img/badges/anonymous-access.svg @@ -1,61 +1 @@ - -image/svg+xml \ No newline at end of file + diff --git a/static/static/img/badges/backup.svg b/static/static/img/badges/backup.svg index b3f79d3..36c3ace 100644 --- a/static/static/img/badges/backup.svg +++ b/static/static/img/badges/backup.svg @@ -1,76 +1 @@ - -image/svg+xml \ No newline at end of file + diff --git a/static/static/img/badges/encrypted-data-storage.svg b/static/static/img/badges/encrypted-data-storage.svg index 589972c..30fb594 100644 --- a/static/static/img/badges/encrypted-data-storage.svg +++ b/static/static/img/badges/encrypted-data-storage.svg @@ -1,63 +1 @@ - -image/svg+xml \ No newline at end of file + diff --git a/static/static/img/badges/logging.svg b/static/static/img/badges/logging.svg index 31817d5..9107f4c 100644 --- a/static/static/img/badges/logging.svg +++ b/static/static/img/badges/logging.svg @@ -1,162 +1 @@ - -image/svg+xml \ No newline at end of file + diff --git a/static/static/img/badges/secure-connection.svg b/static/static/img/badges/secure-connection.svg index 9c200a5..f3cfbb4 100644 --- a/static/static/img/badges/secure-connection.svg +++ b/static/static/img/badges/secure-connection.svg @@ -1,63 +1 @@ - - - - - - image/svg+xml - - - - - - - - - - - + diff --git a/static/static/img/badges/stable.svg b/static/static/img/badges/stable.svg index bb05433..cdd17d8 100644 --- a/static/static/img/badges/stable.svg +++ b/static/static/img/badges/stable.svg @@ -1,46 +1 @@ - -image/svg+xml \ No newline at end of file + diff --git a/static/static/img/badges/zero-knowledge.svg b/static/static/img/badges/zero-knowledge.svg index f0f777e..cab1547 100644 --- a/static/static/img/badges/zero-knowledge.svg +++ b/static/static/img/badges/zero-knowledge.svg @@ -1,62 +1 @@ - - - - - - image/svg+xml - - - - - - - - - - - + diff --git a/themes/datacoop2020/assets/static/css/style.scss b/themes/datacoop2020/assets/static/css/style.scss index e1fb7d8..0f6e57e 100644 --- a/themes/datacoop2020/assets/static/css/style.scss +++ b/themes/datacoop2020/assets/static/css/style.scss @@ -207,6 +207,7 @@ aside > footer img:hover { .badge-icon { width: 30px; height: auto; + svg{fill:#4b3aba;} } dl.dl-services { diff --git a/themes/datacoop2020/layouts/partials/badges.html b/themes/datacoop2020/layouts/partials/badges.html index 5364f24..134a34f 100644 --- a/themes/datacoop2020/layouts/partials/badges.html +++ b/themes/datacoop2020/layouts/partials/badges.html @@ -4,7 +4,10 @@

{{ title .name }} - + + {{$svg := printf "static/static/img/badges/%s" .icon}} + {{ $svg | readFile | safeHTML }} +

{{ markdownify .description }} From 25ddc7a26b16803d29fcab9c9b1145b0dbf409df Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Mon, 23 Jan 2023 13:08:59 +0100 Subject: [PATCH 8/8] Fix error in title (before it was thought that the title of the website was the first element in the menu) --- themes/datacoop2020/layouts/partials/head.html | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/themes/datacoop2020/layouts/partials/head.html b/themes/datacoop2020/layouts/partials/head.html index aa5ee52..3985763 100644 --- a/themes/datacoop2020/layouts/partials/head.html +++ b/themes/datacoop2020/layouts/partials/head.html @@ -20,16 +20,6 @@ {{ $style := resources.Get "static/css/style.scss" | resources.ToCSS | resources.Minify | resources.Fingerprint "sha512" }} - {{ if .IsHome }} - {{ $homepage := "Home" }} - {{ with .Site.Menus.nav }} - {{ range first 1 . }} - {{ $homepage = .Name }} - {{ end }} - {{ end }} - {{ $homepage }} | {{ .Site.Title }} - {{ else }} {{ .Title }} | {{ .Site.Title }} - {{ end }}