making things work

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

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 <http://www.gnu.org/licenses/>.
 
+module Handler.About where
+
 import Import
 
 getAboutR :: Handler Html
-getAboutR =
+getAboutR = do
+  master <- getYesod
   defaultLayout $
     $(widgetFile "about")
 

Import.hs

@@ -51,5 +51,8 @@ infixr 5 <>
 (<>) = mappend
 #endif
 
-version :: Text
+import Data.Version
-version = ""
+import qualified Paths_eidolon as P
+
+version :: String
+version = showVersion $ P.version

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 {..}
 

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

static/css/main.css

@@ -193,6 +193,10 @@ footer {
 	float: right;
 }
 
+ul, ol {
+	text-align: left;
+}
+
 @media (max-width: 755px) {
 	#main {
 		margin-top: 120px;

templates/about.hamlet

@@ -7,17 +7,14 @@ $newline always
     This software is licenced under the
     <a href="http://www.gnu.org/licenses/agpl-3.0">
       GNU Affero General Public License 3.0
-    .
   <p>
     The source code for this instance can be found at
-    <a href="#{appAfferoLink $ appSettings master} target=_blank>
+    <a href="#{appAfferoLink $ appSettings master}" target=_blank>
       #{appAfferoLink $ appSettings master}
-    .
   $maybe contact <- appContactEmail $ appSettings master
     <p>
       if you wish to contact the maintaner of this Eidolon, you can do it by
-      <a href="mailto:#{appContactEmail $ appSettings master}">
+      <a href="mailto:#{contact}">
         email
-      .
   <a href=@{ThreatR}>
     Data and threat analysis

templates/threat.hamlet

@@ -35,5 +35,5 @@ $newline always
     anonymous email account.
   <p>
     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.<br>Additionally the authentication mechanism does not
     need the password to be transmitted in clear text to the server.