diff --git a/app/templates/cotton/ui/card.html b/app/templates/cotton/ui/card.html new file mode 100644 index 0000000..ca2a88f --- /dev/null +++ b/app/templates/cotton/ui/card.html @@ -0,0 +1,5 @@ +
+
+ {{ slot }} +
+
\ No newline at end of file diff --git a/app/templates/cotton/ui/info_card.html b/app/templates/cotton/ui/info_card.html new file mode 100644 index 0000000..4e22eab --- /dev/null +++ b/app/templates/cotton/ui/info_card.html @@ -0,0 +1,9 @@ +
+
+ +
+
+
{{ title }}{% if help_text %}{% include 'includes/help_icon.html' with content=help_text %}{% endif %}
+ {{ slot }} +
+
\ No newline at end of file diff --git a/app/templates/monthly_overview/fragments/monthly_summary.html b/app/templates/monthly_overview/fragments/monthly_summary.html index 5089391..5d36e65 100644 --- a/app/templates/monthly_overview/fragments/monthly_summary.html +++ b/app/templates/monthly_overview/fragments/monthly_summary.html @@ -1,17 +1,10 @@ {% load i18n %} {% load currency_display %} -
{# Daily Spending#}
-
-
- -
-
-
{% translate 'Daily Spending Allowance' %}{% include 'includes/help_icon.html' with content=_('This is the final total divided by the remaining days in the month') %}
-
+ +
{% translate 'today' %}
@@ -39,18 +32,11 @@ {% endfor %}
-
-
+
{# Income#}
-
-
- -
-
-
{% translate 'Income' %}
+
{% translate 'current' %}
@@ -110,18 +96,11 @@ {% endfor %}
-
-
+
{# Expenses#}
-
-
- -
-
-
{% translate 'Expenses' %}
+
{% translate 'current' %}
@@ -181,18 +160,11 @@ {% endfor %}
-
-
+
{# Total#}
-
-
- -
-
-
{% translate 'Total' %}
+
{% translate 'current' %}
@@ -278,10 +250,14 @@ {% endfor %}
-
-
+ +
+
+ + {% for p in percentages.values %} +

{{ p.currency.name }} ({{ p.currency.code }})

+ + {% endfor %} +
-{% for p in percentages.values %} - -{% endfor %} diff --git a/app/templates/net_worth/net_worth.html b/app/templates/net_worth/net_worth.html index d89c3b2..43fb68e 100644 --- a/app/templates/net_worth/net_worth.html +++ b/app/templates/net_worth/net_worth.html @@ -14,61 +14,42 @@
-
-
- -
-
-
- {% translate 'By currency' %} -
- {% for currency in currency_net_worth.values %} -
-
-
- {{ currency.currency.name }} -
-
-
- -
+ + {% for currency in currency_net_worth.values %} +
+
+
+ {{ currency.currency.name }}
-
- {% if currency.exchanged and currency.exchanged.total_final %} +
+ :amount="currency.total_final" + :prefix="currency.currency.prefix" + :suffix="currency.currency.suffix" + :decimal_places="currency.currency.decimal_places" + color="{% if currency.total_final > 0 %}green{% elif currency.total_final < 0 %}red{% endif %}" + text-end>
- {% endif %} - {% endfor %} -
-
+
+
+ {% if currency.exchanged and currency.exchanged.total_final %} +
+ +
+ {% endif %} + {% endfor %} +
-
-
- -
-
-
- {% translate 'By account' %} -
+ {% regroup account_net_worth.values by account.group as account_data %} {% for data in account_data %} {% if data.grouper %} @@ -136,8 +117,7 @@ {% endfor %} {% endif %} {% endfor %} -
-
+