diff options
| -rw-r--r-- | ishtar_common/forms_common.py | 14 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/blocks/sheet_creation_section.html | 24 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/sheet_document.html | 103 | ||||
| -rw-r--r-- | scss/custom.scss | 4 |
4 files changed, 103 insertions, 42 deletions
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index f389ab84d..4dd55c38a 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -1261,7 +1261,8 @@ class DocumentForm(forms.ModelForm, CustomForm, ManageOldType): form_admin_name = _("Document - General") form_slug = "document-general" file_upload = True - extra_form_modals = ["author", "person", "organization", "documenttag"] + extra_form_modals = ["author", "person", "organization", "documenttag", + "container"] associated_models = {'source_type': models.SourceType, 'support_type': models.SupportType, 'publisher': models.Organization, @@ -1271,7 +1272,7 @@ class DocumentForm(forms.ModelForm, CustomForm, ManageOldType): title = forms.CharField(label=_("Title"), required=False, validators=[validators.MaxLengthValidator(200)]) source_type = widgets.ModelChoiceField( - model=models.SourceType, label=_("Source type"), choices=[], + model=models.SourceType, label=_("Type"), choices=[], required=False) support_type = widgets.ModelChoiceField( model=models.SupportType, label=_("Support"), choices=[], @@ -1320,7 +1321,7 @@ class DocumentForm(forms.ModelForm, CustomForm, ManageOldType): label=_("Source"), model=models.Document, required=False) source_free_input = forms.CharField( - label=_("Source free input"), + label=_("Source - free input"), validators=[validators.MaxLengthValidator(500)], required=False) associated_url = forms.URLField( max_length=1000, required=False, @@ -1376,8 +1377,8 @@ class DocumentForm(forms.ModelForm, CustomForm, ManageOldType): 'authors', 'receipt_date', 'receipt_date_in_documentation', 'creation_date', 'publisher', 'language', 'isbn', 'issn', 'licenses', - 'container', "container_ref", 'source', 'source_free_input', + 'container', "container_ref", 'comment', 'description', 'additional_information', 'duplicate' ] @@ -1388,6 +1389,7 @@ class DocumentForm(forms.ModelForm, CustomForm, ManageOldType): 'authors': FormHeader(_("Authors")), 'receipt_date': FormHeader(_("Dates")), 'publisher': FormHeader(_("Publishing"), collapse=True), + 'source': FormHeader(_("Source"), collapse=True), 'container': FormHeader(_("Container"), collapse=True), 'comment': FormHeader(_("Advanced"), collapse=True), 'finds': FormHeader(_("Related items")), @@ -1397,6 +1399,10 @@ class DocumentForm(forms.ModelForm, CustomForm, ManageOldType): ("tags", ("ishtar_common.add_documenttag",), {"new": True}), ("authors", ("ishtar_common.add_author",), {"new": True}), ("publisher", ("ishtar_common.add_organization",), {"new": True}), + ("container", ("archaeological_warehouse.add_container",), + {"new": True}), + ("container_ref", ("archaeological_warehouse.add_container",), + {"new": True}), ] def __init__(self, *args, **kwargs): diff --git a/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html b/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html index 6d0baa2de..a848dad5d 100644 --- a/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html +++ b/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html @@ -1,19 +1,19 @@ {% load i18n link_to_window %} {% if item.history_creator.ishtaruser.person %} -<div class="col-12 col-md-6 col-lg-3 flex-wrap"> - <dt>{% trans "Creation" context "Sheet" %}{{item.history_creator.ishtaruser.person|link_to_window:request}}</dt> - <dd> - {{item.history_creator.ishtaruser.person}}<br/> - <small class="text-muted">{{item.history_creation_date|date:"DATETIME_FORMAT"}}</small> - </dd> +<div class="col-12 col-md-6 col-lg-3 flex-wrap text-muted" + title="{% trans 'Creation' context 'Sheet' %}"> + <i class="fa fa-plus-circle" aria-hidden="true"></i> + {{item.history_creator.ishtaruser.person}} + {{item.history_creator.ishtaruser.person|link_to_window:request}}<br/> + <small>{{item.history_creation_date|date:"DATETIME_FORMAT"}}</small> </div> {% endif %} {% if not item.last_edition_date or item.history_creation_date != item.last_edition_date %} -<div class="col-12 col-md-6 col-lg-3 flex-wrap"> - <dt>{% trans "Modification" context "Sheet" %}{{item.history_modifier.ishtaruser.person|link_to_window:request}}</dt> - <dd> - {{item.history_modifier.ishtaruser.person}}<br/> - <small class="text-muted">{% firstof item.history_date|date:"DATETIME_FORMAT" item.history.all.0.history_date|date:"DATETIME_FORMAT" %}</small> - </dd> +<div class="col-12 col-md-6 col-lg-3 flex-wrap text-muted" + title="{% trans 'Modification' context 'Sheet' %}"> + <i class="fa fa-pencil" aria-hidden="true"></i> + {{item.history_modifier.ishtaruser.person}} + {{item.history_modifier.ishtaruser.person|link_to_window:request}}<br/> + <small>{% firstof item.history_date|date:"DATETIME_FORMAT" item.history.all.0.history_date|date:"DATETIME_FORMAT" %}</small> </div> {% endif %} diff --git a/ishtar_common/templates/ishtar/sheet_document.html b/ishtar_common/templates/ishtar/sheet_document.html index 321125edd..0212b1695 100644 --- a/ishtar_common/templates/ishtar/sheet_document.html +++ b/ishtar_common/templates/ishtar/sheet_document.html @@ -11,42 +11,93 @@ {% block general %} -{% if item.images.count %} -<div class="row"> - <div class="offset-lg-4 col-lg-4 offset-md-3 col-md-6 offset-sm-1 col-sm-10 col-12"> - <div class="card"> - {% include "ishtar/blocks/window_image.html" %} +{% if item.main_image %} +<div class="clearfix"> + <div class="card float-left col-12 col-md-4"> + {% include "ishtar/blocks/window_image.html" %} + </div> + <div class="row float-left col-12 col-md-6 col-lg-8 text-center"> +{% else %} + <div class="row"> +{% endif %} + + <h4 class="col-12">{% trans "Identification" %}</h4> + <div class="col-12 col-md-6 col-lg-3 flex-wrap"> + <p class="window-refs" + title="{% trans 'Reference' %}">{{ item.reference|default:"" }}</p> + <p class="window-refs" + title="{% trans 'Internal reference' %}">{{ item.internal_reference|default:"" }}</p> + {% include "ishtar/blocks/sheet_external_id.html" %} </div> + {% field_flex "Title" item.title %} + {% field_flex "Type" item.source_type_html "" "" 1 %} + {% include "ishtar/blocks/sheet_creation_section.html" %} + + {% if item.format_type or item.support_type or item.scale %} + <h4 class="col-12">{% trans "Format" %}</h4> + {% field_flex "Format" item.format_type %} + {% field_flex "Support" item.support_type %} + {% field_flex "Scale" item.scale %} + {% endif %} + + {% if item.associated_file or item.associated_url or item.tags.count %} + <h4 class="col-12">{% trans "Content" %}</h4> + {% trans "File" context "Not directory" as file_label %} + {% field_flex_file file_label item.associated_file %} + {% trans "Web link" as weblink_label %} + {% field_flex_url weblink_label item.associated_url %} + {% field_flex_multiple_obj "Tags" item 'tags' %} + {% endif %} + + {% if item.authors.count %} + <h4 class="col-12">{% trans "Authors" %}</h4> + {% field_flex_full "" item.authors|add_links:'person' %} + {% endif %} </div> +{% if item.main_image %} </div> {% endif %} - <div class="row"> - {% field_flex "Title" item.title %} - {% field_flex "Index" item.index %} - {% field_flex "Source type" item.source_type_html "" "" 1 %} - {% trans "File" context "Not directory" as file_label %} - {% field_flex_file file_label item.associated_file %} - {% field_flex "Format" item.format_type %} - {% field_flex "Scale" item.scale %} - {% trans "Web link" as weblink_label %} - {% field_flex_url weblink_label item.associated_url %} - {% if item.item_number != 1 %}{% field_flex "Item number" item.item_number %}{% endif %} - {% field_flex "Ref." item.reference %} - {% field_flex "Internal ref." item.internal_reference %} + + {% if item.creation_date or item.receipt_date or item.receipt_date_in_documentation %} + <h4 class="col-12">{% trans "Dates" %}</h4> + {% field_flex "Creation date" item.creation_date|date:"DATE_FORMAT" %} + {% field_flex "Receipt date" item.receipt_date|date:"DATE_FORMAT" %} + {% field_flex "Receipt date in documentation" item.receipt_date_in_documentation|date:"DATE_FORMAT" %} + {% endif %} + + {% if item.publisher or item.language or item.isbn or item.issn or item.licenses.count %} + <h4 class="col-12">{% trans "Publishing" %}</h4> + {% field_flex_detail "Publisher" item.publisher %} + {% field_flex "Language" item.language %} + {% field_flex "ISBN" item.isbn %} + {% field_flex "ISSN" item.issn %} + {% field_flex_multiple_obj "Licenses" item 'licenses' %} + {% endif %} + + {% if item.source or item.source_free_input %} + <h4 class="col-12">{% trans "Source" %}</h4> + {% field_flex_detail "Source" item.source %} + {% field_flex "" item.source_free_input %} + {% endif %} + + {% if item.container or item.container_ref or item.item_number != 1 or item.duplicate %} + <h4 class="col-12">{% trans "Container" %}</h4> {% field_flex_detail "Container" item.container %} {% field_flex_detail "Reference container" item.container_ref %} - {% field_flex "Creation date" item.creation_date %} - {% field_flex "Receipt date" item.receipt_date %} - {% field_flex "Receipt date in documentation" item.receipt_date_in_documentation %} + {% if item.item_number != 1 %}{% field_flex "Item number" item.item_number %}{% endif %} {% if item.duplicate %}{% field_flex "Has a duplicate" item.duplicate %}{% endif %} - {% field_flex "Description" item.description %} - {% field_flex "Comment" item.comment %} - {% field_flex "Additional information" item.additional_information %} - {% field_flex_full "Authors" item.authors|add_links:'person' %} + {% endif %} + + {% if item.description or item.comment or item.additional_information %} + <h4 class="col-12">{% trans "Other" %}</h4> + {% field_flex_full "Description" item.description %} + {% field_flex_full "Comment" item.comment %} + {% field_flex_full "Additional information" item.additional_information %} + {% endif %} + </div> </div> <div class="row"> - {% include "ishtar/blocks/sheet_creation_section.html" %} </div> {% include "ishtar/blocks/sheet_json.html" %} diff --git a/scss/custom.scss b/scss/custom.scss index c8a9ff7a1..a79458fe3 100644 --- a/scss/custom.scss +++ b/scss/custom.scss @@ -75,6 +75,10 @@ dd > pre{ display: inline; } +input[type="file"].form-control{ + height: 3em; +} + .form-check-label{ margin: 0.1em 0.5em; } |