From 0f8a553b5142eb62f6f8b9c9c5b818b1318170bc Mon Sep 17 00:00:00 2001 From: Danielle McLean Date: Mon, 2 Oct 2017 21:23:10 +1100 Subject: [PATCH] Remove the copyright setting from settings.yml and put it in the layout directly, since it needs to contain HTML (a link to the license) --- config/settings.yml | 1 - src/Settings.hs | 3 --- templates/default-layout.hamlet | 3 ++- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/config/settings.yml b/config/settings.yml index 87604c6..4c45d29 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -31,5 +31,4 @@ database: database: "_env:MYSQL_DATABASE:lebd" poolsize: "_env:MYSQL_POOLSIZE:10" -copyright: 'All content on this site is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License.' #analytics: UA-YOURCODE diff --git a/src/Settings.hs b/src/Settings.hs index 110a8be..7e4aecb 100644 --- a/src/Settings.hs +++ b/src/Settings.hs @@ -59,8 +59,6 @@ data AppSettings = AppSettings -- ^ Perform no stylesheet/script combining -- Example app-specific configuration values. - , appCopyright :: Text - -- ^ Copyright text to appear in the footer of the page , appAnalytics :: Maybe Text -- ^ Google Analytics code @@ -91,7 +89,6 @@ instance FromJSON AppSettings where appMutableStatic <- o .:? "mutable-static" .!= defaultDev appSkipCombining <- o .:? "skip-combining" .!= defaultDev - appCopyright <- o .: "copyright" appAnalytics <- o .:? "analytics" -- This code enables MySQL's strict mode, without which MySQL will truncate data. diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet index e61e01a..faf4277 100644 --- a/templates/default-layout.hamlet +++ b/templates/default-layout.hamlet @@ -47,4 +47,5 @@ $else