fraport/fradrive
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(tooltips): replace tooltips

Browse Source
This commit is contained in:
Sarah Vaupel 2019-10-01 14:06:03 +02:00
parent 276dcb6ad9
commit 3b0e1d570d
9 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Handler/Exam/Form.hs
View File

@ -137,7 +137,8 @@ examCorrectorsForm mPrev = wFormToAForm $ do
miCell' :: Either UserEmail UserId -> Widget
miCell' (Left email) =
miCell' (Left email) = do
invWarnMsg <- messageI Warning MsgEmailInvitationWarning
$(widgetFile "widgets/massinput/examCorrectors/cellInvitation")
miCell' (Right userId) = do
User{..} <- liftHandler . runDB $ get404 userId

4
src/Handler/ExamOffice/Users.hs
View File

@ -103,7 +103,9 @@ makeExamOfficeUsersForm template = renderWForm FormStandard $ do
-> pure . nub $ oldUsers ++ Set.toList newUsers
return (res', $(widgetFile "widgets/massinput/examOfficeUsers/add"))
miCell' :: Either UserEmail UserId -> Widget
miCell' (Left email) = $(widgetFile "widgets/massinput/examOfficeUsers/cellInvitation")
miCell' (Left email) = do
invWarnMsg <- messageI Warning MsgEmailInvitationWarning
$(widgetFile "widgets/massinput/examOfficeUsers/cellInvitation")
miCell' (Right uid) = do
User{..} <- liftHandler . runDB $ getJust uid
$(widgetFile "widgets/massinput/examOfficeUsers/cellKnown")

12
src/Handler/Sheet.hs
View File

@ -422,11 +422,12 @@ getSShowR tid ssh csh shn = do
setTitleI $ prependCourseTitle tid ssh csh $ SomeMessage shn
let zipLink = CSheetR tid ssh csh shn SArchiveR
visibleFrom = visibleUTCTime SelFormatDateTime <$> sheetVisibleFrom sheet
sheetFrom <- formatTime SelFormatDateTime $ sheetActiveFrom sheet
sheetTo <- formatTime SelFormatDateTime $ sheetActiveTo sheet
hintsFrom <- traverse (formatTime SelFormatDateTime) $ sheetHintFrom sheet
solutionFrom <- traverse (formatTime SelFormatDateTime) $ sheetSolutionFrom sheet
markingText <- runMaybeT $ assertM_ (Authorized ==) (evalAccessCorrector tid ssh csh) >> hoistMaybe (sheetMarkingText sheet)
sheetFrom <- formatTime SelFormatDateTime $ sheetActiveFrom sheet
sheetTo <- formatTime SelFormatDateTime $ sheetActiveTo sheet
hintsFrom <- traverse (formatTime SelFormatDateTime) $ sheetHintFrom sheet
solutionFrom <- traverse (formatTime SelFormatDateTime) $ sheetSolutionFrom sheet
markingText <- runMaybeT $ assertM_ (Authorized ==) (evalAccessCorrector tid ssh csh) >> hoistMaybe (sheetMarkingText sheet)
submissionTip <- messageI Info MsgSheetCorrectorSubmissionsTip
$(widgetFile "sheetShow")
getSArchiveR :: TermId -> SchoolId -> CourseShorthand -> SheetName -> Handler TypedContent
@ -765,6 +766,7 @@ correctorForm shid = wFormToAForm $ do
Right uid -> do
User{userEmail, userDisplayName, userSurname} <- liftHandler . runDB $ getJust uid
return $ nameEmailWidget userEmail userDisplayName userSurname
invWarnMsg <- messageI Warning MsgEmailInvitationWarning
return (res, $(widgetFile "sheetCorrectors/cell"))

4
src/Handler/Submission.hs
View File

@ -131,7 +131,9 @@ makeSubmissionForm cid msmid uploadMode grouping isLecturer prefillUsers = ident
<*> wFormToAForm submittorsForm
where
miCell' :: Markup -> Either UserEmail UserId -> Widget
miCell' csrf (Left email) = $(widgetFile "widgets/massinput/submissionUsers/cellInvitation")
miCell' csrf (Left email) = do
invWarnMsg <- messageI Warning MsgEmailInvitationWarning
$(widgetFile "widgets/massinput/submissionUsers/cellInvitation")
miCell' csrf (Right uid) = do
User{..} <- liftHandler . runDB $ getJust uid
$(widgetFile "widgets/massinput/submissionUsers/cellKnown")

5
templates/sheetCorrectors/cell.hamlet
View File

@ -4,10 +4,7 @@ $case userIdent
<td>
^{identWidget}
<td>
<div .tooltip>
<div .tooltip__handle>
<div .tooltip__content>
_{MsgEmailInvitationWarning}
^{messageTooltip invWarnMsg}
$of Right _
<td colspan=2>
^{identWidget}

4
templates/sheetShow.hamlet
View File

@ -28,9 +28,7 @@ $maybe descr <- sheetDescription sheet
<dd .deflist__dd>_{classifySubmissionMode (sheetSubmissionMode sheet)}
$case sheetSubmissionMode sheet
$of SubmissionMode True _
<div .tooltip>
<div .tooltip__handle>
<div .tooltip__content>_{MsgSheetCorrectorSubmissionsTip}
^{messageTooltip submissionTip}
$of _
$case sheetSubmissionMode sheet
$of SubmissionMode True _

5
templates/widgets/massinput/examCorrectors/cellInvitation.hamlet
View File

@ -3,7 +3,4 @@ $newline never
<span style="font-family: monospace">
#{email}
<td>
<div .tooltip>
<div .tooltip__handle>
<div .tooltip__content>
_{MsgEmailInvitationWarning}
^{messageTooltip invWarnMsg}

5
templates/widgets/massinput/examOfficeUsers/cellInvitation.hamlet
View File

@ -3,7 +3,4 @@
<span style="font-family: monospace">
#{email}
<td>
<div .tooltip>
<div .tooltip__handle>
<div .tooltip__content>
_{MsgEmailInvitationWarning}
^{messageTooltip invWarnMsg}

5
templates/widgets/massinput/submissionUsers/cellInvitation.hamlet
View File

@ -4,7 +4,4 @@
<span style="font-family: monospace">
#{email}
<td>
<div .tooltip>
<div .tooltip__handle>
<div .tooltip__content>
_{MsgEmailInvitationWarning}
^{messageTooltip invWarnMsg}