Merge branch 'develop' into feature/statistic/month_name_bug

This commit is contained in:
Andrew Smirnov
2021-05-27 20:45:03 +03:00
41 changed files with 2001 additions and 398 deletions

View File

@@ -7,21 +7,21 @@
{% block heading %} Страницы просмотра статистики{% endblock %}
{% block content%}
<div class="mt-5">
<div class="mt-5 py-4">
<div class="container-fluid" style="font-size:2rem">
<form method="post">
{% csrf_token %}
<div class="row g-3">
<div class="col-auto">
{{ form.email.label }}
<div class="col-auto p-2">
<h4 class="py-1">{{ form.email.label }}</h4>
</div>
<div class="col-auto mt-4">
{{ form.email }}
</div>
</div>
<div class="row g-3 mt-4">
<div class="col-auto">
{{ form.interval.label }}
<div class="col-auto p-2">
<h4 class="py-1">{{ form.interval.label }}</h4>
</div>
<div class="col-auto">
{% for radio in form.interval%}
@@ -33,8 +33,8 @@
</div>
</div>
<div class="row g-3 mt-4">
<div class="col-auto">
{{ form.display_format.label }}
<div class="col-auto p-2">
<h4 class="py-1">{{ form.display_format.label }}</h4>
</div>
<div class="col-auto">
{% for radio in form.display_format%}
@@ -46,8 +46,8 @@
</div>
</div>
<div class="row g-3 mt-4">
<div class="col-auto">
{{ form.range_start.label}}
<div class="col-auto p-2">
<h4 class="py-1">{{ form.range_start.label}}</h4>
</div>
<div class="col-auto">
<div class='col-sm-7'>
@@ -56,8 +56,8 @@
</div>
</div>
<div class="row g-3 mt-4">
<div class="col-auto">
{{ form.range_end.label}}
<div class="col-auto p-2">
<h4 class="py-1">{{ form.range_end.label}}</h4>
</div>
<div class="col-auto">
<div class='col-sm-7'>
@@ -65,9 +65,9 @@
</div>
</div>
</div>
<div class="form-row text-center">
<div class="form-row text-center py-5">
<div class="col-12">
<button type="submit" class="btn btn-outline-primary">Посмотреть статистику</button>
<button type="submit" class="btn default-button btn-info py-3 px-5">Посмотреть статистику</button>
</div>
</div>
</form>