simplify forms

diff --git a/telemeta/forms/media.py b/telemeta/forms/media.py
index 67cde3a62d455caa542971a5bb3098e06ee861c9..ace16439d6239b0540bd2d8380983522fd024480 100644 (file)
--- 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 a4a647e0f6837b146b235749342de49333ea273d..be0e2f951b88b2b8b6412dc81f45adde4fcbe190 100644 (file)
--- 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 f798c88c8c3be525426397a7a63690c5631150b9..d6200a12e649f527a1370e99f8d290a62d0a2364 100644 (file)
--- 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 %}
-    <img src="{{ STATIC_URL }}telemeta/images/collections_red.png" style="vertical-align:middle" /> Collection : NEW
+    <img src="{{ STATIC_URL }}telemeta/images/collections_red.png" style="vertical-align:middle" /> Collection : {% trans "New" %}
 {% endblock %}
 
 {% block title_buttons %}
      <a href="{% url "telemeta-collections" %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
-     <a href="#" class="component_icon button icon_save"
-                onclick="document.getElementById('_addCollectionForm').submit(); return false;">{% trans "Save" %}</a>
 {% endblock %}
 
-{% block infos %}
-        <div class="infos">
-        <form method="post" id ="_addCollectionForm" action="">{% csrf_token %}
-        <table>
-        <tr><td colspan="2">{% for error in form.non_field_errors %}<li class="error">{{ error }}</li>{% endfor %}</td></tr>
-        {% for field in form %}
-         <tr>
-        {% if field.html_name == "copied_from_item" or field.html_name == "doctype_code" %}
-            <td>{{ field.label_tag.as_hidden }}</td><td>{{ field.as_hidden }}</td>
-        {% else %}
-            <tr><td class="error">{{ field.errors }}</td></tr>
-            <td>{{ field.label_tag }}:</td><td> {{ field }}</td>
-        {% endif %}
-        </tr>
-        {% endfor %}
-        </table>
-        <div align="center" style="margin-top:3ex;">
+    {% block cancel %}
             <a href="{% url "telemeta-collections" %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
-            <a href="#" class="component_icon button icon_save"
-                onclick="document.getElementById('_addCollectionForm').submit(); return false;">{% trans "Save" %}</a>
-        </div>
-        </form>
-        </div>
-{% 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 6bf2324018f3664464b1f90e6ee2437541e7e4c5..33341074bc3735180aa48878d49902220f16b584 100644 (file)
--- a/telemeta/templates/telemeta/collection_edit.html
+++ b/telemeta/templates/telemeta/collection_edit.html
@@ -47,13 +47,13 @@
 
     </div>
 
-
     <div align="center" style="margin-top:3ex;">
-           <a href="{% url "telemeta-collection-detail" object.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
-           {% if perms.telemeta.change_mediacollection %}
-            <input type="submit" value="Enregistrer" class="default" name="_save"/>
-           {% endif %}
-           {# <a href="#" class="component_icon button icon_save" id="submit_button">{% trans "Save" %}</a> #}
+      {% block cancel %}
+       <a href="{% url "telemeta-collection-detail" object.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+      {% endblock %}
+       {% if perms.telemeta.change_mediacollection %}
+        <input type="submit" value="Enregistrer" class="default" name="_save"/>
+       {% endif %}
     </div>
 
    </form>

diff --git a/telemeta/templates/telemeta/mediaitem_edit.html b/telemeta/templates/telemeta/mediaitem_edit.html
index 4dd3d03b29f364ae3d4ac55414d6bb1d6c2b56ce..ef948ac583f12f8d88b5c91cca0bea0039ad01cf 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_edit.html
+++ b/telemeta/templates/telemeta/mediaitem_edit.html
@@ -25,7 +25,7 @@
 
     <ul class="nav nav-tabs" role="tablist">
       <li class="active"><a href="#general" role="tab" data-toggle="tab">{% trans "General" %}</a></li>
-      <li><a href="#player" role="tab" data-toggle="tab">{% trans "Player" %}</a></li>
+{#       <li><a href="#player" role="tab" data-toggle="tab">{% trans "Player" %}</a></li> #}
       <li><a href="#related" role="tab" data-toggle="tab">{% trans "Related media" %}</a></li>
       <li><a href="#keyword_relations" role="tab" data-toggle="tab">{% trans "Keywords" %}</a></li>
       <li><a href="#performances" role="tab" data-toggle="tab">{% trans "Performance" %}</a></li>
@@ -41,11 +41,11 @@
         {{ form.media }}
         {% bootstrap_form form %}
       </div>
-
+{#
       <div class="tab-pane fade in active" id="player">
 
       </div>
-
+ #}
       {% for formset in inlines %}
       <div class="tab-pane" id="{{ formset.prefix }}">
           {{ formset.management_form }}
@@ -62,11 +62,13 @@
 
 
     <div align="center" style="margin-top:3ex;">
-           <a href="{% url "telemeta-collection-detail" object.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
-           {% if perms.telemeta.change_mediaitem %}
-            <input type="submit" value="Enregistrer" class="default" name="_save" onclick="var d=document; d.getElementById('wait-img').style.display='inline'; setTimeout(function(){d.getElementById('_editItemForm').submit();},300); return false;"/>
-            <img id="wait-img" style="display:none" style="vertical-align:middle" alt="wait" src="{{ STATIC_URL }}telemeta/images/wait.gif" />
-           {% endif %}
+    {% block cancel %}
+     <a href="{% url "telemeta-collection-detail" object.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+     {% endblock %}
+     {% if perms.telemeta.change_mediaitem %}
+      <input type="submit" value="Enregistrer" class="default" name="_save" onclick="var d=document; d.getElementById('wait-img').style.display='inline'; setTimeout(function(){d.getElementById('_editItemForm').submit();},300); return false;"/>
+      <img id="wait-img" style="display:none" style="vertical-align:middle" alt="wait" src="{{ STATIC_URL }}telemeta/images/wait.gif" />
+     {% endif %}
     </div>
 
    </form>

diff --git a/telemeta/templates/telemeta/resource_add.html b/telemeta/templates/telemeta/resource_add.html
index 87ecda83174f405510c0827771659ae2dd9feeed..a445b6d66b1e429fb62241e08b9508808b0d623e 100644 (file)
--- a/telemeta/templates/telemeta/resource_add.html
+++ b/telemeta/templates/telemeta/resource_add.html
@@ -1,45 +1,16 @@
-{% extends "telemeta/resource_detail.html" %}
+{% extends "telemeta/resource_edit.html" %}
 {% load i18n %}
 {% load telemeta_utils %}
+{% load bootstrap3 %}
 
 {% block title %}
 <img src="{{ STATIC_URL }}telemeta/images/{{ type }}.png" style="vertical-align:middle" /> {{ type }} : {% trans "New" %}
 {% endblock %}
 
 {% block title_buttons %}
-    <a href="/archives/{{type}}/" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
-    {% if perms.telemeta.add_mediacorpus or perms.telemeta.add_mediafonds %}
-    <a href="#" class="component_icon button icon_save" onclick="document.getElementById('_addResourceForm').submit(); return false;">{% trans "Save" %}</a>
-    {% endif %}
-
+    <a href="{% url "telemeta-resource-list" type %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
 {% endblock %}
 
-
-{% block infos %}
-        <div class="infos">
-        <form method="post" id ="_addResourceForm" action="">{% csrf_token %}
-        <table>
-        <tr><td colspan="2">{% for error in form.non_field_errors %}<li class="error">{{ error }}</li>{% endfor %}</td></tr>
-        {% for field in form %}
-         <tr>
-            <tr><td class="error">{{ field.errors }}</td></tr>
-            {% if "children" in field.html_name %}
-            <td>{{ field.label_tag }}:</td><td><div class="vscroll"> {{ field }}</div></td>
-            {% else %}
-            <td>{{ field.label_tag }}:</td><td> {{ field }}</td>
-            {% endif %}
-        </tr>
-        {% endfor %}
-        </table>
-        <div align="center" style="margin-top:3ex;">
-            <a href="/archives/{{type}}/" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
-            {% if perms.telemeta.add_mediacorpus or perms.telemeta.add_mediafonds %}
-            <a href="#" class="component_icon button icon_save" onclick="document.getElementById('_addResourceForm').submit(); return false;">{% trans "Save" %}</a>
-            {% endif %}
-        </div>
-        </form>
-        </div>
-{% endblock infos%}
-
-{% block delete %}
-{% endblock %}
+      {% block cancel %}
+       <a href="{% url "telemeta-resource-list" type %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+       {% endblock %}

diff --git a/telemeta/templates/telemeta/resource_edit.html b/telemeta/templates/telemeta/resource_edit.html
index 896eda07a6f9ff1d3a51175fe275571c58937326..86d7172fa86ab2da98c1a31cf40eef7c9ca05df2 100644 (file)
--- a/telemeta/templates/telemeta/resource_edit.html
+++ b/telemeta/templates/telemeta/resource_edit.html
@@ -6,6 +6,7 @@
 {% block title %}
 <img src="{{ STATIC_URL }}telemeta/images/{{ type }}.png" style="vertical-align:middle" /> {{ type }} : {{ resource }}
 {% endblock %}
+
 {% block title_buttons %}
     <a href="{% url "telemeta-resource-detail" type resource.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
 {% endblock %}
@@ -46,13 +47,13 @@
 
     </div>
 
-
     <div align="center" style="margin-top:3ex;">
-           <a href="{% url "telemeta-resource-detail" type resource.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
-           {% if perms.telemeta.change_mediacorpus or perms.telemeta.change_mediafonds %}
-            <input type="submit" value="Enregistrer" class="default" name="_save"/>
-           {% endif %}
-           {# <a href="#" class="component_icon button icon_save" id="submit_button">{% trans "Save" %}</a> #}
+      {% block cancel %}
+       <a href="{% url "telemeta-resource-detail" type resource.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+       {% endblock %}
+       {% if perms.telemeta.change_mediacorpus or perms.telemeta.change_mediafonds %}
+        <input type="submit" value="{% trans "Save" %}" class="default" name="_save"/>
+       {% endif %}
     </div>
 
    </form>