IT-Naturschutz/konova
7
1
Fork 0
Code Issues 6 Pull Requests 1 Actions Projects Releases 28 Wiki Activity

86_User_suggestions_and_feedback #106

Merged
mpeltriaux merged 12 commits from 86_User_suggestions_and_feedback into master 2022-02-04 14:47:24 +01:00
Conversation 0 Commits 12 Files Changed 72 +267 -238
22 changed files with 267 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4bff5f2548 - Show all commits

30
compensation/templates/compensation/detail/compensation/includes/actions.html
View File

@ -21,16 +21,13 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card-body scroll-300"> <div class="card-body scroll-300 p-2">
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
<tr> <tr>
<th class="w-25" scope="col"> <th class="" scope="col">
{% trans 'Action type' %} {% trans 'Action type' %}
</th> </th>
<th class="w-25" scope="col">
{% trans 'Action type details' %}
</th>
<th scope="col"> <th scope="col">
{% trans 'Amount' context 'Compensation' %} {% trans 'Amount' context 'Compensation' %}
</th> </th>
@ -39,7 +36,9 @@
</th> </th>
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<th scope="col"> <th scope="col">
<span class="float-right">
{% trans 'Action' %} {% trans 'Action' %}
</span>
</th> </th>
{% endif %} {% endif %}
</tr> </tr>
@ -47,23 +46,26 @@
<tbody> <tbody>
{% for action in actions %} {% for action in actions %}
<tr> <tr>
<td class="align-middle"> <td class="">
{{ action.action_type }} <span>{{ action.action_type }}</span>
</td> {% if action.action_type_details.count > 0 %}
<td class="align-middle"> <hr>
<span>{% trans 'Action type details' %}:</span>
{% for detail in action.action_type_details.all %} {% for detail in action.action_type_details.all %}
<div class="mb-2" title="{{detail}}">{{detail.long_name}}</div> <br>
<div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
{% endfor %} {% endfor %}
{% endif %}
</td> </td>
<td class="align-middle">{{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }}</td> <td class="">{{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }}</td>
<td class="align-middle"> <td class="">
<div class="scroll-150"> <div class="scroll-150">
{{ action.comment }} {{ action.comment }}
</div> </div>
</td> </td>
<td class="align-middle"> <td class="">
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<button data-form-url="{% url 'compensation:action-remove' obj.id action.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove action' %}"> <button data-form-url="{% url 'compensation:action-remove' obj.id action.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove action' %}">
{% fa5_icon 'trash' %} {% fa5_icon 'trash' %}
</button> </button>
{% endif %} {% endif %}

6
compensation/templates/compensation/detail/compensation/includes/deadlines.html
View File

@ -20,7 +20,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card-body scroll-300"> <div class="card-body scroll-300 p-2">
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
<tr> <tr>
@ -35,7 +35,9 @@
</th> </th>
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<th scope="col"> <th scope="col">
<span class="float-right">
{% trans 'Action' %} {% trans 'Action' %}
</span>
</th> </th>
{% endif %} {% endif %}
</tr> </tr>
@ -54,7 +56,7 @@
</td> </td>
<td> <td>
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<button data-form-url="{% url 'compensation:deadline-remove' obj.id deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove deadline' %}"> <button data-form-url="{% url 'compensation:deadline-remove' obj.id deadline.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove deadline' %}">
{% fa5_icon 'trash' %} {% fa5_icon 'trash' %}
</button> </button>
{% endif %} {% endif %}

6
compensation/templates/compensation/detail/compensation/includes/documents.html
View File

@ -20,7 +20,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card-body scroll-300"> <div class="card-body scroll-300 p-2">
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
<tr> <tr>
@ -32,7 +32,9 @@
</th> </th>
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<th scope="col"> <th scope="col">
<span class="float-right">
{% trans 'Action' %} {% trans 'Action' %}
</span>
</th> </th>
{% endif %} {% endif %}
</tr> </tr>
@ -52,7 +54,7 @@
</td> </td>
<td class="align-middle"> <td class="align-middle">
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<button data-form-url="{% url 'compensation:remove-doc' doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}"> <button data-form-url="{% url 'compensation:remove-doc' doc.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove document' %}">
{% fa5_icon 'trash' %} {% fa5_icon 'trash' %}
</button> </button>
{% endif %} {% endif %}

34
compensation/templates/compensation/detail/compensation/includes/states-after.html
View File

@ -20,27 +20,26 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card-body scroll-300">
{% if sum_before_states > sum_after_states %} {% if sum_before_states > sum_after_states %}
<div class="row alert alert-danger"> <div class="alert alert-danger mb-0">
{% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m² {% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m²
</div> </div>
{% endif %} {% endif %}
<div class="card-body scroll-300 p-2">
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
<tr> <tr>
<th class="w-25" scope="col"> <th class="w-50" scope="col">
{% trans 'Biotope type' %} {% trans 'Biotope type' %}
</th> </th>
<th class="w-25" scope="col">
{% trans 'Biotope additional type' %}
</th>
<th scope="col"> <th scope="col">
{% trans 'Surface' %} {% trans 'Surface' %}
</th> </th>
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<th scope="col"> <th scope="col">
<span class="float-right">
{% trans 'Action' %} {% trans 'Action' %}
</span>
</th> </th>
{% endif %} {% endif %}
</tr> </tr>
@ -48,20 +47,21 @@
<tbody> <tbody>
{% for state in after_states %} {% for state in after_states %}
<tr> <tr>
<td class="align-middle"> <td>
{{ state.biotope_type }} <span>{{ state.biotope_type }}</span>
</td> {% if state.biotope_type_details.count > 0 %}
<td class="align-middle"> <hr>
{% for biotope_extra in state.biotope_type_details.all %} <span>{% trans 'Biotope additional type' %}:</span>
<div class="mb-2" title="{{ biotope_extra }}"> {% for detail in state.biotope_type_details.all %}
{{ biotope_extra.long_name }} <br>
</div> <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
{% endfor %} {% endfor %}
{% endif %}
</td> </td>
<td class="align-middle">{{ state.surface|floatformat:2 }} m²</td> <td>{{ state.surface|floatformat:2 }} m²</td>
<td class="align-middle"> <td>
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<button data-form-url="{% url 'compensation:state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}"> <button data-form-url="{% url 'compensation:state-remove' obj.id state.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove state' %}">
{% fa5_icon 'trash' %} {% fa5_icon 'trash' %}
</button> </button>
{% endif %} {% endif %}

34
compensation/templates/compensation/detail/compensation/includes/states-before.html
View File

@ -20,27 +20,26 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card-body scroll-300">
{% if sum_before_states < sum_after_states %} {% if sum_before_states < sum_after_states %}
<div class="row alert alert-danger"> <div class="alert alert-danger mb-0">
{% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m² {% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m²
</div> </div>
{% endif %} {% endif %}
<div class="card-body scroll-300 p-2">
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
<tr> <tr>
<th class="w-25" scope="col"> <th class="w-50" scope="col">
{% trans 'Biotope type' %} {% trans 'Biotope type' %}
</th> </th>
<th class="w-25" scope="col">
{% trans 'Biotope additional type' %}
</th>
<th scope="col"> <th scope="col">
{% trans 'Surface' %} {% trans 'Surface' %}
</th> </th>
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<th scope="col"> <th scope="col">
<span class="float-right">
{% trans 'Action' %} {% trans 'Action' %}
</span>
</th> </th>
{% endif %} {% endif %}
</tr> </tr>
@ -48,20 +47,21 @@
<tbody> <tbody>
{% for state in before_states %} {% for state in before_states %}
<tr> <tr>
<td class="align-middle"> <td>
{{ state.biotope_type }} <span>{{ state.biotope_type }}</span>
</td> {% if state.biotope_type_details.count > 0 %}
<td class="align-middle"> <hr>
{% for biotope_extra in state.biotope_type_details.all %} <span>{% trans 'Biotope additional type' %}:</span>
<div class="mb-2" title="{{ biotope_extra }}"> {% for detail in state.biotope_type_details.all %}
{{ biotope_extra.long_name }} <br>
</div> <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
{% endfor %} {% endfor %}
{% endif %}
</td> </td>
<td class="align-middle">{{ state.surface|floatformat:2 }} m²</td> <td>{{ state.surface|floatformat:2 }} m²</td>
<td class="align-middle"> <td>
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<button data-form-url="{% url 'compensation:state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}"> <button data-form-url="{% url 'compensation:state-remove' obj.id state.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove state' %}">
{% fa5_icon 'trash' %} {% fa5_icon 'trash' %}
</button> </button>
{% endif %} {% endif %}

30
compensation/templates/compensation/detail/eco_account/includes/actions.html
View File

@ -20,16 +20,13 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card-body scroll-300"> <div class="card-body scroll-300 p-2">
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
<tr> <tr>
<th class="w-25" scope="col"> <th class="" scope="col">
{% trans 'Action type' %} {% trans 'Action type' %}
</th> </th>
<th class="w-25" scope="col">
{% trans 'Action type details' %}
</th>
<th scope="col"> <th scope="col">
{% trans 'Amount' context 'Compensation' %} {% trans 'Amount' context 'Compensation' %}
</th> </th>
@ -38,7 +35,9 @@
</th> </th>
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<th scope="col"> <th scope="col">
<span class="float-right">
{% trans 'Action' %} {% trans 'Action' %}
</span>
</th> </th>
{% endif %} {% endif %}
</tr> </tr>
@ -46,23 +45,26 @@
<tbody> <tbody>
{% for action in actions %} {% for action in actions %}
<tr> <tr>
<td class="align-middle"> <td class="">
{{ action.action_type }} <span>{{ action.action_type }}</span>
</td> {% if action.action_type_details.count > 0 %}
<td class="align-middle"> <hr>
<span>{% trans 'Action type details' %}:</span>
{% for detail in action.action_type_details.all %} {% for detail in action.action_type_details.all %}
<div class="mb-2" title="{{detail}}">{{detail.long_name}}</div> <br>
<div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
{% endfor %} {% endfor %}
{% endif %}
</td> </td>
<td class="align-middle">{{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }}</td> <td class="">{{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }}</td>
<td class="align-middle"> <td class="">
<div class="scroll-150"> <div class="scroll-150">
{{ action.comment }} {{ action.comment }}
</div> </div>
</td> </td>
<td class="align-middle"> <td class="">
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<button data-form-url="{% url 'compensation:acc:action-remove' obj.id action.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove action' %}"> <button data-form-url="{% url 'compensation:acc:action-remove' obj.id action.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove action' %}">
{% fa5_icon 'trash' %} {% fa5_icon 'trash' %}
</button> </button>
{% endif %} {% endif %}

6
compensation/templates/compensation/detail/eco_account/includes/deadlines.html
View File

@ -20,7 +20,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card-body scroll-300"> <div class="card-body scroll-300 p-2">
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
<tr> <tr>
@ -34,7 +34,9 @@
{% trans 'Comment' %} {% trans 'Comment' %}
</th> </th>
<th scope="col"> <th scope="col">
<span class="float-right">
{% trans 'Action' %} {% trans 'Action' %}
</span>
</th> </th>
</tr> </tr>
</thead> </thead>
@ -52,7 +54,7 @@
</td> </td>
<td class="align-middle"> <td class="align-middle">
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<button data-form-url="{% url 'compensation:acc:deadline-remove' obj.id deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove deadline' %}"> <button data-form-url="{% url 'compensation:acc:deadline-remove' obj.id deadline.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove deadline' %}">
{% fa5_icon 'trash' %} {% fa5_icon 'trash' %}
</button> </button>
{% endif %} {% endif %}

6
compensation/templates/compensation/detail/eco_account/includes/deductions.html
View File

@ -20,7 +20,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card-body scroll-300"> <div class="card-body scroll-300 p-2">
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
<tr> <tr>
@ -37,7 +37,9 @@
{% trans 'Created' %} {% trans 'Created' %}
</th> </th>
<th scope="col"> <th scope="col">
<span class="float-right">
{% trans 'Action' %} {% trans 'Action' %}
</span>
</th> </th>
</tr> </tr>
</thead> </thead>
@ -60,7 +62,7 @@
<td class="align-middle">{{ deduction.created.timestamp|default_if_none:""|naturalday}}</td> <td class="align-middle">{{ deduction.created.timestamp|default_if_none:""|naturalday}}</td>
<td> <td>
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<button data-form-url="{% url 'compensation:acc:remove-deduction' deduction.account.id deduction.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove Deduction' %}"> <button data-form-url="{% url 'compensation:acc:remove-deduction' deduction.account.id deduction.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove Deduction' %}">
{% fa5_icon 'trash' %} {% fa5_icon 'trash' %}
</button> </button>
{% endif %} {% endif %}

6
compensation/templates/compensation/detail/eco_account/includes/documents.html
View File

@ -20,7 +20,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card-body scroll-300"> <div class="card-body scroll-300 p-2">
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
<tr> <tr>
@ -31,7 +31,9 @@
{% trans 'Comment' %} {% trans 'Comment' %}
</th> </th>
<th scope="col"> <th scope="col">
<span class="float-right">
{% trans 'Action' %} {% trans 'Action' %}
</span>
</th> </th>
</tr> </tr>
</thead> </thead>
@ -50,7 +52,7 @@
</td> </td>
<td class="align-middle"> <td class="align-middle">
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<button data-form-url="{% url 'compensation:acc:remove-doc' doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}"> <button data-form-url="{% url 'compensation:acc:remove-doc' doc.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove document' %}">
{% fa5_icon 'trash' %} {% fa5_icon 'trash' %}
</button> </button>
{% endif %} {% endif %}

34
compensation/templates/compensation/detail/eco_account/includes/states-after.html
View File

@ -20,27 +20,26 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card-body scroll-300">
{% if sum_before_states > sum_after_states %} {% if sum_before_states > sum_after_states %}
<div class="row alert alert-danger"> <div class="alert alert-danger mb-0">
{% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m² {% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m²
</div> </div>
{% endif %} {% endif %}
<div class="card-body scroll-300 p-2">
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
<tr> <tr>
<th class="w-25" scope="col"> <th class="w-50" scope="col">
{% trans 'Biotope type' %} {% trans 'Biotope type' %}
</th> </th>
<th class="w-25" scope="col">
{% trans 'Biotope additional type' %}
</th>
<th scope="col"> <th scope="col">
{% trans 'Surface' %} {% trans 'Surface' %}
</th> </th>
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<th scope="col"> <th scope="col">
<span class="float-right">
{% trans 'Action' %} {% trans 'Action' %}
</span>
</th> </th>
{% endif %} {% endif %}
</tr> </tr>
@ -48,20 +47,21 @@
<tbody> <tbody>
{% for state in after_states %} {% for state in after_states %}
<tr> <tr>
<td class="align-middle"> <td>
{{ state.biotope_type }} <span>{{ state.biotope_type }}</span>
</td> {% if state.biotope_type_details.count > 0 %}
<td class="align-middle"> <hr>
{% for biotope_extra in state.biotope_type_details.all %} <span>{% trans 'Biotope additional type' %}:</span>
<div class="mb-2" title="{{ biotope_extra }}"> {% for detail in state.biotope_type_details.all %}
{{ biotope_extra.long_name }} <br>
</div> <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
{% endfor %} {% endfor %}
{% endif %}
</td> </td>
<td class="align-middle">{{ state.surface|floatformat:2 }} m²</td> <td>{{ state.surface|floatformat:2 }} m²</td>
<td class="align-middle"> <td>
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<button data-form-url="{% url 'compensation:acc:state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}"> <button data-form-url="{% url 'compensation:acc:state-remove' obj.id state.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove state' %}">
{% fa5_icon 'trash' %} {% fa5_icon 'trash' %}
</button> </button>
{% endif %} {% endif %}

34
compensation/templates/compensation/detail/eco_account/includes/states-before.html
View File

@ -20,27 +20,26 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card-body scroll-300">
{% if sum_before_states < sum_after_states %} {% if sum_before_states < sum_after_states %}
<div class="row alert alert-danger"> <div class="alert alert-danger mb-0">
{% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m² {% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m²
</div> </div>
{% endif %} {% endif %}
<div class="card-body scroll-300 p-2">
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
<tr> <tr>
<th class="w-25" scope="col"> <th class="w-50" scope="col">
{% trans 'Biotope type' %} {% trans 'Biotope type' %}
</th> </th>
<th class="w-25" scope="col">
{% trans 'Biotope additional type' %}
</th>
<th scope="col"> <th scope="col">
{% trans 'Surface' %} {% trans 'Surface' %}
</th> </th>
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<th scope="col"> <th scope="col">
<span class="float-right">
{% trans 'Action' %} {% trans 'Action' %}
</span>
</th> </th>
{% endif %} {% endif %}
</tr> </tr>
@ -48,20 +47,21 @@
<tbody> <tbody>
{% for state in before_states %} {% for state in before_states %}
<tr> <tr>
<td class="align-middle"> <td>
{{ state.biotope_type }} <span>{{ state.biotope_type }}</span>
</td> {% if state.biotope_type_details.count > 0 %}
<td class="align-middle"> <hr>
{% for biotope_extra in state.biotope_type_details.all %} <span>{% trans 'Biotope additional type' %}:</span>
<div class="mb-2" title="{{ biotope_extra }}"> {% for detail in state.biotope_type_details.all %}
{{ biotope_extra.long_name }} <br>
</div> <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
{% endfor %} {% endfor %}
{% endif %}
</td> </td>
<td class="align-middle">{{ state.surface|floatformat:2 }} m²</td> <td>{{ state.surface|floatformat:2 }} m²</td>
<td class="align-middle"> <td>
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<button data-form-url="{% url 'compensation:acc:state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}"> <button data-form-url="{% url 'compensation:acc:state-remove' obj.id state.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove state' %}">
{% fa5_icon 'trash' %} {% fa5_icon 'trash' %}
</button> </button>
{% endif %} {% endif %}

28
ema/templates/ema/detail/includes/actions.html
View File

@ -20,16 +20,13 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card-body scroll-300"> <div class="card-body scroll-300 p-2">
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
<tr> <tr>
<th class="w-25" scope="col"> <th class="w-25" scope="col">
{% trans 'Action type' %} {% trans 'Action type' %}
</th> </th>
<th class="w-25" scope="col">
{% trans 'Action type details' %}
</th>
<th scope="col"> <th scope="col">
{% trans 'Amount' context 'Compensation' %} {% trans 'Amount' context 'Compensation' %}
</th> </th>
@ -37,30 +34,35 @@
{% trans 'Comment' %} {% trans 'Comment' %}
</th> </th>
<th scope="col"> <th scope="col">
<span class="float-right">
{% trans 'Action' %} {% trans 'Action' %}
</span>
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for action in obj.actions.all %} {% for action in obj.actions.all %}
<tr> <tr>
<td class="align-middle"> <td class="">
{{ action.action_type }} <span>{{ action.action_type }}</span>
</td> {% if action.action_type_details.count > 0 %}
<td class="align-middle"> <hr>
<span>{% trans 'Action type details' %}:</span>
{% for detail in action.action_type_details.all %} {% for detail in action.action_type_details.all %}
<div class="mb-2" title="{{detail}}">{{detail.long_name}}</div> <br>
<div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
{% endfor %} {% endfor %}
{% endif %}
</td> </td>
<td class="align-middle">{{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }}</td> <td class="">{{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }}</td>
<td class="align-middle"> <td class="">
<div class="scroll-150"> <div class="scroll-150">
{{ action.comment }} {{ action.comment }}
</div> </div>
</td> </td>
<td class="align-middle"> <td class="">
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<button data-form-url="{% url 'ema:action-remove' obj.id action.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove action' %}"> <button data-form-url="{% url 'ema:action-remove' obj.id action.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove action' %}">
{% fa5_icon 'trash' %} {% fa5_icon 'trash' %}
</button> </button>
{% endif %} {% endif %}

6
ema/templates/ema/detail/includes/deadlines.html
View File

@ -20,7 +20,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card-body scroll-300"> <div class="card-body scroll-300 p-2">
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
<tr> <tr>
@ -34,7 +34,9 @@
{% trans 'Comment' %} {% trans 'Comment' %}
</th> </th>
<th scope="col"> <th scope="col">
<span class="float-right">
{% trans 'Action' %} {% trans 'Action' %}
</span>
</th> </th>
</tr> </tr>
</thead> </thead>
@ -52,7 +54,7 @@
</td> </td>
<td class="align-middle"> <td class="align-middle">
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<button data-form-url="{% url 'ema:deadline-remove' obj.id deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove deadline' %}"> <button data-form-url="{% url 'ema:deadline-remove' obj.id deadline.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove deadline' %}">
{% fa5_icon 'trash' %} {% fa5_icon 'trash' %}
</button> </button>
{% endif %} {% endif %}

6
ema/templates/ema/detail/includes/documents.html
View File

@ -20,7 +20,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card-body scroll-300"> <div class="card-body scroll-300 p-2">
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
<tr> <tr>
@ -31,7 +31,9 @@
{% trans 'Comment' %} {% trans 'Comment' %}
</th> </th>
<th scope="col"> <th scope="col">
<span class="float-right">
{% trans 'Action' %} {% trans 'Action' %}
</span>
</th> </th>
</tr> </tr>
</thead> </thead>
@ -50,7 +52,7 @@
</td> </td>
<td class="align-middle"> <td class="align-middle">
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<button data-form-url="{% url 'ema:remove-doc' doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}"> <button data-form-url="{% url 'ema:remove-doc' doc.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove document' %}">
{% fa5_icon 'trash' %} {% fa5_icon 'trash' %}
</button> </button>
{% endif %} {% endif %}

34
ema/templates/ema/detail/includes/states-after.html
View File

@ -20,46 +20,46 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card-body scroll-300">
{% if sum_before_states > sum_after_states %} {% if sum_before_states > sum_after_states %}
<div class="row alert alert-danger"> <div class="alert alert-danger mb-0">
{% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m² {% trans 'Missing surfaces according to states before: ' %}{{ diff_states|floatformat:2 }} m²
</div> </div>
{% endif %} {% endif %}
<div class="card-body scroll-300 p-2">
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
<tr> <tr>
<th class="w-25" scope="col"> <th class="w-50" scope="col">
{% trans 'Biotope type' %} {% trans 'Biotope type' %}
</th> </th>
<th class="w-25" scope="col">
{% trans 'Biotope additional type' %}
</th>
<th scope="col"> <th scope="col">
{% trans 'Surface' %} {% trans 'Surface' %}
</th> </th>
<th scope="col"> <th scope="col">
<span class="float-right">
{% trans 'Action' %} {% trans 'Action' %}
</span>
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for state in after_states %} {% for state in after_states %}
<tr> <tr>
<td class="align-middle"> <td>
{{ state.biotope_type }} <span>{{ state.biotope_type }}</span>
</td> {% if state.biotope_type_details.count > 0 %}
<td class="align-middle"> <hr>
{% for biotope_extra in state.biotope_type_details.all %} <span>{% trans 'Biotope additional type' %}:</span>
<div class="mb-2" title="{{ biotope_extra }}"> {% for detail in state.biotope_type_details.all %}
{{ biotope_extra.long_name }} <br>
</div> <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
{% endfor %} {% endfor %}
{% endif %}
</td> </td>
<td class="align-middle">{{ state.surface|floatformat:2 }} m²</td> <td>{{ state.surface|floatformat:2 }} m²</td>
<td class="align-middle"> <td>
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<button data-form-url="{% url 'ema:state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}"> <button data-form-url="{% url 'ema:state-remove' obj.id state.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove state' %}">
{% fa5_icon 'trash' %} {% fa5_icon 'trash' %}
</button> </button>
{% endif %} {% endif %}

34
ema/templates/ema/detail/includes/states-before.html
View File

@ -20,46 +20,46 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card-body scroll-300">
{% if sum_before_states < sum_after_states %} {% if sum_before_states < sum_after_states %}
<div class="row alert alert-danger"> <div class="alert alert-danger mb-0">
{% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m² {% trans 'Missing surfaces according to states after: ' %}{{ diff_states|floatformat:2 }} m²
</div> </div>
{% endif %} {% endif %}
<div class="card-body scroll-300 p-2">
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
<tr> <tr>
<th class="w-25" scope="col"> <th class="w-50" scope="col">
{% trans 'Biotope type' %} {% trans 'Biotope type' %}
</th> </th>
<th class="w-25" scope="col">
{% trans 'Biotope additional type' %}
</th>
<th scope="col"> <th scope="col">
{% trans 'Surface' %} {% trans 'Surface' %}
</th> </th>
<th scope="col"> <th scope="col">
<span class="float-right">
{% trans 'Action' %} {% trans 'Action' %}
</span>
</th> </th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for state in before_states %} {% for state in before_states %}
<tr> <tr>
<td class="align-middle"> <td>
{{ state.biotope_type }} <span>{{ state.biotope_type }}</span>
</td> {% if state.biotope_type_details.count > 0 %}
<td class="align-middle"> <hr>
{% for biotope_extra in state.biotope_type_details.all %} <span>{% trans 'Biotope additional type' %}:</span>
<div class="mb-2" title="{{ biotope_extra }}"> {% for detail in state.biotope_type_details.all %}
{{ biotope_extra.long_name }} <br>
</div> <div class="badge badge-pill rlp-r" title="{{detail}}">{{detail.long_name}}</div>
{% endfor %} {% endfor %}
{% endif %}
</td> </td>
<td class="align-middle">{{ state.surface|floatformat:2 }} m²</td> <td>{{ state.surface|floatformat:2 }} m²</td>
<td class="align-middle"> <td>
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<button data-form-url="{% url 'ema:state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}"> <button data-form-url="{% url 'ema:state-remove' obj.id state.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove state' %}">
{% fa5_icon 'trash' %} {% fa5_icon 'trash' %}
</button> </button>
{% endif %} {% endif %}

8
intervention/templates/intervention/detail/includes/compensations.html
View File

@ -22,11 +22,11 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card-body scroll-300"> <div class="card-body scroll-300 p-2">
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
<tr> <tr>
<th scope="col"> <th class="w-25" scope="col">
{% trans 'Identifier' %} {% trans 'Identifier' %}
</th> </th>
<th scope="col"> <th scope="col">
@ -34,7 +34,9 @@
</th> </th>
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<th scope="col"> <th scope="col">
<span class="float-right">
{% trans 'Action' %} {% trans 'Action' %}
</span>
</th> </th>
{% endif %} {% endif %}
</tr> </tr>
@ -50,7 +52,7 @@
<td class="align-middle">{{ comp.title }}</td> <td class="align-middle">{{ comp.title }}</td>
<td> <td>
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<button data-form-url="{% url 'compensation:remove' comp.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove compensation' %}"> <button data-form-url="{% url 'compensation:remove' comp.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove compensation' %}">
{% fa5_icon 'trash' %} {% fa5_icon 'trash' %}
</button> </button>
{% endif %} {% endif %}

8
intervention/templates/intervention/detail/includes/deductions.html
View File

@ -20,11 +20,11 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card-body scroll-300"> <div class="card-body scroll-300 p-2">
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
<tr> <tr>
<th scope="col"> <th class="w-25" scope="col">
{% trans 'Account Identifier' %} {% trans 'Account Identifier' %}
</th> </th>
<th scope="col"> <th scope="col">
@ -35,7 +35,9 @@
</th> </th>
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<th scope="col"> <th scope="col">
<span class="float-right">
{% trans 'Action' %} {% trans 'Action' %}
</span>
</th> </th>
{% endif %} {% endif %}
</tr> </tr>
@ -55,7 +57,7 @@
<td class="align-middle">{{ deduction.created.timestamp|default_if_none:""|naturalday}}</td> <td class="align-middle">{{ deduction.created.timestamp|default_if_none:""|naturalday}}</td>
<td> <td>
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<button data-form-url="{% url 'compensation:acc:remove-deduction' deduction.account.id deduction.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove Deduction' %}"> <button data-form-url="{% url 'compensation:acc:remove-deduction' deduction.account.id deduction.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove Deduction' %}">
{% fa5_icon 'trash' %} {% fa5_icon 'trash' %}
</button> </button>
{% endif %} {% endif %}

14
intervention/templates/intervention/detail/includes/documents.html
View File

@ -20,19 +20,21 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card-body scroll-300"> <div class="card-body scroll-300 p-2">
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
<tr> <tr>
<th scope="col"> <th scope="col">
{% trans 'Title' %} {% trans 'Title' %}
</th> </th>
<th scope="col"> <th class="w-50" scope="col">
{% trans 'Comment' %} {% trans 'Comment' %}
</th> </th>
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<th scope="col"> <th scope="col">
<span class="float-right">
{% trans 'Action' %} {% trans 'Action' %}
</span>
</th> </th>
{% endif %} {% endif %}
</tr> </tr>
@ -40,19 +42,19 @@
<tbody> <tbody>
{% for doc in obj.documents.all %} {% for doc in obj.documents.all %}
<tr> <tr>
<td class="align-middle"> <td>
<a href="{% url 'intervention:get-doc' doc.id %}"> <a href="{% url 'intervention:get-doc' doc.id %}">
{{ doc.title }} {{ doc.title }}
</a> </a>
</td> </td>
<td class="align-middle"> <td>
<div class="scroll-150"> <div class="scroll-150">
{{ doc.comment }} {{ doc.comment }}
</div> </div>
</td> </td>
<td class="align-middle"> <td>
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<button data-form-url="{% url 'intervention:remove-doc' doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}"> <button data-form-url="{% url 'intervention:remove-doc' doc.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove document' %}">
{% fa5_icon 'trash' %} {% fa5_icon 'trash' %}
</button> </button>
{% endif %} {% endif %}

8
intervention/templates/intervention/detail/includes/payments.html
View File

@ -20,7 +20,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card-body scroll-300"> <div class="card-body scroll-300 p-2">
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
<tr> <tr>
@ -30,12 +30,14 @@
<th scope="col"> <th scope="col">
{% trans 'Due on' %} {% trans 'Due on' %}
</th> </th>
<th scope="col"> <th class="w-50" scope="col">
{% trans 'Comment' %} {% trans 'Comment' %}
</th> </th>
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<th scope="col"> <th scope="col">
<span class="float-right">
{% trans 'Action' %} {% trans 'Action' %}
</span>
</th> </th>
{% endif %} {% endif %}
</tr> </tr>
@ -54,7 +56,7 @@
</td> </td>
<td class="align-middle"> <td class="align-middle">
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<button data-form-url="{% url 'compensation:pay:remove' pay.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove payment' %}"> <button data-form-url="{% url 'compensation:pay:remove' pay.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove payment' %}">
{% fa5_icon 'trash' %} {% fa5_icon 'trash' %}
</button> </button>
{% endif %} {% endif %}

6
intervention/templates/intervention/detail/includes/revocation.html
View File

@ -23,7 +23,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card-body scroll-300"> <div class="card-body scroll-300 p-2">
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
<tr> <tr>
@ -38,7 +38,9 @@
</th> </th>
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<th scope="col"> <th scope="col">
<span class="float-right">
{% trans 'Action' %} {% trans 'Action' %}
</span>
</th> </th>
{% endif %} {% endif %}
</tr> </tr>
@ -63,7 +65,7 @@
</td> </td>
<td class="align-middle"> <td class="align-middle">
{% if is_default_member and has_access %} {% if is_default_member and has_access %}
<button data-form-url="{% url 'intervention:remove-revocation' rev.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove revocation' %}"> <button data-form-url="{% url 'intervention:remove-revocation' rev.id %}" class="btn btn-default btn-modal float-right" title="{% trans 'Remove revocation' %}">
{% fa5_icon 'trash' %} {% fa5_icon 'trash' %}
</button> </button>
{% endif %} {% endif %}

5
templates/base.html
View File

@ -23,15 +23,14 @@
{% include 'navbars/navbar.html' %} {% include 'navbars/navbar.html' %}
{% endblock %} {% endblock %}
</header> </header>
<div class="container-fluid mt-3"> <div class="col">
<div class="">
{% for message in messages %} {% for message in messages %}
<div class="row alert alert-{{ message.tags }}"> <div class="row alert alert-{{ message.tags }}">
{{ message }} {{ message }}
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
<div class="container-fluid mt-3">
{% comment %} {% comment %}
The modal wrapper, which can be used on every view can stay on the base.html template The modal wrapper, which can be used on every view can stay on the base.html template
{% endcomment %} {% endcomment %}