Merge branch 'master' into v0.9

Conflicts:
	ishtar_common/migrations/0053_auto__add_field_ishtarsiteprofile_currency.py

2 files changed, 16 insertions, 23 deletions

diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html
index 02ddb85df..1a7c8fa54 100644
--- a/ishtar_common/templates/base.html
+++ b/ishtar_common/templates/base.html
@@ -61,9 +61,9 @@
         <i class="fa fa-arrow-circle-up" aria-hidden="true"></i>
     </div>
     <div id="window"></div>
-    <div id="logo">
+    <a href='{% url "start" %}' id="logo">
 {% if APP_NAME %}<p id="app_name">{{APP_NAME}}</p>{%endif%}
-    </div>
+    </a>
     {% if not reminders %}<div id="context_menu">
         {% block context %}{% if current_menu %}
         <form method="post" action="{% url 'update-current-item' %}">
diff --git a/ishtar_common/templates/ishtar/sheet_person.html b/ishtar_common/templates/ishtar/sheet_person.html
index 90b65b72c..3c554acdf 100644
--- a/ishtar_common/templates/ishtar/sheet_person.html
+++ b/ishtar_common/templates/ishtar/sheet_person.html
@@ -83,27 +83,20 @@
 {% dynamic_table_document af 'files' 'in_charge' item.pk '' output %}
 {% endif %}
 
-<table>
-  <caption>{%trans "Documents"%}</caption>
-  <tr>
-    <th>{% trans "Year" %}</th>
-    <th>{% trans "Title" %}</th>
-    <th>{% trans "Type" %}</th>
-    <th>{% trans "Link" %}</th>
-  </tr>
-  {% for author in item.author.all %}
-  {% for doc in author.related_sources %}
-  <tr>
-    <td class='string'>{{ doc.creation_date|date:"Y"}}</td>
-    <td class='string'>{{ doc.title }}</td>
-    <td class='string'>{{ doc.source_type }}</td>
-    <td class='string'>{% if doc.associated_url  %}<a href='{{doc.associated_url}}'>{% trans "Link"%}</a>{% endif %}</td>
-  </tr>
-  {% endfor %}
-  {% empty %}
-  <tr><td colspan="4" class='no_items'>{% trans "No document associated to this person" %}</td></tr>
-  {% endfor %}
-</table>
+{% if item.operation_docs_q.count %}
+{% trans "Documents associated to operations" as operation_docs %}
+{% dynamic_table_document operation_docs 'operation_docs' 'person' item.pk '' output %}
+{% endif %}
+
+{% if item.contextrecord_docs_q.count %}
+{% trans "Documents associated to context records" as context_records %}
+{% dynamic_table_document context_records 'context_records_docs' 'person' item.pk '' output %}
+{% endif %}
+
+{% if item.find_docs_q.count %}
+{% trans "Documents associated to finds" as finds_docs %}
+{% dynamic_table_document finds_docs 'finds_docs' 'person' item.pk '' output %}
+{% endif %}
 
 
 {% endblock %}