diff --git a/nummi/main/locale/fr/LC_MESSAGES/django.mo b/nummi/main/locale/fr/LC_MESSAGES/django.mo index 0c4e703..54df9d0 100644 Binary files a/nummi/main/locale/fr/LC_MESSAGES/django.mo and b/nummi/main/locale/fr/LC_MESSAGES/django.mo differ diff --git a/nummi/main/locale/fr/LC_MESSAGES/django.po b/nummi/main/locale/fr/LC_MESSAGES/django.po index 9a3b2df..d4bc5b8 100644 --- a/nummi/main/locale/fr/LC_MESSAGES/django.po +++ b/nummi/main/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-18 10:54+0200\n" +"POT-Creation-Date: 2023-04-18 11:13+0200\n" "PO-Revision-Date: 2022-12-21 17:30+0100\n" "Last-Translator: edpibu \n" "Language-Team: edpibu \n" @@ -35,14 +35,14 @@ msgstr "Utilisateur" #: .\main\models.py:45 .\main\models.py:79 .\main\models.py:87 #: .\main\models.py:237 .\main\templates\main\base.html:39 -#: .\main\templates\main\table\snapshot.html:23 -#: .\main\templates\main\table\transaction.html:32 +#: .\main\templates\main\table\snapshot.html:33 +#: .\main\templates\main\table\transaction.html:42 msgid "Account" msgstr "Compte" #: .\main\models.py:45 .\main\models.py:97 .\main\models.py:208 #: .\main\models.py:278 .\main\templates\main\table\invoice.html:9 -#: .\main\templates\main\table\transaction.html:25 +#: .\main\templates\main\table\transaction.html:35 msgid "Name" msgstr "Nom" @@ -61,7 +61,7 @@ msgstr "Comptes" #: .\main\models.py:97 .\main\models.py:121 .\main\models.py:227 #: .\main\templates\main\base.html:49 #: .\main\templates\main\plot\category.html:14 -#: .\main\templates\main\table\transaction.html:29 +#: .\main\templates\main\table\transaction.html:39 msgid "Category" msgstr "Catégorie" @@ -90,7 +90,7 @@ msgstr "Valeur de fin" msgid "Start value" msgstr "Valeur de début" -#: .\main\models.py:141 .\main\templates\main\table\snapshot.html:26 +#: .\main\models.py:141 .\main\templates\main\table\snapshot.html:36 msgid "Difference" msgstr "Différence" @@ -127,13 +127,13 @@ msgstr "Transaction" msgid "Description" msgstr "Description" -#: .\main\models.py:212 .\main\templates\main\table\snapshot.html:25 -#: .\main\templates\main\table\transaction.html:26 +#: .\main\models.py:212 .\main\templates\main\table\snapshot.html:35 +#: .\main\templates\main\table\transaction.html:36 msgid "Value" msgstr "Valeur" -#: .\main\models.py:214 .\main\templates\main\table\snapshot.html:21 -#: .\main\templates\main\table\transaction.html:24 +#: .\main\models.py:214 .\main\templates\main\table\snapshot.html:31 +#: .\main\templates\main\table\transaction.html:34 msgid "Date" msgstr "Date" @@ -141,7 +141,7 @@ msgstr "Date" msgid "Real date" msgstr "Date réelle" -#: .\main\models.py:217 .\main\templates\main\table\transaction.html:27 +#: .\main\models.py:217 .\main\templates\main\table\transaction.html:37 msgid "Trader" msgstr "Commerçant" @@ -155,7 +155,7 @@ msgstr "Paiement" #: .\main\templates\main\list\transaction.html:6 #: .\main\templates\main\list\transaction.html:23 #: .\main\templates\main\snapshot_form.html:39 -#: .\main\templates\main\table\snapshot.html:27 +#: .\main\templates\main\table\snapshot.html:37 msgid "Transactions" msgstr "Transactions" @@ -242,17 +242,21 @@ msgstr "Aucune facture" msgid "New invoice" msgstr "Nouvelle facture" -#~ msgid "New statement" -#~ msgstr "Nouveau relevé" +#: .\main\templates\main\table\snapshot.html:5 +msgid "New statement" +msgstr "Nouveau relevé" -#~ msgid "View all statements" -#~ msgstr "Voir tous les relevés" +#: .\main\templates\main\table\snapshot.html:10 +msgid "View all statements" +msgstr "Voir tous les relevés" -#~ msgid "New transaction" -#~ msgstr "Ajouter une transaction" +#: .\main\templates\main\table\transaction.html:6 +msgid "New transaction" +msgstr "Nouvelle transaction" -#~ msgid "View all transactions" -#~ msgstr "Voir toutes les transactions" +#: .\main\templates\main\table\transaction.html:11 +msgid "View all transactions" +msgstr "Voir toutes les transactions" #~ msgid "Valid" #~ msgstr "Valide" diff --git a/nummi/main/static/main/css/index.css b/nummi/main/static/main/css/index.css index f900910..ae42038 100644 --- a/nummi/main/static/main/css/index.css +++ b/nummi/main/static/main/css/index.css @@ -12,12 +12,9 @@ h1 img { margin-right: var(--gap); } -#categories > a, -#accounts > a { - display: inline-block; - padding: 1em; +a.big-link { + margin-right: 1em; } -#categories > a > i, -#accounts > a > i { +a.big-link > i { margin-right: .5rem; } diff --git a/nummi/main/static/main/css/main.css b/nummi/main/static/main/css/main.css index 552e652..9c85c75 100644 --- a/nummi/main/static/main/css/main.css +++ b/nummi/main/static/main/css/main.css @@ -53,9 +53,13 @@ h1 { margin: 0; } +p { + line-height: 2em; +} a { color: var(--text-link); text-decoration: none; + display: inline-block; } a:hover { text-decoration: underline; diff --git a/nummi/main/templates/main/index.html b/nummi/main/templates/main/index.html index 96ca5bd..18495c5 100644 --- a/nummi/main/templates/main/index.html +++ b/nummi/main/templates/main/index.html @@ -18,11 +18,11 @@ {% if accounts %}

{% translate "Accounts" %}

{% spaceless %} -
+

{% for acc in accounts %} - {{ acc }} + {{ acc }} {% endfor %} -

+

{% endspaceless %} {% endif %} {% if transactions %} @@ -34,11 +34,11 @@ {% if categories %}

{% translate "Categories" %}

{% spaceless %} -
+

{% for cat in categories %} - {{ cat }} + {{ cat }} {% endfor %} -

+

{% endspaceless %} {% endif %} {% if snapshots %} diff --git a/nummi/main/templates/main/table/snapshot.html b/nummi/main/templates/main/table/snapshot.html index c07e6bd..7039cb5 100644 --- a/nummi/main/templates/main/table/snapshot.html +++ b/nummi/main/templates/main/table/snapshot.html @@ -1,5 +1,15 @@ {% load main_extras %} {% load i18n %} +{% if new_snapshot_url %} +

+ {% translate "New statement" %} +

+{% endif %} +{% if snapshots_url %} +

+ {% translate "View all statements" %} +

+{% endif %}
diff --git a/nummi/main/templates/main/table/transaction.html b/nummi/main/templates/main/table/transaction.html index c21adbe..227becc 100644 --- a/nummi/main/templates/main/table/transaction.html +++ b/nummi/main/templates/main/table/transaction.html @@ -1,6 +1,16 @@ {% load main_extras %} {% load i18n %}
+ {% if new_transaction_url %} +

+ {% translate "New transaction" %} +

+ {% endif %} + {% if transactions_url %} +

+ {% translate "View all transactions" %} +

+ {% endif %}