diff --git a/config.toml b/config.toml index 3c3667f..8cd3ec9 100644 --- a/config.toml +++ b/config.toml @@ -50,8 +50,6 @@ math = false mermaid = false # Enable comment support globally. comment = false -# Disable the post navigation. -disable_post_navigation = false [extra.style] # The custom background color. diff --git a/content/theme-config.md b/content/theme-config.md index 9348b0e..47325c7 100644 --- a/content/theme-config.md +++ b/content/theme-config.md @@ -19,8 +19,6 @@ math = false mermaid = false # Enable comment support globally. comment = false -# Disable the post navigation. -disable_post_navigation = false [extra.style] # The custom background color. diff --git a/templates/archive.html b/templates/archive.html index 56d4146..9141dcd 100644 --- a/templates/archive.html +++ b/templates/archive.html @@ -22,5 +22,4 @@ {% endfor %} - {% endblock main %} diff --git a/templates/index.html b/templates/index.html index ff0db6e..0c784dc 100644 --- a/templates/index.html +++ b/templates/index.html @@ -9,48 +9,9 @@ > {% block main %} - + {% if paginator is undefined or paginator.current_index == 1 %} - {% if config.extra.profile.avatar_url or config.extra.profile.name %} -
- {% if config.extra.profile.avatar_url %} -
- {{ config.extra.profile.name | default(value=config.title) }} -
- {% endif %} - - {% if config.extra.profile.name %} -
-

{{ config.extra.profile.name }}

-
- {{ config.extra.profile.bio | default(value=`A blog by ` ~ config.extra.profile.name) }} -
- - {% if config.extra.profile.social %} - - {% endif %} -
- {% endif %} -
- {% endif %} + {% include "partials/profile.html" %} {% endif %} {% include "partials/page_list.html" %} diff --git a/templates/page.html b/templates/page.html index 096f386..31ff5d7 100644 --- a/templates/page.html +++ b/templates/page.html @@ -15,110 +15,24 @@ /> {% endif %} - - {% if page.toc %} -
-
- - Table of Contents - -
-
    - {% for h1 in page.toc %} -
  • - {{ h1.title }} - {% if h1.children %} - - {% endif %} -
  • - {% endfor %} -
-
-
-
- {% endif %} + + {% include "partials/toc.html" %} +
{{ page.content | safe }}

- {% if page.taxonomies %} - - {% endif %} + {% include "partials/post_taxonomies.html" %} - {% if not config.extra.disable_post_navigation %} - {% if page.lower or page.higher %} - - {% endif %} - {% endif %} + {% include "partials/post_navigation.html" %} - + {% if page.extra.comment | default(value=config.extra.comment) %} - {% if config.extra.giscus.repo %} -
- - {% endif %} + {% include "partials/comment.html" %} {% endif %} {% endblock main %} diff --git a/templates/partials/comment.html b/templates/partials/comment.html new file mode 100644 index 0000000..9a299f0 --- /dev/null +++ b/templates/partials/comment.html @@ -0,0 +1,20 @@ +{% if config.extra.giscus.repo %} +
+ +{% endif %} diff --git a/templates/partials/head.html b/templates/partials/head.html index 0a0a6d2..1babf07 100644 --- a/templates/partials/head.html +++ b/templates/partials/head.html @@ -61,18 +61,20 @@ {% if page.extra.mermaid | default(value=config.extra.mermaid) %} - + + {% include "partials/mermaid.html" %} + {% endif %} + - {% if config.generate_feed %} {% if config.feed_filename == "atom.xml" %} + {% if config.generate_feed %} + + {% if config.feed_filename == "atom.xml" %} + import mermaid from "https://cdn.jsdelivr.net/npm/mermaid@10/dist/mermaid.esm.min.mjs"; + mermaid.initialize({ startOnLoad: true }); + diff --git a/templates/partials/post_navigation.html b/templates/partials/post_navigation.html new file mode 100644 index 0000000..656e6f7 --- /dev/null +++ b/templates/partials/post_navigation.html @@ -0,0 +1,18 @@ +{% if page.lower or page.higher %} + +{% endif %} diff --git a/templates/partials/post_taxonomies.html b/templates/partials/post_taxonomies.html new file mode 100644 index 0000000..8248ff0 --- /dev/null +++ b/templates/partials/post_taxonomies.html @@ -0,0 +1,20 @@ +{% if page.taxonomies %} + +{% endif %} diff --git a/templates/partials/profile.html b/templates/partials/profile.html new file mode 100644 index 0000000..5533f94 --- /dev/null +++ b/templates/partials/profile.html @@ -0,0 +1,40 @@ +{% if config.extra.profile.avatar_url or config.extra.profile.name %} +
+ {% if config.extra.profile.avatar_url %} +
+ {{ config.extra.profile.name | default(value=config.title) }} +
+ {% endif %} + + {% if config.extra.profile.name %} +
+

{{ config.extra.profile.name }}

+
+ {{ config.extra.profile.bio | default(value=`A blog by ` ~ config.extra.profile.name) }} +
+ + {% if config.extra.profile.social %} + + {% endif %} +
+ {% endif %} +
+{% endif %} diff --git a/templates/partials/toc.html b/templates/partials/toc.html new file mode 100644 index 0000000..30de0a8 --- /dev/null +++ b/templates/partials/toc.html @@ -0,0 +1,31 @@ +{% if page.toc %} +
+
+ + Table of Contents + +
+
    + {% for h1 in page.toc %} +
  • + {{ h1.title }} + {% if h1.children %} + + {% endif %} +
  • + {% endfor %} +
+
+
+
+{% endif %} diff --git a/templates/projects.html b/templates/projects.html index 932a378..6490ec5 100644 --- a/templates/projects.html +++ b/templates/projects.html @@ -1,10 +1,13 @@ {% extends "index.html" %} {% block main %} + {% for asset in page.assets %} {% if asset is ending_with("data.toml") %} -{% set data = load_data(path=asset, format="toml") %} -

{{ page.title }}

+{% set_global data = load_data(path=asset, format="toml") %} +{% endif %} +{% endfor %} +

{{ page.title }}

{% for project in data.project %}

{{ project.name }}

@@ -29,8 +32,4 @@
{% endfor %} - -{% break %} -{% endif %} -{% endfor %} {% endblock main %} diff --git a/templates/section.html b/templates/section.html index 7726395..90c8e90 100644 --- a/templates/section.html +++ b/templates/section.html @@ -1,9 +1,7 @@ {% extends "index.html" %} -{% block main %} +{% block main %}

{{ section.title }}

- {% include "partials/page_list.html" %} - {% endblock main %} diff --git a/templates/taxonomy_list.html b/templates/taxonomy_list.html index 34087c3..1f82dff 100644 --- a/templates/taxonomy_list.html +++ b/templates/taxonomy_list.html @@ -2,7 +2,7 @@ {% block main %}

{{ taxonomy.name | title }}

- +
{% for term in terms %}
@@ -23,5 +23,4 @@
{% endfor %}
- {% endblock main %} diff --git a/templates/taxonomy_single.html b/templates/taxonomy_single.html index dd33e12..0d1559d 100644 --- a/templates/taxonomy_single.html +++ b/templates/taxonomy_single.html @@ -2,8 +2,6 @@ {% block main %}

#{{ term.name }}

- {% include "partials/page_list.html" %} - {% endblock main %}