From d240c0f6801674cba475a4a645b6a33523414303 Mon Sep 17 00:00:00 2001 From: SJost Date: Sat, 30 Jun 2018 13:16:38 +0200 Subject: [PATCH] Renamed to: Uni2work --- src/Foundation.hs | 4 ++-- src/Handler/Admin.hs | 2 +- src/Handler/Home.hs | 2 +- src/Model/Types.hs | 5 +++++ templates/adminTest.hamlet | 4 ++-- templates/home.hamlet | 2 +- templates/homeUser.hamlet | 2 +- templates/widgets/navbar.lucius | 2 +- 8 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/Foundation.hs b/src/Foundation.hs index 283ae9df5..700f0a2ca 100644 --- a/src/Foundation.hs +++ b/src/Foundation.hs @@ -569,7 +569,7 @@ instance Yesod UniWorX where -- Define breadcrumbs. instance YesodBreadcrumbs UniWorX where breadcrumb (AuthR _) = return ("Login" , Just HomeR) - breadcrumb HomeR = return ("UniWorkY", Nothing) + breadcrumb HomeR = return ("Uni2work", Nothing) breadcrumb UsersR = return ("Benutzer", Just HomeR) breadcrumb AdminTestR = return ("Test" , Just HomeR) breadcrumb (AdminUserR _) = return ("Users" , Just UsersR) @@ -601,7 +601,7 @@ instance YesodBreadcrumbs UniWorX where -- Deprecated below breadcrumb SubmissionListR = return ("Abgaben", Just HomeR) -- Others - breadcrumb _ = return ("UniWorkY", Nothing) -- Default is no breadcrumb at all + breadcrumb _ = return ("Uni2work", Nothing) -- Default is no breadcrumb at all pageActions :: Route UniWorX -> [MenuTypes] pageActions (CourseR tid csh CShowR) = diff --git a/src/Handler/Admin.hs b/src/Handler/Admin.hs index 1fc340912..d3e5d2353 100644 --- a/src/Handler/Admin.hs +++ b/src/Handler/Admin.hs @@ -46,7 +46,7 @@ getAdminTestR :: Handler Html -- Demo Page. Referenzimplementierungen sollte hie getAdminTestR = do (btnWdgt, btnEnctype) <- generateFormPost (buttonForm :: Form CreateButton) defaultLayout $ do - -- setTitle "UniWorkY Admin Testpage" + -- setTitle "Uni2work Admin Testpage" $(widgetFile "adminTest") postAdminTestR :: Handler Html diff --git a/src/Handler/Home.hs b/src/Handler/Home.hs index 00e2c90c0..e8367a12c 100644 --- a/src/Handler/Home.hs +++ b/src/Handler/Home.hs @@ -169,6 +169,6 @@ homeUser uid = do } defaultLayout $ do - -- setTitle "Willkommen zum Uniworky Test!" + -- setTitle "Willkommen zum Uni2work Test!" $(widgetFile "homeUser") $(widgetFile "dsgvDisclaimer") diff --git a/src/Model/Types.hs b/src/Model/Types.hs index 3b0f1a084..f054899b2 100644 --- a/src/Model/Types.hs +++ b/src/Model/Types.hs @@ -236,6 +236,11 @@ instance Read Theme where -- generic Read-Instance for Show/Bounded | (Just t) <- (Map.lookup s readTheme) = [(t,"")] | otherwise = [(Default,"")] -- read shall always succeed +{- +instance Default Theme where + def = Default +-} + derivePersistField "Theme" diff --git a/templates/adminTest.hamlet b/templates/adminTest.hamlet index ac9d45c05..66e2b891c 100644 --- a/templates/adminTest.hamlet +++ b/templates/adminTest.hamlet @@ -1,7 +1,7 @@
- UniWorkY ist noch nicht abgeschlossen. + Uni2work ist noch nicht abgeschlossen.
Die Korrektoren wurden aktualisiert! (.alert-success) @@ -15,7 +15,7 @@ Nicht so gut! Egal was das war. Es hat mir nicht gefallen! (.alert-error)
-

Uniworky - Admin Demopage +

Uni2work - Admin Demopage

Diese interne Seite dient lediglich zum Testen diverser Funktionalitäten diff --git a/templates/home.hamlet b/templates/home.hamlet index 01b241c6c..7c2a3b0af 100644 --- a/templates/home.hamlet +++ b/templates/home.hamlet @@ -7,7 +7,7 @@

Vorabversion! Die Implementierung von - UniWorkY ist noch nicht abgeschlossen. + Uni2work ist noch nicht abgeschlossen.

Kurse mit offener Registrierung
diff --git a/templates/homeUser.hamlet b/templates/homeUser.hamlet index 70aaac6f5..9ed3f93d3 100644 --- a/templates/homeUser.hamlet +++ b/templates/homeUser.hamlet @@ -7,7 +7,7 @@
Vorabversion! Die Implementierung von - UniWorkY ist noch nicht abgeschlossen. + Uni2work ist noch nicht abgeschlossen.

Anstehende Übungsblätter
diff --git a/templates/widgets/navbar.lucius b/templates/widgets/navbar.lucius index 4ed1521ef..0c29ca920 100644 --- a/templates/widgets/navbar.lucius +++ b/templates/widgets/navbar.lucius @@ -49,7 +49,7 @@ } &::before { - content: 'UniWorkY'; + content: 'Uni2work'; font-family: var(--font-logo); font-size: 42px; font-weight: bold;