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 index 93eab8e..b17d59c 160000 --- a/garage +++ b/garage @@ -1 +1 @@ -Subproject commit 93eab8eaa3927b99626fee4a747a0f9f041cafdb +Subproject commit b17d59cfabbe92c509f4888cae83f6053a8cab1e 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 @@ {% include "partials/shared/head.html" %} + + {% block title %}{% endblock %} + diff --git a/templates/page.html b/templates/blog_article.html similarity index 99% rename from templates/page.html rename to 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); {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/section.html b/templates/blog_index.html similarity index 98% rename from templates/section.html rename to 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 @@

Deploy with Docker

All of the builds listed in the sections below can be downloaded as Docker images available - on the Docker hub. + on the Docker hub.

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 %}
@@ -77,12 +81,12 @@
  • Fast to deploy, safe to operate -

    We are sysadmins, we know the value of operator friendly software

    +

    We are sysadmins, we know the value of operator-friendly software

  • Deploy everywhere on every machine -

    We do not have a dedicated backbone, neither do you,
    +

    We do not have a dedicated backbone, and neither do you,
    so we made software that run over the Internet across multiple datacenters

    • 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 %} - - {% block title %} - {{ config.title }} - An open-source distributed storage service - {% endblock title %} - - {% if config.extra.katex.enabled %} @@ -36,4 +30,4 @@ integrity="sha384-+XBljXPPiv+OzfbB3cVmLHf4hdUFHlWNZN5spNQ7rmHTXpd7WvJum6fIACpNNfIR" crossorigin="anonymous"> {% endif %} -{% endif %} \ No newline at end of file +{% endif %}