UI: adapt each form to use the new date widget. Force localization of format.

1 files changed, 8 insertions, 7 deletions

diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index 001c10052..458a3baa8 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -41,11 +41,12 @@ import models
 
 from ishtar_common.forms import FormSet, FloatField, \
     get_form_selection, reverse_lazy, TableSelect, get_now, FinalForm, \
-    ManageOldType, FieldType
+    ManageOldType, FieldType, IshtarForm
 
 from ishtar_common.forms_common import get_town_field, SourceSelect, CustomForm
 from ishtar_common.utils import convert_coordinates_to_point
 from ishtar_common import widgets
+from bootstrap_datepicker.widgets import DatePicker
 from archaeological_operations.widgets import OAWidget
 
 from archaeological_warehouse.models import Warehouse
@@ -126,7 +127,7 @@ class RecordFormSelection(CustomForm, forms.Form):
             cr.operation.pk)
 
 
-class FindForm(CustomForm, ManageOldType, forms.Form):
+class FindForm(CustomForm, ManageOldType):
     file_upload = True
     form_label = _("Find")
     form_admin_name = _(u"Find - 020 - General")
@@ -147,7 +148,7 @@ class FindForm(CustomForm, ManageOldType, forms.Form):
     description = forms.CharField(label=_("Description"),
                                   widget=forms.Textarea, required=False)
     get_first_base_find__discovery_date = forms.DateField(
-        label=_(u"Discovery date"), widget=widgets.JQueryDate, required=False)
+        label=_(u"Discovery date"), widget=DatePicker, required=False)
     get_first_base_find__batch = forms.ChoiceField(
         label=_(u"Batch/object"), choices=[],
         required=False)
@@ -196,7 +197,7 @@ class FindForm(CustomForm, ManageOldType, forms.Form):
     mark = forms.CharField(label=_(u"Mark"), required=False)
     checked = forms.ChoiceField(label=_(u"Check"))
     check_date = forms.DateField(
-        initial=get_now, label=_(u"Check date"), widget=widgets.JQueryDate)
+        initial=get_now, label=_(u"Check date"), widget=DatePicker)
     comment = forms.CharField(label=_(u"Comment"), required=False,
                               widget=forms.Textarea)
     dating_comment = forms.CharField(
@@ -268,7 +269,7 @@ class FindForm(CustomForm, ManageOldType, forms.Form):
         return self.cleaned_data
 
 
-class PreservationForm(CustomForm, ManageOldType, forms.Form):
+class PreservationForm(CustomForm, ManageOldType):
     form_label = _("Preservation")
     form_admin_name = _(u"Find - 030 - Preservation")
     form_slug = "find-030-preservation"
@@ -295,7 +296,7 @@ class PreservationForm(CustomForm, ManageOldType, forms.Form):
                                             choices=[], required=False)
     insurance_value = FloatField(label=_(u"Insurance value"), required=False)
     appraisal_date = forms.DateField(
-        label=_(u"Appraisal date"), widget=widgets.JQueryDate, required=False)
+        label=_(u"Appraisal date"), widget=DatePicker, required=False)
     conservatory_comment = forms.CharField(
         label=_(u"Conservatory comment"), required=False,
         widget=forms.Textarea)
@@ -729,7 +730,7 @@ class NewFindBasketForm(forms.ModelForm):
         return super(NewFindBasketForm, self).save(commit)
 
 
-class SelectFindBasketForm(forms.Form):
+class SelectFindBasketForm(IshtarForm):
     form_label = _(u"Basket")
     associated_models = {'basket': models.FindBasket}
     need_user_for_initialization = True