diff --git a/action.php b/action.php index 2f27af2..c38ea2f 100644 --- a/action.php +++ b/action.php @@ -270,6 +270,10 @@ class action_plugin_botmon extends DokuWiki_Action_Plugin { echo DOKU_TAB . '};' . NL; echo '' . NL; + + // insert a warning message for users without JavaScript: + echo '

' . $this->getLang('bm_noJsWarning') . '

' . NL; + } } diff --git a/captcha.js b/captcha.js index 4a72efe..8a059e2 100644 --- a/captcha.js +++ b/captcha.js @@ -6,6 +6,11 @@ const $BMCaptcha = { init: function() { + + // hide the NoJS warning: + document.getElementById('BM__NoJSWarning').close(); + + // install the captcha: document.getElementsByTagName('body')[0].classList.add('botmon_captcha'); $BMCaptcha._cbDly = 1.5; $BMCaptcha.install() diff --git a/config/known-ipranges.json b/config/known-ipranges.json index 11449a3..3d26f0f 100644 --- a/config/known-ipranges.json +++ b/config/known-ipranges.json @@ -6,7 +6,6 @@ {"id": "brasilnet", "name": "BrasilNet"}, {"id": "charter", "name": "Charter Inc. Range"}, {"id": "chinanet", "name": "ChinaNet"}, - {"id": "cloudflare", "name": "Cloudflare Network"}, {"id": "cnisp", "name": "China ISP Range"}, {"id": "cnmob", "name": "China Mobile"}, {"id": "domtehniki", "name": "Dom Tehniki / WS Telecom"}, @@ -108,7 +107,6 @@ {"from": "2603:8000::::::", "to": "2603:80ff:ffff:ffff:ffff:ffff:ffff:ffff", "m": 24, "g": "charter"}, {"from": "2607:a400::::::", "to": "2607:a400:ffff:ffff:ffff:ffff:ffff:ffff", "m": 32, "g": "zenlayer"}, {"from": "2804:::::::", "to": "2804:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF", "m": 16, "g": "misc_sa"}, - {"from": "2a09:bac3::::::", "to": "2a09:bac3:ffff:ffff:ffff:ffff:ffff:ffff", "m": 32,"g": "cloudflare"}, {"from": "2a0a:4cc0::::::", "to": "2a0a:4cc0:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF", "g": "netcup"} ] } \ No newline at end of file diff --git a/lang/de/lang.php b/lang/de/lang.php index 1c6bd10..f84a16e 100644 --- a/lang/de/lang.php +++ b/lang/de/lang.php @@ -12,3 +12,4 @@ $lang['bm_dlgConfirm'] = 'Klicke, um zu bestätigen.'; $lang['bm_dlgChecking'] = 'Wird überprüft …'; $lang['bm_dlgLoading'] = 'Seite wird geladen …'; $lang['bm_dlgError'] = 'Es ist ein Fehler aufgetreten.'; +$lang['bm_noJsWarning'] = 'Bitte aktivieren Sie JavaScript, um diese Seite anzuzeigen.'; diff --git a/lang/en/lang.php b/lang/en/lang.php index b5b9334..d455fde 100644 --- a/lang/en/lang.php +++ b/lang/en/lang.php @@ -12,3 +12,4 @@ $lang['bm_dlgConfirm'] = 'Click to confirm.'; $lang['bm_dlgChecking'] = 'Checking …'; $lang['bm_dlgLoading'] = 'Loading page …'; $lang['bm_dlgError'] = 'An error occured.'; +$lang['bm_noJsWarning'] = 'This page requires JavaScript to be enabled.'; diff --git a/lang/fr/lang.php b/lang/fr/lang.php new file mode 100644 index 0000000..b8af382 --- /dev/null +++ b/lang/fr/lang.php @@ -0,0 +1,9 @@ + + */ + +// Captcha dialog locale strings: +$lang['bm_noJsWarning'] = 'Veuillez activer JavaScript pour afficher cette page.'; diff --git a/style.less b/style.less index 593404c..67a5325 100644 --- a/style.less +++ b/style.less @@ -106,7 +106,19 @@ body.botmon_captcha { } } -// smaller screens: +// no js warning +#BM__NoJSWarning { + position: fixed; + bottom: calc(50vh - 2.5rem); + width: 100%; max-width: fit-content; + margin: 0 auto; + padding: .25rem 1rem; + border-radius: .5rem; + border: red solid 2pt; + box-shadow: rgba(128, 0, 0, 0.5) .25rem .25rem .5rem; +} + +// captcha on smaller screens: @media (max-width: 480px) { body.botmon_captcha #botmon_captcha_box { width: 100vw;