diff --git a/assets/css/styles.css b/assets/css/styles.css
index cdd45ec79d423d8f3e23c5c6042fa1273b849ef7..dffbcd58d917ca9b6660474004d989ab1e0369db 100644
--- a/assets/css/styles.css
+++ b/assets/css/styles.css
@@ -532,6 +532,7 @@ span.reverse {
#playbutton, #fdroidbutton {
width:200px;
+ border: 0;
}
#phone {
diff --git a/config.yaml b/config.yaml
index 27413fe94e0aaadc053b3207b6554886f98ff78f..f9c50be9699cd28b7cf47add2be28a61b5a6abc4 100644
--- a/config.yaml
+++ b/config.yaml
@@ -15,7 +15,7 @@ permalinks:
menu:
main:
- - identifier: home
+ - identifier: index
name: Home
title: Home
url: /
@@ -27,7 +27,7 @@ menu:
url: /download/
weight: -100
- - identifier: howitworks
+ - identifier: how
name: How it works
title: How it works
url: /how-it-works/
@@ -39,7 +39,7 @@ menu:
url: /about-us/
weight: -80
- - identifier: getinvolved
+ - identifier: involved
name: Get Involved
title: Get Involved
url: /get-involved/
diff --git a/content/page/download.md b/content/page/download.md
index 9b23254ae38dfdeac05ff3dcf6f1ac32626bb0d2..6b17c2a62e00a7baf41e93c543506a44722da2e7 100644
--- a/content/page/download.md
+++ b/content/page/download.md
@@ -10,8 +10,9 @@ Briar 1.1 for Android is now available for download from Google Play.
Thank you to everyone who has tested Briar and sent feedback! We've
fixed a lot of bugs and made many improvements thanks to your feedback.
-<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" >}}
If you prefer not to use Google Play, you can [install the app via
F-Droid](/fdroid) or [download the APK file](/apk) directly from
diff --git a/themes/briar/layouts/_default/baseof.html b/themes/briar/layouts/_default/baseof.html
index 5f8e2ec023617e039fca216fbce12e2cf3abc73d..ba9e13ffe41e3be811fd5ca14c0817c84008bb95 100644
--- a/themes/briar/layouts/_default/baseof.html
+++ b/themes/briar/layouts/_default/baseof.html
@@ -1,11 +1,15 @@
<!DOCTYPE html>
-<html>
+<html lang="{{ .Site.LanguageCode }}">
{{- partial "head.html" . -}}
<body>
+ <div id="wrapper">
{{- partial "header.html" . -}}
- <div id="content">
+ <div id="container">
+ <div id="content">
{{- block "main" . }}{{- end }}
+ </div>
</div>
{{- partial "footer.html" . -}}
+ </div>
</body>
</html>
diff --git a/themes/briar/layouts/_default/list.html b/themes/briar/layouts/_default/list.html
index 0e1775305c1415984085e0288182675c6e15127c..5b2148269cdae28b73704e913159e3a63b23612c 100644
--- a/themes/briar/layouts/_default/list.html
+++ b/themes/briar/layouts/_default/list.html
@@ -1,6 +1,4 @@
{{ define "main" }}
- <div id="container">
- <div id="content">
<h1>{{ with .Title }} {{ . }} {{ else }} {{ .Site.Title }} {{ end }}</h1>
{{ range first 1 .Pages.ByDate.Reverse }}
<h3 itemprop="headline" class="blog-post-title">
@@ -13,6 +11,4 @@
</p>
{{ end }}
{{ .Content }}
- </div> <!-- content -->
- </div> <!-- container -->
{{ end }}
diff --git a/themes/briar/layouts/_default/section.html b/themes/briar/layouts/_default/section.html
index ce70db856601fef233bed4a8dbd6cd712192413a..d870959866390f639a83d4241574416fe9cdb151 100644
--- a/themes/briar/layouts/_default/section.html
+++ b/themes/briar/layouts/_default/section.html
@@ -1,6 +1,4 @@
{{ define "main" }}
- <div id="container">
- <div id="content">
<h1>{{ with .Title }} {{ . }} {{ else }} {{ .Site.Title }} {{ end }}</h1>
{{ range first 10 .Pages.ByDate.Reverse }}
<h3 itemprop="headline" class="blog-post-title">
@@ -13,6 +11,4 @@
</p>
{{ end }}
{{ .Content }}
- </div> <!-- content -->
- </div> <!-- container -->
{{ end }}
diff --git a/themes/briar/layouts/_default/single.html b/themes/briar/layouts/_default/single.html
index 1271be3f92284e9375f35b0b17b7ee6499edda3d..830b17ec82cb08239ead118e5eca620cffdd38e6 100644
--- a/themes/briar/layouts/_default/single.html
+++ b/themes/briar/layouts/_default/single.html
@@ -1,8 +1,4 @@
{{ define "main" }}
- <div id="container">
- <div id="content">
<h2>{{ .Title }}</h2>
{{ .Content }}
- </div> <!-- content -->
- </div> <!-- container -->
{{ end }}
diff --git a/themes/briar/layouts/partials/footer.html b/themes/briar/layouts/partials/footer.html
index 0c10e30cb435f037f168f5b0e3d9546188b59601..85133818857f56639e9d88d9514834f6c78254a9 100644
--- a/themes/briar/layouts/partials/footer.html
+++ b/themes/briar/layouts/partials/footer.html
@@ -2,14 +2,14 @@
<div id="footer">
<div id="signup2">
<div id="twitter2">
- <a href="https://twitter.com/BriarApp" rel="noopener noreferrer" target="_blank"><img class="twitterbutton" src="/img/twitter.png"/></a>
+ <a href="https://twitter.com/BriarApp" rel="noopener noreferrer" target="_blank"><img class="twitterbutton" src="/img/twitter.png" alt="Small logo of twitter"/></a>
</div> <!-- twitter2 -->
<form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" rel="noopener noreferrer" target="_blank" method="get" onSubmit="submitForm2()">
- <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
+ <input placeholder="Email address" type="email" name="email" tabindex="2"/>
<button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
</form>
<div id="signupconf2">Thanks! We'll keep you updated.</div>
- <script language="JavaScript">
+ <script>
<!--
function submitForm2(){
document.getElementById('signupform2').style.display = 'none';
diff --git a/themes/briar/layouts/partials/head.html b/themes/briar/layouts/partials/head.html
index af70b8643a4d88fe5da676e71e8ab8b60a1a173f..bd8ae2caae4ccc876ed27f00f3f100a0da207c26 100644
--- a/themes/briar/layouts/partials/head.html
+++ b/themes/briar/layouts/partials/head.html
@@ -1,4 +1,5 @@
<head>
+ <meta charset="utf-8" />
{{ .Hugo.Generator }}
{{ with resources.Get "css/styles.css" | minify }}
<style media="screen">{{ .Content | safeCSS }}</style>
@@ -7,7 +8,6 @@
<meta name="description"
lang="{{ $.Site.LanguageCode | default "en" }}"
content="{{ with .Param "description" }}{{ . }}{{ else }}{{ .Summary }}{{ end }}"/>
- <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="flattr:id"
content="{{ with .Param "flatterid" }}{{ . }}{{ end }}">
diff --git a/themes/briar/layouts/partials/header.html b/themes/briar/layouts/partials/header.html
index 50c4aee3d2e56f4c80914721a734be7120667bec..616075ee26dc7d8b434ac36ef1268c088df1c41b 100644
--- a/themes/briar/layouts/partials/header.html
+++ b/themes/briar/layouts/partials/header.html
@@ -1,18 +1,17 @@
- <div id="wrapper">
<div id="header_container">
<div id="header">
<a href="index.html"><div id="logo"><img src="/img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
<div id="nav">
<div id="signup">
<div id="twitter">
- <a href="https://twitter.com/BriarApp" rel="noopener noreferrer" target="_blank"><img class="twitterbutton" src="/img/twitter.png"/></a>
+ <a href="https://twitter.com/BriarApp" rel="noopener noreferrer" target="_blank"><img class="twitterbutton" src="/img/twitter.png" alt="Small twitter logo"/></a>
</div> <!-- twitter -->
<form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" rel="noopener noreferrer" target="_blank" method="get" onSubmit="submitForm()">
- <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
+ <input placeholder="Email address" type="email" name="email" tabindex="2"/>
<button name="submit" type="submit" id="signup-submit">Keep me updated</button>
</form>
<div id="signupconf">Thanks! We'll keep you updated.</div>
- <script language="JavaScript">
+ <script>
<!--
function submitForm(){
document.getElementById('signupform').style.display = 'none';
@@ -22,12 +21,12 @@
//-->
</script>
</div> <!-- signup -->
- <label for="menu-toggle"><img src="/img/menu.png"></label>
+ <label for="menu-toggle"><img src="/img/menu.png" alt="Drop-down menu"></label>
<input type="checkbox" id="menu-toggle"/>
<ul id="menu">
{{ range .Site.Menus.main }}
<li>
- <a id="indexnav" href="{{ .URL }}">{{ .Name }}</a>
+ <a id="{{ .Identifier }}nav" href="{{ .URL }}">{{ .Name }}</a>
</li>
{{ end }}
</ul>
diff --git a/themes/briar/layouts/shortcodes/fdroid.html b/themes/briar/layouts/shortcodes/fdroid.html
index 63298bd74ec62291d08dc7d2efe2465d810f895c..b21ece6dfd023b3478fd5c9616f03b8bfe3f0875 100644
--- a/themes/briar/layouts/shortcodes/fdroid.html
+++ b/themes/briar/layouts/shortcodes/fdroid.html
@@ -1,2 +1,3 @@
<a href="{{.Get "url" }}">
-<img id="fdroidbutton" src="img/fdroid_badge.png" alt="Get it on F-Droid" border="0"></a>
+<img id="fdroidbutton" src="/img/fdroid_badge.png" alt="Get it on F-Droid">
+</a>
diff --git a/themes/briar/layouts/shortcodes/googleplay.html b/themes/briar/layouts/shortcodes/googleplay.html
index d9807be123274de5def4fbcf89f8a750aca733ff..e0b1b69d2ebf0e6506a7d29f75a32c8575117c3b 100644
--- a/themes/briar/layouts/shortcodes/googleplay.html
+++ b/themes/briar/layouts/shortcodes/googleplay.html
@@ -1,3 +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>
+alt="Get it on Google Play"></a>
diff --git a/themes/briar/layouts/shortcodes/hidingemail.html b/themes/briar/layouts/shortcodes/hidingemail.html
index 2d31b5d1ad172a578bf7196e237adea036674071..16aa37fcfdd8e1bf7c27f1c087253c89c91cea43 100644
--- a/themes/briar/layouts/shortcodes/hidingemail.html
+++ b/themes/briar/layouts/shortcodes/hidingemail.html
@@ -1,2 +1,2 @@
{{.Get "name" }} <span class="reverse">{{.Get "email" }}</span>
-[<a href="{{.Get "pgplink" }}">PGP key</a>]<F12>
+[<a href="{{.Get "pgplink" }}">PGP key</a>]