Djangoization - Major refactoring (step 9)

* move templates
* change labels

1 files changed, 34 insertions, 19 deletions

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 = \