diff --git a/package.yaml b/package.yaml index 6f6de5fd2..2133c682c 100644 --- a/package.yaml +++ b/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. diff --git a/src/Handler/Home.hs b/src/Handler/Home.hs index de28d7927..0448c1718 100644 --- a/src/Handler/Home.hs +++ b/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 = do - let features = $(widgetFile "featureList") - changeLog <- withUrlRenderer $(textFile "ChangeLog.md") - defaultLayout $ do - $(widgetFile "versionHistory") +getVersionR :: Handler TypedContent +getVersionR = selectRep $ do + provideRep . defaultLayout $ do + let features = $(widgetFile "featureList") + gitInfo :: Text + gitInfo = $gitDescribe <> " (" <> $gitCommitDate <> ")" + changeLog <- withUrlRenderer $(textFile "ChangeLog.md") + $(widgetFile "versionHistory") + provideRep $ + return ($gitDescribe :: Text) diff --git a/templates/versionHistory.hamlet b/templates/versionHistory.hamlet index 09ce83f3b..0ce080032 100644 --- a/templates/versionHistory.hamlet +++ b/templates/versionHistory.hamlet @@ -8,9 +8,11 @@ Vorabversion! Die Implementierung von Uni2work ist noch nicht abgeschlossen. - ^{features} -
+
+
#{changeLog}
-
+
+ #{gitInfo}
diff --git a/templates/versionHistory.lucius b/templates/versionHistory.lucius
index a6ef22367..60203fcc4 100644
--- a/templates/versionHistory.lucius
+++ b/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;
}
Bekannte Bugs
@@ -21,13 +23,13 @@
Versionsgeschichte
-
+
Impressum
@@ -46,3 +48,7 @@
Ludwig-Maximilians-Universität München