fraport/fradrive
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into formgroups

Browse Source
This commit is contained in:
SJost 2019-02-21 12:01:17 +01:00
commit 8e7eb94c17
3 changed files with 48 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
messages/uniworx/de.msg
View File

@ -235,6 +235,8 @@ LoginTitle: Authentifizierung
ProfileHeading: Benutzereinstellungen ProfileHeading: Benutzereinstellungen
ProfileFor: Benutzereinstellungen für ProfileFor: Benutzereinstellungen für
ProfileDataHeading: Gespeicherte Benutzerdaten ProfileDataHeading: Gespeicherte Benutzerdaten
InfoHeading: Informationen
VersionHeading: Versionsgeschichte
ImpressumHeading: Impressum ImpressumHeading: Impressum
DataProtHeading: Datenschutzerklärung DataProtHeading: Datenschutzerklärung
SystemMessageHeading: Uni2work Statusmeldung SystemMessageHeading: Uni2work Statusmeldung

6
routes
View File

@ -41,16 +41,14 @@
/admin/test AdminTestR GET POST /admin/test AdminTestR GET POST
/admin/errMsg AdminErrMsgR GET POST /admin/errMsg AdminErrMsgR GET POST
/info InfoR GET !free /info InfoR GET !free
/impressum ImpressumR GET !free /info/lecturer InfoLecturerR GET !lecturer
/info/data DataProtR GET !free /info/data DataProtR GET !free
/impressum ImpressumR GET !free
/version VersionR GET !free /version VersionR GET !free
/help HelpR GET POST !free /help HelpR GET POST !free
/help/lecturer InfoLecturerR GET !lecturer
/user ProfileR GET POST !free /user ProfileR GET POST !free
/user/profile ProfileDataR GET POST !free /user/profile ProfileDataR GET POST !free

58
src/Foundation.hs
View File

@ -1068,12 +1068,14 @@ instance YesodBreadcrumbs UniWorX where
breadcrumb (AdminUserR _) = return ("Users" , Just UsersR) breadcrumb (AdminUserR _) = return ("Users" , Just UsersR)
breadcrumb InfoR = return ("Information" , Nothing) breadcrumb InfoR = return ("Information" , Nothing)
breadcrumb ImpressumR = return ("Impressum" , Just InfoR) breadcrumb InfoLecturerR = return ("Veranstalter" , Just InfoR)
breadcrumb DataProtR = return ("Datenschutz" , Just InfoR) breadcrumb DataProtR = return ("Datenschutz" , Just InfoR)
breadcrumb VersionR = return ("Impressum" , Just InfoR) breadcrumb ImpressumR = return ("Impressum" , Just InfoR)
breadcrumb VersionR = return ("Versionsgeschichte", Just InfoR)
breadcrumb HelpR = return ("Hilfe" , Just HomeR) breadcrumb HelpR = return ("Hilfe" , Just HomeR)
breadcrumb InfoLecturerR = return ("Veranstalter" , Just HelpR)
breadcrumb ProfileR = return ("User" , Just HomeR) breadcrumb ProfileR = return ("User" , Just HomeR)
breadcrumb ProfileDataR = return ("Profile" , Just ProfileR) breadcrumb ProfileDataR = return ("Profile" , Just ProfileR)
@ -1272,6 +1274,16 @@ pageActions (HomeR) =
, menuItemAccessCallback' = return True , menuItemAccessCallback' = return True
} }
] ]
pageActions (InfoR) = [
MenuItem
{ menuItemType = PageActionPrime
, menuItemLabel = MsgInfoLecturerTitle
, menuItemIcon = Nothing
, menuItemRoute = SomeRoute InfoLecturerR
, menuItemModal = False
, menuItemAccessCallback' = return True
}
]
pageActions (VersionR) = [ pageActions (VersionR) = [
MenuItem MenuItem
{ menuItemType = PageActionPrime { menuItemType = PageActionPrime
@ -1283,14 +1295,14 @@ pageActions (VersionR) = [
} }
] ]
pageActions (HelpR) = [ pageActions (HelpR) = [
MenuItem -- MenuItem
{ menuItemType = PageActionPrime -- { menuItemType = PageActionPrime
, menuItemLabel = MsgInfoLecturerTitle -- , menuItemLabel = MsgInfoLecturerTitle
, menuItemIcon = Nothing -- , menuItemIcon = Nothing
, menuItemRoute = SomeRoute InfoLecturerR -- , menuItemRoute = SomeRoute InfoLecturerR
, menuItemModal = False -- , menuItemModal = False
, menuItemAccessCallback' = return True -- , menuItemAccessCallback' = return True
} -- }
] ]
pageActions (ProfileR) = pageActions (ProfileR) =
[ MenuItem [ MenuItem
@ -1348,6 +1360,16 @@ pageActions (CourseListR) =
, menuItemAccessCallback' = return True , menuItemAccessCallback' = return True
} }
] ]
pageActions (CourseNewR) = [
MenuItem
{ menuItemType = PageActionPrime
, menuItemLabel = MsgInfoLecturerTitle
, menuItemIcon = Nothing
, menuItemRoute = SomeRoute InfoLecturerR
, menuItemModal = False
, menuItemAccessCallback' = return True
}
]
pageActions (CourseR tid ssh csh CShowR) = pageActions (CourseR tid ssh csh CShowR) =
[ MenuItem [ MenuItem
{ menuItemType = PageActionPrime { menuItemType = PageActionPrime
@ -1682,14 +1704,22 @@ pageHeading HomeR
= Just $ i18nHeading MsgHomeHeading = Just $ i18nHeading MsgHomeHeading
pageHeading UsersR pageHeading UsersR
= Just $ i18nHeading MsgUsers = Just $ i18nHeading MsgUsers
pageHeading (AdminTestR)
= Just $ [whamlet|Internal Code Demonstration Page|]
pageHeading (AdminUserR _) pageHeading (AdminUserR _)
= Just $ i18nHeading MsgAdminUserHeading = Just $ i18nHeading MsgAdminUserHeading
pageHeading (AdminTestR)
= Just $ [whamlet|Internal Code Demonstration Page|]
pageHeading (AdminErrMsgR) pageHeading (AdminErrMsgR)
= Just $ i18nHeading MsgErrMsgHeading = Just $ i18nHeading MsgErrMsgHeading
pageHeading (VersionR)
pageHeading (InfoR)
= Just $ i18nHeading MsgInfoHeading
pageHeading (DataProtR)
= Just $ i18nHeading MsgDataProtHeading
pageHeading (ImpressumR)
= Just $ i18nHeading MsgImpressumHeading = Just $ i18nHeading MsgImpressumHeading
pageHeading (VersionR)
= Just $ i18nHeading MsgVersionHeading
pageHeading (HelpR) pageHeading (HelpR)
= Just $ i18nHeading MsgHelpRequest = Just $ i18nHeading MsgHelpRequest