3 files changed, 27 insertions, 24 deletions
diff --git a/ishtar_common/templates/blocks/JQueryJqGrid.html b/ishtar_common/templates/blocks/JQueryJqGrid.html
index 258082877..1768ab427 100644
--- a/ishtar_common/templates/blocks/JQueryJqGrid.html
+++ b/ishtar_common/templates/blocks/JQueryJqGrid.html
@@ -31,7 +31,7 @@
 </div>
 
 {% if multiple %}
-<input type="button" id="add_button_{{name}}" value="{% trans "Add" %}"/>
+<input type="button" id="add_button_{{name}}" value="{% trans 'Add' %}"/>
 <ul id="selectmulti_{{name}}" class="selectmulti"></ul>
 {% endif %}
 
@@ -70,6 +70,9 @@ jQuery(document).ready(function(){
     $(".{{sname}}-csv").attr("href", csv_url);
     var csv_full_url = "{{source_full}}csv?submited=1&" + data;
     $(".{{sname}}-csv-full").attr("href", csv_full_url);
+    {% for slug, name, extra_source in extra_sources %}
+    $(".{{slug}}-csv-full").attr("href", '{{extra_source}}csv?submited=1&' + data);
+    {% endfor %}
 
     mygrid.setGridParam({url:url, page:1});
     mygrid.trigger("reloadGrid");
diff --git a/ishtar_common/templates/ishtar/sheet_organization.html b/ishtar_common/templates/ishtar/sheet_organization.html
index 1f4bd77b7..66048095b 100644
--- a/ishtar_common/templates/ishtar/sheet_organization.html
+++ b/ishtar_common/templates/ishtar/sheet_organization.html
@@ -6,7 +6,7 @@
 {% block content %}
 {% window_nav item window_id 'show-organization' 'organization_modify' %}
 <p><label>{% trans "Name" %}</label> <span class='value'>{{item.name}}</span></p>
-<p><label>{%trans "Created by:"%}</label> <span class='value'>{{ item.history_creator.ishtaruser.full_label }}</span></p>
+<p><label>{%trans "Created by:"%}</label> <span class='value'>{{ item.history_creator.ishtaruser.person }}</span></p>
 {% if item.address %}<p><label>{% trans "Address" %}</label> <span class='value'>{{item.address}}</span></p> {% endif %}
 {% if item.address_complement %}<p><label>{% trans "Address complement" %}</label> <span class='value'>{{item.address_complement}}</span></p> {% endif %}
 {% if item.postal_code %}<p><label>{% trans "Postal code" %}</label> <span class='value'>{{item.postal_code}}</span></p> {% endif %}
diff --git a/ishtar_common/templates/ishtar/sheet_person.html b/ishtar_common/templates/ishtar/sheet_person.html
index bcf39c363..5339e4f07 100644
--- a/ishtar_common/templates/ishtar/sheet_person.html
+++ b/ishtar_common/templates/ishtar/sheet_person.html
@@ -6,13 +6,13 @@
 {% window_nav item window_id 'show-person' 'person_modify' %}
 <h3>{% trans "Identity" %}</h3>
 
-{% field "Title" item.full_title %}
-{% field "Name" item.name %}
-{% field "Surname" item.surname %}
-{% field "Raw name" item.raw_name %}
-{% field "Created by" item.history_creator.ishtaruser.full_label %}
-{% field "Email" item.email %}
-{% field "Type(s)" item.person_types_list %}
+{% field_li "Title" item.full_title %}
+{% field_li "Name" item.name %}
+{% field_li "Surname" item.surname %}
+{% field_li "Raw name" item.raw_name %}
+{% field_li_detail "Created by" item.history_creator.ishtaruser.person %}
+{% field_li "Email" item.email %}
+{% field_li "Type(s)" item.person_types_list %}
 
 {% if item.phone or item.phone2 or item.phone3 or item.mobile_phone %}
 <table class='formset table-form'>
@@ -42,29 +42,29 @@
 
 {% if item.address or item.postal_code or item.town %}
 <h3>{% trans "Business address" %}</h3>
-{% field "Address" item.address %}
-{% field "Address complement" item.address_complement %}
-{% field "Postal code" item.postal_code %}
-{% field "Town" item.town %}
+{% field_li "Address" item.address %}
+{% field_li "Address complement" item.address_complement %}
+{% field_li "Postal code" item.postal_code %}
+{% field_li "Town" item.town %}
 {% endif %}
 
 {% if item.alt_address or item.alt_postal_code or item.alt_town %}
 <h3>{% trans "Other address" %}</h3>
-{% field "Address" item.alt_address %}
-{% field "Address complement" item.alt_address_complement %}
-{% field "Postal code" item.alt_postal_code %}
-{% field "Town" item.alt_town %}
+{% field_li "Address" item.alt_address %}
+{% field_li "Address complement" item.alt_address_complement %}
+{% field_li "Postal code" item.alt_postal_code %}
+{% field_li "Town" item.alt_town %}
 {% endif %}
 
 
 {% if item.attached_to %}<h3>{% trans "Associated organization"%}</h3>
-{% field "Name" item.attached_to %}
-{% field "Address" item.attached_to.address %}
-{% field "Address complement" item.attached_to.address_complement %}
-{% field "Postal code" item.attached_to.postal_code %}
-{% field "Town" item.attached_to.town %}
-{% field "Phone" item.attached_to.phone %}
-{% field "Mobile phone" item.attached_to.mobile_phone %}
+{% field_li "Name" item.attached_to %}
+{% field_li "Address" item.attached_to.address %}
+{% field_li "Address complement" item.attached_to.address_complement %}
+{% field_li "Postal code" item.attached_to.postal_code %}
+{% field_li "Town" item.attached_to.town %}
+{% field_li "Phone" item.attached_to.phone %}
+{% field_li "Mobile phone" item.attached_to.mobile_phone %}
 {% endif %}