From 33cb859e2dc08e418aedcc29eb6c576aaf2926ad Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 29 Mar 2011 03:14:01 +0200 Subject: Correct PDF export (closes #306) --- ishtar/furnitures/forms.py | 5 ++--- ishtar/templates/base.html | 2 +- ishtar/templates/search.html | 3 +++ ishtar/templates/sheet.html | 7 ++++--- ishtar/templates/sheet_file_pdf.html | 4 ++++ ishtar/templates/sheet_operation_pdf.html | 4 ++++ 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/ishtar/furnitures/forms.py b/ishtar/furnitures/forms.py index 467d2b342..a9519266f 100644 --- a/ishtar/furnitures/forms.py +++ b/ishtar/furnitures/forms.py @@ -2121,9 +2121,8 @@ ResultItemFormSet = formset_factory(ResultItemForm, can_delete=True, formset=FormSet) ResultItemFormSet.form_label = _(u"Resulting items") -UpstreamItemFormSelection = ItemFormSelection - -UpstreamItemFormSelection.form_label = _(u"Upstream item") +class UpstreamItemFormSelection(ItemFormSelection): + form_label = _(u"Upstream item") treatment_creation_wizard = TreatmentWizard([ ('basetreatment-treatment_creation', BaseTreatmentForm), diff --git a/ishtar/templates/base.html b/ishtar/templates/base.html index 7bfc579bb..630fe666e 100644 --- a/ishtar/templates/base.html +++ b/ishtar/templates/base.html @@ -4,7 +4,7 @@ - + {% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %}
{% trans "Close" %} - {% trans "Close all windows" %} -
+{% endblock %}
{% block content %}{% endblock %}
diff --git a/ishtar/templates/sheet_file_pdf.html b/ishtar/templates/sheet_file_pdf.html index 2a23cb6a4..3c77c75f8 100644 --- a/ishtar/templates/sheet_file_pdf.html +++ b/ishtar/templates/sheet_file_pdf.html @@ -1,10 +1,14 @@ {% extends "sheet_file.html" %} +{% block css_head %} + +{% endblock %} {% block main_head %} {{ block.super }}
Ishtar – {{APP_NAME}} – {{item}}
{% endblock %} +{%block head_sheet%}{%endblock%} {%block main_foot%}
– – diff --git a/ishtar/templates/sheet_operation_pdf.html b/ishtar/templates/sheet_operation_pdf.html index 30f9595bf..3397d5f43 100644 --- a/ishtar/templates/sheet_operation_pdf.html +++ b/ishtar/templates/sheet_operation_pdf.html @@ -1,10 +1,14 @@ {% extends "sheet_operation.html" %} +{% block css_head %} + +{% endblock %} {% block main_head %} {{ block.super }}
Ishtar – {{APP_NAME}} – {{item}}
{% endblock %} +{%block head_sheet%}{%endblock%} {%block main_foot%}
– – -- cgit v1.2.3