Merge branch 'master' into feat/exercises

src/Handler/Course.hs

@@ -221,7 +221,7 @@ courseEditHandler course = do
     let formActions = defaultFormActions
     defaultLayout $ do
       setTitle [shamlet| #{formTitle} |]
-      $(widgetFile "generic_form")
+      $(widgetFile "formPage")
       
       
 data CourseForm = CourseForm 

src/Handler/Term.hs

@@ -116,7 +116,7 @@ termEditHandler term = do
     let formActions = defaultFormActions
     defaultLayout $ do
       setTitle [shamlet| #{formTitle} |]
-      $(widgetFile "generic_form")
+      $(widgetFile "formPage")
 
 {-            
 wdgtTermForm :: (ToWidget UniWorX a) => a -> Enctype ->  Handler Html              
@@ -126,7 +126,7 @@ wdgtTermForm formWidget formEnctype = do
     let formActions = defaultFormActions
     defaultLayout $ do
       setTitle [shamlet| #{formTitle} |]
-      $(widgetFile "generic_form")
+      $(widgetFile "formPage")
 -}
       
 newTermForm :: Maybe Term -> Form Term