From: Guillaume Pellerin Date: Tue, 14 Oct 2014 23:43:11 +0000 (+0200) Subject: simplify forms X-Git-Tag: 1.5.0rc1~27^2~78 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a2baa327e67555a806f3ea5f8024f526257b2256;p=telemeta.git simplify forms --- diff --git a/telemeta/forms/media.py b/telemeta/forms/media.py index 67cde3a6..ace16439 100644 --- a/telemeta/forms/media.py +++ b/telemeta/forms/media.py @@ -48,7 +48,7 @@ class MediaFondsForm(ModelForm): class Meta: model = MediaFonds - exclude = ['description',] + exclude = ['description'] class Media: css = {'all': ['/static/admin/css/widgets.css',],} @@ -69,7 +69,7 @@ class MediaCorpusForm(ModelForm): class Meta: model = MediaCorpus - exclude = ['description',] + exclude = ['description'] class Media: css = {'all': ('/static/admin/css/widgets.css',),} diff --git a/telemeta/models/media.py b/telemeta/models/media.py index a4a647e0..be0e2f95 100644 --- a/telemeta/models/media.py +++ b/telemeta/models/media.py @@ -122,7 +122,6 @@ class MediaBaseResource(MediaResource): "Describe a media base resource" title = CharField(_('title'), required=True) - description = CharField(_('description_old')) descriptions = TextField(_('description')) code = CharField(_('code'), unique=True, required=True) public_access = CharField(_('public access'), choices=PUBLIC_ACCESS_CHOICES, @@ -785,8 +784,8 @@ class MediaCorpus(MediaBaseResource): children = models.ManyToManyField(MediaCollection, related_name="corpus", verbose_name=_('collections'), blank=True, null=True) - recorded_from_year = IntegerField(_('recording year (from)')) - recorded_to_year = IntegerField(_('recording year (until)')) + recorded_from_year = IntegerField(_('recording year (from)'), help_text='YYYY') + recorded_to_year = IntegerField(_('recording year (until)'), help_text='YYYY') objects = MediaCorpusManager() diff --git a/telemeta/templates/telemeta/collection_add.html b/telemeta/templates/telemeta/collection_add.html index f798c88c..d6200a12 100644 --- a/telemeta/templates/telemeta/collection_add.html +++ b/telemeta/templates/telemeta/collection_add.html @@ -1,41 +1,15 @@ -{% extends "telemeta/collection_detail.html" %} +{% extends "telemeta/collection_edit.html" %} {% load i18n %} {% load telemeta_utils %} {% block title %} - Collection : NEW + Collection : {% trans "New" %} {% endblock %} {% block title_buttons %} {% trans "Cancel" %} - {% trans "Save" %} {% endblock %} -{% block infos %} -
-
{% csrf_token %} - - - {% for field in form %} - - {% if field.html_name == "copied_from_item" or field.html_name == "doctype_code" %} - - {% else %} - - - {% endif %} - - {% endfor %} -
{% for error in form.non_field_errors %}
  • {{ error }}
    • {% endfor %}
    {{ field.label_tag.as_hidden }}{{ field.as_hidden }}
    {{ field.errors }}
    {{ field.label_tag }}: {{ field }}
    -
    + {% block cancel %} {% trans "Cancel" %} - {% trans "Save" %} -
    -
    -
    -{% endblock infos%} - -{% block delete %} -{% endblock %} + {% endblock %} \ No newline at end of file diff --git a/telemeta/templates/telemeta/collection_edit.html b/telemeta/templates/telemeta/collection_edit.html index 6bf23240..33341074 100644 --- a/telemeta/templates/telemeta/collection_edit.html +++ b/telemeta/templates/telemeta/collection_edit.html @@ -47,13 +47,13 @@ -
    - {% trans "Cancel" %} - {% if perms.telemeta.change_mediacollection %} - - {% endif %} - {# {% trans "Save" %} #} + {% block cancel %} + {% trans "Cancel" %} + {% endblock %} + {% if perms.telemeta.change_mediacollection %} + + {% endif %}
    diff --git a/telemeta/templates/telemeta/mediaitem_edit.html b/telemeta/templates/telemeta/mediaitem_edit.html index 4dd3d03b..ef948ac5 100644 --- a/telemeta/templates/telemeta/mediaitem_edit.html +++ b/telemeta/templates/telemeta/mediaitem_edit.html @@ -25,7 +25,7 @@