Djangoization - Major refactoring (step 9)

* move templates
* change labels

14 files changed, 65 insertions, 41 deletions

diff --git a/archaeological_files/urls.py b/archaeological_files/urls.py
index a64a8b2b1..4c5d923a2 100644
--- a/archaeological_files/urls.py
+++ b/archaeological_files/urls.py
@@ -23,6 +23,15 @@ import views
 
 # forms:
 urlpatterns = patterns('',
+       url(r'file_administrativeactfile/(?P<step>.+)?$',
+           views.file_administrativeactfile_wizard,
+           name='file_administrativeactfile'),
+       url(r'file_administrativeactfile_deletion/(?P<step>.+)?$',
+           views.file_administrativeactfile_deletion_wizard,
+           name='file_administrativeactfile_deletion'),
+       url(r'file_administrativeactfile_modification/(?P<step>.+)?$',
+           views.file_administrativeactfile_modification_wizard,
+           name='file_administrativeactfile_modification'),
        url(r'file_search/(?P<step>.+)?$',
            views.file_search_wizard, name='file_search'),
        url(r'file_creation/(?P<step>.+)?$',
@@ -33,15 +42,6 @@ urlpatterns = patterns('',
            views.file_closing_wizard, name='file_closing'),
        url(r'file_deletion/(?P<step>.+)?$',
            views.file_deletion_wizard, name='file_deletion'),
-       url(r'file_administrativeactfile/(?P<step>.+)?$',
-           views.file_administrativeactfile_wizard,
-           name='file_administrativeactfile'),
-       url(r'file_administrativeactfile_modification/(?P<step>.+)?$',
-           views.file_administrativeactfile_modification_wizard,
-           name='file_administrativeactfile_modification'),
-       url(r'file_administrativeactfile_deletion/(?P<step>.+)?$',
-           views.file_administrativeactfile_deletion_wizard,
-           name='file_administrativeactfile_deletion'),
 )
 
 urlpatterns += patterns('archaeological_files.views',
diff --git a/archaeological_files/views.py b/archaeological_files/views.py
index 84a42b95a..84ee84136 100644
--- a/archaeological_files/views.py
+++ b/archaeological_files/views.py
@@ -22,6 +22,7 @@ import json
 from django.db.models import Q
 from django.http import HttpResponse
 from django.shortcuts import render_to_response
+from django.utils.translation import ugettext_lazy as _
 
 from ishtar_common.views import get_item, show_item, revert_item
 from archaeological_operations.models import AdministrativeAct
@@ -79,6 +80,7 @@ def dashboard_file(request, dct, obj_id=None, *args, **kwargs):
 
 file_search_wizard = SearchWizard.as_view(
                             [('general-file_search', FileFormSelection)],
+                            label=_(u"File search"),
                             url_name='file_search',)
 file_creation_wizard = FileWizard.as_view([
                             ('general-file_creation', FileFormGeneral),
@@ -87,11 +89,12 @@ file_creation_wizard = FileWizard.as_view([
                             ('parcels-file_creation', ParcelFormSet),
                             ('preventive-file_creation', FileFormPreventive),
                             ('final-file_creation', FinalForm)],
+             label=_(u"New file"),
              condition_dict={'preventive-file_creation':is_preventive(
                                          'general-file_creation',
                                          models.FileType, type_key='file_type')
                             },
-                            url_name='file_creation',)
+             url_name='file_creation',)
 
 file_modification_wizard = FileModificationWizard.as_view([
                           ('selec-file_modification', FileFormSelection),
@@ -101,22 +104,25 @@ file_modification_wizard = FileModificationWizard.as_view([
                           ('parcels-file_modification', ParcelFormSet),
                           ('preventive-file_modification', FileFormPreventive),
                           ('final-file_modification', FinalForm)],
+             label=_(u"File modification"),
              condition_dict={'preventive-file_modification':is_preventive(
                                          'general-file_modification',
                                          models.FileType, type_key='file_type')
                             },
-                          url_name='file_modification',)
+             url_name='file_modification',)
 
 file_closing_wizard = FileClosingWizard.as_view([
                      ('selec-file_closing', FileFormSelection),
                      ('date-file_closing', ClosingDateFormSelection),
                      ('final-file_closing', FinalFileClosingForm)],
+                      label=_(u"File closing"),
                       url_name='file_closing',)
 
 
 file_deletion_wizard = FileDeletionWizard.as_view([
                      ('selec-file_deletion', FileFormSelection),
                      ('final-file_deletion', FinalFileDeleteForm)],
+                      label=_(u"File deletion"),
                       url_name='file_deletion',)
 
 file_administrativeactfile_wizard = FileAdministrativeActWizard.as_view([
@@ -124,6 +130,7 @@ file_administrativeactfile_wizard = FileAdministrativeActWizard.as_view([
        ('administrativeact-file_administrativeactfile',
                                             AdministrativeActFileForm),
        ('final-file_administrativeactfile', FinalForm)],
+       label=_(u"File: new administrative act"),
        url_name='file_administrativeactfile',)
 
 file_administrativeactfile_modification_wizard = \
@@ -133,6 +140,7 @@ file_administrativeactfile_modification_wizard = \
        ('administrativeact-file_administrativeactfile_modification',
                                             AdministrativeActFileForm),
        ('final-file_administrativeactfile_modification', FinalForm)],
+       label=_(u"File: administrative act modification"),
        url_name='file_administrativeactfile_modification',)
 
 file_administrativeactfile_deletion_wizard = \
@@ -141,5 +149,6 @@ file_administrativeactfile_deletion_wizard = \
                                  AdministrativeActFileFormSelection),
                      ('final-file_administrativeactfile_deletion',
                                  FinalAdministrativeActDeleteForm)],
+                      label=_(u"File: administrative act deletion"),
                       url_name='file_administrativeactfile_deletion',)
 
diff --git a/archaeological_files/wizards.py b/archaeological_files/wizards.py
index 0cc34ebcc..e2f6722ef 100644
--- a/archaeological_files/wizards.py
+++ b/archaeological_files/wizards.py
@@ -144,7 +144,7 @@ class FileDeletionWizard(FileClosingWizard):
         for operation in Operation.objects.filter(associated_file=obj).all():
             operation.delete()
         obj.delete()
-        return render_to_response('wizard_done.html', {},
+        return render_to_response('ishtar/wizard/wizard_delete_done.html', {},
                                   context_instance=RequestContext(self.request))
 
 
diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py
index 7866e2c66..c00624fe1 100644
--- a/archaeological_operations/views.py
+++ b/archaeological_operations/views.py
@@ -96,6 +96,7 @@ def dashboard_operation(request, dct, obj_id=None, *args, **kwargs):
 
 operation_search_wizard = SearchWizard.as_view([
                           ('general-operation_search', OperationFormSelection)],
+                          label=_(u"Operation search"),
                           url_name='operation_search',)
 
 operation_creation_wizard = OperationWizard.as_view([
@@ -109,19 +110,26 @@ operation_creation_wizard = OperationWizard.as_view([
            ('remains-operation_creation', RemainFormset),
            ('periods-operation_creation', PeriodFormset),
            ('final-operation_creation', FinalForm)],
-             condition_dict={
-'preventive-operation_creation':is_preventive('general-operation_creation',
-                     models.OperationType, 'operation_type', 'prev_excavation'),
-'preventivediag-operation_creation':is_preventive('general-operation_creation',
-                     models.OperationType, 'operation_type', 'arch_diagnostic'),
-'townsgeneral-operation_creation':has_associated_file(
+           label=_(u"Operation creation"),
+           condition_dict={
+                     'preventive-operation_creation':\
+                            is_preventive('general-operation_creation',
+                                          models.OperationType,
+                                          'operation_type', 'prev_excavation'),
+                     'preventivediag-operation_creation':\
+                            is_preventive('general-operation_creation',
+                                          models.OperationType,
+                                          'operation_type', 'arch_diagnostic'),
+                     'townsgeneral-operation_creation':has_associated_file(
                                      'general-operation_creation', negate=True),
-'towns-operation_creation':has_associated_file('general-operation_creation'),
-'parcelsgeneral-operation_creation':has_associated_file(
+                     'towns-operation_creation':has_associated_file(
+                                     'general-operation_creation'),
+                     'parcelsgeneral-operation_creation':has_associated_file(
                                      'general-operation_creation', negate=True),
-'parcels-operation_creation':has_associated_file('general-operation_creation'),
+                     'parcels-operation_creation':has_associated_file(
+                                     'general-operation_creation'),
                             },
-                    url_name='operation_creation',)
+           url_name='operation_creation',)
 
 operation_modification_wizard = OperationModificationWizard.as_view([
          ('selec-operation_modification', OperationFormSelection),
@@ -135,33 +143,36 @@ operation_modification_wizard = OperationModificationWizard.as_view([
          ('remains-operation_modification', RemainFormset),
          ('periods-operation_modification', PeriodFormset),
          ('final-operation_modification', FinalForm)],
-             condition_dict={
-'preventive-operation_modification':is_preventive(
+         label=_(u"Operation modification"),
+         condition_dict={
+            'preventive-operation_modification':is_preventive(
                          'general-operation_modification', models.OperationType,
                          'operation_type', 'prev_excavation'),
-'preventivediag-operation_modification':is_preventive(
+            'preventivediag-operation_modification':is_preventive(
                          'general-operation_modification', models.OperationType,
                          'operation_type', 'arch_diagnostic'),
-'townsgeneral-operation_modification':has_associated_file(
+            'townsgeneral-operation_modification':has_associated_file(
                                  'general-operation_modification', negate=True),
-'towns-operation_modification':has_associated_file(
+            'towns-operation_modification':has_associated_file(
                                  'general-operation_modification'),
-'parcelsgeneral-operation_modification':has_associated_file(
+            'parcelsgeneral-operation_modification':has_associated_file(
                                  'general-operation_modification', negate=True),
-'parcels-operation_modification':has_associated_file(
+            'parcels-operation_modification':has_associated_file(
                                  'general-operation_modification'),
                             },
-                    url_name='operation_modification',)
+         url_name='operation_modification',)
 
 operation_closing_wizard = OperationClosingWizard.as_view([
                      ('selec-operation_closing', OperationFormSelection),
                      ('date-operation_closing', ClosingDateFormSelection),
                      ('final-operation_closing', FinalOperationClosingForm)],
+                      label=_(u"Operation closing"),
                       url_name='operation_closing',)
 
 operation_deletion_wizard = OperationDeletionWizard.as_view([
                      ('selec-operation_deletion', OperationFormSelection),
                      ('final-operation_deletion', OperationDeletionForm)],
+                      label=_(u"Operation deletion"),
                       url_name='operation_deletion',)
 
 operation_source_creation_wizard = OperationSourceWizard.as_view([
@@ -169,18 +180,21 @@ operation_source_creation_wizard = OperationSourceWizard.as_view([
              ('source-operation_source_creation',OperationSourceForm),
              ('authors-operation_source_creation', AuthorFormset),
              ('final-operation_source_creation', FinalForm)],
-                  url_name='operation_source_creation',)
+              label=_(u"Operation: source creation"),
+              url_name='operation_source_creation',)
 
 operation_source_modification_wizard = OperationSourceWizard.as_view([
          ('selec-operation_source_modification', OperationSourceFormSelection),
          ('source-operation_source_modification', OperationSourceForm),
          ('authors-operation_source_modification', AuthorFormset),
          ('final-operation_source_modification', FinalForm)],
+          label=_(u"Operation: source modification"),
           url_name='operation_source_modification',)
 
 operation_source_deletion_wizard = OperationSourceDeletionWizard.as_view([
          ('selec-operation_source_deletion', OperationSourceFormSelection),
          ('final-operation_source_deletion', SourceDeletionForm)],
+          label=_(u"Operation: source deletion"),
           url_name='operation_source_deletion',)
 
 operation_administrativeactop_wizard = \
@@ -188,6 +202,7 @@ operation_administrativeactop_wizard = \
     ('selec-operation_administrativeactop', OperationFormSelection),
     ('administrativeact-operation_administrativeactop', AdministrativeActOpeForm),
     ('final-operation_administrativeactop', FinalForm)],
+     label=_(u"Operation: new administrative act"),
      url_name='operation_administrativeactop',)
 
 operation_administrativeactop_modification_wizard = \
diff --git a/archaeological_operations/wizards.py b/archaeological_operations/wizards.py
index 2dae72aad..7c09c1154 100644
--- a/archaeological_operations/wizards.py
+++ b/archaeological_operations/wizards.py
@@ -33,8 +33,7 @@ class OperationWizard(Wizard):
 
     def get_template_names(self):
         templates = super(OperationWizard, self).get_template_names()
-        current_step = storage.get_current_step() or self.get_first_step(
-                                                            request, storage)
+        current_step = self.steps. current
         if current_step.startswith('towns-'):
             # vérifier que le context_data est bien chargé
             #templates = ['ishtar/wizard/towns_wizard.html'] + templates
@@ -45,7 +44,7 @@ class OperationWizard(Wizard):
         """
         Return extra context for templates
         """
-        context = super(OperationWizard, self).get_context_data(forms,
+        context = super(OperationWizard, self).get_context_data(form,
                                                                 **kwargs)
         #step = self.determine_step(request, storage)
         step = self.steps.current
@@ -207,7 +206,7 @@ class OperationAdministrativeActWizard(OperationWizard):
         else:
             admact = models.AdministrativeAct(**dct)
         admact.save()
-        res = render_to_response('wizard_done.html', {},
+        res = render_to_response('ishtar/wizard/wizard_done.html', {},
                                   context_instance=RequestContext(self.request))
         return res
 
@@ -227,7 +226,7 @@ class AdministrativeActDeletionWizard(ClosingWizard):
     def done(self, form_list, **kwargs):
         obj = self.get_current_object()
         obj.delete()
-        return render_to_response('wizard_done.html', {},
+        return render_to_response('ishtar/wizard/wizard_delete_done.html', {},
                                   context_instance=RequestContext(self.request))
 
 def is_preventive(form_name, model, type_key='operation_type', key=''):
diff --git a/archaeological_warehouse/wizards.py b/archaeological_warehouse/wizards.py
index 06d3ec887..cbd756bc8 100644
--- a/archaeological_warehouse/wizards.py
+++ b/archaeological_warehouse/wizards.py
@@ -43,6 +43,6 @@ class PackagingWizard(TreatmentWizard):
             new.upstream_treatment = treatment
             new.container = dct['container']
             new.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
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