From 777b8b30e97c6ca47b390a1c6559a8d0d34c8c9e Mon Sep 17 00:00:00 2001
From: Marco Balmer <micressor@secure.mailbox.org>
Date: Fri, 7 Dec 2018 18:28:12 +0100
Subject: [PATCH] Templating title meta tag
* Templating title meta tag
* Add hugo shortcodes for googleplay and fdroid
* Fix a feed valitation error: Author is missing
---
config.yaml | 5 ++++-
content/_index.md | 6 ++++--
content/hiring/2018-05-java-developer.md | 3 ---
content/hiring/2018-05-usability-consultant.md | 3 ---
content/hiring/2018-05-ux-designer.md | 3 ---
content/news/2017-beta-released-security-audit.md | 3 ---
content/news/2018-1.0-released-new-funding.md | 3 ---
content/news/2018-briar-1.1-released.md | 3 ---
content/page/about.md | 5 ++---
content/page/apk.md | 4 +---
content/page/building.md | 13 ++++++++++---
content/page/copyright.md | 3 ---
content/page/fdroid.md | 3 ---
content/page/get-involved.md | 2 --
content/page/hiring.md | 3 ---
content/page/how-it-works.md | 2 --
content/page/privacy.md | 3 ---
themes/briar/layouts/_default/single.html | 1 +
themes/briar/layouts/shortcodes/fdroid.html | 2 ++
themes/briar/layouts/shortcodes/googleplay.html | 3 +++
20 files changed, 27 insertions(+), 46 deletions(-)
create mode 100644 themes/briar/layouts/shortcodes/fdroid.html
create mode 100644 themes/briar/layouts/shortcodes/googleplay.html
diff --git a/config.yaml b/config.yaml
index b7431e0..27413fe 100644
--- a/config.yaml
+++ b/config.yaml
@@ -6,6 +6,9 @@ theme: briar
Params:
flatterid: 4pq200
+Author:
+ name: Briar Team
+
permalinks:
#post: /:section/:year/:month/:title/
page: /:slug/
@@ -33,7 +36,7 @@ menu:
- identifier: about
name: About
title: About
- url: /about/
+ url: /about-us/
weight: -80
- identifier: getinvolved
diff --git a/content/_index.md b/content/_index.md
index 754000e..074abb8 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -11,8 +11,10 @@ title: Secure messaging, anywhere
<li>Free and open source software</li>
</ul>
- <a href="https://play.google.com/store/apps/details?id=org.briarproject.briar.android" rel="noopener noreferrer" target="_blank"><img id="playbutton" src="img/google_play_badge_web_generic.png" alt="Get it on Google Play" border="0"></a>
- <a href="/fdroid"><img id="fdroidbutton" src="img/fdroid_badge.png" alt="Get it on F-Droid" border="0"></a>
+{{< googleplay url="https://play.google.com/store/apps/details?id=org.briarproject.briar.android" >}}
+
+{{< fdroid url="/fdroid" >}}
+
</div> <!-- intro -->
<div id="phone">
diff --git a/content/hiring/2018-05-java-developer.md b/content/hiring/2018-05-java-developer.md
index eaf3a61..db980f9 100644
--- a/content/hiring/2018-05-java-developer.md
+++ b/content/hiring/2018-05-java-developer.md
@@ -3,9 +3,6 @@ title: Java Developer
date: 2018-05-01T00:00:00+01:00
---
-Java Developer
---------------
-
Sorry, this position is no longer available. If you'd like to hear about
future vacancies, please email <contact@briarproject.org> \[[PGP
key](/keys/contact.asc)\].
diff --git a/content/hiring/2018-05-usability-consultant.md b/content/hiring/2018-05-usability-consultant.md
index 96c646f..9fb25b1 100644
--- a/content/hiring/2018-05-usability-consultant.md
+++ b/content/hiring/2018-05-usability-consultant.md
@@ -3,9 +3,6 @@ date: 2018-05-01T00:00:00+02:00
title: Usability Consultant
---
-Usability Consultant
---------------------
-
Sorry, this position is no longer available. If you'd like to hear about
future vacancies, please email <contact@briarproject.org> \[[PGP
key](/keys/contact.asc)\].
diff --git a/content/hiring/2018-05-ux-designer.md b/content/hiring/2018-05-ux-designer.md
index 49ff85a..aa090b2 100644
--- a/content/hiring/2018-05-ux-designer.md
+++ b/content/hiring/2018-05-ux-designer.md
@@ -3,9 +3,6 @@ date: 2018-05-01T00:00:00+01:00
title: UX Designer
---
-UX Designer
------------
-
Sorry, this position is no longer available. If you'd like to hear about
future vacancies, please email <contact@briarproject.org> \[[PGP
key](/keys/contact.asc)\].
diff --git a/content/news/2017-beta-released-security-audit.md b/content/news/2017-beta-released-security-audit.md
index 9c9c8b2..283a788 100644
--- a/content/news/2017-beta-released-security-audit.md
+++ b/content/news/2017-beta-released-security-audit.md
@@ -8,9 +8,6 @@ title: 'Briar - Darknet Messenger Releases Beta, Passes Security Audit'
Press Release
-------------
-Darknet Messenger Releases Beta, Passes Security Audit
-------------------------------------------------------
-
##### July 21 2017
After extensive private beta tests, the first public beta of Briar was
diff --git a/content/news/2018-1.0-released-new-funding.md b/content/news/2018-1.0-released-new-funding.md
index 6e3a43e..e926b5a 100644
--- a/content/news/2018-1.0-released-new-funding.md
+++ b/content/news/2018-1.0-released-new-funding.md
@@ -7,9 +7,6 @@ title: 'Briar - Secure P2P Messenger Releases First Version, Receives New Fundin
### Press Release
-Secure P2P Messenger Releases First Version, Receives New Funding
------------------------------------------------------------------
-
##### May 9 2018
The peer-to-peer messenger Briar released its first stable version
diff --git a/content/news/2018-briar-1.1-released.md b/content/news/2018-briar-1.1-released.md
index 25f1c7f..8cef898 100644
--- a/content/news/2018-briar-1.1-released.md
+++ b/content/news/2018-briar-1.1-released.md
@@ -7,9 +7,6 @@ title: 'Briar 1.1 released with dark theme, new emoji and more'
### Press Release
-Briar 1.1 released with dark theme, new emoji and more
-------------------------------------------------------
-
##### September 14 2018
The Briar Project released version 1.1 of its Android app today. This
diff --git a/content/page/about.md b/content/page/about.md
index c54ca19..ea883a9 100644
--- a/content/page/about.md
+++ b/content/page/about.md
@@ -1,11 +1,10 @@
---
aliases:
- /about.html
-title: About
+- /about
+title: About Us
---
-# About Us
-
**Michael Rogers** started the Briar project to support freedom of
expression, freedom of association and the right to privacy. He has
studied and built peer-to-peer systems for over a decade and contributed
diff --git a/content/page/apk.md b/content/page/apk.md
index 47512e7..66fcce1 100644
--- a/content/page/apk.md
+++ b/content/page/apk.md
@@ -1,12 +1,10 @@
---
aliases:
+- /apk
- /apk.html
title: Installing Briar via Direct Download
---
-Installing Briar via Direct Download
-------------------------------------
-
1\) Open the **Settings** app, scroll down, and open the **Security**
section.
diff --git a/content/page/building.md b/content/page/building.md
index 75f63c6..ff805f9 100644
--- a/content/page/building.md
+++ b/content/page/building.md
@@ -5,9 +5,6 @@ aliases:
title: Building the Source Code
---
-Building the Source Code
-------------------------
-
1\) Download and install [Android
Studio](http://developer.android.com/sdk/index.html).
@@ -15,28 +12,35 @@ Studio](http://developer.android.com/sdk/index.html).
Control**.
+
3\) Select **Git** from the popup menu.
+
4\) Enter **https://code.briarproject.org/briar/briar.git** as the **Git
Repository URL**, then click **Clone**.
+
5\) When the source code has downloaded, click **Yes** to open the
project.
+
6\) Click **OK** to accept the default settings.
+
7\) If Android Studio asks you about an **Unregistered VCS root**, click
**Add root**. This will allow you to update the source code later
without repeating the previous steps.
+
8\) Select **Build > Build APK** from the Android Studio menu.
+
9\) When the build process finishes, click **Show in File Manager** to
open the folder containing the APK file, **briar-android-debug.apk**.
You can
@@ -44,14 +48,17 @@ You can
this file onto any Android device.
+
10\) Briar is under constant development, so you should check for updates
regularly. To get the latest version of the source code, click the
**Update Project** button on the Android Studio toolbar.
+
11\) Click **OK** to accept the default settings.
+
12\) Repeat steps 8 and 9 to build and install the updated app.
If you're interested in getting involved or following the progress of
diff --git a/content/page/copyright.md b/content/page/copyright.md
index 20a85a5..f6bd2a9 100644
--- a/content/page/copyright.md
+++ b/content/page/copyright.md
@@ -4,9 +4,6 @@ aliases:
title: Copyright
---
-Copyright
----------
-
Briar is free software. You can redistribute it and modify it under the
terms of the [GNU General Public
License](https://gnu.org/licenses/gpl.txt).
diff --git a/content/page/fdroid.md b/content/page/fdroid.md
index 2950dab..d01b602 100644
--- a/content/page/fdroid.md
+++ b/content/page/fdroid.md
@@ -5,9 +5,6 @@ aliases:
title: Installing Briar via F-Droid
---
-Installing Briar via F-Droid
-----------------------------
-
1\) Install the [F-Droid app](https://f-droid.org/).
2\) Open [this
diff --git a/content/page/get-involved.md b/content/page/get-involved.md
index 39b7f70..a459849 100644
--- a/content/page/get-involved.md
+++ b/content/page/get-involved.md
@@ -4,8 +4,6 @@ aliases:
title: Get Involved
---
-# Get Involved
-
We're looking for volunteers to contribute to all aspects of the
project, including design, development, documentation, translation and
testing. We're happy to provide guidance or mentoring for less
diff --git a/content/page/hiring.md b/content/page/hiring.md
index 06aeb10..bd252c1 100644
--- a/content/page/hiring.md
+++ b/content/page/hiring.md
@@ -4,9 +4,6 @@ aliases:
title: Sorry, We're Not Currently Hiring
---
-Sorry, We're Not Currently Hiring
----------------------------------
-
We don't currently have any paid positions available. If you'd like to
hear about future vacancies, please email <contact@briarproject.org>
\[[PGP key](/keys/contact.asc)\].
diff --git a/content/page/how-it-works.md b/content/page/how-it-works.md
index 5ce4f6f..6e9ef3f 100644
--- a/content/page/how-it-works.md
+++ b/content/page/how-it-works.md
@@ -4,8 +4,6 @@ aliases:
title: How it works
---
-# How It Works
-
Briar is a messaging app designed for activists, journalists, and anyone
else who needs a safe, easy and robust way to communicate. Unlike
traditional messaging apps, Briar doesn't rely on a central server -
diff --git a/content/page/privacy.md b/content/page/privacy.md
index d397a00..09ac88f 100644
--- a/content/page/privacy.md
+++ b/content/page/privacy.md
@@ -5,9 +5,6 @@ aliases:
title: Privacy Policy
---
-Privacy Policy
---------------
-
We do not have access to the content or metadata of your communications
via the Briar app. We will not modify the Briar app to enable us or
anyone else to access that content or metadata.
diff --git a/themes/briar/layouts/_default/single.html b/themes/briar/layouts/_default/single.html
index 18bbb26..1271be3 100644
--- a/themes/briar/layouts/_default/single.html
+++ b/themes/briar/layouts/_default/single.html
@@ -1,6 +1,7 @@
{{ define "main" }}
<div id="container">
<div id="content">
+ <h2>{{ .Title }}</h2>
{{ .Content }}
</div> <!-- content -->
</div> <!-- container -->
diff --git a/themes/briar/layouts/shortcodes/fdroid.html b/themes/briar/layouts/shortcodes/fdroid.html
new file mode 100644
index 0000000..63298bd
--- /dev/null
+++ b/themes/briar/layouts/shortcodes/fdroid.html
@@ -0,0 +1,2 @@
+<a href="{{.Get "url" }}">
+<img id="fdroidbutton" src="img/fdroid_badge.png" alt="Get it on F-Droid" border="0"></a>
diff --git a/themes/briar/layouts/shortcodes/googleplay.html b/themes/briar/layouts/shortcodes/googleplay.html
new file mode 100644
index 0000000..d9807be
--- /dev/null
+++ b/themes/briar/layouts/shortcodes/googleplay.html
@@ -0,0 +1,3 @@
+<a href="{{.Get "url" }}" rel="noopener noreferrer" target="_blank">
+<img id="playbutton" src="/img/google_play_badge_web_generic.png"
+alt="Get it on Google Play" border="0"></a>
--
GitLab