From 6456376f3c6f1f8fd71e4284caf01b3f15a46913 Mon Sep 17 00:00:00 2001 From: D-u-c-k-s-e-l <98615937+D-u-c-k-s-e-l@users.noreply.github.com> Date: Fri, 18 Jul 2025 00:26:29 -0500 Subject: [PATCH] fix content insertion --- website/_data/nav.yml | 50 +++++++++++++++++++-------- website/_includes/mainnavbuttons.html | 5 +++ website/_includes/sidenav.html | 9 ----- website/_includes/subnavbuttons.html | 10 ++++++ website/_layouts/default.html | 50 +++++++++++++++++---------- website/register.md | 4 +-- 6 files changed, 84 insertions(+), 44 deletions(-) create mode 100644 website/_includes/mainnavbuttons.html delete mode 100644 website/_includes/sidenav.html create mode 100644 website/_includes/subnavbuttons.html diff --git a/website/_data/nav.yml b/website/_data/nav.yml index 6374ef9..66583a4 100644 --- a/website/_data/nav.yml +++ b/website/_data/nav.yml @@ -1,14 +1,36 @@ -- url: / - title: Home -- url: "#" - title: About -- url: "#" - title: Linuxposting News -- url: "#" - title: Site Announcements -- url: "/register" - title: Register for Accounts -- url: "#" - title: View Molly's Page -- url: "#" - title: Contact Us \ No newline at end of file +# navigation buttons are specified in this file: +# - main: for the upper column of buttons +# - sub: for the lower column of buttons +# each button has 3 properties: +# - title: the button text +# - url: the link the button leads to +# - idn: the index name of the button. buttons get the class "btn-". +# +# Note: idn is optional and if not specified, will not apply any extra classes. + +main: + - title: Home + url: / + idn: 'home' + - title: About + url: /about/ + idn: 'about' + - title: Linuxposting News + url: /news/ + idn: 'new' + - title: Announcements + url: /announcements/ + idn: 'ann' + - title: Molly's Page + url: https://molly.linuxposting.xyz/ + idn: 'molly' +sub: + - title: Register + url: /register/ + idn: 'reg' + - title: Contact Us + url: "#" + idn: 'msg' + - title: Theme Selection + url: "#" + idn: 'theme' \ No newline at end of file diff --git a/website/_includes/mainnavbuttons.html b/website/_includes/mainnavbuttons.html new file mode 100644 index 0000000..80595c4 --- /dev/null +++ b/website/_includes/mainnavbuttons.html @@ -0,0 +1,5 @@ +{% for item in site.data.nav.main %} +{{ item.title }} +{% endfor %} \ No newline at end of file diff --git a/website/_includes/sidenav.html b/website/_includes/sidenav.html deleted file mode 100644 index 6a37dfc..0000000 --- a/website/_includes/sidenav.html +++ /dev/null @@ -1,9 +0,0 @@ - \ No newline at end of file diff --git a/website/_includes/subnavbuttons.html b/website/_includes/subnavbuttons.html new file mode 100644 index 0000000..f2d227b --- /dev/null +++ b/website/_includes/subnavbuttons.html @@ -0,0 +1,10 @@ + + +{% assign subnav_offset = site.data.nav.main.size %} + +{% for item in site.data.nav.sub %} +{% assign subnav_index = forloop.index | plus: subnav_offset %} +{{ item.title }} +{% endfor %} \ No newline at end of file diff --git a/website/_layouts/default.html b/website/_layouts/default.html index b6bb80e..135c7c9 100644 --- a/website/_layouts/default.html +++ b/website/_layouts/default.html @@ -3,17 +3,23 @@ - bleh + nya! {{page.title}}
high mouse cherishing lunix. but fr tho, we need logo and stuff -

Headline

+

{{ page.headline }}

- + +
@@ -22,16 +28,10 @@
- About - Linuxposting News - Announcements - News - Molly's Page + {% include mainnavbuttons.html %}
- Register - Contact Us - Theme Selection + {% include subnavbuttons.html %}
@@ -55,23 +55,29 @@
-

text

+

{{ content }}

Table of Contents
-
    -
  1. If we had content with chapters, it would go here
    2. -
  2. Oh yeah, very good structure
    3. -
  3. another point
    4. -
+ {% comment %} + Table of contents generated by https://github.com/allejo/jekyll-toc . + The file is included as toc.html in the _includes directory. + {% endcomment %} + {% include toc.html html=content %}
Announcements
-

Server restart at 23:00 UTC

+ {% for announcement in site.announce %} +

+ {{ announcement.title }} +

+ {% else %} +

No announcements available at the moment.

+ {% endfor %}
RSS Feed @@ -81,7 +87,13 @@
NEWS NEWS NEWS
-

Read here more about whatever shenanigans we are up to

+ {% for article in site.news %} +

+ {{ article.title }} +

+ {% else %} +

No news articles available at the moment.

+ {% endfor %}
Read more diff --git a/website/register.md b/website/register.md index f78d6c6..76fdc35 100644 --- a/website/register.md +++ b/website/register.md @@ -4,9 +4,9 @@ layout: default headline: Account Registration --- -### How to Register for accounts on linuxposting.xyz - +## Rabout +This page will explain how to get accounts for various services on linuxposting.xyz ## Requisites