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)

This commit is contained in:
Danielle McLean 2017-10-02 21:23:10 +11:00
parent c996018486
commit 0f8a553b51
Signed by: 00dani
GPG key ID: 3844A6973C6058F1
3 changed files with 2 additions and 5 deletions

View file

@ -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 <a rel="license" href="//creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a>.'
#analytics: UA-YOURCODE

View file

@ -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.

View file

@ -47,4 +47,5 @@ $else
<footer .footer>
<div .container>
<p .text-muted>
#{appCopyright $ appSettings master}
All content on this site is licensed under a
<a rel="license" href="//creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a>.