7 files changed, 66 insertions, 2 deletions
diff --git a/ishtar_common/templates/blocks/JQueryJqGrid.html b/ishtar_common/templates/blocks/JQueryJqGrid.html
index 7e7086738..e8647dadf 100644
--- a/ishtar_common/templates/blocks/JQueryJqGrid.html
+++ b/ishtar_common/templates/blocks/JQueryJqGrid.html
@@ -73,6 +73,7 @@ jQuery(document).ready(function(){
       {name:'link', index:'link', width:30},
       {{extra_cols|safe}}
     ],
+    height: 300,
     sortname: 'value',
     viewrecords: true,
     sortorder: "asc",
diff --git a/ishtar_common/templates/blocks/inline_formset.html b/ishtar_common/templates/blocks/inline_formset.html
index 3affb7bf3..4d4042985 100644
--- a/ishtar_common/templates/blocks/inline_formset.html
+++ b/ishtar_common/templates/blocks/inline_formset.html
@@ -12,7 +12,7 @@
     {% if frm.errors %}<tr><td colspan='3'><ul>{% for error in frm.errors.values %}<li>{{error}}</li>{% endfor%}</ul></td></tr>{% endif %}
         <tr>{% endif %}{% for field in frm.visible_fields %}<td>
         {% if field.errors %}<div class='errors'>{{ field.errors.as_ul }}</div>{% endif %}
-        {{ field }}
+        {{ field|safe }}
         {# Include the hidden fields in the form #}
         {% if forloop.first %}
           {{ formset.management_form }}
diff --git a/ishtar_common/templates/ishtar/blocks/window_field_url.html b/ishtar_common/templates/ishtar/blocks/window_field_url.html
new file mode 100644
index 000000000..b91f318b6
--- /dev/null
+++ b/ishtar_common/templates/ishtar/blocks/window_field_url.html
@@ -0,0 +1,3 @@
+{% load i18n %}
+{% if link %}<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></p>{% endif%}
diff --git a/ishtar_common/templates/ishtar/sheet.html b/ishtar_common/templates/ishtar/sheet.html
index 915376938..1302e4637 100644
--- a/ishtar_common/templates/ishtar/sheet.html
+++ b/ishtar_common/templates/ishtar/sheet.html
@@ -45,7 +45,9 @@ jQuery(document).ready(function(){
 </script>
 {% endblock %}
 <div class="body">
-{% block content %}{% endblock %}
+{% block toolbar %}{% endblock %}
+{% block content %}
+{% endblock %}
 </div>
 </div>
 {%block main_foot%}
diff --git a/ishtar_common/templates/ishtar/sheet_source.html b/ishtar_common/templates/ishtar/sheet_source.html
new file mode 100644
index 000000000..47e285017
--- /dev/null
+++ b/ishtar_common/templates/ishtar/sheet_source.html
@@ -0,0 +1,24 @@
+{% extends "ishtar/sheet.html" %}
+{% load i18n window_field link_to_window %}
+{% block toolbar %}{% include "ishtar/sheet_toolbar.html" %}{% endblock %}
+{% block content %}
+{% block general %}
+{% field "Title" item.title %}
+{% 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 "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 %}
+{% endblock %}
+
diff --git a/ishtar_common/templates/ishtar/sheet_toolbar.html b/ishtar_common/templates/ishtar/sheet_toolbar.html
new file mode 100644
index 000000000..2e059781e
--- /dev/null
+++ b/ishtar_common/templates/ishtar/sheet_toolbar.html
@@ -0,0 +1,2 @@
+{% load i18n link_to_window %}<div class='tool'>{%trans "Export as:"%} <a href='{{item|link_to_odt}}'>{%trans "OpenOffice.org file"%}</a>, <a href='{{item|link_to_pdf}}'>{%trans "PDF file"%}</a></div>
+
diff --git a/ishtar_common/templates/ishtar/wizard/relations_wizard.html b/ishtar_common/templates/ishtar/wizard/relations_wizard.html
new file mode 100644
index 000000000..9ca592ca8
--- /dev/null
+++ b/ishtar_common/templates/ishtar/wizard/relations_wizard.html
@@ -0,0 +1,32 @@
+{% extends "ishtar/wizard/default_wizard.html" %}
+{% load i18n range inline_formset %}
+{% block extra_head %}
+{{wizard.form.media}}
+{% endblock %}
+{% block wizard_form %}
+<form action="." method="post">{% csrf_token %}
+<div class='form'>
+{{ wizard.form.media }}
+{{ wizard.management_form }}
+{{ wizard.form.management_form }}
+
+{% if wizard.form.non_form_errors%}
+<table class='formset'>
+<tr class='error'><th colspan='2'>{{wizard.form.non_form_errors}}</th></tr>
+</table>{%endif%}
+
+<table class='inline-table'>
+  <tr>{% for field in wizard.form.forms.0 %}<th{% if not forloop.last %} rowspan='2'{% endif %}>{{ field.label_tag }}</th>{% endfor %}</tr>
+  <tr><td>({% trans "all"%} <input type='checkbox' name='check-all' class='check-all'/>)</td></tr>
+  {% inline_formset 'Parcels' wizard.form.forms False %}
+</table>
+<p><button name="formset_modify" value="{{wizard.steps.current}}">{% trans "Add/Modify" %}</button></p>
+<input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
+{{ previous_fields|safe }}
+{% block "validation_bar" %}
+{% include 'ishtar/wizard/validation_bar.html' %}
+{% endblock %}
+</div>
+</form>
+{% endblock %}
+