Merge branch 'contrib' into next

contrib/notification: format the values italic
contrib/notification: update date format
2026-01-07 09:39:32 +00:00 · 2025-10-29 16:12:17 +01:00 · 2025-10-29 16:12:17 +01:00 · 2025-10-29 16:07:58 +01:00 · 2025-10-29 15:56:56 +01:00 · 2025-10-29 15:56:56 +01:00
8 changed files with 8 additions and 13 deletions
--- a/.gitignore
+++ b/.gitignore
@ -7,7 +7,6 @@
 *.rej

 # html files (as generated from markdown)
-style.css
 *.html

 # checksums file as used by $ScriptInstallUpdate
--- a/9
+++ b/9
@ -7,14 +7,11 @@ LOCAL = $(wildcard *.local.rsc)
 WIFI = $(wildcard *.wifi.rsc)

 MARKDOWN = $(wildcard *.md doc/*.md doc/mod/*.md)
-HTML = $(MARKDOWN:.md=.html) style.css
+HTML = $(MARKDOWN:.md=.html)

 all: $(CAPSMAN) $(LOCAL) $(WIFI) $(HTML) checksums.json

-style.css: contrib/general/style.css
-	cp $< $@
-
-%.html: %.md style.css contrib/html.sh contrib/html.sh.d/head.html
+%.html: %.md contrib/html.sh contrib/html.sh.d/head.html
 	contrib/html.sh $< > $@

 %.capsman.rsc: %.template.rsc Makefile
@ -36,7 +33,7 @@ style.css: contrib/general/style.css
 		< $< > $@

 checksums.json: contrib/checksums.sh *.rsc */*.rsc
-	contrib/checksums.sh > $@
+	contrib/checksums.sh

 clean:
 	rm -f $(HTML) checksums.json
--- a/contrib/checksums.sh
+++ b/contrib/checksums.sh
@ -6,4 +6,4 @@ set -e

 md5sum $(find -name '*.rsc' | sort) | \
 	sed -e "s| \./||" -e 's|.rsc$||' | \
-	jq --raw-input --null-input '[ inputs | split (" ") | { (.[1]): (.[0]) }] | add'
+	jq --raw-input --null-input '[ inputs | split (" ") | { (.[1]): (.[0]) }] | add' > 'checksums.json'
--- a/contrib/general/style.css
+++ b/contrib/general/style.css
@ -1,4 +1,3 @@
-/* stylesheet for RouterOS Scripts */
 body {
  font-family: fira-sans, sans-serif;
  font-size: 10pt;
--- a/contrib/html.sh
+++ b/contrib/html.sh
@ -5,7 +5,7 @@ set -e
 RELTO="$(dirname "${1}")"
 sed \
 	-e "s|__TITLE__|$(head -n1 "${1}")|" \
-	-e "s|__STYLE__|$(realpath --relative-to="${RELTO}" style.css)|" \
+	-e "s|__STYLE__|$(realpath --relative-to="${RELTO}" contrib/general/style.css)|" \
 	-e "s|__LOGO__|$(realpath --relative-to="${RELTO}" logo.png)|" \
 	< "${0}.d/head.html"
 markdown -f toc,idanchor "${1}" | sed \
--- a/contrib/html.sh.d/head.html
+++ b/contrib/html.sh.d/head.html
@ -2,5 +2,5 @@
 <head><meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>RouterOS Scripts :: __TITLE__</title>
 <link rel="stylesheet" type="text/css" href="__STYLE__">
-<link rel="icon" type="image/png" href="__LOGO__">
+<link rel="icon" href="__LOGO__" type="image/png">
 </head><body>
--- a/contrib/logo-color.html
+++ b/contrib/logo-color.html
@ -2,7 +2,7 @@
 <head><meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>RouterOS Scripts :: Logo Color Changer</title>
 <link rel="stylesheet" type="text/css" href="general/style.css">
-<link rel="icon" type="image/png" href="../logo.png">
+<link rel="icon" href="../logo.png" type="image/png">
 <script src="logo-color.d/script.js"></script>
 </head><body>

--- a/contrib/notification.html
+++ b/contrib/notification.html
@ -2,7 +2,7 @@
 <head><meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>RouterOS Scripts :: Notification Generator</title>
 <link rel="stylesheet" type="text/css" href="general/style.css">
-<link rel="icon" type="image/png" href="../logo.png">
+<link rel="icon" href="../logo.png" type="image/png">
 <script src="notification.d/script.js"></script>
 </head><body>
Author	SHA1	Message	Date
Christian Hesse	a17582e703	Merge branch 'contrib' into next	2025-10-29 16:12:17 +01:00
Christian Hesse	99170cc163	contrib/notification: format the values italic	2025-10-29 16:12:17 +01:00
Christian Hesse	68c2d1d1da	contrib/notification: update date format	2025-10-29 16:07:58 +01:00
Christian Hesse	b3412b2228	contrib/{logo-color,notification}: add navigation structure	2025-10-29 15:56:56 +01:00
Christian Hesse	3edac71c0d	contrib/*: unify html code	2025-10-29 15:56:56 +01:00
Christian Hesse	90a59986b9	contrib/html.sh: link the logo with relative path	2025-10-29 15:05:20 +01:00
Christian Hesse	19d1d0fd55	contrib/html.sh: include stylesheet via link	2025-10-29 15:05:20 +01:00
Christian Hesse	ac41c80a07	contrib/{logo-color,notification}: use a single style	2025-10-29 14:31:17 +01:00