diff --git a/app/templates/accounts/fragments/list.html b/app/templates/accounts/fragments/list.html index 6bcf835..ea4ffe4 100644 --- a/app/templates/accounts/fragments/list.html +++ b/app/templates/accounts/fragments/list.html @@ -3,7 +3,7 @@ url="{% url 'account_add' %}" hx_target="#generic-offcanvas"> -
+
{% spaceless %}
{% translate 'Accounts' %}
diff --git a/app/templates/calendar_view/pages/calendar.html b/app/templates/calendar_view/pages/calendar.html index 8868fcc..6bf8174 100644 --- a/app/templates/calendar_view/pages/calendar.html +++ b/app/templates/calendar_view/pages/calendar.html @@ -12,33 +12,31 @@ {% endblock %} {% block content %} -
+
{# Date picker#}
-
- - - -
-
+ + +
{{ month|month_name }} {{ year }}
-
- - - -
+ + +
diff --git a/app/templates/dca/fragments/strategy/list.html b/app/templates/dca/fragments/strategy/list.html index e2d16f4..7791938 100644 --- a/app/templates/dca/fragments/strategy/list.html +++ b/app/templates/dca/fragments/strategy/list.html @@ -3,7 +3,7 @@ url="{% url 'dca_strategy_add' %}" hx_target="#generic-offcanvas"> -
+
{% spaceless %}
{% translate 'Dollar Cost Average Strategies' %}
diff --git a/app/templates/export_app/fragments/export.html b/app/templates/export_app/fragments/export.html index 8a41a9f..9b3364e 100644 --- a/app/templates/export_app/fragments/export.html +++ b/app/templates/export_app/fragments/export.html @@ -5,7 +5,7 @@ {% block title %}{% translate 'Export' %}{% endblock %} {% block body %} -
+
{% crispy form %}
diff --git a/app/templates/export_app/fragments/restore.html b/app/templates/export_app/fragments/restore.html index c158a75..edf6ddf 100644 --- a/app/templates/export_app/fragments/restore.html +++ b/app/templates/export_app/fragments/restore.html @@ -5,7 +5,7 @@ {% block title %}{% translate 'Restore' %}{% endblock %} {% block body %} -
+
-
+
-
+
{% trans "Income/Expense by Account" %}
@@ -30,7 +30,7 @@
-
+
{% trans "Income/Expense by Currency" %}
@@ -42,4 +42,4 @@
-
\ No newline at end of file +
diff --git a/app/templates/insights/fragments/category_overview/index.html b/app/templates/insights/fragments/category_overview/index.html index ca418ed..2083dbb 100644 --- a/app/templates/insights/fragments/category_overview/index.html +++ b/app/templates/insights/fragments/category_overview/index.html @@ -6,25 +6,25 @@
@@ -47,7 +47,8 @@
- - -
{% if total_table %} {% if view_type == "table" %}
- -
- - - - - - - - - - - {% for category in total_table.values %} - - - - - - - - - - {% if show_tags %} - {% for tag_id, tag in category.tags.items %} - {% if tag.name or not tag.name and category.tags.values|length > 1 %} - - - - - - - - {% if show_entities %} - {% for entity_id, entity in tag.entities.items %} - {% if entity.name or not entity.name and tag.entities.values|length > 1 %} - - - - - - +
+ +
+
{% trans 'Category' %}{% trans 'Income' %}{% trans 'Expense' %}{% trans 'Total' %}
{% if category.name %}{{ category.name }}{% else %}{% trans 'Uncategorized' %}{% endif %} {# income #} - {% for currency in category.currencies.values %} - {% if showing == 'current' and currency.income_current != 0 %} - - {% elif showing == 'projected' and currency.income_projected != 0 %} - - {% elif showing == 'final' and currency.total_income != 0 %} - - {% else %} -
-
- {% endif %} - {% endfor %} -
{# expenses #} - {% for currency in category.currencies.values %} - {% if showing == 'current' and currency.expense_current != 0 %} - - {% elif showing == 'projected' and currency.expense_projected != 0 %} - - {% elif showing == 'final' and currency.total_expense != 0 %} - - {% else %} -
-
- {% endif %} - {% endfor %} -
{# total #} - {% for currency in category.currencies.values %} - {% if showing == 'current' and currency.total_current != 0 %} - - {% elif showing == 'projected' and currency.total_projected != 0 %} - - {% elif showing == 'final' and currency.total_final != 0 %} - - {% else %} -
-
- {% endif %} - {% endfor %} -
- {% if tag.name %}{{ tag.name }}{% else %}{% trans 'Untagged' %}{% endif %} - - {% for currency in tag.currencies.values %} - {% if showing == 'current' and currency.income_current != 0 %} - - {% elif showing == 'projected' and currency.income_projected != 0 %} - - {% elif showing == 'final' and currency.total_income != 0 %} - - {% else %} -
-
- {% endif %} - {% endfor %} -
- {% for currency in tag.currencies.values %} - {% if showing == 'current' and currency.expense_current != 0 %} - - {% elif showing == 'projected' and currency.expense_projected != 0 %} - - {% elif showing == 'final' and currency.total_expense != 0 %} - - {% else %} -
-
- {% endif %} - {% endfor %} -
- {% for currency in tag.currencies.values %} - {% if showing == 'current' and currency.total_current != 0 %} - - {% elif showing == 'projected' and currency.total_projected != 0 %} - - {% elif showing == 'final' and currency.total_final != 0 %} - - {% else %} -
-
- {% endif %} - {% endfor %} -
- {% if entity.name %}{{ entity.name }}{% else %}{% trans 'No entity' %}{% endif %} - - {% for currency in entity.currencies.values %} - {% if showing == 'current' and currency.income_current != 0 %} - - {% elif showing == 'projected' and currency.income_projected != 0 %} - - {% elif showing == 'final' and currency.total_income != 0 %} - - {% else %} -
-
- {% endif %} - {% endfor %} -
- {% for currency in entity.currencies.values %} - {% if showing == 'current' and currency.expense_current != 0 %} - - {% elif showing == 'projected' and currency.expense_projected != 0 %} - - {% elif showing == 'final' and currency.total_expense != 0 %} - - {% else %} -
-
- {% endif %} - {% endfor %} -
- {% for currency in entity.currencies.values %} - {% if showing == 'current' and currency.total_current != 0 %} - - {% elif showing == 'projected' and currency.total_projected != 0 %} - - {% elif showing == 'final' and currency.total_final != 0 %} - - {% else %} -
-
- {% endif %} - {% endfor %} -
+ + + + + + + + + + {% for category in total_table.values %} +{# Category row #} + + + + + + + + + {% if show_tags %} + {% for tag_id, tag in category.tags.items %} + {% if tag.name or not tag.name and category.tags.values|length > 1 %} + + + + + + +{# Entity rows #} + {% if show_entities %} + {% for entity_id, entity in tag.entities.items %} + {% if entity.name or not entity.name and tag.entities.values|length > 1 %} + + + + + + + {% endif %} + {% endfor %} + {% endif %} + {% endif %} + {% endfor %} {% endif %} {% endfor %} - {% endif %} - {% endfor %} - -
{% trans 'Category' %}{% trans 'Income' %}{% trans 'Expense' %}{% trans 'Total' %}
{% if category.name %}{{ category.name }}{% else %}{% trans 'Uncategorized' %}{% endif %} + {% for currency in category.currencies.values %} + {% if showing == 'current' and currency.income_current != 0 %} + + {% elif showing == 'projected' and currency.income_projected != 0 %} + + {% elif showing == 'final' and currency.total_income != 0 %} + + {% else %} +
-
{% endif %} {% endfor %} - {% endif %} +
+ {% for currency in category.currencies.values %} + {% if showing == 'current' and currency.expense_current != 0 %} + + {% elif showing == 'projected' and currency.expense_projected != 0 %} + + {% elif showing == 'final' and currency.total_expense != 0 %} + + {% else %} +
-
+ {% endif %} + {% endfor %} +
+ {% for currency in category.currencies.values %} + {% if showing == 'current' and currency.total_current != 0 %} + + {% elif showing == 'projected' and currency.total_projected != 0 %} + + {% elif showing == 'final' and currency.total_final != 0 %} + + {% else %} +
-
+ {% endif %} + {% endfor %} +
+ {% if tag.name %}{{ tag.name }}{% else %}{% trans 'Untagged' %}{% endif %} + + {% for currency in tag.currencies.values %} + {% if showing == 'current' and currency.income_current != 0 %} + + {% elif showing == 'projected' and currency.income_projected != 0 %} + + {% elif showing == 'final' and currency.total_income != 0 %} + + {% else %} +
-
+ {% endif %} + {% endfor %} +
+ {% for currency in tag.currencies.values %} + {% if showing == 'current' and currency.expense_current != 0 %} + + {% elif showing == 'projected' and currency.expense_projected != 0 %} + + {% elif showing == 'final' and currency.total_expense != 0 %} + + {% else %} +
-
+ {% endif %} + {% endfor %} +
+ {% for currency in tag.currencies.values %} + {% if showing == 'current' and currency.total_current != 0 %} + + {% elif showing == 'projected' and currency.total_projected != 0 %} + + {% elif showing == 'final' and currency.total_final != 0 %} + + {% else %} +
-
+ {% endif %} + {% endfor %} +
+ {% if entity.name %}{{ entity.name }}{% else %}{% trans 'No entity' %}{% endif %} + + {% for currency in entity.currencies.values %} + {% if showing == 'current' and currency.income_current != 0 %} + + {% elif showing == 'projected' and currency.income_projected != 0 %} + + {% elif showing == 'final' and currency.total_income != 0 %} + + {% else %} +
-
+ {% endif %} + {% endfor %} +
+ {% for currency in entity.currencies.values %} + {% if showing == 'current' and currency.expense_current != 0 %} + + {% elif showing == 'projected' and currency.expense_projected != 0 %} + + {% elif showing == 'final' and currency.total_expense != 0 %} + + {% else %} +
-
+ {% endif %} + {% endfor %} +
+ {% for currency in entity.currencies.values %} + {% if showing == 'current' and currency.total_current != 0 %} + + {% elif showing == 'projected' and currency.total_projected != 0 %} + + {% elif showing == 'final' and currency.total_final != 0 %} + + {% else %} +
-
+ {% endif %} + {% endfor %} +
+ + +
diff --git a/app/templates/insights/pages/index.html b/app/templates/insights/pages/index.html index df5cc43..3e5809c 100644 --- a/app/templates/insights/pages/index.html +++ b/app/templates/insights/pages/index.html @@ -73,22 +73,22 @@ remove .btn-active from <.insights-list button/> add .btn-active to event.target set event.target's @aria-selected to 'true'"> - - - - - -
+ +
+
diff --git a/app/templates/monthly_overview/pages/overview.html b/app/templates/monthly_overview/pages/overview.html index f7ae3b7..068b8fc 100644 --- a/app/templates/monthly_overview/pages/overview.html +++ b/app/templates/monthly_overview/pages/overview.html @@ -17,13 +17,13 @@
{# Date picker#}
-
- -
+ + +
{{ month|month_name }} {{ year }}
-
- - - -
+ + +
diff --git a/app/templates/net_worth/net_worth.html b/app/templates/net_worth/net_worth.html index 8f945eb..df56042 100644 --- a/app/templates/net_worth/net_worth.html +++ b/app/templates/net_worth/net_worth.html @@ -70,7 +70,7 @@