diff --git a/website/apps/base/data.scm b/website/apps/base/data.scm index 0abcc7a..4ccca9a 100644 --- a/website/apps/base/data.scm +++ b/website/apps/base/data.scm @@ -13,7 +13,6 @@ ;;; Data. ;;; - (define contact-media (list ;; The first three will be featured in the home page. @@ -30,12 +29,18 @@ (contact #:name "Help Mailing List" #:description - '(p - "Subscribe to the Help mailing list to get support from the - GuixSD and GNU Guix community via email. " - (a (@ (href "https://lists.gnu.org/archive/html/guix-devel/2015-12/msg00584.html")) - "Until December 2015") - ", the Guix-devel mailing list filled that role.") + `(("en" + "Subscribe to the Help mailing list to get support from the GuixSD +and GNU Guix community via email. You can post messages in English though we +also accept other languages.") + ("eo" + "Subskribu al la retmesaĝolisto \"Help\" por demandi helpon pri +GuixSD kaj GNU Guix al la grupo. Vi povas skribi esperantlingve.") + ("fr" + "Abonnez-vous à la liste de diffusion « Help » pour obtenir l'aide +de la communauté sur GuixSD et GNU Guix par courrier électronique. Vous +pouvez envoyer des messages en Français.")) + #:url "https://lists.gnu.org/mailman/listinfo/help-guix" #:log "https://lists.gnu.org/archive/html/help-guix") diff --git a/website/apps/base/templates/components.scm b/website/apps/base/templates/components.scm index b329c71..04d3a08 100644 --- a/website/apps/base/templates/components.scm +++ b/website/apps/base/templates/components.scm @@ -13,6 +13,7 @@ #:use-module (apps base types) #:use-module (apps base utils) #:use-module (srfi srfi-1) + #:use-module (ice-9 match) #:export (breadcrumbs button-big button-little @@ -121,6 +122,11 @@ "…"))) +(define (language-tag lang) + `(span (@ (class "button-little button-little-active") + (style "float: left; text-align: center; width: 20px; vertical-align: middle")) + ,lang)) + (define (contact->shtml contact) "Return an SHTML representation of the given contact object. @@ -133,7 +139,18 @@ "" `(small " (" (a (@ (href ,(contact-log contact))) "archive") ") ")) - ,(contact-description contact))) + + ;; The description can be a list of language/blurb pairs. + ,(match (contact-description contact) + ((((? string? languages) blurbs) ...) + `(p ,@(map (lambda (language blurb) + `(div (@ (style "margin: 0 10px 10px 0")) + ,(language-tag language) + (div ,blurb))) + languages + blurbs))) + (blurb + blurb)))) (define* (horizontal-separator #:key (light #false)) diff --git a/website/apps/base/templates/contact.scm b/website/apps/base/templates/contact.scm index 16e4b4e..c246d4b 100644 --- a/website/apps/base/templates/contact.scm +++ b/website/apps/base/templates/contact.scm @@ -23,7 +23,8 @@ "Community" "Mailing lists" "IRC channels" "Bug reports" "Help") #:active-menu-item "About" #:css (list - (guix-url "static/base/css/page.css")) + (guix-url "static/base/css/page.css") + (guix-url "static/base/css/buttons.css")) #:crumbs (list (crumb "Contact" "./")) #:content `(main diff --git a/website/static/base/css/buttons.css b/website/static/base/css/buttons.css index 9e45190..feabcea 100644 --- a/website/static/base/css/buttons.css +++ b/website/static/base/css/buttons.css @@ -37,6 +37,7 @@ } +.button-little, .button-little:link, .button-little:visited { border-color: #C0C0C0; @@ -58,4 +59,4 @@ .button-little:hover { background-color: #FFCC00; border-color: #D4AA00; -} \ No newline at end of file +}