From c213b8590f5b56bfd3e6d667d494385c6a3ed10d Mon Sep 17 00:00:00 2001 From: Felix Hamann Date: Thu, 7 Jun 2018 12:24:04 +0200 Subject: [PATCH] changed buttons in submission list to simple links --- src/Handler/Sheet.hs | 6 +++--- src/Handler/Utils/Form.hs | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs index 1defbcce5..265b28496 100644 --- a/src/Handler/Sheet.hs +++ b/src/Handler/Sheet.hs @@ -154,7 +154,7 @@ getSheetList courseEnt = do rated <- count $ (SubmissionRatingTime !=. Nothing):sheetsub return (sid, sheet, (submissions, rated)) let colBase = mconcat - [ headed "Blatt" $ \(sid,sheet,_) -> linkButton (toWgt $ sheetName sheet) BCLink $ CSheetR tid csh (sheetName sheet) SShowR + [ headed "Blatt" $ \(sid,sheet,_) -> simpleLink (toWgt $ sheetName sheet) $ CSheetR tid csh (sheetName sheet) SShowR , headed "Abgabe ab" $ toWgt . formatTimeGerWD . sheetActiveFrom . snd3 , headed "Abgabe bis" $ toWgt . formatTimeGerWD . sheetActiveTo . snd3 , headed "Bewertung" $ toWgt . show . sheetType . snd3 @@ -162,8 +162,8 @@ getSheetList courseEnt = do let colAdmin = mconcat -- only show edit button for allowed course assistants [ headed "Korrigiert" $ toWgt . snd . trd3 , headed "Eingereicht" $ toWgt . fst . trd3 - , headed "" $ \s -> linkButton "Edit" BCLink $ CSheetR tid csh (sheetName $ snd3 s) SEditR - , headed "" $ \s -> linkButton "Delete" BCLink $ CSheetR tid csh (sheetName $ snd3 s) SDelR + , headed "" $ \s -> simpleLink "Edit" $ CSheetR tid csh (sheetName $ snd3 s) SEditR + , headed "" $ \s -> simpleLink "Delete" $ CSheetR tid csh (sheetName $ snd3 s) SDelR ] showAdmin <- case sheets of ((_,firstSheet,_):_) -> do diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs index b01b8376a..c4ab73a96 100644 --- a/src/Handler/Utils/Form.hs +++ b/src/Handler/Utils/Form.hs @@ -135,6 +135,8 @@ linkButton lbl cls url = [whamlet| +simpleLink :: Widget -> Route UniWorX -> Widget +simpleLink lbl url = [whamlet| ^{lbl} |] buttonField :: Button a => a -> Field Handler a buttonField btn = Field {fieldParse, fieldView, fieldEnctype}