IT-Naturschutz/konova
7
0
Fork 0
Code Issues 6 Pull Requests Actions Projects Releases 44 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

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

@@ -22,11 +22,11 @@
</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 scope="col">
<th class="w-25" scope="col">
{% trans 'Identifier' %}
</th>
<th scope="col">
@@ -34,7 +34,9 @@
</th>
{% if is_default_member and has_access %}
<th scope="col">
{% trans 'Action' %}
<span class="float-right">
{% trans 'Action' %}
</span>
</th>
{% endif %}
</tr>
@@ -50,7 +52,7 @@
<td class="align-middle">{{ comp.title }}</td>
<td>
{% 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' %}
</button>
{% endif %}

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

@@ -20,11 +20,11 @@
</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 scope="col">
<th class="w-25" scope="col">
{% trans 'Account Identifier' %}
</th>
<th scope="col">
@@ -35,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>
@@ -55,7 +57,7 @@
<td class="align-middle">{{ deduction.created.timestamp|default_if_none:""|naturalday}}</td>
<td>
{% 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' %}
</button>
{% endif %}

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

@@ -20,19 +20,21 @@
</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 scope="col">
{% trans 'Title' %}
</th>
<th scope="col">
<th class="w-50" scope="col">
{% trans 'Comment' %}
</th>
{% if is_default_member and has_access %}
<th scope="col">
{% trans 'Action' %}
<span class="float-right">
{% trans 'Action' %}
</span>
</th>
{% endif %}
</tr>
@@ -40,19 +42,19 @@
<tbody>
{% for doc in obj.documents.all %}
<tr>
<td class="align-middle">
<td>
<a href="{% url 'intervention:get-doc' doc.id %}">
{{ doc.title }}
</a>
</td>
<td class="align-middle">
<td>
<div class="scroll-150">
{{ doc.comment }}
</div>
</td>
<td class="align-middle">
<td>
{% 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' %}
</button>
{% endif %}

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

@@ -20,7 +20,7 @@
</div>
</div>
</div>
<div class="card-body scroll-300">
<div class="card-body scroll-300 p-2">
<table class="table table-hover">
<thead>
<tr>
@@ -30,12 +30,14 @@
<th scope="col">
{% trans 'Due on' %}
</th>
<th scope="col">
<th class="w-50" scope="col">
{% trans 'Comment' %}
</th>
{% if is_default_member and has_access %}
<th scope="col">
{% trans 'Action' %}
<span class="float-right">
{% trans 'Action' %}
</span>
</th>
{% endif %}
</tr>
@@ -54,7 +56,7 @@
</td>
<td class="align-middle">
{% 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' %}
</button>
{% endif %}

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

@@ -23,7 +23,7 @@
</div>
</div>
</div>
<div class="card-body scroll-300">
<div class="card-body scroll-300 p-2">
<table class="table table-hover">
<thead>
<tr>
@@ -38,7 +38,9 @@
</th>
{% if is_default_member and has_access %}
<th scope="col">
{% trans 'Action' %}
<span class="float-right">
{% trans 'Action' %}
</span>
</th>
{% endif %}
</tr>
@@ -63,7 +65,7 @@
</td>
<td class="align-middle">
{% 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' %}
</button>
{% endif %}