aboutsummaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorJoris2016-06-04 11:02:43 +0200
committerJoris2016-06-04 11:02:43 +0200
commit38896af4281d2e191cbde15836a23e4c0274fff6 (patch)
tree0d7df152cc84beaa79cc9fa055db1e7992c4ac91 /src/server
parent9dfa7a7e2c6fac564a456b11623c04d0b26fbce5 (diff)
downloadbudget-38896af4281d2e191cbde15836a23e4c0274fff6.tar.gz
budget-38896af4281d2e191cbde15836a23e4c0274fff6.tar.bz2
budget-38896af4281d2e191cbde15836a23e4c0274fff6.zip
Add mean payment by month
Diffstat (limited to 'src/server')
-rw-r--r--src/server/Design/LoggedIn/Home/Expandables.hs2
-rw-r--r--src/server/Design/LoggedIn/Home/Table.hs6
-rw-r--r--src/server/Design/LoggedIn/Stat.hs5
-rw-r--r--src/server/Model/Message/Key.hs1
-rw-r--r--src/server/Model/Message/Translations.hs5
5 files changed, 14 insertions, 5 deletions
diff --git a/src/server/Design/LoggedIn/Home/Expandables.hs b/src/server/Design/LoggedIn/Home/Expandables.hs
index 635a4a7..36ba67d 100644
--- a/src/server/Design/LoggedIn/Home/Expandables.hs
+++ b/src/server/Design/LoggedIn/Home/Expandables.hs
@@ -16,7 +16,7 @@ design = do
".expand" ? do
position absolute
right blockPadding
- bottom (px 2)
+ bottom (px 0)
".monthlyPayments" ? expandBlock Color.gothic Color.white (px inputHeight)
diff --git a/src/server/Design/LoggedIn/Home/Table.hs b/src/server/Design/LoggedIn/Home/Table.hs
index d13ab85..b68f48f 100644
--- a/src/server/Design/LoggedIn/Home/Table.hs
+++ b/src/server/Design/LoggedIn/Home/Table.hs
@@ -19,7 +19,6 @@ design = do
display D.table
width (pct 100)
textAlign (alignSide (sideCenter))
- "border-spacing" -: "10 px"
".header" <> ".row" ? display tableRow
let headerHeight = (px 70)
@@ -29,11 +28,11 @@ design = do
backgroundColor Color.gothic
color Color.white
fontSize iconFontSize
- lineHeight headerHeight
+ height headerHeight
".row" ? do
fontSize (px 18)
- lineHeight (px rowHeightPx)
+ height (px rowHeightPx)
hover & do
let (borderW, triangleW, triangleH) = (4, 6, 8)
@@ -70,6 +69,7 @@ design = do
".cell" ? do
display tableCell
position relative
+ verticalAlign middle
".category" & width (pct 40)
".cost" & do
width (pct 17)
diff --git a/src/server/Design/LoggedIn/Stat.hs b/src/server/Design/LoggedIn/Stat.hs
index 42bcb71..ff44a9d 100644
--- a/src/server/Design/LoggedIn/Stat.hs
+++ b/src/server/Design/LoggedIn/Stat.hs
@@ -7,4 +7,7 @@ module Design.LoggedIn.Stat
import Clay
design :: Css
-design = h1 ? paddingBottom (px 0)
+design = do
+ h1 ? paddingBottom (px 0)
+
+ ".mean" ? marginBottom (em 1.5)
diff --git a/src/server/Model/Message/Key.hs b/src/server/Model/Message/Key.hs
index 7c48e71..4a49900 100644
--- a/src/server/Model/Message/Key.hs
+++ b/src/server/Model/Message/Key.hs
@@ -72,6 +72,7 @@ data Key =
| Overall
| ByMonths
| By
+ | Mean
-- Income
diff --git a/src/server/Model/Message/Translations.hs b/src/server/Model/Message/Translations.hs
index f593c49..3ceb7a3 100644
--- a/src/server/Model/Message/Translations.hs
+++ b/src/server/Model/Message/Translations.hs
@@ -277,6 +277,11 @@ m l By =
English -> "by"
French -> "par"
+m l Mean =
+ case l of
+ English -> "Mean: {0}"
+ French -> "En moyenne : {0}"
+
-- Income
m l CumulativeIncomesSince =