From 5a09786d665b8bffd02fa7ee9543545e96c31320 Mon Sep 17 00:00:00 2001 From: hulkoba Date: Wed, 24 Jan 2024 14:25:10 +0100 Subject: [PATCH] Website: Rename Categories and change order --- docs/_data/documentation_page.json | 3 +++ docs/_data/{extra_pages.json => project_pages.json} | 3 +-- docs/bootable.md | 2 +- docs/building-rpms-from-source.md | 2 +- docs/distribution-policy.md | 2 +- docs/index.md | 8 +++++--- docs/initrd.md | 2 +- docs/sysext.md | 2 +- 8 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 docs/_data/documentation_page.json rename docs/_data/{extra_pages.json => project_pages.json} (67%) diff --git a/docs/_data/documentation_page.json b/docs/_data/documentation_page.json new file mode 100644 index 000000000..cb8e33171 --- /dev/null +++ b/docs/_data/documentation_page.json @@ -0,0 +1,3 @@ +[ + { "category": "Documentation", "title": "A longer description and available features and options", "url": "https://github.com/systemd/mkosi/blob/main/mkosi/resources/mkosi.md" } +] diff --git a/docs/_data/extra_pages.json b/docs/_data/project_pages.json similarity index 67% rename from docs/_data/extra_pages.json rename to docs/_data/project_pages.json index 003cafd9e..eb7b39b6b 100644 --- a/docs/_data/extra_pages.json +++ b/docs/_data/project_pages.json @@ -3,6 +3,5 @@ { "category": "Project", "title": "Releases", "url": "https://github.com/systemd/mkosi/releases" }, { "category": "Project", "title": "GitHub Project Page", "url": "https://github.com/systemd/mkosi" }, { "category": "Project", "title": "Issues", "url": "https://github.com/systemd/mkosi/issues" }, - { "category": "Project", "title": "Pull Requests", "url": "https://github.com/systemd/mkosi/pulls" }, - { "category": "Man page", "title": "A longer description and available features and options", "url": "https://github.com/systemd/mkosi/blob/main/mkosi/resources/mkosi.md" } + { "category": "Project", "title": "Pull Requests", "url": "https://github.com/systemd/mkosi/pulls" } ] diff --git a/docs/bootable.md b/docs/bootable.md index 65056ca62..59d4511d8 100644 --- a/docs/bootable.md +++ b/docs/bootable.md @@ -1,6 +1,6 @@ --- title: Building a bootable image on different distros -category: Documentation +category: Tutorials layout: default SPDX-License-Identifier: LGPL-2.1-or-later --- diff --git a/docs/building-rpms-from-source.md b/docs/building-rpms-from-source.md index 5511a5abb..d93f9cafb 100644 --- a/docs/building-rpms-from-source.md +++ b/docs/building-rpms-from-source.md @@ -1,6 +1,6 @@ --- title: Building RPMs from source with mkosi -category: Documentation +category: Tutorials layout: default SPDX-License-Identifier: LGPL-2.1-or-later --- diff --git a/docs/distribution-policy.md b/docs/distribution-policy.md index 87514056b..b5bb94edb 100644 --- a/docs/distribution-policy.md +++ b/docs/distribution-policy.md @@ -1,6 +1,6 @@ --- title: Adding new distributions -category: Documentation +category: Tutorials layout: default SPDX-License-Identifier: LGPL-2.1-or-later --- diff --git a/docs/index.md b/docs/index.md index f3beac5a7..36cb9db44 100644 --- a/docs/index.md +++ b/docs/index.md @@ -9,9 +9,11 @@ A fancy wrapper around `dnf --installroot`, `apt`, `pacman` and `zypper` that ge --- -{% assign by_category = site.pages | group_by:"category" %} -{% assign extra_pages = site.data.extra_pages | group_by:"category" %} -{% assign merged = by_category | concat: extra_pages | sort:"name" %} +{% assign tutorials = site.pages | group_by:"category" %} +{% assign project = site.data.project_pages | group_by:"category" %} +{% assign documentation = site.data.documentation_page | group_by:"category" %} +{% assign merged = documentation | concat: tutorials | concat: project %} + {% for pair in merged %} {% if pair.name != "" %} diff --git a/docs/initrd.md b/docs/initrd.md index 177dbc085..3472ae6a4 100644 --- a/docs/initrd.md +++ b/docs/initrd.md @@ -1,6 +1,6 @@ --- title: Building a custom initrd and using it in a mkosi image -category: Documentation +category: Tutorials layout: default SPDX-License-Identifier: LGPL-2.1-or-later --- diff --git a/docs/sysext.md b/docs/sysext.md index 0266eb49a..d43ba5453 100644 --- a/docs/sysext.md +++ b/docs/sysext.md @@ -1,6 +1,6 @@ --- title: Building system extensions with mkosi -category: Documentation +category: Tutorials layout: default SPDX-License-Identifier: LGPL-2.1-or-later --- -- 2.47.2