Djangoization - Major refactoring (step 9)

* move templates
* change labels

8 files changed, 5 insertions, 4 deletions

diff --git a/ishtar_common/templates/ishtar/wizard/confirm_wizard.html b/ishtar_common/templates/ishtar/wizard/confirm_wizard.html
index bd80e3967..5d1b1c042 100644
--- a/ishtar_common/templates/ishtar/wizard/confirm_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/confirm_wizard.html
@@ -2,6 +2,7 @@
 {% load i18n %}
 {% load range %}
 {% block content %}
+<h2>{{wizard_label}}</h2>
 <form action="." method="post">{% csrf_token %}
 <ul id='form_path'>
 {% for step in previous_steps %}
diff --git a/ishtar_common/templates/wizard_closing_done.html b/ishtar_common/templates/ishtar/wizard/wizard_closing_done.html
index 54990a629..54990a629 100644
--- a/ishtar_common/templates/wizard_closing_done.html
+++ b/ishtar_common/templates/ishtar/wizard/wizard_closing_done.html
diff --git a/ishtar_common/templates/wizard_delete_done.html b/ishtar_common/templates/ishtar/wizard/wizard_delete_done.html
index 854341aa3..854341aa3 100644
--- a/ishtar_common/templates/wizard_delete_done.html
+++ b/ishtar_common/templates/ishtar/wizard/wizard_delete_done.html
diff --git a/ishtar_common/templates/wizard_done.html b/ishtar_common/templates/ishtar/wizard/wizard_done.html
index a7068bbab..a7068bbab 100644
--- a/ishtar_common/templates/wizard_done.html
+++ b/ishtar_common/templates/ishtar/wizard/wizard_done.html
diff --git a/ishtar_common/templates/wizard_done_summary.html b/ishtar_common/templates/ishtar/wizard/wizard_done_summary.html
index 53650dafe..53650dafe 100644
--- a/ishtar_common/templates/wizard_done_summary.html
+++ b/ishtar_common/templates/ishtar/wizard/wizard_done_summary.html
diff --git a/ishtar_common/templates/wizard_done_summary_2.html b/ishtar_common/templates/ishtar/wizard/wizard_done_summary_2.html
index 66a572542..66a572542 100644
--- a/ishtar_common/templates/wizard_done_summary_2.html
+++ b/ishtar_common/templates/ishtar/wizard/wizard_done_summary_2.html
diff --git a/ishtar_common/templates/wizard_list_search_result.html b/ishtar_common/templates/ishtar/wizard/wizard_list_search_result.html
index 6cbafb930..6cbafb930 100644
--- a/ishtar_common/templates/wizard_list_search_result.html
+++ b/ishtar_common/templates/ishtar/wizard/wizard_list_search_result.html
diff --git a/ishtar_common/wizards.py b/ishtar_common/wizards.py
index e423b834e..fb6ad22e2 100644
--- a/ishtar_common/wizards.py
+++ b/ishtar_common/wizards.py
@@ -417,7 +417,7 @@ class Wizard(NamedUrlWizardView):
                 # necessary to manage interaction between models like
                 # material_index management for baseitems
                 obj.save()
-        res = render_to_response('wizard_done.html', {},
+        res = render_to_response('ishtar/wizard/wizard_done.html', {},
                                   context_instance=RequestContext(self.request))
         return return_object and (obj, res) or res
 
@@ -727,7 +727,7 @@ class DeletionWizard(Wizard):
     def done(self, form_list, **kwargs):
         obj = self.get_current_object()
         obj.delete()
-        return render_to_response('wizard_delete_done.html', {},
+        return render_to_response('ishtar/wizard/wizard_delete_done.html', {},
                                   context_instance=RequestContext(self.request))
 
 class ClosingWizard(Wizard):
@@ -777,7 +777,7 @@ class ClosingWizard(Wizard):
                 if 'end_date' in form.cleaned_data and hasattr(obj, 'end_date'):
                     obj.end_date = form.cleaned_data['end_date']
                     obj.save()
-        return render_to_response('wizard_closing_done.html', {},
+        return render_to_response('ishtar/wizard/wizard_closing_done.html', {},
                                   context_instance=RequestContext(self.request))
 
 class PersonWizard(Wizard):
@@ -853,7 +853,7 @@ class AccountWizard(Wizard):
                                                            "app_name":app_name}
             send_mail(subject, msg, settings.ADMINS[0][1],
                       [dct['email']], fail_silently=True)
-        res = render_to_response('wizard_done.html', {},
+        res = render_to_response('ishtar/wizard/wizard_done.html', {},
                                   context_instance=RequestContext(self.request))
         return res