diff --git a/messages/uniworx/de.msg b/messages/uniworx/de.msg index 259162ce0..7f0df9e9a 100644 --- a/messages/uniworx/de.msg +++ b/messages/uniworx/de.msg @@ -700,6 +700,8 @@ MenuInformation: Informationen MenuImpressum: Impressum MenuDataProt: Datenschutz MenuVersion: Versionsgeschichte +MenuInstance: Instanz-Identifikation +MenuHealth: Instanz-Zustand MenuHelp: Hilfe MenuProfile: Anpassen MenuLogin: Login @@ -881,4 +883,10 @@ HealthReport: Instanz-Zustand InstanceIdentification: Instanz-Identifikation InstanceId: Instanz-Nummer -ClusterId: Cluster-Nummer \ No newline at end of file +ClusterId: Cluster-Nummer + +HealthMatchingClusterConfig: Cluster-geteilte Konfiguration ist aktuell +HealthHTTPReachable: Cluster kann an der erwarteten URL über HTTP erreicht werden +HealthLDAPAdmins: Anteil der Administratoren, die im LDAP-Verzeichnis gefunden werden können +HealthSMTPConnect: SMTP-Server kann erreicht werden +HealthWidgetMemcached: Memcached-Server liefert Widgets korrekt aus \ No newline at end of file diff --git a/src/Foundation.hs b/src/Foundation.hs index 1560cab35..d7b1060ae 100644 --- a/src/Foundation.hs +++ b/src/Foundation.hs @@ -1655,6 +1655,26 @@ pageActions (VersionR) = [ , menuItemAccessCallback' = return True } ] +pageActions HealthR = [ + MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgMenuInstance + , menuItemIcon = Nothing + , menuItemRoute = SomeRoute InstanceR + , menuItemModal = False + , menuItemAccessCallback' = return True + } + ] +pageActions InstanceR = [ + MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgMenuHealth + , menuItemIcon = Nothing + , menuItemRoute = SomeRoute HealthR + , menuItemModal = False + , menuItemAccessCallback' = return True + } + ] pageActions (HelpR) = [ -- MenuItem -- { menuItemType = PageActionPrime diff --git a/src/Handler/Health.hs b/src/Handler/Health.hs index d21b7734a..f3d5b4007 100644 --- a/src/Handler/Health.hs +++ b/src/Handler/Health.hs @@ -7,6 +7,8 @@ import qualified Data.Text.Lazy.Builder as Builder import Utils.Lens +import qualified Data.UUID as UUID + getHealthR :: Handler TypedContent getHealthR = do @@ -24,10 +26,24 @@ getHealthR = do provideRep $ siteLayoutMsg MsgHealthReport $ do setTitleI MsgHealthReport - let report' = Aeson.encodePrettyToTextBuilder healthReport + let HealthReport{..} = healthReport [whamlet| -
- #{report'}
+ $newline never
+