diff --git a/.gitignore b/.gitignore index 8abdc284..9d27373a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ *.rej # html files (as generated from markdown) +style.css *.html # checksums file as used by $ScriptInstallUpdate diff --git a/Makefile b/Makefile index f841ca2b..e376e568 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ ALL_RSC := $(wildcard *.rsc */*.rsc) GEN_RSC := $(wildcard *.capsman.rsc *.local.rsc *.wifi.rsc) MARKDOWN := $(wildcard *.md doc/*.md doc/mod/*.md) -HTML := $(MARKDOWN:.md=.html) +HTML := $(MARKDOWN:.md=.html) style.css .PHONY: all checksums docs rsc clean @@ -19,7 +19,10 @@ checksums.json: contrib/checksums.sh $(ALL_RSC) docs: $(HTML) -%.html: %.md general/style.css 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 $< > $@ rsc: $(GEN_RSC) diff --git a/general/qr-code.png b/README.d/upstream.png similarity index 100% rename from general/qr-code.png rename to README.d/upstream.png diff --git a/README.md b/README.md index 36408ec6..b77538dd 100644 --- a/README.md +++ b/README.md @@ -404,7 +404,7 @@ immediately remove the link in question. Upstream -------- -[![upstream](general/qr-code.png)](https://rsc.eworm.de/) +[![upstream](README.d/upstream.png)](https://rsc.eworm.de/) URL: [GitHub.com](https://github.com/eworm-de/routeros-scripts#routeros-scripts) diff --git a/contrib/Makefile b/contrib/Makefile deleted file mode 100644 index aae31786..00000000 --- a/contrib/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# Makefile - -HTML := $(wildcard *.html) - -.PHONY: all docs - -all: docs - -docs: $(HTML) - sed -i '/href=/s|\.md|\.html|' $(HTML) diff --git a/general/style.css b/contrib/general/style.css similarity index 82% rename from general/style.css rename to contrib/general/style.css index 016ca631..7ee47bbd 100644 --- a/general/style.css +++ b/contrib/general/style.css @@ -5,6 +5,12 @@ body { font-size: 10pt; line-height: 1.6; } +@media only screen and (orientation: landscape) { + body { + margin-left: 10vw; + margin-right: 10vw; + } +} h2 { border-bottom: 1px solid #ccc; color: #000; @@ -18,7 +24,7 @@ a:hover { blockquote { border-left: 4px solid #ccc; padding: 0 10px; - color: #555; + color: #777; } code { margin: 0 2px; @@ -29,7 +35,7 @@ code { } div.notification { position: relative; - float: none; + float: right; width: 600px; border: 3px outset #6c5d53; /* border-radius: 5px; */ @@ -68,24 +74,3 @@ pre code { span.link { color: #863600; } -td.head-top { - height: 48px; - vertical-align: bottom; - font-size: 250%; - font-weight: bold; -} -td.head-bottom { - height: 48px; - vertical-align: top; - font-size: 125%; - color: #555; -} -@media only screen and (orientation: landscape) { - body { - margin-left: 10vw; - margin-right: 10vw; - } - div.notification { - float: right; - } -} diff --git a/contrib/html.sh b/contrib/html.sh index 6276df1a..bd15bf04 100755 --- a/contrib/html.sh +++ b/contrib/html.sh @@ -5,13 +5,11 @@ set -e RELTO="$(dirname "${1}")" sed \ -e "s|__TITLE__|$(head -n1 "${1}")|" \ - -e "s|__STYLE__|$(realpath --relative-to="${RELTO}" general/style.css)|" \ + -e "s|__STYLE__|$(realpath --relative-to="${RELTO}" 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)|" \ < "${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 '/' diff --git a/contrib/html.sh.d/head.html b/contrib/html.sh.d/head.html index 1d4f93a3..0ce3ff73 100644 --- a/contrib/html.sh.d/head.html +++ b/contrib/html.sh.d/head.html @@ -4,14 +4,3 @@ - - - - - - - - - -
eworm on meadowQR code: rsc.eworm.deRouterOS Scripts
a collection of scripts for MikroTik RouterOS
-
diff --git a/contrib/logo-color.html b/contrib/logo-color.html index f824e2d4..78d19e6c 100644 --- a/contrib/logo-color.html +++ b/contrib/logo-color.html @@ -1,14 +1,14 @@ RouterOS Scripts :: Logo Color Changer - +

Logo Color Changer

-

⬅️ Go back to main README

+

⬅️ Go back to main README

You want the logo for your own notifications? But you joined the Telegram Group and want @@ -24,20 +24,20 @@ something that differentiates? Color it!

Then right-click, click "Take Screenshot" and finally select the logo and download it.

-

Screenshot Browser 01

-

Screenshot Browser 02

-

Screenshot Browser 03

+

Screenshot Browser 01 +Screenshot Browser 02 +Screenshot Browser 03

(This example is with Firefox. The workflow for other browsers may differ.)

See how to -Set +Set a profile photo for your Telegram bot.

-

⬅️ Go back to main README
+

⬅️ Go back to main README
⬆️ Go back to top

diff --git a/contrib/notification.html b/contrib/notification.html index a4d04864..298e3bdd 100644 --- a/contrib/notification.html +++ b/contrib/notification.html @@ -1,14 +1,14 @@ RouterOS Scripts :: Notification Generator - +

Notification Generator

-

⬅️ Go back to main README

+

⬅️ Go back to main README

@@ -33,6 +33,6 @@ notification and download it.

-

⬅️ Go back to main README
+

⬅️ Go back to main README
⬆️ Go back to top

diff --git a/doc/mod/notification-telegram.md b/doc/mod/notification-telegram.md index 05180b2a..804104fa 100644 --- a/doc/mod/notification-telegram.md +++ b/doc/mod/notification-telegram.md @@ -107,7 +107,7 @@ chat with [BotFather ↗️](https://t.me/BotFather) and set it there. ![set profile photo](notification-telegram.d/setuserpic.avif) Have a look at my -[RouterOS-Scripts Logo Color Changer](../../contrib/logo-color.html) +[RouterOS-Scripts Logo Color Changer](https://git.eworm.de/cgit/routeros-scripts/plain/contrib/logo-color.html) to create a colored version of this scripts' logo. See also diff --git a/general/eworm-meadow.avif b/general/eworm-meadow.avif deleted file mode 100644 index f592d59b..00000000 Binary files a/general/eworm-meadow.avif and /dev/null differ