Reformat template files with djLint
This commit is contained in:
parent
3a31eec326
commit
16dba43810
GPG Key ID:
9833D3C5A25BD227
|
|
@ -5,14 +5,22 @@
|
|||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width,initial-scale=1" />
|
||||
|
||||
<title>{% block title %}Nummi{% endblock %}</title>
|
||||
|
||||
<title>
|
||||
{% block title %}Nummi{% endblock %}
|
||||
</title>
|
||||
{% block link %}
|
||||
<link rel="icon" href="{% static 'main/svg/logo.svg' %}" type="image/svg+xml" />
|
||||
<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" />
|
||||
<link rel="icon"
|
||||
href="{% static 'main/svg/logo.svg' %}"
|
||||
type="image/svg+xml"/>
|
||||
<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 %}
|
||||
</head>
|
||||
<body>
|
||||
|
|
@ -22,7 +30,8 @@
|
|||
<a href="{% url 'index' %}"
|
||||
class="home{% if request.resolver_match.url_name == 'index' %} cur{% endif %}"
|
||||
accesskey="h">
|
||||
<img src="{% static 'main/svg/logo.svg' %}" alt="" />Nummi
|
||||
<img src="{% static 'main/svg/logo.svg' %}" alt="" />
|
||||
Nummi
|
||||
</a>
|
||||
<a href="{% url 'transaction' %}"
|
||||
class="{% if request.resolver_match.url_name == 'transaction' %}cur{% endif %}"
|
||||
|
|
@ -41,19 +50,18 @@
|
|||
</a>
|
||||
<form id="search" action="{% url 'search' %}" method="post">
|
||||
{% 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" %}" />
|
||||
</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>
|
||||
</a>
|
||||
</nav>
|
||||
{% endspaceless %}
|
||||
{% endblock %}
|
||||
{% block body %}
|
||||
{% endblock %}
|
||||
{% block body %}{% endblock %}
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -2,25 +2,27 @@
|
|||
{% load static %}
|
||||
{% load main_extras %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block link %}
|
||||
{{ block.super }}
|
||||
<link rel="stylesheet" href="{% static 'main/css/form.css' %}" type="text/css" />
|
||||
<link rel="stylesheet" href="{% static 'main/css/table.css' %}" type="text/css" />
|
||||
<link rel="stylesheet"
|
||||
href="{% static 'main/css/form.css' %}"
|
||||
type="text/css"/>
|
||||
<link rel="stylesheet"
|
||||
href="{% static 'main/css/table.css' %}"
|
||||
type="text/css"/>
|
||||
{% endblock %}
|
||||
|
||||
{% block body %}
|
||||
<h1><i class="fa fa-{{ category.icon }}"></i> {{ category }}</h1>
|
||||
|
||||
<h1>
|
||||
<i class="fa fa-{{ category.icon }}"></i> {{ category }}
|
||||
</h1>
|
||||
<form action="{% url 'category' category.id %}" method="post">
|
||||
{% csrf_token %}
|
||||
{{ form }}
|
||||
{% form_buttons category %}
|
||||
</form>
|
||||
|
||||
{% if transactions %}
|
||||
<img src="{% url "plot-category" category.id %}" alt="Graph representing value over time" />
|
||||
|
||||
<img src="{% url "plot-category" category.id %}"
|
||||
alt="Graph representing value over time"/>
|
||||
<h2>{% translate "Transactions" %}</h2>
|
||||
{% transaction_table transactions %}
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
{% if form.non_field_errors %}
|
||||
<ul class='errorlist'>
|
||||
{% for error in form.non_field_errors %}
|
||||
<li>{{ error }}</li>
|
||||
{% endfor %}
|
||||
{% for error in form.non_field_errors %}<li>{{ error }}</li>{% endfor %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
{% for field in form %}
|
||||
|
|
|
|||
|
|
@ -2,19 +2,22 @@
|
|||
{% load static %}
|
||||
{% load main_extras %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block link %}
|
||||
{{ block.super }}
|
||||
<link rel="stylesheet" href="{% static 'main/css/index.css' %}" type="text/css" />
|
||||
<link rel="stylesheet" href="{% static 'main/css/table.css' %}" type="text/css" />
|
||||
<link rel="stylesheet"
|
||||
href="{% static 'main/css/index.css' %}"
|
||||
type="text/css"/>
|
||||
<link rel="stylesheet"
|
||||
href="{% static 'main/css/table.css' %}"
|
||||
type="text/css"/>
|
||||
{% endblock %}
|
||||
|
||||
{% block body %}
|
||||
{% if transactions %}
|
||||
<h2>{% translate "Transactions" %} <a href="{% url "transactions" %}"><i class="fa fa-magnifying-glass-plus"></i></a></h2>
|
||||
<h2>
|
||||
{% translate "Transactions" %} <a href="{% url "transactions" %}"><i class="fa fa-magnifying-glass-plus"></i></a>
|
||||
</h2>
|
||||
{% transaction_table transactions %}
|
||||
{% endif %}
|
||||
|
||||
{% if categories %}
|
||||
<h2>{% translate "Categories" %}</h2>
|
||||
<div id="categories">
|
||||
|
|
@ -23,7 +26,6 @@
|
|||
{% endfor %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if snapshots %}
|
||||
<h2>{% translate "Snapshots" %}</h2>
|
||||
<div id="snapshots" class="table col1-5">
|
||||
|
|
@ -48,13 +50,9 @@
|
|||
<a href="{% url 'snapshot' snap.id %}">{{ snap.date|date:"Y-m-d" }}</a>
|
||||
</span>
|
||||
<span class="value num right">{{ snap.value|value }}</span>
|
||||
<span class="diff num right">
|
||||
{{ snap.diff|pmvalue }}
|
||||
</span>
|
||||
<span class="diff num right">{{ snap.diff|pmvalue }}</span>
|
||||
{% with sum=snap.sum %}
|
||||
<span class="sum num right">
|
||||
{{ sum|pmvalue }}
|
||||
</span>
|
||||
<span class="sum num right">{{ sum|pmvalue }}</span>
|
||||
<span class="valid center">
|
||||
{% if snap.previous is not None %}
|
||||
{% if sum == snap.diff %}
|
||||
|
|
@ -69,5 +67,4 @@
|
|||
{% endfor %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -1,23 +1,19 @@
|
|||
{% extends "main/base.html" %}
|
||||
{% load static %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block link %}
|
||||
{{ 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 %}
|
||||
|
||||
{% block body %}
|
||||
|
||||
<h1>{% translate "Log In" %}</h1>
|
||||
|
||||
<form action="{% url 'login' %}" method="post">
|
||||
{% csrf_token %}
|
||||
{% if form.non_field_errors %}
|
||||
<ul class='errorlist'>
|
||||
{% for error in form.non_field_errors %}
|
||||
<li>{{ error }}</li>
|
||||
{% endfor %}
|
||||
{% for error in form.non_field_errors %}<li>{{ error }}</li>{% endfor %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
{% for field in form %}
|
||||
|
|
@ -31,5 +27,4 @@
|
|||
<input type="submit" value="{% translate "Log In" %}" />
|
||||
</div>
|
||||
</form>
|
||||
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -2,14 +2,18 @@
|
|||
{% load static %}
|
||||
{% load main_extras %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block link %}
|
||||
{{ block.super }}
|
||||
<link rel="stylesheet" href="{% static 'main/css/form.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" />
|
||||
<link rel="stylesheet"
|
||||
href="{% static 'main/css/form.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 %}
|
||||
|
||||
{% block body %}
|
||||
{% with sum=snapshot.sum %}
|
||||
<h1>
|
||||
|
|
@ -22,13 +26,13 @@
|
|||
{% endif %}
|
||||
{{ snapshot }}
|
||||
</h1>
|
||||
|
||||
<form action="{% url 'snapshot' snapshot.id %}" method="post" enctype="multipart/form-data">
|
||||
<form action="{% url 'snapshot' snapshot.id %}"
|
||||
method="post"
|
||||
enctype="multipart/form-data">
|
||||
{% csrf_token %}
|
||||
{{ form }}
|
||||
{% form_buttons snapshot %}
|
||||
</form>
|
||||
|
||||
{% if categories %}
|
||||
<h2>{% translate "Categories" %}</h2>
|
||||
<div class="chart">
|
||||
|
|
@ -36,25 +40,18 @@
|
|||
<div class="name">
|
||||
{% if cat.category %}
|
||||
<i class="fa fa-{{ cat.category__icon }}"></i>
|
||||
<a href="{% url 'category' cat.category %}">
|
||||
{{ cat.category__name }}
|
||||
</a>
|
||||
<a href="{% url 'category' cat.category %}">{{ cat.category__name }}</a>
|
||||
{% else %}
|
||||
<i class="fa fa-wallet"></i></i>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="value left">
|
||||
{{ cat.sum_m|pmvalue }}
|
||||
</div>
|
||||
<div class="value left">{{ cat.sum_m|pmvalue }}</div>
|
||||
<div class="left">
|
||||
<div
|
||||
class="bar bar_m"
|
||||
<div class="bar bar_m"
|
||||
style="width:{% widthratio cat.sum_m cat_lim_m 100 %}%"
|
||||
title="{{ cat.sum_m }}">
|
||||
</div>
|
||||
title="{{ cat.sum_m }}"></div>
|
||||
{% if cat.sum < 0 %}
|
||||
<div
|
||||
class="bar tot"
|
||||
<div class="bar tot"
|
||||
style="width:{% widthratio cat.sum cat_lim_m 100 %}%"
|
||||
title="{{ cat.sum }}">
|
||||
<span>{{ cat.sum|pmvalue }}</span>
|
||||
|
|
@ -62,30 +59,23 @@
|
|||
{% endif %}
|
||||
</div>
|
||||
<div class="right">
|
||||
<div
|
||||
class="bar bar_p"
|
||||
<div class="bar bar_p"
|
||||
style="width:{% widthratio cat.sum_p cat_lim 100 %}%"
|
||||
title="{{ cat.sum_p }}">
|
||||
</div>
|
||||
title="{{ cat.sum_p }}"></div>
|
||||
{% if cat.sum >= 0 %}
|
||||
<div
|
||||
class="bar tot"
|
||||
<div class="bar tot"
|
||||
style="width:{% widthratio cat.sum cat_lim 100 %}%"
|
||||
title="{{ cat.sum }}">
|
||||
<span>{{ cat.sum|pmvalue }}</span>
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="value right">
|
||||
{{ cat.sum_p|pmvalue }}
|
||||
</div>
|
||||
<div class="value right">{{ cat.sum_p|pmvalue }}</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if snapshot.transactions %}
|
||||
<h2>{% translate "Transactions" %} ({{ sum|pmvalue }} / {{ snapshot.diff|pmvalue }})</h2>
|
||||
|
||||
{% transaction_table snapshot.transactions %}
|
||||
{% endif %}
|
||||
{% endwith %}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,11 @@
|
|||
<div class="buttons">
|
||||
{% if not adding %}
|
||||
{% translate "Delete" as del %}
|
||||
<a
|
||||
class="btn del"
|
||||
<a class="btn del"
|
||||
onclick="return confirm('{{ del }} <{{ instance }}> ?')"
|
||||
href="{% url del_url instance.id %}">
|
||||
{{ del }}
|
||||
</a>
|
||||
|
||||
{% endif %}
|
||||
<input type="reset" />
|
||||
<input type="submit" value="{% translate 'Save' %}" />
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
{% extends "main/tag/value.html" %}
|
||||
|
||||
{% block "value" %}
|
||||
{% if value %}
|
||||
{% if value > 0 %}+{% endif %}
|
||||
{{ block.super }}
|
||||
{% else %}–{% endif %}
|
||||
{% else %}
|
||||
–
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{% load main_extras %}
|
||||
{% load i18n %}
|
||||
|
||||
<div id="transactions" class="table col1-6">
|
||||
<div class="header">
|
||||
<strong class="attach center"><i class="fa fa-paperclip"></i></strong>
|
||||
|
|
@ -29,9 +28,7 @@
|
|||
<span class="category text center">
|
||||
{% if trans.category %}
|
||||
<i class="fa fa-{{ trans.category.icon }}"></i>
|
||||
<a href="{% url 'category' trans.category.id %}">
|
||||
{{ trans.category }}
|
||||
</a>
|
||||
<a href="{% url 'category' trans.category.id %}">{{ trans.category }}</a>
|
||||
{% else %}
|
||||
–
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
{% spaceless %}
|
||||
<span>
|
||||
{% block "value" %}
|
||||
{{ value }} €
|
||||
{% endblock %}
|
||||
{% block "value" %}{{ value }} €{% endblock %}
|
||||
</span>
|
||||
{% endspaceless %}
|
||||
|
|
|
|||
|
|
@ -2,25 +2,27 @@
|
|||
{% load static %}
|
||||
{% load main_extras %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block link %}
|
||||
{{ block.super }}
|
||||
<link rel="stylesheet" href="{% static 'main/css/form.css' %}" type="text/css" />
|
||||
<link rel="stylesheet" href="{% static 'main/css/table.css' %}" type="text/css" />
|
||||
<link rel="stylesheet"
|
||||
href="{% static 'main/css/form.css' %}"
|
||||
type="text/css"/>
|
||||
<link rel="stylesheet"
|
||||
href="{% static 'main/css/table.css' %}"
|
||||
type="text/css"/>
|
||||
{% endblock %}
|
||||
|
||||
{% block body %}
|
||||
<h1>{{ transaction }}</h1>
|
||||
|
||||
{% spaceless %}
|
||||
<form id="transaction" action="{% url 'transaction' transaction.id %}" method="post">
|
||||
<form id="transaction"
|
||||
action="{% url 'transaction' transaction.id %}"
|
||||
method="post">
|
||||
{% csrf_token %}
|
||||
<input type="hidden" name="form" value="transaction" />
|
||||
{{ form }}
|
||||
{% form_buttons transaction %}
|
||||
</form>
|
||||
{% endspaceless %}
|
||||
|
||||
<div class="split">
|
||||
{% if transaction.has_invoice %}
|
||||
<div>
|
||||
|
|
@ -44,14 +46,17 @@
|
|||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<div>
|
||||
<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 %}
|
||||
<input type="hidden" name="form" value="invoice" />
|
||||
{{ 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>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -2,17 +2,18 @@
|
|||
{% load static %}
|
||||
{% load main_extras %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block link %}
|
||||
{{ block.super }}
|
||||
<link rel="stylesheet" href="{% static 'main/css/table.css' %}" type="text/css" />
|
||||
<link rel="stylesheet" href="{% static 'main/css/page.css' %}" type="text/css" />
|
||||
<link rel="stylesheet"
|
||||
href="{% static 'main/css/table.css' %}"
|
||||
type="text/css"/>
|
||||
<link rel="stylesheet"
|
||||
href="{% static 'main/css/page.css' %}"
|
||||
type="text/css"/>
|
||||
{% endblock %}
|
||||
|
||||
{% block body %}
|
||||
<h1>{% translate "Transactions" %}</h1>
|
||||
{% transaction_table transactions %}
|
||||
|
||||
{% if page_obj %}
|
||||
<div class="pagination">
|
||||
<span class="step-links">
|
||||
|
|
@ -20,11 +21,7 @@
|
|||
<a href="?page=1">↞</a>
|
||||
<a href="?page={{ page_obj.previous_page_number }}">←</a>
|
||||
{% 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 %}
|
||||
<a href="?page={{ page_obj.next_page_number }}">→</a>
|
||||
<a href="?page={{ page_obj.paginator.num_pages }}">↠</a>
|
||||
|
|
|
|||
Loading…
Reference in New Issue