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 +69 -58
11 changed files with 69 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c7665a1aff - Show all commits

4
analysis/templates/analysis/reports/detail.html
View File

@ -3,11 +3,11 @@
{% block body %} {% block body %}
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
<h3>{% trans 'Evaluation report' %} {{office.long_name}}</h3> <h3>{% trans 'Evaluation report' %} {{office.long_name}}</h3>
<h5>{% trans 'From' %} {{report.date_from.date}} {% trans 'to' %} {{report.date_to.date}}</h5> <h5>{% trans 'From' %} {{report.date_from.date}} {% trans 'to' %} {{report.date_to.date}}</h5>
</div> </div>
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
<div class="d-flex justify-content-end"> <div class="d-flex justify-content-end">
<div class="dropdown"> <div class="dropdown">
<div class="btn btn" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> <div class="btn btn" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">

20
compensation/templates/compensation/detail/compensation/view.html
View File

@ -14,16 +14,16 @@
{% block body %} {% block body %}
<div id="detail-header" class="row"> <div id="detail-header" class="row">
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
<h3>{% trans 'Compensation' %}<br> {{obj.identifier}}</h3> <h3>{% trans 'Compensation' %}<br> {{obj.identifier}}</h3>
</div> </div>
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
{% include 'compensation/detail/compensation/includes/controls.html' %} {% include 'compensation/detail/compensation/includes/controls.html' %}
</div> </div>
</div> </div>
<hr> <hr>
<div id="data" class="row"> <div id="data" class="row">
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
<div class="table-container"> <div class="table-container">
<table class="table table-hover"> <table class="table table-hover">
<tr> <tr>
@ -105,7 +105,8 @@
</table> </table>
</div> </div>
</div> </div>
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
<div class="col">
<div class="row"> <div class="row">
{% include 'map/geom_form.html' %} {% include 'map/geom_form.html' %}
</div> </div>
@ -117,26 +118,27 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<hr> <hr>
<div id="related_data"> <div id="related_data">
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
{% include 'compensation/detail/compensation/includes/states-before.html' %} {% include 'compensation/detail/compensation/includes/states-before.html' %}
</div> </div>
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
{% include 'compensation/detail/compensation/includes/states-after.html' %} {% include 'compensation/detail/compensation/includes/states-after.html' %}
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
{% include 'compensation/detail/compensation/includes/actions.html' %} {% include 'compensation/detail/compensation/includes/actions.html' %}
</div> </div>
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
{% include 'compensation/detail/compensation/includes/deadlines.html' %} {% include 'compensation/detail/compensation/includes/deadlines.html' %}
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
{% include 'compensation/detail/compensation/includes/documents.html' %} {% include 'compensation/detail/compensation/includes/documents.html' %}
</div> </div>
</div> </div>

20
compensation/templates/compensation/detail/eco_account/view.html
View File

@ -14,16 +14,16 @@
{% block body %} {% block body %}
<div id="detail-header" class="row"> <div id="detail-header" class="row">
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
<h3>{% trans 'Eco-account' %}<br> {{obj.identifier}}</h3> <h3>{% trans 'Eco-account' %}<br> {{obj.identifier}}</h3>
</div> </div>
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
{% include 'compensation/detail/eco_account/includes/controls.html' %} {% include 'compensation/detail/eco_account/includes/controls.html' %}
</div> </div>
</div> </div>
<hr> <hr>
<div id="data" class="row"> <div id="data" class="row">
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
<div class="table-container"> <div class="table-container">
<table class="table table-hover"> <table class="table table-hover">
<tr> <tr>
@ -88,7 +88,7 @@
</table> </table>
</div> </div>
</div> </div>
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
<div class="row"> <div class="row">
{% include 'map/geom_form.html' %} {% include 'map/geom_form.html' %}
</div> </div>
@ -104,26 +104,26 @@
<div id="related_data"> <div id="related_data">
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
{% include 'compensation/detail/eco_account/includes/states-before.html' %} {% include 'compensation/detail/eco_account/includes/states-before.html' %}
</div> </div>
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
{% include 'compensation/detail/eco_account/includes/states-after.html' %} {% include 'compensation/detail/eco_account/includes/states-after.html' %}
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
{% include 'compensation/detail/eco_account/includes/actions.html' %} {% include 'compensation/detail/eco_account/includes/actions.html' %}
</div> </div>
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
{% include 'compensation/detail/eco_account/includes/deadlines.html' %} {% include 'compensation/detail/eco_account/includes/deadlines.html' %}
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
{% include 'compensation/detail/eco_account/includes/documents.html' %} {% include 'compensation/detail/eco_account/includes/documents.html' %}
</div> </div>
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
{% include 'compensation/detail/eco_account/includes/deductions.html' %} {% include 'compensation/detail/eco_account/includes/deductions.html' %}
</div> </div>
</div> </div>

4
compensation/templates/compensation/report/compensation/report.html
View File

@ -3,7 +3,7 @@
{% block body %} {% block body %}
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
<h3>{% trans 'Report' %}</h3> <h3>{% trans 'Report' %}</h3>
<h4>{{obj.identifier}}</h4> <h4>{{obj.identifier}}</h4>
<div class="table-container"> <div class="table-container">
@ -33,7 +33,7 @@
{% include 'compensation/detail/compensation/includes/states-after.html' %} {% include 'compensation/detail/compensation/includes/states-after.html' %}
{% include 'compensation/detail/compensation/includes/actions.html' %} {% include 'compensation/detail/compensation/includes/actions.html' %}
</div> </div>
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
<div class="row"> <div class="row">
{% include 'map/geom_form.html' %} {% include 'map/geom_form.html' %}
</div> </div>

4
compensation/templates/compensation/report/eco_account/report.html
View File

@ -3,7 +3,7 @@
{% block body %} {% block body %}
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
<h3>{% trans 'Report' %}</h3> <h3>{% trans 'Report' %}</h3>
<h4>{{obj.identifier}}</h4> <h4>{{obj.identifier}}</h4>
<div class="table-container"> <div class="table-container">
@ -50,7 +50,7 @@
{% include 'compensation/detail/compensation/includes/states-after.html' %} {% include 'compensation/detail/compensation/includes/states-after.html' %}
{% include 'compensation/detail/compensation/includes/actions.html' %} {% include 'compensation/detail/compensation/includes/actions.html' %}
</div> </div>
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
<div class="row"> <div class="row">
{% include 'map/geom_form.html' %} {% include 'map/geom_form.html' %}
</div> </div>

18
ema/templates/ema/detail/view.html
View File

@ -14,16 +14,16 @@
{% block body %} {% block body %}
<div id="detail-header" class="row"> <div id="detail-header" class="row">
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
<h3>{% trans 'Payment funded compensation' %} <br> {{obj.identifier}}</h3> <h3>{% trans 'Payment funded compensation' %} <br> {{obj.identifier}}</h3>
</div> </div>
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
{% include 'ema/detail/includes/controls.html' %} {% include 'ema/detail/includes/controls.html' %}
</div> </div>
</div> </div>
<hr> <hr>
<div id="data" class="row"> <div id="data" class="row">
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
<div class="table-container"> <div class="table-container">
<table class="table table-hover"> <table class="table table-hover">
<tr> <tr>
@ -82,7 +82,7 @@
</table> </table>
</div> </div>
</div> </div>
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
<div class="row"> <div class="row">
{% include 'map/geom_form.html' %} {% include 'map/geom_form.html' %}
</div> </div>
@ -97,23 +97,23 @@
<hr> <hr>
<div id="related_data"> <div id="related_data">
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
{% include 'ema/detail/includes/states-before.html' %} {% include 'ema/detail/includes/states-before.html' %}
</div> </div>
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
{% include 'ema/detail/includes/states-after.html' %} {% include 'ema/detail/includes/states-after.html' %}
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
{% include 'ema/detail/includes/actions.html' %} {% include 'ema/detail/includes/actions.html' %}
</div> </div>
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
{% include 'ema/detail/includes/deadlines.html' %} {% include 'ema/detail/includes/deadlines.html' %}
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
{% include 'ema/detail/includes/documents.html' %} {% include 'ema/detail/includes/documents.html' %}
</div> </div>
</div> </div>

4
ema/templates/ema/report/report.html
View File

@ -3,7 +3,7 @@
{% block body %} {% block body %}
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
<h3>{% trans 'Report' %}</h3> <h3>{% trans 'Report' %}</h3>
<h4>{{obj.identifier}}</h4> <h4>{{obj.identifier}}</h4>
<div class="table-container"> <div class="table-container">
@ -37,7 +37,7 @@
{% include 'compensation/detail/compensation/includes/states-after.html' %} {% include 'compensation/detail/compensation/includes/states-after.html' %}
{% include 'compensation/detail/compensation/includes/actions.html' %} {% include 'compensation/detail/compensation/includes/actions.html' %}
</div> </div>
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
<div class="row"> <div class="row">
{% include 'map/geom_form.html' %} {% include 'map/geom_form.html' %}
</div> </div>

20
intervention/templates/intervention/detail/view.html
View File

@ -14,16 +14,16 @@
{% block body %} {% block body %}
<div id="detail-header" class="row"> <div id="detail-header" class="row">
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
<h3>{% trans 'Intervention' %}<br> {{obj.identifier}}</h3> <h3>{% trans 'Intervention' %}<br> {{obj.identifier}}</h3>
</div> </div>
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
{% include 'intervention/detail/includes/controls.html' %} {% include 'intervention/detail/includes/controls.html' %}
</div> </div>
</div> </div>
<hr> <hr>
<div id="data" class="row"> <div id="data" class="row">
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
<div class="table-container"> <div class="table-container">
<table class="table table-hover"> <table class="table table-hover">
<tr {% if not obj.title %}class="alert alert-danger" title="{% trans 'Missing' %}" {% endif %}> <tr {% if not obj.title %}class="alert alert-danger" title="{% trans 'Missing' %}" {% endif %}>
@ -122,7 +122,7 @@
</table> </table>
</div> </div>
</div> </div>
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
<div class="row"> <div class="row">
{% include 'map/geom_form.html' %} {% include 'map/geom_form.html' %}
</div> </div>
@ -138,26 +138,26 @@
<div id="related_data"> <div id="related_data">
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
{% include 'intervention/detail/includes/compensations.html' %} {% include 'intervention/detail/includes/compensations.html' %}
</div> </div>
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
{% include 'intervention/detail/includes/payments.html' %} {% include 'intervention/detail/includes/payments.html' %}
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
{% include 'intervention/detail/includes/deductions.html' %} {% include 'intervention/detail/includes/deductions.html' %}
</div> </div>
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
{% include 'intervention/detail/includes/revocation.html' %} {% include 'intervention/detail/includes/revocation.html' %}
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
{% include 'intervention/detail/includes/documents.html' %} {% include 'intervention/detail/includes/documents.html' %}
</div> </div>
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
</div> </div>
</div> </div>
</div> </div>

4
intervention/templates/intervention/report/report.html
View File

@ -3,7 +3,7 @@
{% block body %} {% block body %}
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
<h3>{% trans 'Report' %}</h3> <h3>{% trans 'Report' %}</h3>
<h4>{{obj.identifier}}</h4> <h4>{{obj.identifier}}</h4>
<div class="table-container"> <div class="table-container">
@ -96,7 +96,7 @@
</table> </table>
</div> </div>
</div> </div>
<div class="col-sm-12 col-md-12 col-lg-6"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-6">
<div class="row"> <div class="row">
{% include 'map/geom_form.html' %} {% include 'map/geom_form.html' %}
</div> </div>

9
konova/static/css/konova.css
View File

@ -235,6 +235,15 @@ Similar to bootstraps 'shadow-lg'
.select2-results__option--highlighted{ .select2-results__option--highlighted{
background-color: var(--rlp-red) !important; background-color: var(--rlp-red) !important;
} }
.select2-container--default .select2-results__group{
background-color: var(--rlp-gray-light);
}
.select2-container--default .select2-results__option .select2-results__option{
padding-left: 2em !important;
}
.select2-container--default .select2-results > .select2-results__options{ .select2-container--default .select2-results > .select2-results__options{
max-height: 500px !important; max-height: 500px !important;
} }
.select2-container--default .select2-results__option .select2-results__option{
padding-left: 2em;
}

4
templates/base.html
View File

@ -30,12 +30,12 @@
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
<div class="container-fluid mt-3"> <div class="container-fluid mt-3 px-4">
{% 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 %}
<div class="modal fade" tabindex="-1" role="dialog" id="modal"> <div class="modal fade" tabindex="-1" role="dialog" id="modal">
<div class="modal-dialog modal-md modal-lg" role="document"> <div class="modal-dialog modal-md modal-xl" role="document">
<div class="modal-content"></div> <div class="modal-content"></div>
</div> </div>
</div> </div>