From 14462c7305f7aa3c91a328f2d1bd65ad602f3f1a Mon Sep 17 00:00:00 2001 From: Felix Hamann Date: Sun, 27 Jan 2019 19:35:38 +0100 Subject: [PATCH] fix some scrolltable issues (missing, nested) and make more visible --- templates/courses.hamlet | 3 +- templates/default-layout.lucius | 2 + templates/widgets/gradingSummary.hamlet | 49 +++++++++++++------------ 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/templates/courses.hamlet b/templates/courses.hamlet index cc9106b21..6cc6a0c13 100644 --- a/templates/courses.hamlet +++ b/templates/courses.hamlet @@ -1,3 +1,2 @@
-
- ^{coursesTable} + ^{coursesTable} diff --git a/templates/default-layout.lucius b/templates/default-layout.lucius index 08c29a53a..729e4c672 100644 --- a/templates/default-layout.lucius +++ b/templates/default-layout.lucius @@ -335,6 +335,8 @@ input[type="button"].btn-info:hover, /* SCROLLTABLE */ .scrolltable { overflow: auto; + box-shadow: 0 0 3px 0 var(--color-grey); + margin-bottom: 15px; } @media (max-width: 425px) { diff --git a/templates/widgets/gradingSummary.hamlet b/templates/widgets/gradingSummary.hamlet index 75c488504..248c4b085 100644 --- a/templates/widgets/gradingSummary.hamlet +++ b/templates/widgets/gradingSummary.hamlet @@ -9,34 +9,35 @@ $# rowWdgts :: Liste von Widgets für jede Zeile (Normal,Bonus,KeineWert $# --

_{MsgSummaryTitle} _{title $ getSum $ numSheets $ sumSummaries} - - - -
- $# empty cell for row headers - $maybe _ <- hasMarkedPasses - _{MsgCorrected} - $maybe _ <- hasPasses - _{MsgSheetGradingPassing'} - $maybe _ <- hasMarkedPoints - _{MsgCorrected} - $maybe _ <- hasPoints - _{MsgSheetGradingPoints'} - _{MsgSheetGradingCount'} - $# Number of Sheet/Submissions used for calculating maximum passes/points - $forall row <- rowWdgts - ^{row} - $maybe nrNoGrade <- positiveSum $ numNotGraded -
_{MsgSheetTypeNotGraded} +
+ + + +
+ $# empty cell for row headers $maybe _ <- hasMarkedPasses - + _{MsgCorrected} $maybe _ <- hasPasses - + _{MsgSheetGradingPassing'} $maybe _ <- hasMarkedPoints - + _{MsgCorrected} $maybe _ <- hasPoints - - #{nrNoGrade} + _{MsgSheetGradingPoints'} + _{MsgSheetGradingCount'} + $# Number of Sheet/Submissions used for calculating maximum passes/points + $forall row <- rowWdgts + ^{row} + $maybe nrNoGrade <- positiveSum $ numNotGraded +
_{MsgSheetTypeNotGraded} + $maybe _ <- hasMarkedPasses + + $maybe _ <- hasPasses + + $maybe _ <- hasMarkedPoints + + $maybe _ <- hasPoints + + #{nrNoGrade} $maybe _ <- positiveSum $ bonusSummary ^. _numSheets

_{MsgSheetTypeInfoBonus} # $maybe _ <- positiveSum $ bonusSummary ^. _achievedPoints