Compare commits

..

68 commits

Author SHA1 Message Date
Christian Hesse
d7f9f3eade contrib/static-html: split off from Makefile 2025-11-17 13:20:05 +01:00
Christian Hesse
17e7deee16 contrib/html: simplify handling of relative paths 2025-11-17 13:09:58 +01:00
Christian Hesse
626f41427a general/clipboard: add a visual feedback 2025-11-17 12:28:59 +01:00
Christian Hesse
959d4c1eb2 general/style: add a "📋 Copy!" hint to code blocks 2025-11-17 12:28:59 +01:00
Christian Hesse
d44ea0d566 contrib/html: support click on code block to copy to clipboard 2025-11-17 12:28:59 +01:00
Christian Hesse
7b55ae482e global-functions: add and fix global scheduler automatically...
... and also adjust README and INITIAL-COMMANDS.
2025-11-17 12:28:59 +01:00
Christian Hesse
450fe6ab9b contrib/commitinfo: support updating the commit info 2025-11-17 12:28:59 +01:00
Christian Hesse
34c8b7bd80 global-functions: $FetchUserAgentStr: add commit info in user agent string 2025-11-17 12:28:59 +01:00
Christian Hesse
bebfd40f27 Merge branch 'rsc-eworm-de' into next 2025-11-17 12:28:59 +01:00
Christian Hesse
8692119e6a Merge branch 'contrib-template' into next 2025-11-17 12:28:59 +01:00
Christian Hesse
6fb11ff6fc doc/mod/scriptrunonce: get script from rsc.eworm.de 2025-11-17 12:28:59 +01:00
Christian Hesse
e66e213e83 contrib/logo-color: drop width & height properties for images 2025-11-17 12:28:59 +01:00
Christian Hesse
8f21763a73 contrib/template-wifi: split off from Makefile 2025-11-17 12:28:59 +01:00
Christian Hesse
49a7804d10 INITIAL-COMMANDS: install from rsc.eworm.de 2025-11-17 12:28:59 +01:00
Christian Hesse
6f25f4e78b contrib/logo-color: place screenshots below each other...
... not side by side.
2025-11-17 12:28:59 +01:00
Christian Hesse
3ad21c8f92 contrib/template-local: split off from Makefile 2025-11-17 12:28:59 +01:00
Christian Hesse
aae002e4d9 README: install from rsc.eworm.de 2025-11-17 12:28:59 +01:00
Christian Hesse
53966a376f general/style: make the blockquote darker 2025-11-17 12:28:59 +01:00
Christian Hesse
1f72b6d2cf contrib/template-capsman: split off from Makefile 2025-11-17 12:28:59 +01:00
Christian Hesse
f39b9271a2 fw-addr-lists.d/allow: use rsc.eworm.de in the list 2025-11-17 12:28:59 +01:00
Christian Hesse
68862ca59c Merge branch 'contrib-html-head-foot' into next 2025-11-17 12:28:59 +01:00
Christian Hesse
5e72f79ded fw-addr-lists.d/{allow,block}: use short url rsc.eworm.de 2025-11-17 12:28:59 +01:00
Christian Hesse
97722cb8ec Makefile: clean up and add phony targets 2025-11-17 12:28:59 +01:00
Christian Hesse
b608f12edc contrib/html: add a footer 2025-11-17 12:28:59 +01:00
Christian Hesse
4624f787a1 Merge branch 'contrib-html' into next 2025-11-17 12:28:59 +01:00
Christian Hesse
8af3c2db16 contrib/notification: add a head with eworm, QR code and caption 2025-11-17 12:28:59 +01:00
Christian Hesse
558a6de6d8 README: add a sub-section for code hosting 2025-11-17 12:28:59 +01:00
Christian Hesse
406f4492fd contrib/Makefile: hide the hint on broken site 2025-11-17 12:28:59 +01:00
Christian Hesse
0f2e843fe3 contrib/logo-color: add a head with eworm, QR code and caption 2025-11-17 12:28:59 +01:00
Christian Hesse
c2abc8cc22 README: add the upstream url verbatim 2025-11-17 12:28:59 +01:00
Christian Hesse
0822d457f5 contrib/notification: hint on possibly broken site 2025-11-17 12:28:59 +01:00
Christian Hesse
66d3dba986 contrib/html: add a head with eworm, QR code and caption 2025-11-17 12:28:59 +01:00
Christian Hesse
bcfd75a3ce README: move the QR code 2025-11-17 12:28:59 +01:00
Christian Hesse
56da7da9af contrib/logo-color: hint on possibly broken site 2025-11-17 12:28:59 +01:00
Christian Hesse
c2543d0c11 Merge branch 'builtin-trust-store' into next 2025-11-17 12:28:59 +01:00
Christian Hesse
6cd9eb3eb6 contrib/html: hide the hint on broken link 2025-11-17 12:28:59 +01:00
Christian Hesse
98136a380b mod/notification-email: remove schedule with find...
... as a race condition could occur and the scheduler is already gone.
2025-11-17 12:28:59 +01:00
Christian Hesse
1d0662921b doc/mod/notification-matrix: define certificate use 2025-11-17 12:28:59 +01:00
Christian Hesse
c9b2b8b29f doc/mod/notification-telegram: hint on possibly broken link 2025-11-17 12:28:59 +01:00
Christian Hesse
31fa66b561 CERTIFICATES: define certificate use 2025-11-17 12:28:59 +01:00
Christian Hesse
2816e95f13 contrib: introduce Makefile...
... and update references in links.
2025-11-17 12:28:59 +01:00
Christian Hesse
9f8efb8b7c update-tunnelbroker: define certificate use 2025-11-17 12:28:59 +01:00
Christian Hesse
cd637649ac contrib/logo-color: use relative reference in link
... without extra path elements.

This may break, depending on site.
2025-11-17 12:28:59 +01:00
Christian Hesse
863073a772 telegram-chat: define certificate use 2025-11-17 12:28:59 +01:00
Christian Hesse
d8b7e978c2 doc/mod/notification-telegram: use relative reference in link
This may break, depending on site.
2025-11-17 12:28:59 +01:00
Christian Hesse
5e3db518ff netwatch-dns: define certificate use 2025-11-17 12:28:59 +01:00
Christian Hesse
2fe48380ef contrib/notification: format the values italic 2025-11-17 12:28:59 +01:00
Christian Hesse
5556b4bb67 mod/notification-telegram: define certificate use 2025-11-17 12:28:59 +01:00
Christian Hesse
1d9d90cd40 contrib/notification: update date format 2025-11-17 12:28:59 +01:00
Christian Hesse
f5a3742ae2 mod/notification-ntfy: define certificate use 2025-11-17 12:28:59 +01:00
Christian Hesse
21f16fded8 contrib/{logo-color,notification}: add navigation structure 2025-11-17 12:28:59 +01:00
Christian Hesse
fd6730e244 fw-addr-lists: define certificate use 2025-11-17 12:28:59 +01:00
Christian Hesse
5890cdda02 contrib/*: unify html code 2025-11-17 12:28:59 +01:00
Christian Hesse
15df46818a check-certificates: define certificate use 2025-11-17 12:28:59 +01:00
Christian Hesse
ed5a2712ad contrib/html: drop ampersand, comma, dash & tick from id/anchor 2025-11-17 12:28:59 +01:00
Christian Hesse
b83c08fdd0 global-functions: $ScriptInstallUpdate: define certificate use 2025-11-17 12:28:59 +01:00
Christian Hesse
c2a863da2b contrib/html: properly handle anchors 2025-11-17 12:28:59 +01:00
Christian Hesse
569a53babc global-functions: $GetMacVendor: define certificate use 2025-11-17 12:28:59 +01:00
Christian Hesse
dc879b6798 contrib/html: link the logo with relative path 2025-11-17 12:28:59 +01:00
Christian Hesse
884c51a850 global-functions: $DownloadPackage: define certificate use 2025-11-17 12:28:59 +01:00
Christian Hesse
843f6b41f6 contrib/html: increase default line height 2025-11-17 12:28:59 +01:00
Christian Hesse
36f4fcaac9 global-functions: $CertificateAvailable: support new builtin-trust-store...
... which was introduced with RouterOS 7.21beta7.
2025-11-17 12:28:59 +01:00
Christian Hesse
ed3d42e84f contrib/html: add a margin on left and right...
... for windows in landscape (wider than high). Also make the
notification float right for landscape only.
2025-11-17 12:28:59 +01:00
Christian Hesse
a04f96e6ed INITIAL-COMMANDS: support new builtin-trust-store...
... which was introduced with RouterOS 7.21beta7.
2025-11-17 12:28:59 +01:00
Christian Hesse
213d320545 contrib/html: include stylesheet via link 2025-11-17 12:28:59 +01:00
Christian Hesse
1ec3c0ed7c README: support new builtin-trust-store...
... which was introduced with RouterOS 7.21beta7.
2025-11-17 12:28:59 +01:00
Christian Hesse
b0888aba7c contrib/{logo-color,notification}: use a single style 2025-11-17 12:28:59 +01:00
Christian Hesse
79b49ab2ab contrib/html: add empty lines...
... for easier rebasing.
2025-11-17 12:28:59 +01:00
11 changed files with 32 additions and 20 deletions

View file

@ -27,7 +27,7 @@ commitinfo: global-functions.rsc
docs: $(HTML)
%.html: %.md general/style.css contrib/html.sh contrib/html.sh.d/head.html
%.html: %.md general/style.css contrib/html.sh contrib/html.sh.d/head.html contrib/html.sh.d/foot.html
contrib/html.sh $< > $@
rsc: $(GEN_RSC)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

Before After
Before After

View file

@ -6,8 +6,5 @@ HTML := $(wildcard *.html)
all: docs
docs: $(HTML)
sed -i \
-e '/href=/s|\.md|\.html|' \
-e '/blockquote/s|/\*! display \*/|display: none;|' \
$(HTML)
docs: static-html.sh $(HTML)
./static-html.sh $(HTML)

View file

@ -6,17 +6,14 @@ RELTO="$(dirname "${1}")"
sed \
-e "s|__TITLE__|$(head -n1 "${1}")|" \
-e "s|__STYLE__|$(realpath --relative-to="${RELTO}" general/style.css)|" \
-e "s|__LOGO__|$(realpath --relative-to="${RELTO}" logo.png)|" \
-e "s|__EWORM__|$(realpath --relative-to="${RELTO}" general/eworm-meadow.avif)|" \
-e "s|__QR_CODE__|$(realpath --relative-to="${RELTO}" general/qr-code.png)|" \
-e "s|__CLIPBOARD__|$(realpath --relative-to="${RELTO}" general/clipboard.js)|" \
-e "s|__GENERAL__|$(realpath --relative-to="${RELTO}" general/)|" \
-e "s|__ROOT__|$(realpath --relative-to="${RELTO}" ./)|" \
< "${0}.d/head.html"
markdown -f toc,idanchor "${1}" | sed \
-e 's/href="\([-_\./[:alnum:]]*\)\.md\(#[-[:alnum:]]*\)\?"/href="\1.html\2"/g' \
-e '/<h[1234] /s| id="\(.*\)">| id="\L\1">|' \
-e '/<h[1234] /s|-2c-||g' -e '/<h[1234] /s|--26-amp-3b-||g' \
-e '/<h[1234] /s|-2[7cd]-||g' -e '/<h[1234] /s|--26-amp-3b-||g' \
-e '/^<pre>/s|pre|pre onclick="CopyToClipboard(this)"|g' \
-e '/The above link may be broken on code hosting sites/s|blockquote|blockquote style="display: none;"|'

View file

@ -1,14 +1,14 @@
<!DOCTYPE html><html lang="en">
<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__">
<script type="text/javascript" src="__CLIPBOARD__"></script>
<link rel="stylesheet" type="text/css" href="__GENERAL__/style.css">
<link rel="icon" type="image/png" href="__ROOT__/logo.png">
<script type="text/javascript" src="__GENERAL__/clipboard.js"></script>
</head><body>
<table><tr>
<td><img src="__EWORM__" alt="eworm on meadow" /></td>
<td><img src="__QR_CODE__" alt="QR code: rsc.eworm.de" /></td>
<td><img src="__GENERAL__/eworm-meadow.avif" alt="eworm on meadow" /></td>
<td><img src="__GENERAL__/qr-code.png" alt="QR code: rsc.eworm.de" /></td>
<td class="head"><span class="top">RouterOS Scripts</span><br />
<span class="bottom">a collection of scripts for MikroTik RouterOS</span></td>
</tr></table>

View file

@ -18,7 +18,7 @@
<p><a href="../README.md">⬅️ Go back to main README</a></p>
<blockquote style="/*! display */"><p>💡️ <strong>Hint</strong>: This site or links
<blockquote style="/* display */"><p>💡️ <strong>Hint</strong>: This site or links
on it may be broken on code hosting sites. Use
<a href="https://rsc.eworm.de/main/contrib/logo-color.html">Logo Color Changer</a>
instead.</p></blockquote>

View file

@ -18,7 +18,7 @@
<p><a href="../README.md">⬅️ Go back to main README</a></p>
<blockquote style="/*! display */"><p>💡️ <strong>Hint</strong>: This site or links
<blockquote style="/* display */"><p>💡️ <strong>Hint</strong>: This site or links
on it may be broken on code hosting sites. Use
<a href="https://rsc.eworm.de/main/contrib/notification.html">Notification Generator</a>
instead.</p></blockquote>

8
contrib/static-html.sh Executable file
View file

@ -0,0 +1,8 @@
#!/bin/sh
set -e
sed -i \
-e '/href=/s|\.md|\.html|' \
-e '/blockquote/s|/\* display \*/|display: none;|' \
"${@}"

View file

@ -1,4 +1,8 @@
/* copy code to clipboard */
function CopyToClipboard(pre) {
pre.style.filter = 'invert(1)';
navigator.clipboard.writeText(pre.firstElementChild.innerHTML);
setTimeout(function() {
pre.style.filter = 'invert(0)';
}, 100);
}

View file

@ -69,6 +69,12 @@ pre code {
padding: 0;
border: 0;
}
pre::before {
content: "📋 Copy!";
float: right;
border: 1px solid #ccc;
border-radius: 3px;
}
span.link {
color: #863600;
}

View file

@ -132,7 +132,7 @@
}
:if ($AllDone = true && $QueueLen = [ :len $EmailQueue ]) do={
/system/scheduler/remove $Scheduler;
/system/scheduler/remove [ find where name="_FlushEmailQueue" ];
:set EmailQueue;
:return true;
}