Merge branch 'master' into formgroups

messages/uniworx/de.msg

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

routes

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

src/Foundation.hs

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