From 948ebfda6f04577dd956c496bd24569fab479ffc Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Wed, 14 Sep 2022 19:33:05 +0200 Subject: Small templates changes --- config.toml | 6 +- content/blog/_index.md | 4 +- garage | 2 +- templates/base.html | 3 + templates/blog_article.html | 206 ++++++++++++++++++++++++++++++++++++ templates/blog_index.html | 73 +++++++++++++ templates/documentation.html | 2 +- templates/download.html | 2 +- templates/index.html | 8 +- templates/page.html | 206 ------------------------------------ templates/partials/shared/head.html | 8 +- templates/section.html | 73 ------------- 12 files changed, 298 insertions(+), 295 deletions(-) create mode 100755 templates/blog_article.html create mode 100755 templates/blog_index.html delete mode 100755 templates/page.html delete mode 100755 templates/section.html 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..f6aebef 160000 --- a/garage +++ b/garage @@ -1 +1 @@ -Subproject commit 93eab8eaa3927b99626fee4a747a0f9f041cafdb +Subproject commit f6aebefcc9747bf5afad3767e9ae6f9f3aba30ae 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/blog_article.html b/templates/blog_article.html new file mode 100755 index 0000000..6f96847 --- /dev/null +++ b/templates/blog_article.html @@ -0,0 +1,206 @@ +{% extends 'base.html' %} + +{% block title %} + {{ page.title }} | Garage blog +{% endblock %} + +{% block content %} +
+
+
+
+
+
+
+

+ {{ page.title }} +

+ {% if page.description %} +

{{ page.description }}

+ {% endif %} + +
+
+
+
+ +
+
+
+ {{ macros::page_publish_metadata(page=page) }} +
+
+ {{ macros::page_content_metadata(page=page) }} +
+
+ {% if page.taxonomies.categories %} + {{ macros::render_categories(categories=page.taxonomies.categories) }} + {% endif %} +
+
+ {% if page.taxonomies.tags %} + {{ macros::render_tags(tags=page.taxonomies.tags) }} + {% endif %} +
+
+
+
+ {{ page.content | safe }} +
+
+
+ {% if page.extra.toc %} +
+ +
+ {% endif %} +
+
+
+{% endblock %} + +{% block pagination %} +{% if page.earlier or page.later or page.lighter or page.heavier %} +
+
+
+
+ +
+
+
+
+{% endif %} +{% endblock %} + +{% block custom_js %} +{% if page.extra.toc %} + +{% endif %} +{% endblock %} diff --git a/templates/blog_index.html b/templates/blog_index.html new file mode 100755 index 0000000..faf6854 --- /dev/null +++ b/templates/blog_index.html @@ -0,0 +1,73 @@ +{% extends 'base.html' %} + +{% block title %} + {{ section.title }} | {{ config.title }} +{% endblock title %} + +{% block content %} +
+
+
+

{{ section.title }}

+

{{ section.description }}

+
+
+ {{ section.content | safe }} +
+
+
+ {% if paginator %} + {% set pages = paginator.pages %} + {% else %} + {% set pages = section.pages %} + {% endif %} + + {% for page in pages %} +
+

+ + {{ page.title }} + +

+ {% if page.description %} +

{{ page.description }}

+ {% endif %} +
+
+ {{ macros::page_publish_metadata(page=page) }} +
+
+ {{ macros::page_content_metadata(page=page) }} +
+
+
+
+ {{ page.summary | safe | striptags }} +
+ +
+ Read + + + + +
+
+
+ {% if page.taxonomies.categories %} + {{ macros::render_categories(categories=page.taxonomies.categories) }} + {% endif %} +
+
+ {% if page.taxonomies.tags %} + {{ macros::render_tags(tags=page.taxonomies.tags) }} + {% endif %} +
+
+
+ {% endfor %} +
+
+
+
+{% endblock %} 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..56448c9 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 %} 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/page.html b/templates/page.html deleted file mode 100755 index b1c98cd..0000000 --- a/templates/page.html +++ /dev/null @@ -1,206 +0,0 @@ -{% extends 'base.html' %} - -{% block title %} -{{ config.title }} | {{ page.title }} -{% endblock %} - -{% block content %} -
    -
    -
    -
    -
    -
    -
    -

    - {{ page.title }} -

    - {% if page.description %} -

    {{ page.description }}

    - {% endif %} - -
    -
    -
    -
    -     -
    -
    -
    - {{ macros::page_publish_metadata(page=page) }} -
    -
    - {{ macros::page_content_metadata(page=page) }} -
    -
    - {% if page.taxonomies.categories %} - {{ macros::render_categories(categories=page.taxonomies.categories) }} - {% endif %} -
    -
    - {% if page.taxonomies.tags %} - {{ macros::render_tags(tags=page.taxonomies.tags) }} - {% endif %} -
    -
    -
    -
    - {{ page.content | safe }} -
    -
    -
    - {% if page.extra.toc %} -
    - -
    - {% endif %} -
    -
    -
    -{% endblock %} - -{% block pagination %} -{% if page.earlier or page.later or page.lighter or page.heavier %} -
    -
    -
    -
    - -
    -
    -
    -
    -{% endif %} -{% endblock %} - -{% block custom_js %} -{% if page.extra.toc %} - -{% endif %} -{% endblock %} \ No newline at end of file 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 %} diff --git a/templates/section.html b/templates/section.html deleted file mode 100755 index 9ab3785..0000000 --- a/templates/section.html +++ /dev/null @@ -1,73 +0,0 @@ -{% extends 'base.html' %} - -{% block title %} -{{ config.title }} | {{ section.title }} -{% endblock title %} - -{% block content %} -
    -
    -
    -

    {{ section.title }}

    -

    {{ section.description }}

    -
    -
    - {{ section.content | safe }} -
    -
    -
    - {% if paginator %} - {% set pages = paginator.pages %} - {% else %} - {% set pages = section.pages %} - {% endif %} - - {% for page in pages %} -
    -

    - - {{ page.title }} - -

    - {% if page.description %} -

    {{ page.description }}

    - {% endif %} -
    -
    - {{ macros::page_publish_metadata(page=page) }} -
    -
    - {{ macros::page_content_metadata(page=page) }} -
    -
    -
    -
    - {{ page.summary | safe | striptags }} -
    - -
    - Read - - - -     -
    -
    -
    - {% if page.taxonomies.categories %} - {{ macros::render_categories(categories=page.taxonomies.categories) }} - {% endif %} -
    -
    - {% if page.taxonomies.tags %} - {{ macros::render_tags(tags=page.taxonomies.tags) }} - {% endif %} -
    -
    -
    - {% endfor %} -
    -
    -
    -
    -{% endblock %} -- cgit v1.2.3