Merge branch 'master' into 'live'

Include git hash in deployed site

See merge request !60

package.yaml

@@ -86,6 +86,7 @@ dependencies:
 - tz
 - system-locale
 - th-lift-instances
+- gitrev
 
 # The library contains all of our application code. The executable
 # defined below is just a thin wrapper.

src/Handler/Home.hs

@@ -29,6 +29,8 @@ import qualified Database.Esqueleto as E
 
 import Text.Shakespeare.Text
 
+import Development.GitRev
+
 -- import qualified Data.UUID.Cryptographic as UUID
 
 
@@ -196,9 +198,13 @@ homeUser uid = do
     $(widgetFile "dsgvDisclaimer")
 
 
-getVersionR :: Handler Html
+getVersionR :: Handler TypedContent
-getVersionR = do
+getVersionR = selectRep $ do
-  let features = $(widgetFile "featureList")
+    provideRep . defaultLayout $ do
-  changeLog <- withUrlRenderer $(textFile "ChangeLog.md")
+      let features = $(widgetFile "featureList")
-  defaultLayout $ do
+          gitInfo :: Text
-    $(widgetFile "versionHistory")
+          gitInfo  = $gitDescribe <> " (" <> $gitCommitDate <> ")"
+      changeLog <- withUrlRenderer $(textFile "ChangeLog.md")
+      $(widgetFile "versionHistory")
+    provideRep $
+      return ($gitDescribe :: Text)

templates/versionHistory.hamlet

@@ -8,9 +8,11 @@
         Vorabversion!
         Die Implementierung von
         Uni2work ist noch nicht abgeschlossen.
-  ^{features}
 
-  <p>
+  <section>
+    ^{features}
+
+  <section>
     <h2>
       Bekannte Bugs
     <ul>
@@ -21,13 +23,13 @@
       <li>
         Tabellen über mehrere Seiten müssen vor Seitenwechsel manuell sortiert werden
 
-  <p>
+  <section>
     <h2>
       Versionsgeschichte
-    <pre #changelog>
+    <p #changelog>
       #{changeLog}
 
-  <p>
+  <section>
     <h2>
       Impressum
 
@@ -46,3 +48,7 @@
         Ludwig-Maximilians-Universität München
       <li>
         Oettingenstr. 67, 80538 München
+
+  <section>
+    <p #gitrev>
+      #{gitInfo}

templates/versionHistory.lucius

@@ -1,4 +1,11 @@
 #changelog {
   font-size: 14px;
-  white-space: pre-line;
+  white-space: pre-wrap;
+  font-family: monospace;
+}
+
+#gitrev {
+  font-size: 12px;
+  white-space: pre-wrap;  
+  font-family: monospace;
 }