From e3ff54e8afbfd35a0d85d8c657799a14f758f8a6 Mon Sep 17 00:00:00 2001 From: Paul Wilde Date: Wed, 28 Aug 2024 22:33:14 +0100 Subject: [PATCH] docs template use about_norg page if home instead of redirecting --- docs/content/_index.md | 4 ++-- docs/content/introduction/about_norg.md | 3 +-- docs/norgbackupweb | 2 +- docs/themes/norgbackup/templates/index.html | 7 +++++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/docs/content/_index.md b/docs/content/_index.md index 13e5331..4109a88 100644 --- a/docs/content/_index.md +++ b/docs/content/_index.md @@ -1,4 +1,4 @@ +++ -title = "Norg" -redirect_to = "introduction/about-norg" +title = "About Norg" +#redirect_to = "introduction/about-norg" +++ diff --git a/docs/content/introduction/about_norg.md b/docs/content/introduction/about_norg.md index 1fa6205..740c9e5 100644 --- a/docs/content/introduction/about_norg.md +++ b/docs/content/introduction/about_norg.md @@ -12,6 +12,5 @@ Please use the menu or search function to find the information you require. Norg is short for "Nice Borg" - a way to nicely handle borg based backups. Also, I'm a Star Trek fan so obviously I wanted to keep something in line with the -[Borg pseudo-species](https://memory-alpha.fandom.com/wiki/Borg) as the borg backup utility does. -Also, sometimes I feel my code has elements of inexperience but loads of potential... which reminded me of [Nog](https://memory-alpha.fandom.com/wiki/Nog). +[Borg pseudo-species](https://memory-alpha.fandom.com/wiki/Borg) as the borg backup utility does. Sometimes I feel my code has elements of inexperience but loads of potential... which reminded me of [Nog](https://memory-alpha.fandom.com/wiki/Nog). So, simply put, Norg could also be a portmanteau of "Borg" and "Nog". diff --git a/docs/norgbackupweb b/docs/norgbackupweb index ef89abc..5002872 160000 --- a/docs/norgbackupweb +++ b/docs/norgbackupweb @@ -1 +1 @@ -Subproject commit ef89abc7faf20d2fc0ae8076387dbf84fea7e2c6 +Subproject commit 50028724e819d89f2d00c8e06cd7b0f091383d3d diff --git a/docs/themes/norgbackup/templates/index.html b/docs/themes/norgbackup/templates/index.html index 0f0d565..6be4f9f 100644 --- a/docs/themes/norgbackup/templates/index.html +++ b/docs/themes/norgbackup/templates/index.html @@ -137,8 +137,11 @@

{% block article_title -%}{% endblock article_title -%}

{% block content -%} - {%- if section.word_count -%} - {{ section.content |safe }} + {%- if current_path == "/" -%} + {% set p = get_page(path="introduction/about_norg.md") %} + {{ p.content | safe }} + {%- elif section.word_count -%} + {{ section.content | safe }} {%- else -%} {%- include "sec_toc_2_level.html" -%} {% endif -%}