From 0dc740d8f64b31ff49b7cfb51ddc2dde7b5c121e Mon Sep 17 00:00:00 2001 From: Joris Date: Sun, 26 Jun 2016 13:22:47 +0200 Subject: Confirm before payment deletion --- src/server/Design/Form.hs | 9 ++++++++- src/server/Design/LoggedIn/Home/Table.hs | 16 +++------------- src/server/Model/Message/Key.hs | 4 +++- src/server/Model/Message/Translations.hs | 7 ++++++- 4 files changed, 20 insertions(+), 16 deletions(-) (limited to 'src/server') diff --git a/src/server/Design/Form.hs b/src/server/Design/Form.hs index 00de12d..612759b 100644 --- a/src/server/Design/Form.hs +++ b/src/server/Design/Form.hs @@ -82,9 +82,16 @@ design = do marginLeft (px 10) marginRight (px 10) - input ? display none + input ? do + opacity 0 + width (px 30) + margin (px 0) (px (-15)) (px 0) (px (-15)) + label ? cursor pointer + "input:focus + label" ? do + textDecoration underline + "input:checked + label" ? do color Color.chestnutRose fontWeight bold diff --git a/src/server/Design/LoggedIn/Home/Table.hs b/src/server/Design/LoggedIn/Home/Table.hs index 2594f25..0085e4a 100644 --- a/src/server/Design/LoggedIn/Home/Table.hs +++ b/src/server/Design/LoggedIn/Home/Table.hs @@ -11,8 +11,7 @@ import qualified Clay.Display as D import Design.Color as Color import qualified Design.Media as Media -import Design.Constants -import Design.Helper +import Design.Constants as Constants design :: Css design = do @@ -41,9 +40,6 @@ design = do nthChild "odd" & do backgroundColor Color.wildSand - ".edition" & do - backgroundColor Color.negroni - ".delete" |> button ? visibility visible ".cell" ? do display tableCell @@ -66,11 +62,5 @@ design = do position relative width (pct 3) textAlign (alignSide sideCenter) - button ? do - defaultButton Color.chestnutRose Color.white (px rowHeightPx) focusLighten - borderRadius (px 0) (px 0) (px 0) (px 0) - position absolute - top (px 0) - right (px 0) - width (pct 100) - visibility hidden + button # hover ? "svg path" ? do + "fill" -: "rgb(227, 112, 106)" diff --git a/src/server/Model/Message/Key.hs b/src/server/Model/Message/Key.hs index 093024b..a88d2b8 100644 --- a/src/server/Model/Message/Key.hs +++ b/src/server/Model/Message/Key.hs @@ -79,6 +79,8 @@ data Key = | PaymentPunctual | PaymentMonthly + | ConfirmPaymentDelete + -- Statistics | Statistics @@ -93,7 +95,7 @@ data Key = | IncomeNotDeleted | IncomeDate | IncomeAmount - | ConfirmDelete + | ConfirmIncomeDelete -- Form diff --git a/src/server/Model/Message/Translations.hs b/src/server/Model/Message/Translations.hs index 6522d75..3b91d17 100644 --- a/src/server/Model/Message/Translations.hs +++ b/src/server/Model/Message/Translations.hs @@ -327,6 +327,11 @@ m l PaymentMonthly = English -> "Monthly" French -> "Mensuel" +m l ConfirmPaymentDelete = + case l of + English -> "Are you sure to delete this payment ?" + French -> "Voulez-vous vraiment supprimer ce paiement ?" + -- Income m l CumulativeIncomesSince = @@ -359,7 +364,7 @@ m l IncomeAmount = English -> "Amount" French -> "Montant" -m l ConfirmDelete = +m l ConfirmIncomeDelete = case l of English -> "Are you sure to delete this income ?" French -> "Voulez-vous vraiment supprimer ce revenu ?" -- cgit v1.2.3