From 9f887d41c7d813650381f0e44c8b7c29c4c09b82 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Wed, 31 Mar 2021 08:12:28 +0200 Subject: [PATCH] Barging through some last minute changes --- config.toml | 2 +- data/benefits.json | 4 +- data/faq.json | 4 +- .../cloud.autonomic.zone/layouts/index.html | 15 ++--- .../layouts/partials/index/server_hero.html | 7 +- .../partials/index/underline_points.html | 65 +++++++++++-------- 6 files changed, 53 insertions(+), 44 deletions(-) diff --git a/config.toml b/config.toml index 5bbccbb..75e4c0d 100644 --- a/config.toml +++ b/config.toml @@ -27,5 +27,5 @@ theme = "cloud.autonomic.zone" name = "Documentation" link = "https://docs.cloud.autonomic.zone" [[params.links.footer]] - name = "Matrix" + name = "Public Matrix chat" link = "https://matrix.to/#/#coopcloud:autonomic.zone?via=autonomic.zone" diff --git a/data/benefits.json b/data/benefits.json index 642ee6c..e416cb9 100644 --- a/data/benefits.json +++ b/data/benefits.json @@ -1,11 +1,11 @@ [ { "left": "Collaborative", - "right": "Open development process, centred on libre software licenses, community governance and a configuration commons." + "right": "Democratic development process, centred on [libre software licenses](https://www.gnu.org/philosophy/free-sw.html), community governance and a configuration commons." }, { "left": "simple", - "right": "Quick, flexible, and intuitive with low resource requirements, minimal overhead, and extensive documentation." + "right": "Quick, flexible, and intuitive with low resource requirements, minimal overhead, and [extensive documentation](https://docs.cloud.autonomic.zone/)." }, { "left": "private", diff --git a/data/faq.json b/data/faq.json index 66c0253..f1119f7 100644 --- a/data/faq.json +++ b/data/faq.json @@ -5,11 +5,11 @@ }, { "left": "Is this a good long-term choice?", - "right": "Co-op Cloud re-uses upstream libre software project packaging efforts so that we can meet projects where they are at and reduce duplication of effort. The project proposes the notion of more direct coordination between distribution methods (app packagers) and production methods (developers)." + "right": "Co-op Cloud re-uses upstream libre software project packaging efforts (containers) so that we can meet projects where they are at and reduce duplication of effort. The project proposes the notion of more direct coordination between distribution methods (app packagers) and production methods (app developers)." }, { "left": "What libre apps are available?", - "right": "Applications that you may already use in your daily life: Nextcloud, Jitsi, Mediawiki, Rocket.chat and many more! These are tools that are created by volunteer communities who use free software licenses in order to build up the public software commons and offer more digital alternatives. Co-op Cloud allows you to easily deploy and maintain these apps." + "right": "Co-op Cloud helps deploy and maintain applications that you may already use in your daily life: Nextcloud, Jitsi, Mediawiki, Rocket.chat and many more! These are tools that are created by volunteer communities who use [libre software licenses](https://www.gnu.org/philosophy/free-sw.html) in order to build up the public software commons and offer more digital alternatives." }, { "left": "What about other alternatives?", diff --git a/themes/cloud.autonomic.zone/layouts/index.html b/themes/cloud.autonomic.zone/layouts/index.html index e77ddf8..77e6fa1 100644 --- a/themes/cloud.autonomic.zone/layouts/index.html +++ b/themes/cloud.autonomic.zone/layouts/index.html @@ -1,12 +1,9 @@ -{{ define "main" }} - -{{ partial "index/server_hero.html" . }} -{{ partial "index/video.html" . }} -{{ partial "index/underline_points.html" (dict "context" . "title" "benefits" "data" site.Data.benefits) }} -{{ partial "index/underline_points.html" (dict "context" . "title" "faq" "data" site.Data.faq) }} -{{ partial "index/autonomic_hero.html" (dict "context" . "data" site.Data) }} +{{ define "main" }} {{ partial "index/server_hero.html" . }} + +{{ partial "index/underline_points.html" (dict "context" . "title" "benefits" +"data" site.Data.benefits) }} {{ partial "index/underline_points.html" (dict +"context" . "title" "faq" "data" site.Data.faq) }} {{ partial +"index/autonomic_hero.html" (dict "context" . "data" site.Data) }} {{ partial "index/community_project.html" (dict "context" . "data" site.Data) }} - - {{ end }} diff --git a/themes/cloud.autonomic.zone/layouts/partials/index/server_hero.html b/themes/cloud.autonomic.zone/layouts/partials/index/server_hero.html index 87a687f..d0f1549 100644 --- a/themes/cloud.autonomic.zone/layouts/partials/index/server_hero.html +++ b/themes/cloud.autonomic.zone/layouts/partials/index/server_hero.html @@ -4,7 +4,10 @@

- Public infrastructure-as-a-service. + Public interest + infrastructure

An alternative to corporate clouds built by @@ -19,7 +22,7 @@

Learn More

- Down Chevron
diff --git a/themes/cloud.autonomic.zone/layouts/partials/index/underline_points.html b/themes/cloud.autonomic.zone/layouts/partials/index/underline_points.html index 0a42a1a..460fc29 100644 --- a/themes/cloud.autonomic.zone/layouts/partials/index/underline_points.html +++ b/themes/cloud.autonomic.zone/layouts/partials/index/underline_points.html @@ -1,33 +1,42 @@ -
+

{{ .title }}

-
- {{ $title := lower .title }} - {{ $amount := len .data }} - {{ range $index, $item := .data }} - {{/* Don't place
if it is the first in the list */}} - {{ if gt $index 0 }}
{{ end }} -
-
- {{ if eq $title "benefits" }} -

{{ $item.left }}

- {{ else }} -

{{ $item.left }}

- {{ end }} -
-
-
-

{{ markdownify $item.right }}

-
- {{ if and (eq $amount (add $index 1)) (eq $title "faq") }} - - - - {{ end }} -
+
+ {{ $title := lower .title }} {{ $amount := len .data }} {{ range $index, + $item := .data }} {{/* Don't place +
+ if it is the first in the list */}} {{ if gt $index 0 }} +
+ {{ end }} +
+
+ {{ if eq $title "benefits" }} +

+ {{ $item.left }} +

+ {{ else }} +

+ {{ $item.left }} +

+ {{ end }}
+
+
+

+ {{ markdownify $item.right }} +

+
+ {{ if and (eq $amount (add $index 1)) (eq $title "faq") }} + + + + {{ end }} +
+
{{ end }}
-
\ No newline at end of file +