IT-Naturschutz/konova
7
0
Fork 0
Code Issues 5 Pull Requests Actions Projects Releases 48 Wiki Activity

# 86 Visual improvements

Browse Source 
* moves message rendering directly below navigation menu for a more closed look
* reworks message rendering on before_states and after_states for all compensation related datatypes
* reworks layout of action column on all related data card tables
* resizes certain attribute layouts on related data card tables
* reworks layout of details on CompensationState and CompensationAction rendering from own column into subgrouped placement of main type info
* drops align-middle placement for all related data card table contents
This commit is contained in:
mpeltriaux
2022-02-02 14:18:44 +01:00
parent 77b59db56f
commit 874b266352
22 changed files with 267 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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