From 6ab02a7fdfc3ec1d6cac399622964a906db525f7 Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Tue, 18 Jun 2024 17:45:15 +0200 Subject: [PATCH 1/2] Add skip to content link --- src/main.lisp | 21 +++++++++++++++------ src/translate.lisp | 3 ++- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/main.lisp b/src/main.lisp index 3929852..7c9c9ae 100644 --- a/src/main.lisp +++ b/src/main.lisp @@ -4,6 +4,7 @@ (defpackage dev.metalisp.sbt (:use :cl) + (:import-from #:spinneret #:*html-lang*) (:export :*l10n* :find-l10n @@ -149,14 +150,22 @@ Example usage: (:link :type "text/css" :rel "stylesheet" :href ,(bs-url-css)) ,@(loop for url in add-css-urls collect `(:link :type "text/css" - :rel "stylesheet" :href ,url))) + :rel "stylesheet" :href ,url))) - (:body (:h1 :class "visually-hidden" ,title) - (:main ,@(if main-con (list :class "container") nil) ,@body) + (:body - (:script :src ,(bs-url-js)) - ,@(loop for url in add-js-urls - collect `(:script :src ,url)))))) + (:div :class "container text-center py-3" + (:a :href "#main-content" + :class "skip-link" + (find-l10n "skip-link" *html-lang* *l10n*))) + + (:h1 :class "visually-hidden" ,title) + (:main :id "main-content" + ,@(if main-con (list :class "container") nil) ,@body) + + (:script :src ,(bs-url-js)) + ,@(loop for url in add-js-urls + collect `(:script :src ,url)))))) (defun remove-special-chars (str) "Removes all special characters from the string STR except numbers and alphabets. diff --git a/src/translate.lisp b/src/translate.lisp index b820931..8ea7f04 100644 --- a/src/translate.lisp +++ b/src/translate.lisp @@ -70,7 +70,8 @@ ("subscribe" ("en" "Subscribe" "de" "Abonnieren" "fr" "S'abonner")) ("unsubscribe" ("en" "Unsubscribe" "de" "Abbestellen" "fr" "Se désabonner")) ("see-more" ("en" "See More" "de" "Mehr sehen" "fr" "Voir plus")) - ("see-less" ("en" "See Less" "de" "Weniger sehen" "fr" "Voir moins"))) + ("see-less" ("en" "See Less" "de" "Weniger sehen" "fr" "Voir moins")) + ("skip-link" ("en" "Skip to main content" "de" "Zum Hauptinhalt springen" "fr" "Aller au contenu principal"))) "Localization (l10n) settings for multi-language support.") (declaim (ftype (function (string string dict) string) find-l10n)) From e6f308581f734084a3678c2fdfd9030433383bbb Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Wed, 19 Jun 2024 18:16:25 +0200 Subject: [PATCH 2/2] Make symbols public --- src/main.lisp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main.lisp b/src/main.lisp index 7c9c9ae..46fb2e2 100644 --- a/src/main.lisp +++ b/src/main.lisp @@ -15,6 +15,8 @@ :*local-url-js* :*bs-version* :*color-theme* + :bs-url-css + :bs-url-js :download-bs-css :download-bs-js :write-html-to-file