From c4b4eb91492db2950d7d6c08edab9b26fb8bf334 Mon Sep 17 00:00:00 2001 From: stuebinm Date: Mon, 28 Mar 2022 17:21:22 +0200 Subject: server: add a howto link --- config.toml | 1 + server/HtmlOrphans.hs | 6 ++++-- server/Server.hs | 2 ++ static/style.css | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/config.toml b/config.toml index d48953a..6523448 100644 --- a/config.toml +++ b/config.toml @@ -27,6 +27,7 @@ generation = 1 backlink_prefix = "world://lobby#start_" contact_mail = "world@muc.hacc.space" +howto_link = "https://di.c3voc.de/howto:world" # linter's config for this org lintconfig = "./config.json" diff --git a/server/HtmlOrphans.hs b/server/HtmlOrphans.hs index dad2954..c6f74d5 100644 --- a/server/HtmlOrphans.hs +++ b/server/HtmlOrphans.hs @@ -31,7 +31,7 @@ import Lucid.Html5 (a_, body_, button_, class_, code_, disabled_, onclick_, p_, rel_, script_, span_, src_, title_, type_, ul_) import Server (JobStatus (..), - Org (Org, orgBacklinkPrefix, orgContactMail, orgSlug), + Org (Org, orgBacklinkPrefix, orgContactMail, orgHowtoLink, orgSlug), RemoteRef (RemoteRef, reponame, reporef, repourl), prettySha, unState) import Types (Hint (Hint), Level (..)) @@ -61,7 +61,9 @@ instance ToHtml (Org True, RemoteRef, JobStatus, Maybe JobStatus) where "Linter Result" if pending then button_ [class_ "btn btn-primary btn-disabled", disabled_ "true"] "pending …" - else button_ [onclick_ "relint()", class_ "btn btn-primary", id_ "relint_button"] "relint now" + else button_ [onclick_ "relint()", class_ "btn btn-primary", id_ "relint_button"] "Relint" + whenJust orgHowtoLink $ \link -> + a_ [class_ "btn btn-primary", href_ link] "Howto" a_ [class_ "btn btn-primary" , href_ ("mailto:" <> orgContactMail <> "?subject=[Help-walint] " <> reponame <> " " <> rev)] "Help?" diff --git a/server/Server.hs b/server/Server.hs index 48a7170..0c09314 100644 --- a/server/Server.hs +++ b/server/Server.hs @@ -101,6 +101,7 @@ data Org (loaded :: Bool) = Org , orgWebdir :: Text , orgBacklinkPrefix :: Text , orgContactMail :: Text + , orgHowtoLink :: Maybe Text } deriving (Generic) instance NFData (LintConfig Skeleton) => NFData (Org True) @@ -164,6 +165,7 @@ orgCodec = Org <*> T.text "webdir" .= orgWebdir <*> T.text "backlink_prefix" .= orgBacklinkPrefix <*> T.text "contact_mail" .= orgContactMail + <*> coerce (T.first T.text "howto_link") .= orgHowtoLink -- why exactly does everything in tomland need to be invertable urlBimap :: TomlBiMap BaseUrl String diff --git a/static/style.css b/static/style.css index c2846ce..b2e6db2 100644 --- a/static/style.css +++ b/static/style.css @@ -16,7 +16,7 @@ body { } .btn { - margin-left: 2em; + margin-left: 1em; font-family: Ubuntu; } -- cgit v1.2.3