diff options
Diffstat (limited to 'archaeological_context_records')
| -rw-r--r-- | archaeological_context_records/forms.py | 11 | ||||
| -rw-r--r-- | archaeological_context_records/templates/ishtar/sheet_contextrecord.html | 9 |
2 files changed, 12 insertions, 8 deletions
diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py index 7cc94bb9a..ea47be311 100644 --- a/archaeological_context_records/forms.py +++ b/archaeological_context_records/forms.py @@ -35,10 +35,11 @@ from archaeological_operations.models import Period, Parcel, Operation, \ import models from ishtar_common import widgets +from bootstrap_datepicker.widgets import DatePicker from archaeological_operations.widgets import OAWidget from ishtar_common.forms import FinalForm, FormSet, \ reverse_lazy, get_form_selection, TableSelect, ManageOldType, CustomForm,\ - FieldType + FieldType, IshtarForm from ishtar_common.forms_common import get_town_field, SourceSelect from archaeological_operations.forms import OperationSelect, ParcelField,\ RecordRelationsForm as OpeRecordRelationsForm, RecordRelationsFormSetBase @@ -118,7 +119,7 @@ class RecordFormSelection(forms.Form): currents = {'pk': models.ContextRecord} pk = forms.IntegerField( label="", required=False, - widget=widgets.JQueryJqGrid( + widget=widgets.DataTable( reverse_lazy('get-contextrecord'), RecordSelect, models.ContextRecord, source_full=reverse_lazy('get-contextrecord-full')), @@ -132,7 +133,7 @@ class RecordFormSelection(forms.Form): return cleaned_data -class RecordFormGeneral(CustomForm, ManageOldType, forms.Form): +class RecordFormGeneral(CustomForm, ManageOldType): form_label = _("General") form_admin_name = _(u"Context record - 020 - General") form_slug = "contextrecord-020-general" @@ -163,9 +164,9 @@ class RecordFormGeneral(CustomForm, ManageOldType, forms.Form): unit = forms.ChoiceField(label=_(u"Context record type"), required=False, choices=[]) opening_date = forms.DateField(label=_(u"Opening date"), - widget=widgets.JQueryDate, required=False) + widget=DatePicker, required=False) closing_date = forms.DateField(label=_(u"Closing date"), - widget=widgets.JQueryDate, required=False) + widget=DatePicker, required=False) documentation = forms.MultipleChoiceField( label=_("Documentation"), choices=[], required=False, widget=forms.CheckboxSelectMultiple) diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html index e1ea9019b..93a9b67d2 100644 --- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html +++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html @@ -1,10 +1,13 @@ {% extends "ishtar/sheet.html" %} -{% load i18n window_field window_header window_tables %} +{% load i18n window_field window_header window_tables window_field %} -{% block head_title %}{% trans "Context Record" %}{% endblock %} +{% block head_title %}{% trans "Context Record:" %}{{item.full_label}}{% endblock %} -{% block content %} +{% block toolbar %} {% window_nav item window_id 'show-contextrecord' 'record_modify' 'show-historized-contextrecord' 'revert-contextrecord' previous next 1 %} +{% endblock %} + +{% block content %} {% if item.image %} <a href='{{item.image.url}}' rel="prettyPhoto" title="{{item.label}}" class='photo'><img src='{{item.thumbnail.url}}'/></a> |