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

Merge branch 'master' into 138_New_map_client

Browse Source
This commit is contained in:
mpeltriaux
2022-04-19 14:08:20 +02:00
parent f7b074ab23 940aa38154
commit c6e784e6d4
57 changed files with 1132 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,14 +60,13 @@
<th scope="row">{% trans 'Last modified' %}</th>
<td class="align-middle">
{% if obj.modified %}
{{obj.modified.timestamp|default_if_none:""|naturalday}}
{{obj.modified.timestamp|default_if_none:""}}
<br>
{{obj.modified.user.username}}
{% else %}
{{obj.created.timestamp|default_if_none:""|naturalday}}
{{obj.created.timestamp|default_if_none:""}}
<br>
{{obj.created.user.username}}
{% endif %}
</td>
</tr>

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

@@ -43,14 +43,7 @@
{% include 'konova/includes/parcels.html' %}
</div>
<div class="row">
<div class="col-sm-6 col-md-6 col-lg-6">
<h4>{% trans 'Open in browser' %}</h4>
{{ qrcode|safe }}
</div>
<div class="col-sm-6 col-md-6 col-lg-6">
<h4>{% trans 'View in LANIS' %}</h4>
{{ qrcode_lanis|safe }}
</div>
{% include 'konova/includes/report/qrcodes.html' %}
</div>
</div>