diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg index 18f1d62c3..dde4219b2 100644 --- a/messages/uniworx/de-de-formal.msg +++ b/messages/uniworx/de-de-formal.msg @@ -490,9 +490,7 @@ ProfileFor: Benutzereinstellungen für ProfileDataHeading: Gespeicherte Benutzerdaten InfoHeading: Informationen VersionHeading: Versionsgeschichte -ImpressumHeading: Impressum -DataProtHeading: Datenschutzerklärung -TermsUseHeading: Nutzungsbedingungen +LegalHeading: Rechtliche Informationen SystemMessageHeading: Uni2work Statusmeldung SystemMessageListHeading: Uni2work Statusmeldungen NotificationSettingsHeading displayName@Text: Benachrichtigungs-Einstellungen für #{displayName} @@ -1103,9 +1101,11 @@ MenuOpenCourses: Kurse mit offener Registrierung MenuOpenAllocations: Aktive Zentralanmeldungen MenuHome: Aktuell MenuInformation: Informationen -MenuImpressum: Impressum -MenuDataProt: Datenschutz +MenuLegal: Rechtliche Informationen +MenuDataProt: Datenschutzerklärung MenuTermsUse: Nutzungsbedingungen +MenuCopyright: Urheberrecht +MenuImprint: Impressum MenuVersion: Versionsgeschichte MenuInstance: Instanz-Identifikation MenuHealth: Instanz-Zustand diff --git a/messages/uniworx/en-eu.msg b/messages/uniworx/en-eu.msg index 377416b63..3810b4bbe 100644 --- a/messages/uniworx/en-eu.msg +++ b/messages/uniworx/en-eu.msg @@ -488,9 +488,7 @@ ProfileFor: Settings for ProfileDataHeading: Personal information InfoHeading: Information VersionHeading: Version history -ImpressumHeading: Imprint -DataProtHeading: Data protection -TermsUseHeading: Terms of use +LegalHeading: Legal SystemMessageHeading: Uni2work system message SystemMessageListHeading: Uni2work system message NotificationSettingsHeading displayName: Notification settings for #{displayName} @@ -1102,9 +1100,11 @@ MenuOpenCourses: Courses with open registration MenuOpenAllocations: Active central allocations MenuHome: Home MenuInformation: Information -MenuImpressum: Imprint +MenuLegal: Legal MenuDataProt: Data protection MenuTermsUse: Terms of use +MenuCopyright: Copyright +MenuImprint: Imprint MenuVersion: Version history MenuInstance: Instance identification MenuHealth: Instance health diff --git a/routes b/routes index 6db3e14ab..bb73c541a 100644 --- a/routes +++ b/routes @@ -62,11 +62,9 @@ /instance InstanceR GET !free /info InfoR GET !free /info/lecturer InfoLecturerR GET !lecturer -/info/data DataProtR GET !free -/info/termsofuse TermsUseR GET !free +/info/legal LegalR GET !free /info/allocation InfoAllocationR GET !free /info/glossary GlossaryR GET !free -/impressum ImpressumR GET !free /version VersionR GET !free /help HelpR GET POST !free diff --git a/src/Foundation.hs b/src/Foundation.hs index d21b3e8db..31c66f347 100644 --- a/src/Foundation.hs +++ b/src/Foundation.hs @@ -1757,10 +1757,8 @@ instance YesodBreadcrumbs UniWorX where breadcrumb InfoR = i18nCrumb MsgMenuInformation Nothing breadcrumb InfoLecturerR = i18nCrumb MsgInfoLecturerTitle $ Just InfoR - breadcrumb DataProtR = i18nCrumb MsgMenuDataProt $ Just InfoR - breadcrumb TermsUseR = i18nCrumb MsgMenuTermsUse $ Just InfoR + breadcrumb LegalR = i18nCrumb MsgMenuLegal $ Just InfoR breadcrumb InfoAllocationR = i18nCrumb MsgBreadcrumbAllocationInfo $ Just InfoR - breadcrumb ImpressumR = i18nCrumb MsgMenuImpressum $ Just InfoR breadcrumb VersionR = i18nCrumb MsgMenuVersion $ Just InfoR @@ -1974,8 +1972,8 @@ defaultLinks = fmap catMaybes . mapM runMaybeT $ -- Define the menu items of the , return MenuItem { menuItemType = Footer , menuItemLabel = MsgMenuDataProt - , menuItemIcon = Just "shield" - , menuItemRoute = SomeRoute DataProtR + , menuItemIcon = Nothing + , menuItemRoute = SomeRoute $ LegalR :#: ("data-protection" :: Text) , menuItemModal = False , menuItemAccessCallback' = return True } @@ -1983,15 +1981,23 @@ defaultLinks = fmap catMaybes . mapM runMaybeT $ -- Define the menu items of the { menuItemType = Footer , menuItemLabel = MsgMenuTermsUse , menuItemIcon = Nothing - , menuItemRoute = SomeRoute TermsUseR + , menuItemRoute = SomeRoute $ LegalR :#: ("terms-of-use" :: Text) , menuItemModal = False , menuItemAccessCallback' = return True } , return MenuItem { menuItemType = Footer - , menuItemLabel = MsgMenuImpressum + , menuItemLabel = MsgMenuCopyright + , menuItemIcon = Nothing + , menuItemRoute = SomeRoute $ LegalR :#: ("copyright" :: Text) + , menuItemModal = False + , menuItemAccessCallback' = return True + } + , return MenuItem + { menuItemType = Footer + , menuItemLabel = MsgMenuImprint , menuItemIcon = Just "file-signature" - , menuItemRoute = SomeRoute ImpressumR + , menuItemRoute = SomeRoute $ LegalR :#: ("imprint" :: Text) , menuItemModal = False , menuItemAccessCallback' = return True } @@ -2257,6 +2263,14 @@ pageActions (InfoR) = [ , menuItemModal = False , menuItemAccessCallback' = return True } + , MenuItem + { menuItemType = PageActionPrime + , menuItemLabel = MsgMenuLegal + , menuItemIcon = Nothing + , menuItemRoute = SomeRoute LegalR + , menuItemModal = False + , menuItemAccessCallback' = return True + } , MenuItem { menuItemType = PageActionPrime , menuItemLabel = MsgMenuGlossary @@ -3073,12 +3087,8 @@ pageHeading (AdminErrMsgR) pageHeading (InfoR) = Just $ i18nHeading MsgInfoHeading -pageHeading (DataProtR) - = Just $ i18nHeading MsgDataProtHeading -pageHeading (TermsUseR) - = Just $ i18nHeading MsgTermsUseHeading -pageHeading (ImpressumR) - = Just $ i18nHeading MsgImpressumHeading +pageHeading (LegalR) + = Just $ i18nHeading MsgLegalHeading pageHeading (VersionR) = Just $ i18nHeading MsgVersionHeading diff --git a/src/Handler/Info.hs b/src/Handler/Info.hs index 656d75b52..c7cc7adc6 100644 --- a/src/Handler/Info.hs +++ b/src/Handler/Info.hs @@ -16,28 +16,13 @@ getVersionR = selectRep $ do return ($gitDescribe :: Text) provideRep getInfoR --- | Impressum -getImpressumR :: Handler Html -getImpressumR = -- do - siteLayoutMsg' MsgMenuImpressum $ do - setTitleI MsgImpressumHeading - $(i18nWidgetFile "imprint") - --- | Hinweise zu Datenschutz und Aufbewahrungspflichten -getDataProtR :: Handler Html -getDataProtR = -- do - siteLayoutMsg' MsgMenuDataProt $ do - setTitleI MsgDataProtHeading - $(i18nWidgetFile "data-protection") - - --- | Nutzungsbedingungen -getTermsUseR :: Handler Html -getTermsUseR = - siteLayoutMsg' MsgMenuTermsUse $ do - setTitleI MsgTermsUseHeading - $(i18nWidgetFile "terms-of-use") +-- | Datenschutzerklaerung und Aufbewahrungspflichten, Nutzungsbedingungen, Urheberrecht, Impressum +getLegalR :: Handler Html +getLegalR = + siteLayoutMsg' MsgMenuLegal $ do + setTitleI MsgLegalHeading + $(i18nWidgetFile "legal") -- | Allgemeine Informationen diff --git a/templates/i18n/imprint/de-de-formal.hamlet b/templates/i18n/imprint/de-de-formal.hamlet deleted file mode 100644 index edf3db796..000000000 --- a/templates/i18n/imprint/de-de-formal.hamlet +++ /dev/null @@ -1,88 +0,0 @@ -$newline never -
-

Ansprechpartner - -

Inhalt -