From bd38a04747e7d4ed4e28dd75ba1b43583d883e65 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Tue, 5 Nov 2024 12:12:30 +0100
Subject: ✨ ishtar account sheet
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ishtar/blocks/sheet_permission_detail.html     |  13 +
 .../templates/ishtar/blocks/window_nav.html        |   5 +-
 .../templates/ishtar/sheet_ishtaruser.html         | 489 +++++++++++++++++++++
 .../templates/ishtar/sheet_ishtaruser_window.html  |   3 +
 ishtar_common/templates/ishtar/sheet_person.html   |   2 +-
 5 files changed, 509 insertions(+), 3 deletions(-)
 create mode 100644 ishtar_common/templates/ishtar/blocks/sheet_permission_detail.html
 create mode 100644 ishtar_common/templates/ishtar/sheet_ishtaruser.html
 create mode 100644 ishtar_common/templates/ishtar/sheet_ishtaruser_window.html

(limited to 'ishtar_common/templates')

diff --git a/ishtar_common/templates/ishtar/blocks/sheet_permission_detail.html b/ishtar_common/templates/ishtar/blocks/sheet_permission_detail.html
new file mode 100644
index 000000000..aaf88b034
--- /dev/null
+++ b/ishtar_common/templates/ishtar/blocks/sheet_permission_detail.html
@@ -0,0 +1,13 @@
+{% load i18n ishtar_helpers window_tables %}
+
+{% if item|user_can_do:full_permission %}
+<h3>{{table_label}}</h3>
+<div class="alert alert-info" role="alert">
+    <i class="fa fa-info-circle" aria-hidden="true"></i> &nbsp;
+    {% trans "Permission on all items" %}
+</div>
+{% else %}
+{% if has_own_permission %}
+{% dynamic_table_document table_label table_name permission item.pk '' output %}
+{% endif %}
+{% endif %}
diff --git a/ishtar_common/templates/ishtar/blocks/window_nav.html b/ishtar_common/templates/ishtar/blocks/window_nav.html
index 63aafb93a..d318fe264 100644
--- a/ishtar_common/templates/ishtar/blocks/window_nav.html
+++ b/ishtar_common/templates/ishtar/blocks/window_nav.html
@@ -81,7 +81,7 @@
           {% endif %}
       </div>
 
-      {% if not item.NO_ODTPDF_EXPORT or extra_templates %}
+      {% if item.OLD_SHEET_EXPORT or extra_templates or item.HAS_QR_CODE or item.get_absolute_url %}
       <div class="btn-group btn-group-sm" role="group"
            aria-label="{% trans 'Export' %}">
           <div class="btn btn-sm dropdown btn-secondary">
@@ -93,6 +93,7 @@
               </a>
               <div class="dropdown-menu"
                    aria-labelledby="dropdown-sheet-export-{{window_id}}">
+                  {% if item.OLD_SHEET_EXPORT %}
                   <a class="dropdown-item" href='{% url show_url item.pk "odt" %}'
                      title='{% trans "Export as OpenOffice.org file"%}'>
                       <i class="fa fa-file-word-o" aria-hidden="true"></i> ODT
@@ -100,7 +101,7 @@
                   <a class="dropdown-item" href='{% url show_url item.pk "pdf" %}'
                      title='{% trans "Export as PDF file"%}'>
                       <i class="fa fa-file-pdf-o" aria-hidden="true"></i> PDF
-                  </a>{% for template_name, template_url in extra_templates %}
+                  </a>{% endif %}{% for template_name, template_url in extra_templates %}
                   <a class="dropdown-item" href='{{template_url}}'>
                       <i class="fa fa-file-word-o" aria-hidden="true"></i> {{template_name}}
                   </a>{% endfor %}
diff --git a/ishtar_common/templates/ishtar/sheet_ishtaruser.html b/ishtar_common/templates/ishtar/sheet_ishtaruser.html
new file mode 100644
index 000000000..09979c641
--- /dev/null
+++ b/ishtar_common/templates/ishtar/sheet_ishtaruser.html
@@ -0,0 +1,489 @@
+{% extends "ishtar/sheet.html" %}
+{% load i18n ishtar_helpers window_header window_field window_tables %}
+
+{% block head_title %}<strong><i class="fa fa-user" aria-hidden="true"></i> &nbsp;{% trans "Account" %}</strong> &ndash; {{item.person.raw_name}}{% endblock %}
+
+{% block toolbar %}
+{% window_nav item window_id 'show-ishtaruser' %}
+{% endblock %}
+
+{% block content %}
+{% if ADMIN %} {# extra check #}
+{% with has_permission_dict=item.has_permission_dict %}
+
+<ul class="nav nav-tabs" id="{{window_id}}-tabs" role="tablist">
+    <li class="nav-item">
+        <a class="nav-link active" id="{{window_id}}-general-tab"
+           data-toggle="tab" href="#{{window_id}}-general" role="tab"
+           aria-controls="{{window_id}}-general" aria-selected="false">
+            {% trans "General" %}
+        </a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" id="{{window_id}}-view-tab"
+           data-toggle="tab" href="#{{window_id}}-view" role="tab"
+           aria-controls="{{window_id}}-view" aria-selected="false">
+            {% trans "View permissions" %}
+        </a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" id="{{window_id}}-add-tab"
+           data-toggle="tab" href="#{{window_id}}-add" role="tab"
+           aria-controls="{{window_id}}-add" aria-selected="false">
+            {% trans "Add permissions" %}
+        </a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" id="{{window_id}}-change-tab"
+           data-toggle="tab" href="#{{window_id}}-change" role="tab"
+           aria-controls="{{window_id}}-change" aria-selected="false">
+            {% trans "Modify permissions" %}
+        </a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link" id="{{window_id}}-delete-tab"
+           data-toggle="tab" href="#{{window_id}}-delete" role="tab"
+           aria-controls="{{window_id}}-delete" aria-selected="false">
+            {% trans "Delete permissions" %}
+        </a>
+    </li>
+</ul>
+
+<div class="tab-content" id="{{window_id}}-tab-content">
+    <div class="tab-pane fade show active" id="{{window_id}}-general"
+       role="tabpanel" aria-labelledby="{{window_id}}-general-tab">
+        <div class="row">
+            {% field_flex_detail _("Person") item.person %}
+            <dl class="col-12 col-md-6 col-lg-3 flex-wrap">
+                <dt>{% trans "Status" %}</dt>
+                <dd>
+                    {% if item.user_ptr.is_active %}
+                    <i class="fa fa-check-circle text-success" aria-hidden="true"></i>
+                    &nbsp;{%trans "Account activated"%}{% else %}
+                    <i class="fa fa-stop-circle text-warning" aria-hidden="true"></i>
+                    &nbsp;{%trans "Account deactivated"%}
+                    {% endif %}
+                </dd>
+            </dl>
+            {% field_flex _("Profile(s)") item.person.profiles_list %}
+        </div>
+        {% if item.is_ishtaradmin %}
+        <div class="alert alert-warning" role="alert">
+            <i class="fa fa-info-circle" aria-hidden="true"></i> &nbsp;
+            {% trans "Account administrator: all permissions are granted." %}
+        </div>
+        {% endif %}
+    </div>
+
+    <div class="tab-pane fade show" id="{{window_id}}-view"
+       role="tabpanel" aria-labelledby="{{window_id}}-view-tab">
+        <h2>{% trans "View permissions" %}</h2>
+        {% with permission="view_own" %}
+
+        {% with table_label=_("Archaeological files") %}
+        {% with table_name="files" %}
+        {% with full_permission="archaeological_files.view_file" %}
+        {% with has_own_permission=has_permission_dict.view_own_file %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Operations") %}
+        {% with table_name="operations" %}
+        {% with full_permission="archaeological_operations.view_operation" %}
+        {% with has_own_permission=has_permission_dict.view_own_operation %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Archaeological sites") %}
+        {% with table_name="sites" %}
+        {% with full_permission="archaeological_operations.view_archaeologicalsite" %}
+        {% with has_own_permission=has_permission_dict.view_own_archaeologicalsite %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Context records") %}
+        {% with table_name="context_records" %}
+        {% with full_permission="archaeological_context_records.view_contextrecord" %}
+        {% with has_own_permission=has_permission_dict.view_own_contextrecord %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Finds") %}
+        {% with table_name="finds" %}
+        {% with full_permission="archaeological_finds.view_find" %}
+        {% with has_own_permission=has_permission_dict.view_own_find %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Treatments") %}
+        {% with table_name="treatments" %}
+        {% with full_permission="archaeological_finds.view_treatment" %}
+        {% with has_own_permission=has_permission_dict.view_own_treatment %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Treatment files") %}
+        {% with table_name="treatment_files" %}
+        {% with full_permission="archaeological_finds.view_treatmentfile" %}
+        {% with has_own_permission=has_permission_dict.view_own_treatmentfile %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Warehouses") %}
+        {% with table_name="warehouses" %}
+        {% with full_permission="archaeological_warehouse.view_warehouse" %}
+        {% with has_own_permission=has_permission_dict.view_own_warehouse %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Containers") %}
+        {% with table_name="containers" %}
+        {% with full_permission="archaeological_warehouse.view_container" %}
+        {% with has_own_permission=has_permission_dict.view_own_container %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Documents") %}
+        {% with table_name="documents" %}
+        {% with full_permission="ishtar_common.view_document" %}
+        {% with has_own_permission=has_permission_dict.view_own_document %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Administrative acts") %}
+        {% with table_name="admin_acts" %}
+        {% with full_permission="archaeological_operations.view_administrativeact" %}
+        {% with has_own_permission=has_permission_dict.view_own_administrativeact %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Organizations") %}
+        {% with table_name="organizations" %}
+        {% with full_permission="ishtar_common.view_organization" %}
+        {% with has_own_permission=has_permission_dict.view_own_organization %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Persons") %}
+        {% with table_name="persons" %}
+        {% with full_permission="ishtar_common.view_person" %}
+        {% with has_own_permission=has_permission_dict.view_own_person %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% endwith %}
+    </div>
+
+    <div class="tab-pane fade show" id="{{window_id}}-add"
+       role="tabpanel" aria-labelledby="{{window_id}}-add-tab">
+        <h2>{% trans "Add permissions" %}</h2>
+
+        {% if item|user_can_do:"archaeological_files.add_file" %}
+        <h3>{% trans "Archaeological files" %}</h3>
+        <div class="alert alert-info" role="alert">
+            <i class="fa fa-info-circle" aria-hidden="true"></i> &nbsp;
+            {% trans "Can create items" %}
+        </div>
+        {% endif %}
+
+        {% if item|user_can_do:"archaeological_operations.add_operation" %}
+        <h3>{% trans "Operations" %}</h3>
+        <div class="alert alert-info" role="alert">
+            <i class="fa fa-info-circle" aria-hidden="true"></i> &nbsp;
+            {% trans "Can create items" %}
+        </div>
+        {% endif %}
+
+        {% if item|user_can_do:"archaeological_operations.add_archaeologicalsite" %}
+        <h3>{% trans "Archaeological sites" %}</h3>
+        <div class="alert alert-info" role="alert">
+            <i class="fa fa-info-circle" aria-hidden="true"></i> &nbsp;
+            {% trans "Can create items" %}
+        </div>
+        {% endif %}
+
+        {% if item|user_can_do:"archaeological_context_records.add_contextrecord" %}
+        <h3>{% trans "Context records" %}</h3>
+        <div class="alert alert-info" role="alert">
+            <i class="fa fa-info-circle" aria-hidden="true"></i> &nbsp;
+            {% trans "Can create items" %}
+        </div>
+        {% endif %}
+
+        {% if item|user_can_do:"archaeological_finds.add_find" %}
+        <h3>{% trans "Finds" %}</h3>
+        <div class="alert alert-info" role="alert">
+            <i class="fa fa-info-circle" aria-hidden="true"></i> &nbsp;
+            {% trans "Can create items" %}
+        </div>
+        {% endif %}
+
+        {% if item|user_can_do:"archaeological_treatments.add_treatment" %}
+        <h3>{% trans "Treatments" %}</h3>
+        <div class="alert alert-info" role="alert">
+            <i class="fa fa-info-circle" aria-hidden="true"></i> &nbsp;
+            {% trans "Can create items" %}
+        </div>
+        {% endif %}
+
+        {% if item|user_can_do:"archaeological_treatmentfiles.add_treatmentfile" %}
+        <h3>{% trans "Treatment files" %}</h3>
+        <div class="alert alert-info" role="alert">
+            <i class="fa fa-info-circle" aria-hidden="true"></i> &nbsp;
+            {% trans "Can create items" %}
+        </div>
+        {% endif %}
+
+        {% if item|user_can_do:"archaeological_warehouse.add_warehouse" %}
+        <h3>{% trans "Warehouses" %}</h3>
+        <div class="alert alert-info" role="alert">
+            <i class="fa fa-info-circle" aria-hidden="true"></i> &nbsp;
+            {% trans "Can create items" %}
+        </div>
+        {% endif %}
+
+        {% if item|user_can_do:"archaeological_warehouse.add_container" %}
+        <h3>{% trans "Containers" %}</h3>
+        <div class="alert alert-info" role="alert">
+            <i class="fa fa-info-circle" aria-hidden="true"></i> &nbsp;
+            {% trans "Can create items" %}
+        </div>
+        {% endif %}
+
+        {% if item|user_can_do:"ishtar_common.add_document" %}
+        <h3>{% trans "Documents" %}</h3>
+        <div class="alert alert-info" role="alert">
+            <i class="fa fa-info-circle" aria-hidden="true"></i> &nbsp;
+            {% trans "Can create items" %}
+        </div>
+        {% endif %}
+
+        {% if item|user_can_do:"archaeological_operations.add_administrativeact" %}
+        <h3>{% trans "Administrative acts" %}</h3>
+        <div class="alert alert-info" role="alert">
+            <i class="fa fa-info-circle" aria-hidden="true"></i> &nbsp;
+            {% trans "Can create items" %}
+        </div>
+        {% endif %}
+
+        {% if item|user_can_do:"ishtar_common.add_organization" %}
+        <h3>{% trans "Organizations" %}</h3>
+        <div class="alert alert-info" role="alert">
+            <i class="fa fa-info-circle" aria-hidden="true"></i> &nbsp;
+            {% trans "Can create items" %}
+        </div>
+        {% endif %}
+
+        {% if item|user_can_do:"ishtar_common.add_person" %}
+        <h3>{% trans "Persons" %}</h3>
+        <div class="alert alert-info" role="alert">
+            <i class="fa fa-info-circle" aria-hidden="true"></i> &nbsp;
+            {% trans "Can create items" %}
+        </div>
+        {% endif %}
+
+    </div>
+
+    <div class="tab-pane fade show" id="{{window_id}}-change"
+       role="tabpanel" aria-labelledby="{{window_id}}-change-tab">
+        <h2>{% trans "Modify permissions" %}</h2>
+        {% with permission="change_own" %}
+
+        {% with table_label=_("Archaeological files") %}
+        {% with table_name="files" %}
+        {% with full_permission="archaeological_files.change_file" %}
+        {% with has_own_permission=has_permission_dict.change_own_file %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Operations") %}
+        {% with table_name="operations" %}
+        {% with full_permission="archaeological_operations.change_operation" %}
+        {% with has_own_permission=has_permission_dict.change_own_operation %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Archaeological sites") %}
+        {% with table_name="sites" %}
+        {% with full_permission="archaeological_operations.change_archaeologicalsite" %}
+        {% with has_own_permission=has_permission_dict.change_own_archaeologicalsite %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Context records") %}
+        {% with table_name="context_records" %}
+        {% with full_permission="archaeological_context_records.change_contextrecord" %}
+        {% with has_own_permission=has_permission_dict.change_own_contextrecord %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Finds") %}
+        {% with table_name="finds" %}
+        {% with full_permission="archaeological_finds.change_find" %}
+        {% with has_own_permission=has_permission_dict.change_own_find %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Treatments") %}
+        {% with table_name="treatments" %}
+        {% with full_permission="archaeological_finds.change_treatment" %}
+        {% with has_own_permission=has_permission_dict.change_own_treatment %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Treatment files") %}
+        {% with table_name="treatment_files" %}
+        {% with full_permission="archaeological_finds.change_treatmentfile" %}
+        {% with has_own_permission=has_permission_dict.change_own_treatmentfile %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Warehouses") %}
+        {% with table_name="warehouses" %}
+        {% with full_permission="archaeological_warehouse.change_warehouse" %}
+        {% with has_own_permission=has_permission_dict.change_own_warehouse %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Containers") %}
+        {% with table_name="containers" %}
+        {% with full_permission="archaeological_warehouse.change_container" %}
+        {% with has_own_permission=has_permission_dict.change_own_container %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Documents") %}
+        {% with table_name="documents" %}
+        {% with full_permission="ishtar_common.change_document" %}
+        {% with has_own_permission=has_permission_dict.change_own_document %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Administrative acts") %}
+        {% with table_name="admin_acts" %}
+        {% with full_permission="archaeological_operations.change_administrativeact" %}
+        {% with has_own_permission=has_permission_dict.change_own_administrativeact %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Organizations") %}
+        {% with table_name="organizations" %}
+        {% with full_permission="ishtar_common.change_organization" %}
+        {% with has_own_permission=has_permission_dict.change_own_organization %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Persons") %}
+        {% with table_name="persons" %}
+        {% with full_permission="ishtar_common.change_person" %}
+        {% with has_own_permission=has_permission_dict.change_own_person %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% endwith %}
+    </div>
+
+    <div class="tab-pane fade show" id="{{window_id}}-delete"
+       role="tabpanel" aria-labelledby="{{window_id}}-delete-tab">
+        <h2>{% trans "Delete permissions" %}</h2>
+        {% with permission="delete_own" %}
+
+        {% with table_label=_("Archaeological files") %}
+        {% with table_name="files" %}
+        {% with full_permission="archaeological_files.delete_file" %}
+        {% with has_own_permission=has_permission_dict.delete_own_file %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Operations") %}
+        {% with table_name="operations" %}
+        {% with full_permission="archaeological_operations.delete_operation" %}
+        {% with has_own_permission=has_permission_dict.delete_own_operation %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Archaeological sites") %}
+        {% with table_name="sites" %}
+        {% with full_permission="archaeological_operations.delete_archaeologicalsite" %}
+        {% with has_own_permission=has_permission_dict.delete_own_archaeologicalsite %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Context records") %}
+        {% with table_name="context_records" %}
+        {% with full_permission="archaeological_context_records.delete_contextrecord" %}
+        {% with has_own_permission=has_permission_dict.delete_own_contextrecord %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Finds") %}
+        {% with table_name="finds" %}
+        {% with full_permission="archaeological_finds.delete_find" %}
+        {% with has_own_permission=has_permission_dict.delete_own_find %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Treatments") %}
+        {% with table_name="treatments" %}
+        {% with full_permission="archaeological_finds.delete_treatment" %}
+        {% with has_own_permission=has_permission_dict.delete_own_treatment %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Treatment files") %}
+        {% with table_name="treatment_files" %}
+        {% with full_permission="archaeological_finds.delete_treatmentfile" %}
+        {% with has_own_permission=has_permission_dict.delete_own_treatmentfile %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Warehouses") %}
+        {% with table_name="warehouses" %}
+        {% with full_permission="archaeological_warehouse.delete_warehouse" %}
+        {% with has_own_permission=has_permission_dict.delete_own_warehouse %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Containers") %}
+        {% with table_name="containers" %}
+        {% with full_permission="archaeological_warehouse.delete_container" %}
+        {% with has_own_permission=has_permission_dict.delete_own_container %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Documents") %}
+        {% with table_name="documents" %}
+        {% with full_permission="ishtar_common.delete_document" %}
+        {% with has_own_permission=has_permission_dict.delete_own_document %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Administrative acts") %}
+        {% with table_name="admin_acts" %}
+        {% with full_permission="archaeological_operations.delete_administrativeact" %}
+        {% with has_own_permission=has_permission_dict.delete_own_administrativeact %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Organizations") %}
+        {% with table_name="organizations" %}
+        {% with full_permission="ishtar_common.delete_organization" %}
+        {% with has_own_permission=has_permission_dict.delete_own_organization %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% with table_label=_("Persons") %}
+        {% with table_name="persons" %}
+        {% with full_permission="ishtar_common.delete_person" %}
+        {% with has_own_permission=has_permission_dict.delete_own_person %}
+        {% include "ishtar/blocks/sheet_permission_detail.html"%}
+        {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+
+        {% endwith %}
+    </div>
+
+</div>
+
+{% endwith %}
+{% endif %}
+{% endblock %}
diff --git a/ishtar_common/templates/ishtar/sheet_ishtaruser_window.html b/ishtar_common/templates/ishtar/sheet_ishtaruser_window.html
new file mode 100644
index 000000000..08db98b20
--- /dev/null
+++ b/ishtar_common/templates/ishtar/sheet_ishtaruser_window.html
@@ -0,0 +1,3 @@
+{% extends "ishtar/sheet_ishtaruser.html" %}
+{% block main_head %}{%endblock%}
+{% block main_foot %}{%endblock%}
diff --git a/ishtar_common/templates/ishtar/sheet_person.html b/ishtar_common/templates/ishtar/sheet_person.html
index 5856e4407..c34997d30 100644
--- a/ishtar_common/templates/ishtar/sheet_person.html
+++ b/ishtar_common/templates/ishtar/sheet_person.html
@@ -18,7 +18,7 @@
     {% field_flex "Type(s)" item.person_types_list %}
     {% field_flex_detail_multiple "Biographical notes" item.biographical_notes %}
     {% if ADMIN %}
-    {% field_flex "Profile(s)" item.profiles_list %}
+    {% field_flex_detail _("Account") item.ishtaruser %}
     {% endif %}
 </div>
 
-- 
cgit v1.2.3