Rename and move sheets templates

10 files changed, 12 insertions, 12 deletions

diff --git a/ishtar_common/templates/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
index 806b06288..d8e06f022 100644
--- a/ishtar_common/templates/sheet_contextrecord.html
+++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
@@ -1,4 +1,4 @@
-{% extends "sheet.html" %}
+{% extends "ishtar/sheet.html" %}
 {% load i18n %}
 {% block content %}
 <div class='tool'>{%trans "Export as:"%} <a href='{% url show-file item.pk "odt" %}'>{%trans "OpenOffice.org file"%}</a>, <a href='{% url show-file item.pk "pdf" %}'>{%trans "PDF file"%}</a></div>
diff --git a/ishtar_common/templates/sheet_contextrecord_window.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord_window.html
index 7ff65d1e7..b485ebd47 100644
--- a/ishtar_common/templates/sheet_contextrecord_window.html
+++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord_window.html
@@ -1,3 +1,3 @@
-{% extends "sheet_contextrecord.html" %}
+{% extends "ishtar/sheet_contextrecord.html" %}
 {% block main_head %}{%endblock%}
 {% block main_foot %}{%endblock%}
diff --git a/ishtar_common/templates/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html
index 88ef1b3a2..1b58aa332 100644
--- a/ishtar_common/templates/sheet_file.html
+++ b/archaeological_files/templates/ishtar/sheet_file.html
@@ -1,4 +1,4 @@
-{% extends "sheet.html" %}
+{% extends "ishtar/sheet.html" %}
 {% load i18n %}
 {% block content %}
 {% if previous or next %}
diff --git a/ishtar_common/templates/sheet_file_pdf.html b/archaeological_files/templates/ishtar/sheet_file_pdf.html
index 3c77c75f8..29a4f4dec 100644
--- a/ishtar_common/templates/sheet_file_pdf.html
+++ b/archaeological_files/templates/ishtar/sheet_file_pdf.html
@@ -1,4 +1,4 @@
-{% extends "sheet_file.html" %}
+{% extends "ishtar/sheet_file.html" %}
 {% block css_head %}
 <link rel="stylesheet" href="{{MEDIA_URL}}/media/style_basic.css" />
 {% endblock %}
diff --git a/ishtar_common/templates/sheet_file_window.html b/archaeological_files/templates/ishtar/sheet_file_window.html
index e9debdd0d..e3486c052 100644
--- a/ishtar_common/templates/sheet_file_window.html
+++ b/archaeological_files/templates/ishtar/sheet_file_window.html
@@ -1,3 +1,3 @@
-{% extends "sheet_file.html" %}
+{% extends "ishtar/sheet_file.html" %}
 {% block main_head %}{%endblock%}
 {% block main_foot %}{%endblock%}
diff --git a/ishtar_common/templates/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html
index 7b161f641..1698f0224 100644
--- a/ishtar_common/templates/sheet_operation.html
+++ b/archaeological_operations/templates/ishtar/sheet_operation.html
@@ -1,4 +1,4 @@
-{% extends "sheet.html" %}
+{% extends "ishtar/sheet.html" %}
 {% load i18n %}
 {% block content %}
 <div class='tool'>{%trans "Export as:"%} <a href='{% url show-operation item.pk "odt" %}'>{%trans "OpenOffice.org file"%}</a>, <a href='{% url show-operation item.pk "pdf" %}'>{%trans "PDF file"%}</a></div>
diff --git a/ishtar_common/templates/sheet_operation_pdf.html b/archaeological_operations/templates/ishtar/sheet_operation_pdf.html
index 3397d5f43..9ef0edbf7 100644
--- a/ishtar_common/templates/sheet_operation_pdf.html
+++ b/archaeological_operations/templates/ishtar/sheet_operation_pdf.html
@@ -1,4 +1,4 @@
-{% extends "sheet_operation.html" %}
+{% extends "ishtar/sheet_operation.html" %}
 {% block css_head %}
 <link rel="stylesheet" href="{{MEDIA_URL}}/media/style_basic.css" />
 {% endblock %}
diff --git a/ishtar_common/templates/sheet_operation_window.html b/archaeological_operations/templates/ishtar/sheet_operation_window.html
index 9c595a1e9..3accaff42 100644
--- a/ishtar_common/templates/sheet_operation_window.html
+++ b/archaeological_operations/templates/ishtar/sheet_operation_window.html
@@ -1,3 +1,3 @@
-{% extends "sheet_operation.html" %}
+{% extends "ishtar/sheet_operation.html" %}
 {% block main_head %}{%endblock%}
 {% block main_foot %}{%endblock%}
diff --git a/ishtar_common/templates/sheet.html b/ishtar_common/templates/ishtar/sheet.html
index 5608a684f..5608a684f 100644
--- a/ishtar_common/templates/sheet.html
+++ b/ishtar_common/templates/ishtar/sheet.html
diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index 54523996f..0d0168bb9 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2010-2012  Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2010-2013  Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -384,7 +384,7 @@ def show_item(model, name):
                                   n.strftime('%Y%m%d-%H%M%S'))
         if doc_type == "odt" and settings.XHTML2ODT_PATH and \
            settings.ODT_TEMPLATE:
-            tpl = loader.get_template('sheet_%s.html' % name)
+            tpl = loader.get_template('ishtar/sheet_%s.html' % name)
             content = tpl.render(context_instance)
             try:
                 tidy_options = dict(output_xhtml=1, add_xml_decl=1, indent=1,
@@ -424,7 +424,7 @@ def show_item(model, name):
             response.write(odtfile)
             return response
         elif doc_type == 'pdf':
-            tpl = loader.get_template('sheet_%s_pdf.html' % name)
+            tpl = loader.get_template('ishtar/sheet_%s_pdf.html' % name)
             content = tpl.render(context_instance)
             result = StringIO.StringIO()
             html = content.encode('utf-8')
@@ -438,7 +438,7 @@ def show_item(model, name):
                 return response
             return HttpResponse(content, content_type="application/xhtml")
         else:
-            tpl = loader.get_template('sheet_%s_window.html' % name)
+            tpl = loader.get_template('ishtar/sheet_%s_window.html' % name)
             content = tpl.render(context_instance)
             return HttpResponse(content, content_type="application/xhtml")
     return func