aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex <alex@adnab.me>2022-09-29 17:30:50 +0200
committerAlex <alex@adnab.me>2022-09-29 17:30:50 +0200
commit08d43d3a9553dffc7f7ea916ef3890b7208c5aec (patch)
tree255cd1dbfa66a538c203e88086a09b8d51539de9
parentd549b125dcb64ccf16fd7dbf066a7d39165523b7 (diff)
parentadb4129999bb10908f62ddeabfdad61fb4911f13 (diff)
downloadgaragehq.deuxfleurs.fr-08d43d3a9553dffc7f7ea916ef3890b7208c5aec.tar.gz
garagehq.deuxfleurs.fr-08d43d3a9553dffc7f7ea916ef3890b7208c5aec.zip
Merge pull request 'Templates changes and doc updates for v0.8' (#11) from v0.8 into master
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garagehq.deuxfleurs.fr/pulls/11
-rwxr-xr-xconfig.toml6
-rwxr-xr-xcontent/blog/_index.md4
m---------garage0
-rwxr-xr-xtemplates/base.html3
-rwxr-xr-xtemplates/blog_article.html (renamed from templates/page.html)4
-rwxr-xr-xtemplates/blog_index.html (renamed from templates/section.html)2
-rw-r--r--templates/documentation.html2
-rw-r--r--templates/download.html4
-rwxr-xr-xtemplates/index.html8
-rw-r--r--templates/partials/shared/head.html8
10 files changed, 22 insertions, 19 deletions
diff --git a/config.toml b/config.toml
index 9b1b23f..fa94f1d 100755
--- a/config.toml
+++ b/config.toml
@@ -1,6 +1,6 @@
base_url = "https://garagehq.deuxfleurs.fr"
-title = "Garage"
-description = "An open-source distributed storage service you can self-host to fullfill many needs"
+title = "Garage HQ"
+description = "An open-source distributed object storage service tailored for self-hosting"
default_language = "en"
output_dir = "public"
compile_sass = true
@@ -61,7 +61,7 @@ webmanifest = "/icons/site.webmanifest"
[extra.organization]
name = "Garage"
-description = "An open-source distributed storage service you can self-host to fullfill many needs"
+description = "An open-source distributed object storage service tailored for self-hosting"
logo = "/images/garage-logo.svg"
logo_simple = "/images/garage-logo-simple.svg"
logo_horizontal = "/images/garage-logo-horizontal.svg"
diff --git a/content/blog/_index.md b/content/blog/_index.md
index 621c16b..b45b8e4 100755
--- a/content/blog/_index.md
+++ b/content/blog/_index.md
@@ -1,6 +1,8 @@
+++
title = "Blog"
description = "This is our developer journal"
+template = "blog_index.html"
+page_template = "blog_article.html"
sort_by = "date"
paginate_by = 5
-+++ \ No newline at end of file
++++
diff --git a/garage b/garage
-Subproject 93eab8eaa3927b99626fee4a747a0f9f041cafd
+Subproject b17d59cfabbe92c509f4888cae83f6053a8cab1
diff --git a/templates/base.html b/templates/base.html
index 34f029b..3816e1a 100755
--- a/templates/base.html
+++ b/templates/base.html
@@ -9,6 +9,9 @@
<meta name="description" content="An open-source distributed storage service you can self-host to fullfill many needs.">
<meta name="application-name" content="{{ config.title }}">
{% include "partials/shared/head.html" %}
+ <title>
+ {% block title %}{% endblock %}
+ </title>
</head>
<body class="has-background-white">
diff --git a/templates/page.html b/templates/blog_article.html
index b1c98cd..6f96847 100755
--- a/templates/page.html
+++ b/templates/blog_article.html
@@ -1,7 +1,7 @@
{% extends 'base.html' %}
{% block title %}
-{{ config.title }} | {{ page.title }}
+ {{ page.title }} | Garage blog
{% endblock %}
{% block content %}
@@ -203,4 +203,4 @@
}, false);
</script>
{% endif %}
-{% endblock %} \ No newline at end of file
+{% endblock %}
diff --git a/templates/section.html b/templates/blog_index.html
index 380e230..fb0d292 100755
--- a/templates/section.html
+++ b/templates/blog_index.html
@@ -1,7 +1,7 @@
{% extends 'base.html' %}
{% block title %}
-{{ config.title }} | {{ section.title }}
+ {{ section.title }} | {{ config.title }}
{% endblock title %}
{% block content %}
diff --git a/templates/documentation.html b/templates/documentation.html
index 3f48e55..fd7889f 100644
--- a/templates/documentation.html
+++ b/templates/documentation.html
@@ -1,7 +1,7 @@
{% extends 'base.html' %}
{% block title %}
- {{ config.title }} | {% if page %}{{ page.title }}{% else %}{{ section.title }}{% endif %}
+ {% if page %}{{ page.title }}{% else %}{{ section.title }}{% endif %} | {{ config.title }}
{% endblock %}
{% block content %}
diff --git a/templates/download.html b/templates/download.html
index f1ba9b3..b2f4744 100644
--- a/templates/download.html
+++ b/templates/download.html
@@ -1,7 +1,7 @@
{% extends 'base.html' %}
{% block title %}
-{{ config.title }} | {{ page.title }}
+Downloads | {{ config.title }}
{% endblock %}
{% block content %}
@@ -18,7 +18,7 @@
<h2 class="text-garage-gray text-xl font-semibold">Deploy with Docker</h2>
<p>All of the builds listed in the sections below can be downloaded as Docker images
available
- <a href="https://hub.docker.com/u/dxflrs" class="text-garage-orange font-bold hover:underline">on the Docker hub</a>.
+ <a href="https://hub.docker.com/r/dxflrs/garage" class="text-garage-orange font-bold hover:underline">on the Docker hub</a>.
</p>
</div>
<div id="docker-images" class="space-y-4">
diff --git a/templates/index.html b/templates/index.html
index ab80207..ccf80db 100755
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,5 +1,9 @@
{% extends "base.html" %}
+{% block title %}
+ Garage - An open-source distributed object storage service
+{% endblock title %}
+
{% block content %}
<section class="section" id="home-section">
<div>
@@ -77,12 +81,12 @@
<div class="w-2 h-2 rounded-full bg-garage-orange"></div>
<li class="py-1.5 flex flex-col items-center justify-center">
<span>Fast to deploy, safe to operate</span>
- <p class="font-normal text-center">We are sysadmins, we know the value of operator friendly software</p>
+ <p class="font-normal text-center">We are sysadmins, we know the value of operator-friendly software</p>
</li>
<div class="w-2 h-2 rounded-full bg-garage-orange"></div>
<li class="py-1.5 flex flex-col items-center justify-center">
<span>Deploy everywhere on every machine</span>
- <p class="font-normal text-center">We do not have a dedicated backbone, neither do you,<br>
+ <p class="font-normal text-center">We do not have a dedicated backbone, and neither do you,<br>
so we made software that run over the Internet across multiple datacenters</p>
</li>
<div class="w-2 h-2 rounded-full bg-garage-orange"></div>
diff --git a/templates/partials/shared/head.html b/templates/partials/shared/head.html
index ca2033e..17acc76 100644
--- a/templates/partials/shared/head.html
+++ b/templates/partials/shared/head.html
@@ -15,12 +15,6 @@
{% block user_custom_stylesheet %}{% endblock %}
-<title>
- {% block title %}
- {{ config.title }} - An open-source distributed storage service
- {% endblock title %}
-</title>
-
{% if config.extra.katex.enabled %}
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex@0.15.1/dist/katex.min.css"
integrity="sha384-R4558gYOUz8mP9YWpZJjofhk+zx0AS11p36HnD2ZKj/6JR5z27gSSULCNHIRReVs" crossorigin="anonymous">
@@ -36,4 +30,4 @@
integrity="sha384-+XBljXPPiv+OzfbB3cVmLHf4hdUFHlWNZN5spNQ7rmHTXpd7WvJum6fIACpNNfIR"
crossorigin="anonymous"></script>
{% endif %}
-{% endif %} \ No newline at end of file
+{% endif %}