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 --- 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 ------------- 9 files changed, 291 insertions(+), 290 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 (limited to 'templates') 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