diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-03-29 03:14:01 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-03-29 03:14:01 +0200 |
| commit | 33cb859e2dc08e418aedcc29eb6c576aaf2926ad (patch) | |
| tree | 7b671fce69843ff607ead32daff6f3da96068c0d | |
| parent | f89463697bfac074afec9322625307a96cb13438 (diff) | |
| download | Ishtar-33cb859e2dc08e418aedcc29eb6c576aaf2926ad.tar.bz2 Ishtar-33cb859e2dc08e418aedcc29eb6c576aaf2926ad.zip | |
Correct PDF export (closes #306)
| -rw-r--r-- | ishtar/furnitures/forms.py | 5 | ||||
| -rw-r--r-- | ishtar/templates/base.html | 2 | ||||
| -rw-r--r-- | ishtar/templates/search.html | 3 | ||||
| -rw-r--r-- | ishtar/templates/sheet.html | 7 | ||||
| -rw-r--r-- | ishtar/templates/sheet_file_pdf.html | 4 | ||||
| -rw-r--r-- | 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 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> - <link rel="shortcut icon" href="{{MEDIA_URL}}/media/images/favicon.png"> + <link rel="shortcut icon" href="{{MEDIA_URL}}/media/images/favicon.png"/> <title>{% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %} </title> <script language="javascript" type="text/javascript"> diff --git a/ishtar/templates/search.html b/ishtar/templates/search.html index 5787cb2c6..1b5829820 100644 --- a/ishtar/templates/search.html +++ b/ishtar/templates/search.html @@ -5,6 +5,9 @@ {{form.media}} {% endblock %} {% block content %} +<ul id='form_path'> + <li class='current'>» <a href='#'>{{form.form_label}}</a></li> +</ul> <div class='form'> {% if form.forms %} <div class='top_button'><input type="submit" id="submit_form" value="{% trans "Validate" %}"/></div> diff --git a/ishtar/templates/sheet.html b/ishtar/templates/sheet.html index 8da56345c..e2d1cc6c0 100644 --- a/ishtar/templates/sheet.html +++ b/ishtar/templates/sheet.html @@ -4,21 +4,22 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> - <link rel="shortcut icon" href="{{MEDIA_URL}}/media/images/favicon.png"> <title>{% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %} </title> + {% block css_head %} <link rel="stylesheet" href="{{MEDIA_URL}}/media/style.css" /> - <link rel="stylesheet" href="{{MEDIA_URL}}/media/style_basic.css" /> + {% endblock %} </head> <body> {% endblock %} <div class="sheet" id='{{window_id}}'> +{% block head_sheet %} <script type="text/javascript">var last_window='{{window_id}}';</script> <div class="head"> <a href='#' onclick='$("#{{window_id}}").hide("slow")'>{% trans "Close" %}</a> - <a href='#' onclick='$("#window > div").hide("slow");$("#window").html("")'> {% trans "Close all windows" %} -</a></div> +</a></div>{% endblock %} <div class="body"> {% block content %}{% endblock %} </div> 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 %} +<link rel="stylesheet" href="{{MEDIA_URL}}/media/style_basic.css" /> +{% endblock %} {% block main_head %} {{ block.super }} <div id="pdfheader"> Ishtar – {{APP_NAME}} – {{item}} </div> {% endblock %} +{%block head_sheet%}{%endblock%} {%block main_foot%} <div id="pdffooter"> – <pdf:pagenumber/> – 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 %} +<link rel="stylesheet" href="{{MEDIA_URL}}/media/style_basic.css" /> +{% endblock %} {% block main_head %} {{ block.super }} <div id="pdfheader"> Ishtar – {{APP_NAME}} – {{item}} </div> {% endblock %} +{%block head_sheet%}{%endblock%} {%block main_foot%} <div id="pdffooter"> – <pdf:pagenumber/> – |