From 6b08113f60a404df539546bf6c6e2ae476dc015e Mon Sep 17 00:00:00 2001 From: "Edgar P. Burkhart" Date: Tue, 2 Jan 2024 16:04:04 +0100 Subject: [PATCH] Add back link on month and year page --- .../locale/fr_FR/LC_MESSAGES/django.po | 8 +-- .../locale/fr_FR/LC_MESSAGES/django.po | 10 ++-- .../locale/fr_FR/LC_MESSAGES/django.po | 10 ++-- nummi/main/locale/fr_FR/LC_MESSAGES/django.po | 44 ++++++++-------- nummi/main/static/main/css/main.css | 30 +++++++++-- nummi/main/templates/main/list.html | 36 ++++++------- .../search/locale/fr_FR/LC_MESSAGES/django.po | 4 +- .../locale/fr_FR/LC_MESSAGES/django.po | 20 ++++---- .../locale/fr_FR/LC_MESSAGES/django.mo | Bin 1431 -> 1494 bytes .../locale/fr_FR/LC_MESSAGES/django.po | 48 +++++++++++------- .../transaction_archive_month.html | 11 ++++ .../transaction/transaction_archive_year.html | 8 +++ 12 files changed, 142 insertions(+), 87 deletions(-) diff --git a/nummi/account/locale/fr_FR/LC_MESSAGES/django.po b/nummi/account/locale/fr_FR/LC_MESSAGES/django.po index 0d61184..e2b3dd5 100644 --- a/nummi/account/locale/fr_FR/LC_MESSAGES/django.po +++ b/nummi/account/locale/fr_FR/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-22 15:16+0200\n" +"POT-Creation-Date: 2024-01-02 15:52+0100\n" "PO-Revision-Date: 2023-04-22 15:17+0200\n" "Last-Translator: Edgar P. Burkhart \n" "Language-Team: \n" @@ -45,14 +45,14 @@ msgstr "Créer un compte" msgid "New account" msgstr "Nouveau compte" -#: .\account\templates\account\account_form.html:13 +#: .\account\templates\account\account_form.html:14 msgid "Statements" msgstr "Relevés" -#: .\account\templates\account\account_form.html:15 +#: .\account\templates\account\account_form.html:18 msgid "Transactions" msgstr "Transactions" -#: .\account\templates\account\account_form.html:18 +#: .\account\templates\account\account_form.html:23 msgid "History" msgstr "Historique" diff --git a/nummi/category/locale/fr_FR/LC_MESSAGES/django.po b/nummi/category/locale/fr_FR/LC_MESSAGES/django.po index e5881ca..d59e917 100644 --- a/nummi/category/locale/fr_FR/LC_MESSAGES/django.po +++ b/nummi/category/locale/fr_FR/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-25 12:05+0100\n" +"POT-Creation-Date: 2024-01-02 15:52+0100\n" "PO-Revision-Date: 2023-04-22 15:18+0200\n" "Last-Translator: Edgar P. Burkhart \n" "Language-Team: \n" @@ -46,11 +46,11 @@ msgstr "Créer une catégorie" msgid "New category" msgstr "Nouvelle catégorie" -#: .\category\templates\category\category_form.html:12 +#: .\category\templates\category\category_form.html:13 msgid "Transactions" msgstr "Transactions" -#: .\category\templates\category\category_form.html:15 +#: .\category\templates\category\category_form.html:18 msgid "History" msgstr "Historique" @@ -62,10 +62,10 @@ msgstr "Dépenses" msgid "Income" msgstr "Revenus" -#: .\category\templates\category\category_plot.html:56 +#: .\category\templates\category\category_plot.html:62 msgid "No transaction" msgstr "Aucune transaction" -#: .\category\templates\category\category_plot.html:64 +#: .\category\templates\category\category_plot.html:70 msgid "Total" msgstr "Total" diff --git a/nummi/history/locale/fr_FR/LC_MESSAGES/django.po b/nummi/history/locale/fr_FR/LC_MESSAGES/django.po index 3df2dfa..50fde9f 100644 --- a/nummi/history/locale/fr_FR/LC_MESSAGES/django.po +++ b/nummi/history/locale/fr_FR/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-12-28 15:45+0100\n" +"POT-Creation-Date: 2024-01-02 15:52+0100\n" "PO-Revision-Date: 2023-04-22 15:18+0200\n" "Last-Translator: Edgar P. Burkhart \n" "Language-Team: \n" @@ -17,18 +17,18 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 3.2.2\n" -#: .\history\templates\history\plot.html:15 +#: .\history\templates\history\plot.html:17 msgid "Month" msgstr "Mois" -#: .\history\templates\history\plot.html:16 +#: .\history\templates\history\plot.html:18 msgid "Expenses" msgstr "Dépenses" -#: .\history\templates\history\plot.html:17 +#: .\history\templates\history\plot.html:19 msgid "Income" msgstr "Revenus" -#: .\history\templates\history\plot.html:68 +#: .\history\templates\history\plot.html:48 msgid "Year" msgstr "Année" diff --git a/nummi/main/locale/fr_FR/LC_MESSAGES/django.po b/nummi/main/locale/fr_FR/LC_MESSAGES/django.po index 18f7b5d..378d5ba 100644 --- a/nummi/main/locale/fr_FR/LC_MESSAGES/django.po +++ b/nummi/main/locale/fr_FR/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-25 12:05+0100\n" +"POT-Creation-Date: 2024-01-02 15:52+0100\n" "PO-Revision-Date: 2023-04-23 08:03+0200\n" "Last-Translator: Edgar P. Burkhart \n" "Language-Team: \n" @@ -21,67 +21,67 @@ msgstr "" msgid "User" msgstr "Utilisateur" -#: .\main\templates\main\base.html:27 +#: .\main\templates\main\base.html:28 msgid "Skip to main content" msgstr "Aller au contenu principal" -#: .\main\templates\main\base.html:33 +#: .\main\templates\main\base.html:34 msgid "Home" msgstr "Accueil" -#: .\main\templates\main\base.html:38 .\main\templates\main\index.html:40 +#: .\main\templates\main\base.html:39 .\main\templates\main\index.html:43 msgid "Statements" msgstr "Relevés" -#: .\main\templates\main\base.html:44 .\main\templates\main\index.html:24 +#: .\main\templates\main\base.html:45 .\main\templates\main\index.html:23 msgid "Transactions" msgstr "Transactions" -#: .\main\templates\main\base.html:50 +#: .\main\templates\main\base.html:51 msgid "Create account" msgstr "Créer un compte" -#: .\main\templates\main\base.html:55 +#: .\main\templates\main\base.html:56 msgid "Create statement" msgstr "Créer un relevé" -#: .\main\templates\main\base.html:60 +#: .\main\templates\main\base.html:61 msgid "Create category" msgstr "Créer une catégorie" -#: .\main\templates\main\base.html:65 +#: .\main\templates\main\base.html:66 msgid "Create transaction" msgstr "Créer une transaction" -#: .\main\templates\main\base.html:70 .\main\templates\main\list.html:10 +#: .\main\templates\main\base.html:71 .\main\templates\main\list.html:10 #: .\main\templates\main\list.html:36 msgid "Search" msgstr "Rechercher" -#: .\main\templates\main\base.html:73 +#: .\main\templates\main\base.html:74 msgid "Log out" msgstr "Se déconnecter" -#: .\main\templates\main\base.html:78 .\main\templates\main\form\login.html:6 -#: .\main\templates\main\login.html:14 +#: .\main\templates\main\base.html:79 .\main\templates\main\form\login.html:6 +#: .\main\templates\main\login.html:11 msgid "Log in" msgstr "Se connecter" -#: .\main\templates\main\base.html:84 +#: .\main\templates\main\base.html:85 #, python-format msgid "Logged in as %(user)s" msgstr "Connecté en tant que %(user)s" -#: .\main\templates\main\confirm_delete.html:19 +#: .\main\templates\main\confirm_delete.html:15 #, python-format msgid "Are you sure you want do delete %(object)s ?" msgstr "Êtes-vous sûr de vouloir supprimer %(object)s ?" -#: .\main\templates\main\confirm_delete.html:23 +#: .\main\templates\main\confirm_delete.html:19 msgid "Cancel" msgstr "Annuler" -#: .\main\templates\main\confirm_delete.html:24 +#: .\main\templates\main\confirm_delete.html:20 msgid "Confirm" msgstr "Confirmer" @@ -105,23 +105,23 @@ msgstr "Créer" msgid "Save" msgstr "Enregistrer" -#: .\main\templates\main\index.html:15 +#: .\main\templates\main\index.html:12 msgid "Accounts" msgstr "Comptes" -#: .\main\templates\main\index.html:20 +#: .\main\templates\main\index.html:17 msgid "No account" msgstr "Aucun compte" -#: .\main\templates\main\index.html:28 +#: .\main\templates\main\index.html:29 msgid "Categories" msgstr "Catégories" -#: .\main\templates\main\index.html:34 +#: .\main\templates\main\index.html:35 msgid "No category" msgstr "Aucune catégorie" -#: .\main\templates\main\index.html:44 +#: .\main\templates\main\index.html:49 msgid "History" msgstr "Historique" diff --git a/nummi/main/static/main/css/main.css b/nummi/main/static/main/css/main.css index 8a2244f..6952422 100644 --- a/nummi/main/static/main/css/main.css +++ b/nummi/main/static/main/css/main.css @@ -69,9 +69,10 @@ a { &.big-link { margin-right: 1em; - } - &.big-link [class^="ri-"] { - margin-right: 0.5em; + + [class^="ri-"] { + margin-right: 0.5em; + } } } @@ -249,3 +250,26 @@ ul.messages { } } } + +.backlinks { + display: grid; + grid-template-columns: repeat(2, 1fr); + + p { + grid-column: 1; + + &.back { + grid-column: 2; + text-align: right; + + .big-link { + margin-right: 0; + margin-left: 1em; + [class^="ri-"] { + margin-right: 0em; + margin-left: 0.5em; + } + } + } + } +} diff --git a/nummi/main/templates/main/list.html b/nummi/main/templates/main/list.html index cd223b7..57adec0 100644 --- a/nummi/main/templates/main/list.html +++ b/nummi/main/templates/main/list.html @@ -19,23 +19,25 @@

{% block h2 %}{% endblock %}

- {% block backlinks %} - {% if account %} -

- {{ account.icon|remix }}{{ account }} -

- {% endif %} - {% if category %} -

- {{ category.icon|remix }}{{ category }} -

- {% endif %} - {% if search %} -

- {% translate "Search" %} -

- {% endif %} - {% endblock %} + {% include "main/pagination.html" %} {% block table %}{% endblock %} {% include "main/pagination.html" %} diff --git a/nummi/search/locale/fr_FR/LC_MESSAGES/django.po b/nummi/search/locale/fr_FR/LC_MESSAGES/django.po index 5517665..21455e6 100644 --- a/nummi/search/locale/fr_FR/LC_MESSAGES/django.po +++ b/nummi/search/locale/fr_FR/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-22 15:16+0200\n" +"POT-Creation-Date: 2024-01-02 15:52+0100\n" "PO-Revision-Date: 2023-04-22 15:20+0200\n" "Last-Translator: Edgar P. Burkhart \n" "Language-Team: \n" @@ -18,7 +18,7 @@ msgstr "" "X-Generator: Poedit 3.2.2\n" #: .\search\forms.py:7 .\search\templates\search\search.html:6 -#: .\search\templates\search\search.html:18 +#: .\search\templates\search\search.html:14 #: .\search\templates\search\search_form.html:5 msgid "Search" msgstr "Rechercher" diff --git a/nummi/statement/locale/fr_FR/LC_MESSAGES/django.po b/nummi/statement/locale/fr_FR/LC_MESSAGES/django.po index c9ae392..69017a9 100644 --- a/nummi/statement/locale/fr_FR/LC_MESSAGES/django.po +++ b/nummi/statement/locale/fr_FR/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-25 12:05+0100\n" +"POT-Creation-Date: 2024-01-02 15:52+0100\n" "PO-Revision-Date: 2023-04-22 15:22+0200\n" "Last-Translator: Edgar P. Burkhart \n" "Language-Team: \n" @@ -38,7 +38,7 @@ msgid "Start value" msgstr "Valeur initiale" #: .\statement\models.py:29 -#: .\statement\templates\statement\statement_table.html:27 +#: .\statement\templates\statement\statement_table.html:28 msgid "Difference" msgstr "Différence" @@ -74,32 +74,32 @@ msgstr "Créer un relevé" msgid "New statement" msgstr "Nouveau relevé" -#: .\statement\templates\statement\statement_form.html:22 +#: .\statement\templates\statement\statement_form.html:23 msgid "Categories" msgstr "Catégories" -#: .\statement\templates\statement\statement_form.html:24 -#: .\statement\templates\statement\statement_table.html:28 +#: .\statement\templates\statement\statement_form.html:27 +#: .\statement\templates\statement\statement_table.html:29 msgid "Transactions" msgstr "Transactions" -#: .\statement\templates\statement\statement_table.html:22 +#: .\statement\templates\statement\statement_table.html:23 msgid "Date" msgstr "Date" -#: .\statement\templates\statement\statement_table.html:24 +#: .\statement\templates\statement\statement_table.html:25 msgid "Account" msgstr "Compte" -#: .\statement\templates\statement\statement_table.html:26 +#: .\statement\templates\statement\statement_table.html:27 msgid "Value" msgstr "Valeur" -#: .\statement\templates\statement\statement_table.html:56 +#: .\statement\templates\statement\statement_table.html:60 msgid "No statement" msgstr "Aucun relevé" -#: .\statement\templates\statement\statement_table.html:64 +#: .\statement\templates\statement\statement_table.html:68 msgid "View all statements" msgstr "Voir tous les relevés" diff --git a/nummi/transaction/locale/fr_FR/LC_MESSAGES/django.mo b/nummi/transaction/locale/fr_FR/LC_MESSAGES/django.mo index b34179b90b20d71fd55363e1e3f5378f254f26e2..6d872a83dba4ee847d3dc60f6792146778c8c726 100644 GIT binary patch delta 687 zcmX}pKP&@b7{~Fqby`|~OZ_P(kkH-ueyd2voHS($G$jr@EC& zPSe${Rk%iiPSuqpog1zkK96Qf#c|JH5o_6vDH&;5}3qA!x Xb9TWk=E_;ij?~^eYel>KXx;n)p^QOj delta 610 zcmX}pKS;ws6vy$`m|AVL*7&Cix+#K_t6RGWf;e>&oGRj=c2E}`vWSagkWz4KM+K?4 z>f$1TOFf+43;p9 z>o|mE%;7eMxQ{+YIEd#M;H7(CL+x{oTHoxwkL;F#Cbn=4A5n$gPz63v3%fXs-_BoD zA%CE^KEM(F7ch+rIEBl&L^DOy{5?*odR5F?WOl|t9bDiv){&px@le4B)Pg6}L0+A0 zR41Rv-qyi9c5xDaPz~fbjrN~M&0j$sbQLqyw>1VTu<6`#6LwK2K0V?d9T~j zhFrvdsG#;zsK_{3Aa$et(5>`iW0aA;y*gLu=@!(vVun;V3U!-AsZyz) V93IC9UitpTYp3FdzY~Y)=RfapE)D\n" "Language-Team: \n" @@ -22,8 +22,8 @@ msgid "Transaction" msgstr "Transaction" #: .\transaction\models.py:19 .\transaction\models.py:89 -#: .\transaction\templates\transaction\invoice_table.html:9 -#: .\transaction\templates\transaction\transaction_table.html:28 +#: .\transaction\templates\transaction\invoice_table.html:10 +#: .\transaction\templates\transaction\transaction_table.html:29 msgid "Name" msgstr "Nom" @@ -32,12 +32,12 @@ msgid "Description" msgstr "Description" #: .\transaction\models.py:23 -#: .\transaction\templates\transaction\transaction_table.html:29 +#: .\transaction\templates\transaction\transaction_table.html:30 msgid "Value" msgstr "Valeur" #: .\transaction\models.py:25 -#: .\transaction\templates\transaction\transaction_table.html:27 +#: .\transaction\templates\transaction\transaction_table.html:28 msgid "Date" msgstr "Date" @@ -46,7 +46,7 @@ msgid "Real date" msgstr "Date réelle" #: .\transaction\models.py:28 -#: .\transaction\templates\transaction\transaction_table.html:30 +#: .\transaction\templates\transaction\transaction_table.html:31 msgid "Trader" msgstr "Commerçant" @@ -55,7 +55,7 @@ msgid "Payment" msgstr "Paiement" #: .\transaction\models.py:38 -#: .\transaction\templates\transaction\transaction_table.html:32 +#: .\transaction\templates\transaction\transaction_table.html:33 msgid "Category" msgstr "Catégorie" @@ -64,12 +64,13 @@ msgid "Statement" msgstr "Relevé" #: .\transaction\models.py:48 -#: .\transaction\templates\transaction\transaction_table.html:35 +#: .\transaction\templates\transaction\transaction_table.html:36 msgid "Account" msgstr "Compte" #: .\transaction\models.py:83 -#: .\transaction\templates\transaction\transaction_archive_month.html:11 +#: .\transaction\templates\transaction\transaction_archive_month.html:24 +#: .\transaction\templates\transaction\transaction_archive_year.html:23 #: .\transaction\templates\transaction\transaction_list.html:4 #: .\transaction\templates\transaction\transaction_list.html:7 msgid "Transactions" @@ -80,18 +81,18 @@ msgid "Invoice" msgstr "Facture" #: .\transaction\models.py:94 -#: .\transaction\templates\transaction\invoice_table.html:10 -#: .\transaction\templates\transaction\invoice_table.html:20 +#: .\transaction\templates\transaction\invoice_table.html:11 +#: .\transaction\templates\transaction\invoice_table.html:22 msgid "File" msgstr "Fichier" #: .\transaction\models.py:123 -#: .\transaction\templates\transaction\transaction_form.html:19 +#: .\transaction\templates\transaction\transaction_form.html:20 msgid "Invoices" msgstr "Factures" #: .\transaction\templates\transaction\invoice_form.html:4 -#: .\transaction\templates\transaction\invoice_table.html:35 +#: .\transaction\templates\transaction\invoice_table.html:37 msgid "Create invoice" msgstr "Créer une facture" @@ -99,19 +100,28 @@ msgstr "Créer une facture" msgid "New invoice" msgstr "Nouvelle facture" -#: .\transaction\templates\transaction\invoice_table.html:11 -#: .\transaction\templates\transaction\invoice_table.html:23 +#: .\transaction\templates\transaction\invoice_table.html:12 +#: .\transaction\templates\transaction\invoice_table.html:25 msgid "Delete" msgstr "Supprimer" -#: .\transaction\templates\transaction\invoice_table.html:28 +#: .\transaction\templates\transaction\invoice_table.html:30 msgid "No invoice" msgstr "Aucune facture" -#: .\transaction\templates\transaction\transaction_archive_month.html:14 +#: .\transaction\templates\transaction\transaction_archive_month.html:12 +msgid "Back" +msgstr "Retour" + +#: .\transaction\templates\transaction\transaction_archive_month.html:19 +#: .\transaction\templates\transaction\transaction_archive_year.html:18 msgid "Categories" msgstr "Catégories" +#: .\transaction\templates\transaction\transaction_archive_year.html:12 +msgid "History" +msgstr "Historique" + #: .\transaction\templates\transaction\transaction_form.html:5 #: .\transaction\templates\transaction\transaction_table.html:5 msgid "Create transaction" @@ -121,10 +131,10 @@ msgstr "Créer une transaction" msgid "New transaction" msgstr "Nouvelle transaction" -#: .\transaction\templates\transaction\transaction_table.html:71 +#: .\transaction\templates\transaction\transaction_table.html:75 msgid "No transaction" msgstr "Aucune transaction" -#: .\transaction\templates\transaction\transaction_table.html:80 +#: .\transaction\templates\transaction\transaction_table.html:84 msgid "View all transactions" msgstr "Voir toutes les transactions" diff --git a/nummi/transaction/templates/transaction/transaction_archive_month.html b/nummi/transaction/templates/transaction/transaction_archive_month.html index e6a2600..5b85799 100644 --- a/nummi/transaction/templates/transaction/transaction_archive_month.html +++ b/nummi/transaction/templates/transaction/transaction_archive_month.html @@ -5,6 +5,17 @@ {% css "main/css/plot.css" %} {% endblock %} {% block h2 %}{{ month|date:"F Y"|capfirst }}{% endblock %} +{% block backlinks %} + {{ block.super }} + {% if account or category %} +

+ + {% translate "Back" %}{{ "arrow-go-back"|remix }} + +

+ {% endif %} +{% endblock %} {% block table %} {% if not category %}
diff --git a/nummi/transaction/templates/transaction/transaction_archive_year.html b/nummi/transaction/templates/transaction/transaction_archive_year.html index ea5b395..4b979d8 100644 --- a/nummi/transaction/templates/transaction/transaction_archive_year.html +++ b/nummi/transaction/templates/transaction/transaction_archive_year.html @@ -6,6 +6,14 @@ {% endblock %} {% block name %}{{ year|date:"Y" }}{% endblock %} {% block h2 %}{{ year|date:"Y" }}{% endblock %} +{% block backlinks %} + {{ block.super }} + {% if account or category %} +

+ {% translate "Back" %}{{ "arrow-go-back"|remix }} +

+ {% endif %} +{% endblock %} {% block table %} {% if history %}