From edca79a7e2bfed1a08de780cc6ab7eac430ef950 Mon Sep 17 00:00:00 2001 From: Joris Date: Tue, 5 Apr 2016 13:39:48 +0200 Subject: Add a statistics empty page --- src/server/Design/Header.hs | 30 ++++++++++++++---------------- src/server/Model/Message/Key.hs | 6 +++++- src/server/Model/Message/Translations.hs | 19 +++++++++++++------ 3 files changed, 32 insertions(+), 23 deletions(-) (limited to 'src/server') diff --git a/src/server/Design/Header.hs b/src/server/Design/Header.hs index c4f9332..3b4f35c 100644 --- a/src/server/Design/Header.hs +++ b/src/server/Design/Header.hs @@ -22,32 +22,30 @@ headerDesign = height headerHeight marginBottom blockMarginBottom position relative + backgroundColor C.red + color C.white - (".title" <> ".user" <> ".icon") ? do - color C.white - backgroundColor C.red + ".item" ? do + float floatLeft + paddingLeft headerPadding + paddingRight headerPadding hover & backgroundColor darkenedRed focus & backgroundColor darkenedRed ".title" ? do - display block - width (pct 100) height (pct 100) fontSize (px 35) textAlign (alignSide sideLeft) paddingLeft headerPadding paddingRight headerPadding - ".signedPanel" ? do - float floatRight - height (pct 100) - display flex - position absolute - top (px 0) - right (px 0) + (".name" <> ".signOut") ? float floatRight - ".user" <> ".icon" ? do - paddingLeft headerPadding - paddingRight headerPadding + ".name" ? do + paddingLeft headerPadding + paddingRight headerPadding - ".icon" ? fontSize iconFontSize + ".signOut" ? do + height (pct 100) + fontSize iconFontSize + color C.white diff --git a/src/server/Model/Message/Key.hs b/src/server/Model/Message/Key.hs index 9d1c053..83d0467 100644 --- a/src/server/Model/Message/Key.hs +++ b/src/server/Model/Message/Key.hs @@ -63,11 +63,15 @@ data Key = | SingularMonthlyCount | PluralMonthlyCount + -- Statistics + + | Statistics + -- Income | AddIncome - | Incomes | Income + | MonthlyNetIncomes | IncomeNotDeleted -- Http error diff --git a/src/server/Model/Message/Translations.hs b/src/server/Model/Message/Translations.hs index 9db4a76..8c1ba08 100644 --- a/src/server/Model/Message/Translations.hs +++ b/src/server/Model/Message/Translations.hs @@ -244,6 +244,13 @@ m l PluralMonthlyCount = French -> "{1} paiements mensuels comptabilisant {2}" ] +-- Statistics + +m l Statistics = + case l of + English -> "Statistics" + French -> "Statistiques" + -- Income m l AddIncome = @@ -251,15 +258,15 @@ m l AddIncome = English -> "Add a monthly net income" French -> "Ajouter un revenu mensuel net" -m l Incomes = +m l Income = case l of - English -> "Monthly net incomes" - French -> "Revenus mensuels nets" + English -> "Income" + French -> "Revenu" -m l Income = +m l MonthlyNetIncomes = case l of - English -> "Monthly net income: {1}" - French -> "Revenu mensuel net : {1}" + English -> "Monthly net incomes" + French -> "Revenus mensuels nets" m l IncomeNotDeleted = case l of -- cgit v1.2.3