diff --git a/Makefile b/Makefile index 2e3ba0d..bd6d302 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ commitinfo: global-functions.rsc docs: $(HTML) -%.html: %.md general/style.css contrib/html.sh contrib/html.sh.d/head.html contrib/html.sh.d/foot.html +%.html: %.md general/style.css contrib/html.sh contrib/html.sh.d/head.html contrib/html.sh $< > $@ rsc: $(GEN_RSC) diff --git a/README.d/04-import-scripts.avif b/README.d/04-import-scripts.avif index a5cfa7b..53439e4 100644 Binary files a/README.d/04-import-scripts.avif and b/README.d/04-import-scripts.avif differ diff --git a/contrib/Makefile b/contrib/Makefile index f704378..cdb9f4c 100644 --- a/contrib/Makefile +++ b/contrib/Makefile @@ -6,5 +6,8 @@ HTML := $(wildcard *.html) all: docs -docs: static-html.sh $(HTML) - ./static-html.sh $(HTML) +docs: $(HTML) + sed -i \ + -e '/href=/s|\.md|\.html|' \ + -e '/blockquote/s|/\*! display \*/|display: none;|' \ + $(HTML) diff --git a/contrib/html.sh b/contrib/html.sh index 5fbba45..cc83d63 100755 --- a/contrib/html.sh +++ b/contrib/html.sh @@ -6,14 +6,17 @@ RELTO="$(dirname "${1}")" sed \ -e "s|__TITLE__|$(head -n1 "${1}")|" \ - -e "s|__GENERAL__|$(realpath --relative-to="${RELTO}" general/)|" \ - -e "s|__ROOT__|$(realpath --relative-to="${RELTO}" ./)|" \ + -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)|" \ < "${0}.d/head.html" markdown -f toc,idanchor "${1}" | sed \ -e 's/href="\([-_\./[:alnum:]]*\)\.md\(#[-[:alnum:]]*\)\?"/href="\1.html\2"/g' \ -e '/| id="\L\1">|' \ - -e '//s|pre|pre onclick="CopyToClipboard(this)"|g' \ -e '/The above link may be broken on code hosting sites/s|blockquote|blockquote style="display: none;"|' diff --git a/contrib/html.sh.d/head.html b/contrib/html.sh.d/head.html index 656a63c..861a87b 100644 --- a/contrib/html.sh.d/head.html +++ b/contrib/html.sh.d/head.html @@ -1,14 +1,14 @@ RouterOS Scripts :: __TITLE__ - - - + + + - - + +
eworm on meadowQR code: rsc.eworm.deeworm on meadowQR code: rsc.eworm.de RouterOS Scripts
a collection of scripts for MikroTik RouterOS
diff --git a/contrib/logo-color.html b/contrib/logo-color.html index a45ea93..5516964 100644 --- a/contrib/logo-color.html +++ b/contrib/logo-color.html @@ -18,7 +18,7 @@

⬅️ Go back to main README

-

💡️ Hint: This site or links +

💡️ Hint: This site or links on it may be broken on code hosting sites. Use Logo Color Changer instead.

diff --git a/contrib/notification.html b/contrib/notification.html index a618f22..902d328 100644 --- a/contrib/notification.html +++ b/contrib/notification.html @@ -18,7 +18,7 @@

⬅️ Go back to main README

-

💡️ Hint: This site or links +

💡️ Hint: This site or links on it may be broken on code hosting sites. Use Notification Generator instead.

diff --git a/contrib/static-html.sh b/contrib/static-html.sh deleted file mode 100755 index 2c6f595..0000000 --- a/contrib/static-html.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -set -e - -sed -i \ - -e '/href=/s|\.md|\.html|' \ - -e '/blockquote/s|/\* display \*/|display: none;|' \ - "${@}" diff --git a/general/clipboard.js b/general/clipboard.js index 9324be8..c392df7 100644 --- a/general/clipboard.js +++ b/general/clipboard.js @@ -1,8 +1,4 @@ /* 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); } diff --git a/general/style.css b/general/style.css index 191c0f6..ea9b111 100644 --- a/general/style.css +++ b/general/style.css @@ -69,12 +69,6 @@ pre code { padding: 0; border: 0; } -pre::before { - content: "📋 Copy!"; - float: right; - border: 1px solid #ccc; - border-radius: 3px; -} span.link { color: #863600; } diff --git a/mod/notification-email.rsc b/mod/notification-email.rsc index 668daba..7c3a6ff 100644 --- a/mod/notification-email.rsc +++ b/mod/notification-email.rsc @@ -132,7 +132,7 @@ } :if ($AllDone = true && $QueueLen = [ :len $EmailQueue ]) do={ - /system/scheduler/remove [ find where name="_FlushEmailQueue" ]; + /system/scheduler/remove $Scheduler; :set EmailQueue; :return true; }