Styling, Screenshots, Manuals etc

.github/workflows/hugo.yaml

@@ -2,77 +2,82 @@
 name: Deploy Hugo site to Pages
 
 on:
-  # Runs on pushes targeting the default branch
-  push:
-    branches:
-      - main
+    # Runs on pushes targeting the default branch
+    push:
+        branches:
+            - main
 
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
+    # Allows you to run this workflow manually from the Actions tab
+    workflow_dispatch:
 
 # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
 permissions:
-  contents: read
-  pages: write
-  id-token: write
+    contents: read
+    pages: write
+    id-token: write
 
 # Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
 # However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
 concurrency:
-  group: "pages"
-  cancel-in-progress: false
+    group: "pages"
+    cancel-in-progress: false
 
 # Default to bash
 defaults:
-  run:
-    shell: bash
+    run:
+        shell: bash
 
 jobs:
-  # Build job
-  build:
-    runs-on: ubuntu-latest
-    env:
-      HUGO_VERSION: 0.111.3
-    steps:
-      - name: Install Hugo CLI
-        run: |
-          wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb \
-          && sudo dpkg -i ${{ runner.temp }}/hugo.deb          
-      - name: Install Dart Sass Embedded
-        run: sudo snap install dart-sass-embedded
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          submodules: recursive
-          fetch-depth: 0
-      - name: Setup Pages
-        id: pages
-        uses: actions/configure-pages@v3
-      - name: Install Node.js dependencies
-        run: "[[ -f package-lock.json || -f npm-shrinkwrap.json ]] && npm ci || true"
-      - name: Build with Hugo
+    # Build job
+    build:
+        runs-on: ubuntu-latest
         env:
-          # For maximum backward compatibility with Hugo modules
-          HUGO_ENVIRONMENT: production
-          HUGO_ENV: production
-        run: |
-          hugo \
-            --gc \
-            --minify \
-            --baseURL "${{ steps.pages.outputs.base_url }}/"          
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
-        with:
-          path: ./public
+            HUGO_VERSION: 0.141.0
+        steps:
+            - name: Install Hugo CLI
+              run: |
+                  wget -O ${{ runner.temp }}/hugo.deb https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.deb \
+                  && sudo dpkg -i ${{ runner.temp }}/hugo.deb
 
-  # Deployment job
-  deploy:
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v2
+            - name: Install Dart Sass Embedded
+              run: sudo snap install dart-sass-embedded
+
+            - name: Checkout
+              uses: actions/checkout@v4
+              with:
+                  submodules: recursive
+                  fetch-depth: 0
+
+            - name: Setup Pages
+              id: pages
+              uses: actions/configure-pages@v3
+
+            - name: Install Node.js dependencies
+              run: "[[ -f package-lock.json || -f npm-shrinkwrap.json ]] && npm ci || true"
+            - name: Build with Hugo
+              env:
+                  # For maximum backward compatibility with Hugo modules
+                  HUGO_ENVIRONMENT: production
+                  HUGO_ENV: production
+              run: |
+                  hugo \
+                    --gc \
+                    --minify \
+                    --baseURL "${{ steps.pages.outputs.base_url }}/"
+
+            - name: Upload artifact
+              uses: actions/upload-pages-artifact@v3
+              with:
+                  path: ./public
+
+    # Deployment job
+    deploy:
+        environment:
+            name: github-pages
+            url: ${{ steps.deployment.outputs.page_url }}
+        runs-on: ubuntu-latest
+        needs: build
+        steps:
+            - name: Deploy to GitHub Pages
+              id: deployment
+              uses: actions/deploy-pages@v4

.gitignore

@@ -1,2 +1,3 @@
 utils/news2hugo/venv
-.DS_Store
+public/
+.DS_Store

Makefile

@@ -18,4 +18,5 @@ cr-manpages: content/help/man-startfluxbox.md
 
 content/help/man-%.md: $(FLUXBOX_SRC)/doc/asciidoc/%.txt
 	asciidoctor -b docbook -o - $^ |\
-	pandoc -f docbook -t markdown_strict - -o $@
+	pandoc -f docbook -t markdown_strict - -o - |\
+	python3 utils/number-manpages.py $(notdir $@) > $@

README.md

@@ -0,0 +1,18 @@
+# The Fluxbox.org Website
+
+This is the repository to host the fluxbox.org website.
+
+## Folders / Interesting Files
+
+* data/fluxbox-news.yaml - stores the published "news", transformed
+  into gohugo-posts via utils/news2hugo/news2hugo.py
+
+* Makefile - various helpers to embed manual-pages into the help/ section
+
+
+
+## Relevant Links
+
+* https://gohugo.io - the site generator
+* https://gohugo.io/hosting-and-deployment/hosting-on-github/ - integrating it into
+  GH actions

config.yml

@@ -1,15 +1,15 @@
 title: "fluxbox"
 subtitle: "The Window Manager"
-copyright: "Copyright © 2001–2023, The Fluxbox Team."
-baseURL: "/"
-languageCode: 'en-us'
-#theme: "hugo-book"
-paginate: 5
+copyright: "Copyright © 2001–2025, The Fluxbox Team."
+languageCode: "en-us"
+theme: "hugo-book"
+pagination:
+    pagerSize: 23
 menu:
-  after:
-    - name: "Github"
-      url: "https://github.com/fluxbox/fluxbox"
-      weight: 100
+    after:
+        - name: "Github"
+          url: "https://github.com/fluxbox/fluxbox"
+          weight: 100
 #  main:
 #    - name: News
 #      url: "/news"
@@ -25,40 +25,39 @@ menu:
 #    - name: Help
 #      url: "/help"
 params:
-  # theme: book
-  BookSection: '*'
-  BookComments: false
-  # theme: terminal
-  fullWidthTheme: false
-  centerTheme: true
-  Toc: true
-  Logo:
-    logoText: "fluxbox"
+    # theme: book
+    BookSection: "*"
+    BookComments: false
+    fullWidthTheme: false
+    centerTheme: true
+    Toc: true
+    Logo:
+        logoText: "fluxbox"
 
 markup:
-  goldmark:
-    renderer:
-      unsafe: true
+    goldmark:
+        renderer:
+            unsafe: true
 
 privacy:
-  disqus:
-    disable: false
-  googleAnalytics:
-    anonymizeIP: false
-    disable: false
-    respectDoNotTrack: false
-    useSessionStorage: false
-  instagram:
-    disable: false
-    simple: false
-  twitter:
-    disable: false
-    enableDNT: false
-    simple: false
-  vimeo:
-    disable: false
-    enableDNT: false
-    simple: false
-  youtube:
-    disable: false
-    privacyEnhanced: false
+    disqus:
+        disable: false
+    googleAnalytics:
+        anonymizeIP: false
+        disable: false
+        respectDoNotTrack: false
+        useSessionStorage: false
+    instagram:
+        disable: false
+        simple: false
+    twitter:
+        disable: false
+        enableDNT: false
+        simple: false
+    vimeo:
+        disable: false
+        enableDNT: false
+        simple: false
+    youtube:
+        disable: false
+        privacyEnhanced: false

content/_index.md

@@ -10,15 +10,16 @@ menu:
 
 ## What is it?
 
-Fluxbox is a windowmanager for X that was based on the Blackbox 0.61.1 code.
-It is very light on resources and easy to handle but yet full of features to
-make an easy, and extremely fast, desktop experience. It is built using C++
-and licensed under the MIT-License
+Fluxbox is a windowmanager for X that was based on the
+[Blackbox 0.61.1](https://github.com/bbidulock/blackboxwm) code. It is very light on
+resources and easy to handle but yet full of features to make an easy, and
+extremely fast, desktop experience. It is built using C++ and licensed under the
+MIT-License.
 
 ## What can it do?
 
 Fluxbox is supplied with lots of native options such as tabbing, grouping, a
-long list of keycommands, Chainable Keygrabber, fully editable menu and much,
+long list of keycommands, chainable Keygrabber, fully editable menu and much,
 much more. You might want to dive into it and learn more about fluxbox's
 features.
 
@@ -31,12 +32,13 @@ setting up fluxbox correctly.
 ## What can it look like?
 
 To get an impression of what many fluxbox desktops look like and what those
-applications are you can see, check out the screenshots-page. Although fluxbox
-is "only" a windowmanager, there are typical applications that are frequently
+applications are you can see, check out the [screenshots-page]({{< ref "/screenshots/" >}}).
+Although fluxbox is "only" a windowmanager, there are typical applications that are frequently
 used amongst fluxbox users.
 
 ## How can I help?
 
 The best way to get in contact with the development team is to join the
-official irc-channel and speak directly to them or to use the bug-tracker and
-forums at sourceforge.net. For further information check out the help-site.
+official [irc-channel]() and speak directly to them or to use the bug-tracker and
+forums at [sourceforge.net](https://sourceforge.net/projects/fluxbox/).
+For further information check out the help-site.

content/download/_index.md

@@ -15,10 +15,10 @@ of the improvements.
 
 The source tarballs for the latest release can be found here:
 
-* 1.3.7 Source tarball (gz)
-* 1.3.7 Source tarball (bz2)
-* 1.3.7 Source tarball (xz)
-    
+* [1.3.7 Source tarball (gz)](https://sourceforge.net/projects/fluxbox/files/fluxbox/1.3.7/fluxbox-1.3.7.tar.gz/download)
+* [1.3.7 Source tarball (bz2)](https://sourceforge.net/projects/fluxbox/files/fluxbox/1.3.7/fluxbox-1.3.7.tar.bz2/download)
+* [1.3.7 Source tarball (xz)](https://sourceforge.net/projects/fluxbox/files/fluxbox/1.3.7/fluxbox-1.3.7.tar.xz/download)
+
 The source tarballs of all releases can be found on the fluxbox-project-page
 on sourceforge.net.
 
@@ -59,4 +59,3 @@ repositories are:
 * klowner's site
 * deviantart
 * customize.org
-