From a075b1648eb9b49c37f8b6f228ae38e83baaf9fe Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Wed, 10 Jul 2019 20:47:46 +0200 Subject: [PATCH] fix(exam participant download): fix icon not being shown icon should have worked, but did not. does now --- src/Handler/Utils/Table/Pagination.hs | 6 +++--- src/Utils.hs | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Handler/Utils/Table/Pagination.hs b/src/Handler/Utils/Table/Pagination.hs index ced5cf30e..91c2bc24d 100644 --- a/src/Handler/Utils/Table/Pagination.hs +++ b/src/Handler/Utils/Table/Pagination.hs @@ -283,7 +283,7 @@ instance Button UniWorX ButtonCsvMode where btnLabel BtnCsvExport = [whamlet| $newline never - #{fontAwesomeIcon "file-csv"} + #{iconCSV} \ _{BtnCsvExport} |] btnLabel BtnCsvImport @@ -781,7 +781,7 @@ dbTable PSValidator{..} dbtable@DBTable{ dbtIdent = dbtIdent'@(toPathPiece -> db , formAnchor = Nothing :: Maybe Text } - + rows' <- E.select . E.from $ \t -> do res <- dbtSQLQuery t E.orderBy (map (sqlSortDirection t) psSorting') @@ -880,7 +880,7 @@ dbTable PSValidator{..} dbtable@DBTable{ dbtIdent = dbtIdent'@(toPathPiece -> db } csvWdgt = $(widgetFile "table/csv-transcode") - + uiLayout table = dbsFilterLayout filterWdgt filterEnc (SomeRoute $ rawAction :#: wIdent "table-wrapper") $(widgetFile "table/layout") dbInvalidateResult' = foldr (<=<) return . catMaybes $ diff --git a/src/Utils.hs b/src/Utils.hs index 759064296..96dd4535e 100644 --- a/src/Utils.hs +++ b/src/Utils.hs @@ -166,6 +166,10 @@ fileDownload = fontAwesomeIcon "file-download" zipDownload :: Markup zipDownload = fontAwesomeIcon "file-archive" +iconCSV :: Markup +iconCSV = fontAwesomeIcon "file-csv" + + -- Conditional icons isVisible :: Bool -> Markup