edpibu
/
nummi
1
Fork 0
Code Issues 4 Releases Activity

Reformat template files with djLint

This commit is contained in:
Edgar P. Burkhart 2022-12-25 16:24:40 +01:00
parent 3a31eec326
commit 16dba43810
Signed by: edpibu
GPG Key ID: 9833D3C5A25BD227
12 changed files with 384 additions and 398 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
nummi/main/templates/main/base.html
View File

@ -5,14 +5,22 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" /> <meta name="viewport" content="width=device-width,initial-scale=1" />
<title>
<title>{% block title %}Nummi{% endblock %}</title> {% block title %}Nummi{% endblock %}
</title>
{% block link %} {% block link %}
<link rel="icon" href="{% static 'main/svg/logo.svg' %}" type="image/svg+xml" /> <link rel="icon"
<link rel="stylesheet" href="{% static 'main/css/main.css' %}" type="text/css" /> href="{% static 'main/svg/logo.svg' %}"
<link rel="stylesheet" href="{% static 'main/css/nav.css' %}" type="text/css" /> type="image/svg+xml"/>
<link rel="stylesheet" href="{% static 'main/fontawesome/css/all.min.css' %}" type="text/css" /> <link rel="stylesheet"
href="{% static 'main/css/main.css' %}"
type="text/css"/>
<link rel="stylesheet"
href="{% static 'main/css/nav.css' %}"
type="text/css"/>
<link rel="stylesheet"
href="{% static 'main/fontawesome/css/all.min.css' %}"
type="text/css"/>
{% endblock %} {% endblock %}
</head> </head>
<body> <body>
@ -22,7 +30,8 @@
<a href="{% url 'index' %}" <a href="{% url 'index' %}"
class="home{% if request.resolver_match.url_name == 'index' %} cur{% endif %}" class="home{% if request.resolver_match.url_name == 'index' %} cur{% endif %}"
accesskey="h"> accesskey="h">
<img src="{% static 'main/svg/logo.svg' %}" alt="" />Nummi <img src="{% static 'main/svg/logo.svg' %}" alt="" />
Nummi
</a> </a>
<a href="{% url 'transaction' %}" <a href="{% url 'transaction' %}"
class="{% if request.resolver_match.url_name == 'transaction' %}cur{% endif %}" class="{% if request.resolver_match.url_name == 'transaction' %}cur{% endif %}"
@ -41,19 +50,18 @@
</a> </a>
<form id="search" action="{% url 'search' %}" method="post"> <form id="search" action="{% url 'search' %}" method="post">
{% csrf_token %} {% csrf_token %}
<input type="text" name="search" placeholder="{% translate "Search" %}" {% if search %}value="{{ search }}"{% endif %} /> <input type="text"
name="search"
placeholder="{% translate "Search" %}"
{% if search %}value="{{ search }}"{% endif %}/>
<input type="submit" value="{% translate "Search" %}" /> <input type="submit" value="{% translate "Search" %}" />
</form> </form>
<a href="{% url 'logout' %}" class="logout" accesskey="l">
<a href="{% url 'logout' %}"
class="logout"
accesskey="l">
<i class="fa fa-right-from-bracket"></i> <i class="fa fa-right-from-bracket"></i>
</a> </a>
</nav> </nav>
{% endspaceless %} {% endspaceless %}
{% endblock %} {% endblock %}
{% block body %} {% block body %}{% endblock %}
{% endblock %}
</body> </body>
</html> </html>

36
nummi/main/templates/main/category.html
View File

@ -2,26 +2,28 @@
{% load static %} {% load static %}
{% load main_extras %} {% load main_extras %}
{% load i18n %} {% load i18n %}
{% block link %} {% block link %}
{{ block.super }} {{ block.super }}
<link rel="stylesheet" href="{% static 'main/css/form.css' %}" type="text/css" /> <link rel="stylesheet"
<link rel="stylesheet" href="{% static 'main/css/table.css' %}" type="text/css" /> href="{% static 'main/css/form.css' %}"
type="text/css"/>
<link rel="stylesheet"
href="{% static 'main/css/table.css' %}"
type="text/css"/>
{% endblock %} {% endblock %}
{% block body %} {% block body %}
<h1><i class="fa fa-{{ category.icon }}"></i> {{ category }}</h1> <h1>
<i class="fa fa-{{ category.icon }}"></i> {{ category }}
<form action="{% url 'category' category.id %}" method="post"> </h1>
<form action="{% url 'category' category.id %}" method="post">
{% csrf_token %} {% csrf_token %}
{{ form }} {{ form }}
{% form_buttons category %} {% form_buttons category %}
</form> </form>
{% if transactions %}
{% if transactions %} <img src="{% url "plot-category" category.id %}"
<img src="{% url "plot-category" category.id %}" alt="Graph representing value over time" /> alt="Graph representing value over time"/>
<h2>{% translate "Transactions" %}</h2>
<h2>{% translate "Transactions" %}</h2> {% transaction_table transactions %}
{% transaction_table transactions %} {% endif %}
{% endif %} {% endblock %}
{% endblock %}

14
nummi/main/templates/main/form.html
View File

@ -1,12 +1,10 @@
{% if form.non_field_errors %} {% if form.non_field_errors %}
<ul class='errorlist'> <ul class='errorlist'>
{% for error in form.non_field_errors %} {% for error in form.non_field_errors %}<li>{{ error }}</li>{% endfor %}
<li>{{ error }}</li> </ul>
{% endfor %}
</ul>
{% endif %} {% endif %}
{% for field in form %} {% for field in form %}
{{ field.errors }} {{ field.errors }}
<label for="{{ field.id_for_label }}">{{ field.label }}</label> <label for="{{ field.id_for_label }}">{{ field.label }}</label>
<div>{{ field }}</div> <div>{{ field }}</div>
{% endfor %} {% endfor %}

41
nummi/main/templates/main/index.html
View File

@ -2,29 +2,31 @@
{% load static %} {% load static %}
{% load main_extras %} {% load main_extras %}
{% load i18n %} {% load i18n %}
{% block link %} {% block link %}
{{ block.super }} {{ block.super }}
<link rel="stylesheet" href="{% static 'main/css/index.css' %}" type="text/css" /> <link rel="stylesheet"
<link rel="stylesheet" href="{% static 'main/css/table.css' %}" type="text/css" /> href="{% static 'main/css/index.css' %}"
type="text/css"/>
<link rel="stylesheet"
href="{% static 'main/css/table.css' %}"
type="text/css"/>
{% endblock %} {% endblock %}
{% block body %} {% block body %}
{% if transactions %} {% if transactions %}
<h2>{% translate "Transactions" %} <a href="{% url "transactions" %}"><i class="fa fa-magnifying-glass-plus"></i></a></h2> <h2>
{% transaction_table transactions %} {% translate "Transactions" %} <a href="{% url "transactions" %}"><i class="fa fa-magnifying-glass-plus"></i></a>
{% endif %} </h2>
{% transaction_table transactions %}
{% if categories %} {% endif %}
{% if categories %}
<h2>{% translate "Categories" %}</h2> <h2>{% translate "Categories" %}</h2>
<div id="categories"> <div id="categories">
{% for cat in categories %} {% for cat in categories %}
<a href="{% url 'category' cat.id %}"><i class="fa fa-{{ cat.icon }}"></i>{{ cat }}</a> <a href="{% url 'category' cat.id %}"><i class="fa fa-{{ cat.icon }}"></i>{{ cat }}</a>
{% endfor %} {% endfor %}
</div> </div>
{% endif %} {% endif %}
{% if snapshots %}
{% if snapshots %}
<h2>{% translate "Snapshots" %}</h2> <h2>{% translate "Snapshots" %}</h2>
<div id="snapshots" class="table col1-5"> <div id="snapshots" class="table col1-5">
<div class="header"> <div class="header">
@ -48,13 +50,9 @@
<a href="{% url 'snapshot' snap.id %}">{{ snap.date|date:"Y-m-d" }}</a> <a href="{% url 'snapshot' snap.id %}">{{ snap.date|date:"Y-m-d" }}</a>
</span> </span>
<span class="value num right">{{ snap.value|value }}</span> <span class="value num right">{{ snap.value|value }}</span>
<span class="diff num right"> <span class="diff num right">{{ snap.diff|pmvalue }}</span>
{{ snap.diff|pmvalue }}
</span>
{% with sum=snap.sum %} {% with sum=snap.sum %}
<span class="sum num right"> <span class="sum num right">{{ sum|pmvalue }}</span>
{{ sum|pmvalue }}
</span>
<span class="valid center"> <span class="valid center">
{% if snap.previous is not None %} {% if snap.previous is not None %}
{% if sum == snap.diff %} {% if sum == snap.diff %}
@ -68,6 +66,5 @@
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
{% endif %} {% endif %}
{% endblock %} {% endblock %}

21
nummi/main/templates/main/login.html
View File

@ -1,23 +1,19 @@
{% extends "main/base.html" %} {% extends "main/base.html" %}
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
{% block link %} {% block link %}
{{ block.super }} {{ block.super }}
<link rel="stylesheet" href="{% static 'main/css/form.css' %}" type="text/css" /> <link rel="stylesheet"
href="{% static 'main/css/form.css' %}"
type="text/css"/>
{% endblock %} {% endblock %}
{% block body %} {% block body %}
<h1>{% translate "Log In" %}</h1>
<h1>{% translate "Log In" %}</h1> <form action="{% url 'login' %}" method="post">
<form action="{% url 'login' %}" method="post">
{% csrf_token %} {% csrf_token %}
{% if form.non_field_errors %} {% if form.non_field_errors %}
<ul class='errorlist'> <ul class='errorlist'>
{% for error in form.non_field_errors %} {% for error in form.non_field_errors %}<li>{{ error }}</li>{% endfor %}
<li>{{ error }}</li>
{% endfor %}
</ul> </ul>
{% endif %} {% endif %}
{% for field in form %} {% for field in form %}
@ -30,6 +26,5 @@
<input type="reset" /> <input type="reset" />
<input type="submit" value="{% translate "Log In" %}" /> <input type="submit" value="{% translate "Log In" %}" />
</div> </div>
</form> </form>
{% endblock %} {% endblock %}

84
nummi/main/templates/main/snapshot.html
View File

@ -2,17 +2,21 @@
{% load static %} {% load static %}
{% load main_extras %} {% load main_extras %}
{% load i18n %} {% load i18n %}
{% block link %} {% block link %}
{{ block.super }} {{ block.super }}
<link rel="stylesheet" href="{% static 'main/css/form.css' %}" type="text/css" /> <link rel="stylesheet"
<link rel="stylesheet" href="{% static 'main/css/table.css' %}" type="text/css" /> href="{% static 'main/css/form.css' %}"
<link rel="stylesheet" href="{% static 'main/css/chart.css' %}" type="text/css" /> type="text/css"/>
<link rel="stylesheet"
href="{% static 'main/css/table.css' %}"
type="text/css"/>
<link rel="stylesheet"
href="{% static 'main/css/chart.css' %}"
type="text/css"/>
{% endblock %} {% endblock %}
{% block body %} {% block body %}
{% with sum=snapshot.sum %} {% with sum=snapshot.sum %}
<h1> <h1>
{% if snapshot.previous is not None %} {% if snapshot.previous is not None %}
{% if sum == snapshot.diff %} {% if sum == snapshot.diff %}
<i class="fa fa-check green"></i> <i class="fa fa-check green"></i>
@ -21,40 +25,33 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
{{ snapshot }} {{ snapshot }}
</h1> </h1>
<form action="{% url 'snapshot' snapshot.id %}"
<form action="{% url 'snapshot' snapshot.id %}" method="post" enctype="multipart/form-data"> method="post"
enctype="multipart/form-data">
{% csrf_token %} {% csrf_token %}
{{ form }} {{ form }}
{% form_buttons snapshot %} {% form_buttons snapshot %}
</form> </form>
{% if categories %}
{% if categories %} <h2>{% translate "Categories" %}</h2>
<h2>{% translate "Categories" %}</h2> <div class="chart">
<div class="chart">
{% for cat in categories %} {% for cat in categories %}
<div class="name"> <div class="name">
{% if cat.category %} {% if cat.category %}
<i class="fa fa-{{ cat.category__icon }}"></i> <i class="fa fa-{{ cat.category__icon }}"></i>
<a href="{% url 'category' cat.category %}"> <a href="{% url 'category' cat.category %}">{{ cat.category__name }}</a>
{{ cat.category__name }}
</a>
{% else %} {% else %}
<i class="fa fa-wallet"></i></i> <i class="fa fa-wallet"></i></i>
{% endif %} {% endif %}
</div> </div>
<div class="value left"> <div class="value left">{{ cat.sum_m|pmvalue }}</div>
{{ cat.sum_m|pmvalue }}
</div>
<div class="left"> <div class="left">
<div <div class="bar bar_m"
class="bar bar_m"
style="width:{% widthratio cat.sum_m cat_lim_m 100 %}%" style="width:{% widthratio cat.sum_m cat_lim_m 100 %}%"
title="{{ cat.sum_m }}"> title="{{ cat.sum_m }}"></div>
</div>
{% if cat.sum < 0 %} {% if cat.sum < 0 %}
<div <div class="bar tot"
class="bar tot"
style="width:{% widthratio cat.sum cat_lim_m 100 %}%" style="width:{% widthratio cat.sum cat_lim_m 100 %}%"
title="{{ cat.sum }}"> title="{{ cat.sum }}">
<span>{{ cat.sum|pmvalue }}</span> <span>{{ cat.sum|pmvalue }}</span>
@ -62,31 +59,24 @@
{% endif %} {% endif %}
</div> </div>
<div class="right"> <div class="right">
<div <div class="bar bar_p"
class="bar bar_p"
style="width:{% widthratio cat.sum_p cat_lim 100 %}%" style="width:{% widthratio cat.sum_p cat_lim 100 %}%"
title="{{ cat.sum_p }}"> title="{{ cat.sum_p }}"></div>
</div>
{% if cat.sum >= 0 %} {% if cat.sum >= 0 %}
<div <div class="bar tot"
class="bar tot"
style="width:{% widthratio cat.sum cat_lim 100 %}%" style="width:{% widthratio cat.sum cat_lim 100 %}%"
title="{{ cat.sum }}"> title="{{ cat.sum }}">
<span>{{ cat.sum|pmvalue }}</span> <span>{{ cat.sum|pmvalue }}</span>
</div> </div>
{% endif %} {% endif %}
</div> </div>
<div class="value right"> <div class="value right">{{ cat.sum_p|pmvalue }}</div>
{{ cat.sum_p|pmvalue }}
</div>
{% endfor %} {% endfor %}
</div> </div>
{% endif %} {% endif %}
{% if snapshot.transactions %}
{% if snapshot.transactions %} <h2>{% translate "Transactions" %} ({{ sum|pmvalue }} / {{ snapshot.diff|pmvalue }})</h2>
<h2>{% translate "Transactions" %} ({{ sum|pmvalue }} / {{ snapshot.diff|pmvalue }})</h2> {% transaction_table snapshot.transactions %}
{% endif %}
{% transaction_table snapshot.transactions %} {% endwith %}
{% endif %} {% endblock %}
{% endwith %}
{% endblock %}

6
nummi/main/templates/main/tag/form_buttons.html
View File

@ -2,13 +2,11 @@
<div class="buttons"> <div class="buttons">
{% if not adding %} {% if not adding %}
{% translate "Delete" as del %} {% translate "Delete" as del %}
<a <a class="btn del"
class="btn del" onclick="return confirm('{{ del }} <{{ instance }}> ?')"
onclick="return confirm('{{ del }} <{{ instance}}> ?')"
href="{% url del_url instance.id %}"> href="{% url del_url instance.id %}">
{{ del }} {{ del }}
</a> </a>
{% endif %} {% endif %}
<input type="reset" /> <input type="reset" />
<input type="submit" value="{% translate 'Save' %}" /> <input type="submit" value="{% translate 'Save' %}" />

5
nummi/main/templates/main/tag/pmvalue.html
View File

@ -1,8 +1,9 @@
{% extends "main/tag/value.html" %} {% extends "main/tag/value.html" %}
{% block "value" %} {% block "value" %}
{% if value %} {% if value %}
{% if value > 0 %}+{% endif %} {% if value > 0 %}+{% endif %}
{{ block.super }} {{ block.super }}
{% else %}–{% endif %} {% else %}
–
{% endif %}
{% endblock %} {% endblock %}

5
nummi/main/templates/main/tag/transaction_table.html
View File

@ -1,6 +1,5 @@
{% load main_extras %} {% load main_extras %}
{% load i18n %} {% load i18n %}
<div id="transactions" class="table col1-6"> <div id="transactions" class="table col1-6">
<div class="header"> <div class="header">
<strong class="attach center"><i class="fa fa-paperclip"></i></strong> <strong class="attach center"><i class="fa fa-paperclip"></i></strong>
@ -29,9 +28,7 @@
<span class="category text center"> <span class="category text center">
{% if trans.category %} {% if trans.category %}
<i class="fa fa-{{ trans.category.icon }}"></i> <i class="fa fa-{{ trans.category.icon }}"></i>
<a href="{% url 'category' trans.category.id %}"> <a href="{% url 'category' trans.category.id %}">{{ trans.category }}</a>
{{ trans.category }}
</a>
{% else %} {% else %}
– –
{% endif %} {% endif %}

8
nummi/main/templates/main/tag/value.html
View File

@ -1,7 +1,5 @@
{% spaceless %} {% spaceless %}
<span> <span>
{% block "value" %} {% block "value" %}{{ value }} €{% endblock %}
{{ value }} € </span>
{% endblock %}
</span>
{% endspaceless %} {% endspaceless %}

41
nummi/main/templates/main/transaction.html
View File

@ -2,26 +2,28 @@
{% load static %} {% load static %}
{% load main_extras %} {% load main_extras %}
{% load i18n %} {% load i18n %}
{% block link %} {% block link %}
{{ block.super }} {{ block.super }}
<link rel="stylesheet" href="{% static 'main/css/form.css' %}" type="text/css" /> <link rel="stylesheet"
<link rel="stylesheet" href="{% static 'main/css/table.css' %}" type="text/css" /> href="{% static 'main/css/form.css' %}"
type="text/css"/>
<link rel="stylesheet"
href="{% static 'main/css/table.css' %}"
type="text/css"/>
{% endblock %} {% endblock %}
{% block body %} {% block body %}
<h1>{{ transaction }}</h1> <h1>{{ transaction }}</h1>
{% spaceless %}
{% spaceless %} <form id="transaction"
<form id="transaction" action="{% url 'transaction' transaction.id %}" method="post"> action="{% url 'transaction' transaction.id %}"
method="post">
{% csrf_token %} {% csrf_token %}
<input type="hidden" name="form" value="transaction" /> <input type="hidden" name="form" value="transaction" />
{{ form }} {{ form }}
{% form_buttons transaction %} {% form_buttons transaction %}
</form> </form>
{% endspaceless %} {% endspaceless %}
<div class="split">
<div class="split">
{% if transaction.has_invoice %} {% if transaction.has_invoice %}
<div> <div>
<h2>{% translate "Invoices" %}</h2> <h2>{% translate "Invoices" %}</h2>
@ -44,15 +46,18 @@
</div> </div>
</div> </div>
{% endif %} {% endif %}
<div> <div>
<h3>{% translate "Add invoice" %}</h3> <h3>{% translate "Add invoice" %}</h3>
<form action="{% url 'transaction' transaction.id %}" method="post" enctype="multipart/form-data"> <form action="{% url 'transaction' transaction.id %}"
method="post"
enctype="multipart/form-data">
{% csrf_token %} {% csrf_token %}
<input type="hidden" name="form" value="invoice" /> <input type="hidden" name="form" value="invoice" />
{{ invoice_form }} {{ invoice_form }}
<div class="buttons"><input class="btn" type="submit" value="{% translate "Add" %}" /></div> <div class="buttons">
<input class="btn" type="submit" value="{% translate "Add" %}" />
</div>
</form> </form>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}

31
nummi/main/templates/main/transactions.html
View File

@ -2,34 +2,31 @@
{% load static %} {% load static %}
{% load main_extras %} {% load main_extras %}
{% load i18n %} {% load i18n %}
{% block link %} {% block link %}
{{ block.super }} {{ block.super }}
<link rel="stylesheet" href="{% static 'main/css/table.css' %}" type="text/css" /> <link rel="stylesheet"
<link rel="stylesheet" href="{% static 'main/css/page.css' %}" type="text/css" /> href="{% static 'main/css/table.css' %}"
type="text/css"/>
<link rel="stylesheet"
href="{% static 'main/css/page.css' %}"
type="text/css"/>
{% endblock %} {% endblock %}
{% block body %} {% block body %}
<h1>{% translate "Transactions" %}</h1> <h1>{% translate "Transactions" %}</h1>
{% transaction_table transactions %} {% transaction_table transactions %}
{% if page_obj %}
{% if page_obj %} <div class="pagination">
<div class="pagination">
<span class="step-links"> <span class="step-links">
{% if page_obj.has_previous %} {% if page_obj.has_previous %}
<a href="?page=1">↞</a> <a href="?page=1">↞</a>
<a href="?page={{ page_obj.previous_page_number }}">←</a> <a href="?page={{ page_obj.previous_page_number }}">←</a>
{% endif %} {% endif %}
<span class="current">{{ page_obj.number }}/{{ page_obj.paginator.num_pages }}</span>
<span class="current">
{{ page_obj.number }}/{{ page_obj.paginator.num_pages }}
</span>
{% if page_obj.has_next %} {% if page_obj.has_next %}
<a href="?page={{ page_obj.next_page_number }}">→</a> <a href="?page={{ page_obj.next_page_number }}">→</a>
<a href="?page={{ page_obj.paginator.num_pages }}">↠</a> <a href="?page={{ page_obj.paginator.num_pages }}">↠</a>
{% endif %} {% endif %}
</span> </span>
</div> </div>
{% endif %} {% endif %}
{% endblock %} {% endblock %}