From b708de0145a44c1a99c1338fe61c6bda32476c63 Mon Sep 17 00:00:00 2001 From: akwizgran <michael@briarproject.org> Date: Fri, 10 Nov 2023 16:20:36 +0000 Subject: [PATCH] Fix display of latest release, remove Flattr meta tag, copy editing. --- config.yaml | 3 --- content/_index.html | 8 ++++---- layouts/shortcodes/latest-news.html | 2 +- layouts/shortcodes/latest-release.html | 1 + themes/briar/layouts/partials/head.html | 1 - 5 files changed, 6 insertions(+), 9 deletions(-) create mode 100644 layouts/shortcodes/latest-release.html diff --git a/config.yaml b/config.yaml index a6fc86b..b40ab7f 100644 --- a/config.yaml +++ b/config.yaml @@ -7,9 +7,6 @@ enableEmoji: true blackfriday: noreferrerLinks: true -Params: - flatterid: 4pq200 - Author: name: The Briar Team # String to hex encoder: http://www.wbwip.com/wbw/emailencoder.html diff --git a/content/_index.html b/content/_index.html index 0988e46..ea052d8 100644 --- a/content/_index.html +++ b/content/_index.html @@ -9,7 +9,7 @@ releaseDate: 23 October 2023 <div id="container-bg"></div> <div class="text"> <h1 id="main-title">Secure messaging <span>anywhere</span></h1> - <p>Censorship-resistant peer-to-peer messaging that bypasses centralized servers. Connect via Bluetooth, Wi-Fi, or Tor, with privacy built-in.</p> + <p>Censorship-resistant peer-to-peer messaging that bypasses centralized servers. Connect via Bluetooth, Wi-Fi or Tor, with privacy built-in.</p> <div class="download-links"> <a style="width: 178px;" href="https://play.google.com/store/apps/details?id=org.briarproject.briar.android"> <img src="/img/google_play_badge_web_generic.png" alt="Google Play Badge" width="178px"> @@ -18,7 +18,7 @@ releaseDate: 23 October 2023 <img src="/img/fdroid_badge.png" alt="FDroid Badge" width="178px"> </a> </div> - <p id="release-text"><strong>Latest Release:</strong> {{ .releaseVersion }}</p> + <p id="release-text"><strong>Latest Release:</strong> {{< latest-release >}}</p> </div> <div class="main-image_container"> <img id="main-image" src="/img/phone.svg" alt="Mobile"> @@ -33,7 +33,7 @@ releaseDate: 23 October 2023 </div> <div class="services-container"> <h3>A better way to communicate</h3> - <p>End-to-end encryption and decentralized technology ensure conversations stay private and available even without internet access.</p> + <p>End-to-end encryption and decentralized technology ensure conversations stay private and available even without Internet access.</p> <div class="services"> <div class="service"> <img src="/img/encryption.svg" alt="Encryption"> @@ -53,7 +53,7 @@ releaseDate: 23 October 2023 <img src="/img/messaging.svg" alt="Messaging"> <div class="text"> <h4>Offline Messaging</h4> - <p>Connect directly with nearby contacts even without internet</p> + <p>Connect directly with nearby contacts, even without Internet</p> </div> </div> <div class="service"> diff --git a/layouts/shortcodes/latest-news.html b/layouts/shortcodes/latest-news.html index 5ce0573..1e0206a 100644 --- a/layouts/shortcodes/latest-news.html +++ b/layouts/shortcodes/latest-news.html @@ -4,5 +4,5 @@ <a href="{{.Permalink}}"> <h2>{{ .Title }}</h2> </a> + {{ end }} </div> -{{ end }} \ No newline at end of file diff --git a/layouts/shortcodes/latest-release.html b/layouts/shortcodes/latest-release.html new file mode 100644 index 0000000..84bae69 --- /dev/null +++ b/layouts/shortcodes/latest-release.html @@ -0,0 +1 @@ +Briar {{ .Page.Params.releaseVersion }} ({{ .Page.Params.releaseDate }}) diff --git a/themes/briar/layouts/partials/head.html b/themes/briar/layouts/partials/head.html index 5547ab0..5e885e6 100644 --- a/themes/briar/layouts/partials/head.html +++ b/themes/briar/layouts/partials/head.html @@ -7,7 +7,6 @@ <title>{{ with .Title }} {{ . }} - {{ end }} {{ .Site.Title }}</title> <meta name="description" lang="{{ $.Site.LanguageCode | default "en" }}" content="{{ with .Param "description" }}{{ . }}{{ else }}{{ .Summary }}{{ end }}"/> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="flattr:id" content="{{ with .Param "flatterid" }}{{ . }}{{ end }}"> <link rel="icon" type="image/x-icon" href="/img/briar_logo_white.ico" /> <link rel="icon" type="image/png" href="/img/briar_logo_circle.png" /> -- GitLab