aboutsummaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorJoris2016-06-19 21:18:56 +0200
committerJoris2016-06-21 12:49:51 +0200
commit36a90770ebeb9bd99e136bfe035fdda5dfabc304 (patch)
tree42b605108f4b8b731fecd65b028006aa41399f40 /src/server
parentfb5629d7f705b7e80dcf1852da58d2864c2b0d25 (diff)
downloadbudget-36a90770ebeb9bd99e136bfe035fdda5dfabc304.tar.gz
budget-36a90770ebeb9bd99e136bfe035fdda5dfabc304.tar.bz2
budget-36a90770ebeb9bd99e136bfe035fdda5dfabc304.zip
Add a dialog to confirm income deletion
Diffstat (limited to 'src/server')
-rw-r--r--src/server/Design/Global.hs18
-rw-r--r--src/server/Model/Message/Key.hs7
-rw-r--r--src/server/Model/Message/Translations.hs18
3 files changed, 33 insertions, 10 deletions
diff --git a/src/server/Design/Global.hs b/src/server/Design/Global.hs
index 68cff68..7d4a1bb 100644
--- a/src/server/Design/Global.hs
+++ b/src/server/Design/Global.hs
@@ -8,14 +8,16 @@ import Clay
import Data.Text.Lazy (Text)
-import qualified Design.Header as HeaderDesign
-import qualified Design.SignIn as SignInDesign
-import qualified Design.LoggedIn as LoggedInDesign
+import qualified Design.Header as Header
+import qualified Design.SignIn as SignIn
+import qualified Design.LoggedIn as LoggedIn
import qualified Design.Form as Form
import Design.Animation.Keyframes
import Design.Color as Color
+import Design.Helper as Helper
+import Design.Constants as Constants
globalDesign :: Text
globalDesign = renderWith compact [] global
@@ -23,9 +25,9 @@ globalDesign = renderWith compact [] global
global :: Css
global = do
- header ? HeaderDesign.design
- ".signIn" ? SignInDesign.design
- ".loggedIn" ? LoggedInDesign.design
+ header ? Header.design
+ ".signIn" ? SignIn.design
+ ".loggedIn" ? LoggedIn.design
Form.design
allKeyframes
@@ -54,4 +56,8 @@ global = do
"margin-left" -: "3vh"
"margin-top" -: "2vh"
+ ".dialog" ? ".content" ? button ? do
+ ".confirm" & Helper.defaultButton Color.chestnutRose Color.white (px Constants.inputHeight) Constants.focusLighten
+ ".undo" & Helper.defaultButton Color.silver Color.white (px Constants.inputHeight) Constants.focusLighten
+
svg ? height (pct 100)
diff --git a/src/server/Model/Message/Key.hs b/src/server/Model/Message/Key.hs
index 27a93dd..1653ea7 100644
--- a/src/server/Model/Message/Key.hs
+++ b/src/server/Model/Message/Key.hs
@@ -83,7 +83,7 @@ data Key =
| IncomeNotDeleted
| Creation
| Amount
- | Delete
+ | ConfirmDelete
-- Form
@@ -94,6 +94,11 @@ data Key =
| SmallerIntThan
| GreaterIntThan
+ -- Dialog
+
+ | Confirm
+ | Undo
+
-- Http error
| Timeout
diff --git a/src/server/Model/Message/Translations.hs b/src/server/Model/Message/Translations.hs
index 55ef97b..8a640d1 100644
--- a/src/server/Model/Message/Translations.hs
+++ b/src/server/Model/Message/Translations.hs
@@ -319,10 +319,10 @@ m l Amount =
English -> "Amount"
French -> "Montant"
-m l Delete =
+m l ConfirmDelete =
case l of
- English -> "Delete"
- French -> "Supprimer"
+ English -> "Are you sure to delete this income ?"
+ French -> "Voulez-vous vraiment supprimer ce revenu ?"
-- Form error
@@ -356,6 +356,18 @@ m l GreaterIntThan =
English -> "Integer smaller than {1} required"
French -> "Entier inférieur à {1} requis"
+-- Dialog
+
+m l Confirm =
+ case l of
+ English -> "Confirm"
+ French -> "Confirmer"
+
+m l Undo =
+ case l of
+ English -> "Undo"
+ French -> "Annuler"
+
-- Http error
m l Timeout =