Merge branch 'master' into v0.9

4 files changed, 28 insertions, 20 deletions

diff --git a/ishtar_common/templates/ishtar/blocks/window_field_multiple.html b/ishtar_common/templates/ishtar/blocks/window_field_multiple.html
index d1ee25c7b..cc817490c 100644
--- a/ishtar_common/templates/ishtar/blocks/window_field_multiple.html
+++ b/ishtar_common/templates/ishtar/blocks/window_field_multiple.html
@@ -1,6 +1,6 @@
 {% load i18n %}{% if data.count %}{% if li %}<li>{% else %}<p>{% endif %}<label>{% trans caption %}{% trans ":"%}</label>
     <span class='value'>{% for d in data.all %}
-        {% if forloop.counter0 %}, {% endif %}{{ d }}
+        {% if forloop.counter0 %} ; {% endif %}{{ d }}
     {% endfor %}</span>
 {% if li %}</li>{% else %}</p>{% endif %}
 {% endif %}
diff --git a/ishtar_common/templates/ishtar/blocks/window_field_url.html b/ishtar_common/templates/ishtar/blocks/window_field_url.html
index 637366d1d..d63ebdca9 100644
--- a/ishtar_common/templates/ishtar/blocks/window_field_url.html
+++ b/ishtar_common/templates/ishtar/blocks/window_field_url.html
@@ -1,3 +1,3 @@
 {% load i18n %}{% if link %}{% if li %}<li>{% else %}<p>{% endif %}<p><label>{% trans caption %}{% trans ":"%}</label>
-<span class='value'><a target="_blank" href='{{link|safe}}'>{% if link_name %}{{link_name}}{% else %}{% trans "link" %}{% endif %}</a></span>{% if li %}</li>{% else %}</p>{% endif %}
+<span class='value'><a target="_blank" href='{{link|safe}}'>{% if link_name %}{{link_name}}{% else %}{{link}}{% endif %}</a></span>{% if li %}</li>{% else %}</p>{% endif %}
 {% endif%}
diff --git a/ishtar_common/templates/ishtar/sheet_source.html b/ishtar_common/templates/ishtar/sheet_source.html
index 653087753..08406286d 100644
--- a/ishtar_common/templates/ishtar/sheet_source.html
+++ b/ishtar_common/templates/ishtar/sheet_source.html
@@ -4,26 +4,33 @@
 {% block content %}
 {% block window_nav %}{% endblock %}
 {% block general %}
-{% field "Title" item.title %}
-{% field "Index" item.index %}
-{% field "Source type" item.source_type %}
-{% field "Format type" item.format_type %}
-{% field "Scale" item.scale %}
-{% field_url "Web link" item.associated_url %}
-{% field_multiple "Authors" item.authors %}
-{% field "Item number" item.item_number %}
-{% field "Ref." item.reference %}
-{% field "Internal ref." item.internal_reference %}
-{% field "Creation date" item.creation_date %}
-{% field "Receipt date" item.receipt_date %}
-{% field "Receipt date in documentation" item.receipt_date_in_documentation %}
-{% field "Has a duplicate" item.duplicate %}
-{% field "Description" item.description %}
-{% field "Comment" item.comment %}
-{% field "Additional information" item.additional_information %}
-{% endblock %}
 {% block related %}
 {% field "Related item" item.owner %}
 {% endblock %}
+
+{% if item.image %}
+<a href='{{item.image.url}}' rel="prettyPhoto" title="{{item.label}}" class='photo'><img src='{{item.thumbnail.url}}'/></a>
+{% endif%}
+
+<ul class='form-flex'>
+{% field_li "Title" item.title %}
+{% field_li "Index" item.index %}
+{% field_li "Source type" item.source_type %}
+{% field_li "Format type" item.format_type %}
+{% field_li "Scale" item.scale %}
+{% field_li_url "Web link" item.associated_url %}
+{% field_li "Authors" item.authors|add_links:'person' %}
+{% field_li "Item number" item.item_number %}
+{% field_li "Ref." item.reference %}
+{% field_li "Internal ref." item.internal_reference %}
+{% field_li "Creation date" item.creation_date %}
+{% field_li "Receipt date" item.receipt_date %}
+{% field_li "Receipt date in documentation" item.receipt_date_in_documentation %}
+{% field_li "Has a duplicate" item.duplicate %}
+{% field_li "Description" item.description %}
+{% field_li "Comment" item.comment %}
+{% field_li "Additional information" item.additional_information %}
+</ul>
+{% endblock %}
 {% endblock %}
 
diff --git a/ishtar_common/templates/welcome.html b/ishtar_common/templates/welcome.html
index 42935d8f9..eb9de475e 100644
--- a/ishtar_common/templates/welcome.html
+++ b/ishtar_common/templates/welcome.html
@@ -2,6 +2,7 @@
 {% load url from future %}
 
 <h2>{% trans "Welcome in Ishtar, open source software for management and inventory of archaeological data" %}</h2>
+{{random_image}}
 <p>{% trans "Some useful links:" %}</p>
 <ul>
     <li><a href='https://ishtar-archeo.net' target="_blank">{% trans "Presentation site and blog" %}</a>{% trans ":"%} {% trans "stay tuned with Ishtar news!" %}</li>