contrib/checksums.sh: output to stdout...

... and let the Makefile redirect.
Merge branch 'contrib' into next
2025-12-06 01:49:28 +00:00 · 2025-10-30 11:07:38 +01:00 · 2025-10-30 10:32:51 +01:00 · 2025-10-30 10:32:51 +01:00 · 2025-10-30 10:32:51 +01:00 · 2025-10-30 10:32:51 +01:00
9 changed files with 83 additions and 49 deletions
--- a/.gitignore
+++ b/.gitignore
@ -7,6 +7,7 @@
 *.rej

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

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

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

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

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

 %.capsman.rsc: %.template.rsc Makefile
@ -33,7 +36,7 @@ all: $(CAPSMAN) $(LOCAL) $(WIFI) $(HTML) checksums.json
 		< $< > $@

 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' > 'checksums.json'
+	jq --raw-input --null-input '[ inputs | split (" ") | { (.[1]): (.[0]) }] | add'
--- a/contrib/notification.d/style.css
+++ b/contrib/notification.d/style.css
@ -1,8 +1,31 @@
+/* stylesheet for RouterOS Scripts */
 body {
  font-family: fira-sans, sans-serif;
  font-size: 10pt;
  background-color: transparent;
 }
+h2 {
+  border-bottom: 1px solid #ccc;
+  color: #000;
+}
+a {
+  text-decoration: none;
+}
+a:hover {
+  text-decoration: underline;
+}
+blockquote {
+  border-left: 4px solid #ccc;
+  padding: 0 10px;
+  color: #777;
+}
+code {
+  margin: 0 2px;
+  padding: 2px 5px;
+  border: 1px solid #ccc;
+  background-color: #f8f8f8;
+  border-radius: 3px;
+}
 div.notification {
  position: relative;
  float: right;
@ -30,6 +53,16 @@ p.hint {
 pre {
  font-family: fira-mono, monospace;
  white-space: pre-wrap;
+  background-color: #f8f8f8;
+  border: 1px solid #ccc;
+  overflow: auto;
+  padding: 6px 10px;
+  border-radius: 3px;
+}
+pre code {
+  margin: 0;
+  padding: 0;
+  border: 0;
 }
 span.link {
  color: #863600;
--- a/contrib/html.sh
+++ b/contrib/html.sh
@ -2,7 +2,12 @@

 set -e

-sed "s|__TITLE__|$(head -n1 "${1}")|" < "${0}.d/head.html"
+RELTO="$(dirname "${1}")"
+sed \
+	-e "s|__TITLE__|$(head -n1 "${1}")|" \
+	-e "s|__STYLE__|$(realpath --relative-to="${RELTO}" style.css)|" \
+	-e "s|__LOGO__|$(realpath --relative-to="${RELTO}" logo.png)|" \
+	< "${0}.d/head.html"
 markdown -f toc,idanchor "${1}" | sed \
 	-e 's/href="\([-_\./[:alnum:]]*\)\.md"/href="\1.html"/g' \
 	-e '/<h[1234] /s| id="\(.*\)">| id="\L\1">|'
--- a/contrib/html.sh.d/head.html
+++ b/contrib/html.sh.d/head.html
@ -1,15 +1,6 @@
 <!DOCTYPE html><html lang="en">
-<head><title>RouterOS Scripts :: __TITLE__</title>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<style>
-  body { font-family: sans-serif; }
-  h2 { border-bottom: 1px solid #ccc; color: #000; }
-  a { text-decoration: none; }
-  a:hover { text-decoration: underline; }
-  blockquote { border-left: 4px solid #ccc; padding: 0 10px; color: #777; }
-  code { margin: 0 2px; padding: 2px 5px; border: 1px solid #ccc; background-color: #f8f8f8; border-radius: 3px; }
-  pre { background-color: #f8f8f8; border: 1px solid #ccc; overflow: auto; padding: 6px 10px; border-radius: 3px; }
-  pre code { margin: 0; padding: 0; border: 0; }
-</style>
-<link rel="icon" href="/logo.png" type="image/png">
+<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__">
 </head><body>
--- a/contrib/logo-color.d/style.css
+++ b/contrib/logo-color.d/style.css
@ -1,5 +0,0 @@
-body {
-  font-family: fira-sans, sans-serif;
-  font-size: 10pt;
-  background-color: transparent;
-}
--- a/contrib/logo-color.html
+++ b/contrib/logo-color.html
@ -1,14 +1,14 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta charset="UTF-8">
-<title>RouterOS-Scripts Logo Color Changer</title>
-<link rel="stylesheet" type="text/css" href="logo-color.d/style.css">
+<!DOCTYPE html><html lang="en">
+<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">
 <script src="logo-color.d/script.js"></script>
-</head>
-<body>
+</head><body>

-<h1>RouterOS-Scripts Logo Color Changer</h1>
+<h1>Logo Color Changer</h1>
+
+<p><a href="../README.html">⬅️ Go back to main README</a></p>

 <p>You want the logo for your own notifications? But you joined the
 <a href="https://t.me/routeros_scripts">Telegram Group</a> and want
@ -36,5 +36,8 @@ for other browsers may differ.)</p>
 <a href="../../about/doc/mod/notification-telegram.md#set-a-profile-photo">Set
 a profile photo</a> for your Telegram bot.</p>

-</body>
-</html>
+<hr />
+
+<p><a href="../README.html">⬅️ Go back to main README</a><br/>
+<a href="#top">⬆️ Go back to top</a></p>
+</body></html>
--- a/contrib/notification.html
+++ b/contrib/notification.html
@ -1,14 +1,14 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta charset="UTF-8">
-<title>RouterOS-Scripts Notification Generator</title>
-<link rel="stylesheet" type="text/css" href="notification.d/style.css">
-<script src="notification.d/script.js"></script> 
-</head>
-<body>
+<!DOCTYPE html><html lang="en">
+<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">
+<script src="notification.d/script.js"></script>
+</head><body>

-<h1>RouterOS-Scripts Notification Generator</h1>
+<h1>Notification Generator</h1>
+
+<p><a href="../README.html">⬅️ Go back to main README</a></p>

 <div class="notification">
  <img src="../logo.svg" alt="logo" class="logo" width=48 height=48>
@ -16,8 +16,8 @@
  <p id="heading" class="heading">[<span id="hostname">MikroTik</span>] <span id="subject">ℹ️  Subject</span></p>
  <pre id="message">Message</pre>
  <p id="link" class="hint">🔗 <span id="link-text" class="link">https://eworm.de/</span></p>
-  <p id="queued" class="hint">⏰ This message was queued since <span id="queued-since">oct/18/2022 18:30:48</span> and may be obsolete.</p>
-  <p id="cut" class="hint">✂️ The message was too long and has been truncated, cut off <span id="cut-percent">13</span>%!</p>
+  <p id="queued" class="hint">⏰ This message was queued since <i><span id="queued-since">2025-10-29 16:06:18</span></i> and may be obsolete.</p>
+  <p id="cut" class="hint">✂️ The message was too long and has been truncated, cut off <i><span id="cut-percent">13</span>%</i>!</p>
  </div>
 </div>

@ -25,11 +25,14 @@
 <p>Subject: <input type="text" size=50 value="ℹ️  Subject" onchange="update(this, 'subject')"></p>
 <p>Message: <textarea id="w3review" name="w3review" rows="4" cols="50" onchange="update(this, 'message')">Message</textarea></p>
 <p><input type="checkbox" onclick="visible(this, 'link')"> Show link: <input type="text" value="https://eworm.de/" onchange="update(this, 'link-text')"></p>
-<p><input type="checkbox" onclick="visible(this, 'queued')"> Queued since <input type="text" value="oct/18/2022 18:30:48" onchange="update(this, 'queued-since')"></p>
+<p><input type="checkbox" onclick="visible(this, 'queued')"> Queued since <input type="text" value="2025-10-29 16:06:18" onchange="update(this, 'queued-since')"></p>
 <p><input type="checkbox" onclick="visible(this, 'cut')"> Cut-off with <input type="number" min=1 max=99 value=13 onchange="update(this, 'cut-percent')"> percent</p>

 <p>Then right-click, click "<i>Take Screenshot</i>" and finally select the
 notification and download it.</p>

-</body>
-</html>
+<hr />
+
+<p><a href="../README.html">⬅️ Go back to main README</a><br/>
+<a href="#top">⬆️ Go back to top</a></p>
+</body></html>
Author	SHA1	Message	Date
Christian Hesse	fd94b7e76b	contrib/checksums.sh: output to stdout... ... and let the Makefile redirect.	2025-10-30 11:07:38 +01:00
Christian Hesse	9079f867f1	Merge branch 'contrib' into next	2025-10-30 10:32:51 +01:00
Christian Hesse	0be7195371	contrib/notification: format the values italic	2025-10-30 10:32:51 +01:00
Christian Hesse	ae1a7cb875	contrib/notification: update date format	2025-10-30 10:32:51 +01:00
Christian Hesse	1e64bbeccb	contrib/{logo-color,notification}: add navigation structure	2025-10-30 10:32:51 +01:00
Christian Hesse	ef5929358e	contrib/*: unify html code	2025-10-30 10:32:51 +01:00
Christian Hesse	9e7d5d1ce3	contrib/html.sh: link the logo with relative path	2025-10-30 10:32:51 +01:00
Christian Hesse	2938c0a716	contrib/html.sh: link the stylesheet from top level... ... and copy it there in Makefile.	2025-10-30 10:32:51 +01:00
Christian Hesse	9a39382c93	contrib/html.sh: include stylesheet via link	2025-10-30 10:32:51 +01:00
Christian Hesse	2dd4bc7a39	contrib/{logo-color,notification}: use a single style	2025-10-30 10:32:51 +01:00