diff options
| -rw-r--r-- | archaeological_context_records/forms.py | 14 | ||||
| -rw-r--r-- | archaeological_context_records/views.py | 47 | ||||
| -rw-r--r-- | archaeological_operations/forms.py | 5 | ||||
| -rw-r--r-- | example_project/urls.py | 3 |
4 files changed, 38 insertions, 31 deletions
diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py index 983dbb869..41e4a1e20 100644 --- a/archaeological_context_records/forms.py +++ b/archaeological_context_records/forms.py @@ -24,22 +24,22 @@ import datetime from itertools import groupby from django import forms +from django.conf import settings from django.core import validators from django.core.exceptions import ObjectDoesNotExist from django.db.models import Max from django.utils.translation import ugettext_lazy as _ -from ishtar import settings - from ishtar_common.models import valid_id from archaeological_operations.models import Period, Parcel, Operation import models -import widgets -from forms import FinalForm, FormSet, \ + +from ishtar_common import widgets +from ishtar_common.forms import FinalForm, FinalForm, FormSet, \ formset_factory, get_now, reverse_lazy, get_form_selection -from forms_common import get_town_field, SourceForm, \ - SourceSelect, AuthorFormset -from forms_operations import OperationSelect +from ishtar_common.forms_common import get_town_field, SourceForm, \ + SourceSelect, AuthorFormset +from archaeological_operations.forms import OperationSelect class RecordSelect(forms.Form): parcel__town = get_town_field() diff --git a/archaeological_context_records/views.py b/archaeological_context_records/views.py index 103db2066..bd18ffa49 100644 --- a/archaeological_context_records/views.py +++ b/archaeological_context_records/views.py @@ -41,8 +41,9 @@ get_contextrecordsource = get_item(models.ContextRecordSource, }) record_search_wizard = SearchWizard.as_view([ - ('general-record_search', RecordFormSelection)], - url_name='record_search',) + ('general-record_search', RecordFormSelection)], + label=_(u"Context record search"), + url_name='record_search',) record_creation_wizard = RecordWizard.as_view([ ('selec-record_creation', OperationRecordFormSelection), @@ -50,7 +51,8 @@ record_creation_wizard = RecordWizard.as_view([ ('datings-record_creation', DatingFormSet), ('interpretation-record_creation', RecordFormInterpretation), ('final-record_creation', FinalForm)], - url_name='record_creation',) + label=_(u"New context record"), + url_name='record_creation',) record_modification_wizard = RecordModifWizard.as_view([ ('selec-record_modification', RecordFormSelection), @@ -58,29 +60,34 @@ record_modification_wizard = RecordModifWizard.as_view([ ('datings-record_modification', DatingFormSet), ('interpretation-record_modification', RecordFormInterpretation), ('final-record_modification', FinalForm)], - url_name='record_modification',) + label=_(u"Context record modification"), + url_name='record_modification',) record_deletion_wizard = RecordDeletionWizard.as_view([ - ('selec-record_deletion', RecordFormSelection), - ('final-record_deletion', RecordDeletionForm)], - url_name='record_deletion',) + ('selec-record_deletion', RecordFormSelection), + ('final-record_deletion', RecordDeletionForm)], + label=_(u"Context record deletion"), + url_name='record_deletion',) record_source_creation_wizard = RecordSourceWizard.as_view([ - ('selec-record_source_creation', SourceRecordFormSelection), - ('source-record_source_creation', SourceForm), - ('authors-record_source_creation', AuthorFormset), - ('final-record_source_creation', FinalForm)], - url_name='record_source_creation',) + ('selec-record_source_creation', SourceRecordFormSelection), + ('source-record_source_creation', SourceForm), + ('authors-record_source_creation', AuthorFormset), + ('final-record_source_creation', FinalForm)], + label=_(u"Context record: new source"), + url_name='record_source_creation',) record_source_modification_wizard = RecordSourceWizard.as_view([ - ('selec-record_source_modification', RecordSourceFormSelection), - ('source-record_source_modification', SourceForm), - ('authors-record_source_modification', AuthorFormset), - ('final-record_source_modification', FinalForm)], - url_name='record_source_modification',) + ('selec-record_source_modification', RecordSourceFormSelection), + ('source-record_source_modification', SourceForm), + ('authors-record_source_modification', AuthorFormset), + ('final-record_source_modification', FinalForm)], + label=_(u"Context record: source modification"), + url_name='record_source_modification',) record_source_deletion_wizard = RecordSourceDeletionWizard.as_view([ - ('selec-record_source_deletion', RecordSourceFormSelection), - ('final-record_source_deletion', RecordDeletionForm)], - url_name='record_source_deletion',) + ('selec-record_source_deletion', RecordSourceFormSelection), + ('final-record_source_deletion', RecordDeletionForm)], + label=_(u"Context record: source deletion"), + url_name='record_source_deletion',) diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index 95d2d5275..e0eefbe5d 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -36,9 +36,8 @@ from ishtar_common.models import valid_id, PersonType, Person, Town from archaeological_files.models import File import models from ishtar_common import widgets -from ishtar_common.forms import FinalForm, FormSet, \ - ClosingDateFormSelection, formset_factory, \ - get_now, reverse_lazy, get_form_selection +from ishtar_common.forms import FinalForm, FormSet, ClosingDateFormSelection, \ + formset_factory, get_now, reverse_lazy, get_form_selection from ishtar_common.forms_common import TownForm, TownFormSet, TownFormset, \ AuthorFormset, SourceForm, SourceSelect, \ SourceDeletionForm, get_town_field diff --git a/example_project/urls.py b/example_project/urls.py index f97f51be4..df8d6ae0a 100644 --- a/example_project/urls.py +++ b/example_project/urls.py @@ -15,7 +15,8 @@ urlpatterns = patterns('', APP_LIST = ['archaeological_files', 'archaeological_operations', 'archaeological_context_records', 'archaeological_warehouse', 'archaeological_finds'] -APP_LIST = ['archaeological_files', 'archaeological_operations'] +APP_LIST = ['archaeological_files', 'archaeological_operations', + 'archaeological_context_records'] for app in APP_LIST: if app in settings.INSTALLED_APPS: urlpatterns += patterns('', |