diff --git a/Application.hs b/Application.hs index c12c3dc..1a587b8 100755 --- a/Application.hs +++ b/Application.hs @@ -69,6 +69,7 @@ import Handler.AdminComments import Handler.Tag import Handler.RootFeed -- import Handler.Search +import Handler.About -- This line actually creates our YesodDispatch instance. It is the second half -- of the call to mkYesodData which occurs in Foundation.hs. Please see the diff --git a/Handler/About.hs b/Handler/About.hs index 63a994f..1e3408d 100644 --- a/Handler/About.hs +++ b/Handler/About.hs @@ -14,10 +14,13 @@ -- You should have received a copy of the GNU Affero General Public License -- along with this program. If not, see . +module Handler.About where + import Import getAboutR :: Handler Html -getAboutR = +getAboutR = do + master <- getYesod defaultLayout $ $(widgetFile "about") diff --git a/Import.hs b/Import.hs index 1aabeee..86f07d8 100755 --- a/Import.hs +++ b/Import.hs @@ -51,5 +51,8 @@ infixr 5 <> (<>) = mappend #endif -version :: Text -version = "" +import Data.Version +import qualified Paths_eidolon as P + +version :: String +version = showVersion $ P.version diff --git a/Settings.hs b/Settings.hs index e47db56..ffb740f 100755 --- a/Settings.hs +++ b/Settings.hs @@ -97,14 +97,14 @@ instance FromJSON AppSettings where appMutableStatic <- o .:? "mutable-static" .!= defaultDev appSkipCombining <- o .:? "skip-combining" .!= defaultDev - appAfferoLink <- o .: "copyrightLink" + appAfferoLink <- o .: "afferoLink" appAnalytics <- o .:? "analytics" appSignupBlocked <- o .: "signupBlocked" appTos1 <- o .: "tos1" appTos2 <- o .: "tos2" - appContact <- o .:? "contactEmail" + appContactEmail <- o .:? "contactEmail" return AppSettings {..} diff --git a/eidolon.cabal b/eidolon.cabal index 74d0a07..ee39655 100755 --- a/eidolon.cabal +++ b/eidolon.cabal @@ -20,6 +20,7 @@ Flag library-only Default: False library + other-modules: Paths_eidolon exposed-modules: Application Foundation Helper @@ -51,6 +52,7 @@ library Handler.RootFeed Handler.Commons -- Handler.Search + Handler.About if flag(dev) || flag(library-only) cpp-options: -DDEVELOPMENT diff --git a/static/css/main.css b/static/css/main.css index f2ebe10..df5c7fe 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -193,6 +193,10 @@ footer { float: right; } +ul, ol { + text-align: left; +} + @media (max-width: 755px) { #main { margin-top: 120px; diff --git a/templates/about.hamlet b/templates/about.hamlet index 8553319..12bb4c9 100644 --- a/templates/about.hamlet +++ b/templates/about.hamlet @@ -7,17 +7,14 @@ $newline always This software is licenced under the GNU Affero General Public License 3.0 - .

- The source code for this instance canbe found at - #{appAfferoLink $ appSettings master} - . $maybe contact <- appContactEmail $ appSettings master

if you wish to contact the maintaner of this Eidolon, you can do it by - + email - . Data and threat analysis diff --git a/templates/threat.hamlet b/templates/threat.hamlet index f5c46b1..b078c7d 100644 --- a/templates/threat.hamlet +++ b/templates/threat.hamlet @@ -35,5 +35,5 @@ $newline always anonymous email account.

Passwords are stored salted and hashed in the database rendering them - useless to an attacker. Additionally the authentication mechanism does not + useless to an attacker.
Additionally the authentication mechanism does not need the password to be transmitted in clear text to the server.