From: yomguy Date: Wed, 26 Sep 2012 11:21:29 +0000 (+0200) Subject: merge lam edit buttons and redirect X-Git-Tag: 1.4.5~60^2 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2d69a061956bef308634f71d37e8aa7f502081ec;p=telemeta.git merge lam edit buttons and redirect --- diff --git a/telemeta/templates/telemeta/mediaitem_add.html b/telemeta/templates/telemeta/mediaitem_add.html index 5d6ce3fd..6c12fe56 100644 --- a/telemeta/templates/telemeta/mediaitem_add.html +++ b/telemeta/templates/telemeta/mediaitem_add.html @@ -6,14 +6,17 @@ {% if item %} {% block title %} - item Item : NEW + item Item : NEW {% endblock %} {% block title_buttons %} - {% if perms.telemeta.add_mediaitem %} {% trans "Cancel" %} + {% if perms.telemeta.add_mediaitem %} + {% trans "Save" %} {% endif %} +

+ {% endblock %} {% block content %} @@ -23,21 +26,14 @@ {% for form in forms %} + + + {% for field in form %} - {% if field.html_name in hidden_fields %} - - {% else %} - {% if field.html_name == "collection" %} - - {% else %} - - {% endif %} - {% endif %} + {% endfor %} {% endfor %} @@ -45,9 +41,11 @@
{% trans "Cancel" %} + {% if perms.telemeta.add_mediaitem %} {% trans "Save" %} - + onclick="var d=document; d.getElementById('wait-img2').style.display='inline'; setTimeout(function(){d.getElementById('_addItemForm').submit();},300); return false;">{% trans "Save" %} + {% endif %} +
diff --git a/telemeta/templates/telemeta/mediaitem_copy.html b/telemeta/templates/telemeta/mediaitem_copy.html index 38c0caed..2491c26f 100644 --- a/telemeta/templates/telemeta/mediaitem_copy.html +++ b/telemeta/templates/telemeta/mediaitem_copy.html @@ -12,9 +12,13 @@ {% endblock %} {% block title_buttons %} - {% if user.is_authenticated and perms.telemeta.add_mediaitem %} - {% trans "Cancel" %} +
+ {% trans "Cancel" %} + {% if perms.telemeta.add_mediaitem %} + {% trans "Save" %} {% endif %} + +
{% endblock %} {% block content %} @@ -31,7 +35,7 @@ {% else %} - {% if field.html_name == "collection" %} + {% if field.html_name == "item-collection" %} @@ -44,9 +48,9 @@ {% endfor %}
{% for error in form.non_field_errors %}
  • {{ error }}
    • {% endfor %}

    {{ form.prefix|capitalize }}

    {{ field.label_tag.as_hidden }}{{ field.as_hidden }}
    {{ field.errors }}
    {{ field.label_tag }}: {% trans "Title" %} : {{ item.collection.title }}
    -  {% trans "Code" %} : {{ item.collection.code }}
    - {{ field }}    		{{ field }}{{ field }}
    {{ field.errors }}
    {{ field.label_tag }}: {% trans "Title" %} : {{ item.collection.title }}
     {% trans "Code" %} : {{ item.collection.code }}
    {{ field }}
    - {% trans "Cancel" %} - {% trans "Save" %} + {% trans "Cancel" %} + {% trans "Save" %} +
    diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html index 27250f46..7614f28f 100644 --- a/telemeta/templates/telemeta/mediaitem_detail.html +++ b/telemeta/templates/telemeta/mediaitem_detail.html @@ -192,127 +192,120 @@ Item : {{ item }} {% block general_info %}
    {% dl_field item "title" placeholder %} - {% dl_field item "alt_title" %} + +
    {% trans "Instruments" %}
    +
    + {% if item.performances %} + {% for performance in item.performances.all %}{{ performance.instrument|default:"" }}, {% endfor %} + {% endif %} +
    + +
    {% trans "Recording date" %}
    +
    {% if item.recorded_from_date %}{{ item.recorded_from_date }}{% endif %}{% if item.recorded_from_date and item.recorded_to_date%} - {% endif %}{% if item.recorded_to_date %}{{ item.recorded_to_date}}{% endif %}
    + {% dl_field item "collector" placeholder %} +
    {% field_label item "collection" %}
    {{ item.collection }}
    -
    {% trans "Recording date" %}
    -
    {% if item.recorded_from_date %}{{ item.recorded_from_date }}{% endif %}{% if item.recorded_from_date and item.recorded_to_date%} - {% endif %}{% if item.recorded_to_date %}{{ item.recorded_to_date}}{% endif %}
    +
    {% trans "Location" %}
    +
    {% if item.location %}{{ item.location.fullnames|join:"
    " }}{% endif %}
    + + {% dl_field item "summary" %} + {% dl_field item "scientist" %} + {% dl_field item "contributor" %} + +
    {% trans "Interprets" %}
    + {% if item.performances %} +
    {% for performance in item.performances.all %}{{ performance.musicians|default:"" }}, {% endfor %}
    + {% endif %} + + {% dl_field item "author" %} + {% dl_field item "topic" %}
    {% trans "Remarks" %}
    {{ item.comment|html_line_break|safe }}
    + {% dl_field item "keywords" join with ", " %} + +
    {% trans "Media type" %}
    +
    {% trans mime_type|mime_to_media_type %}
    + {% if last_revision %} -
    {% trans "Last modification" %}
    -
    {{ last_revision.time }} {% if user.is_authenticated %}({{last_revision.user.username}}){% endif %}
    +
    {% trans "Last modification" %}
    +
    {{ last_revision.time }} {% if user.is_authenticated %}({{last_revision.user.username}}){% endif %}
    {% endif %} -
    {% endblock general_info %} -
    - {% block geoethnic_data %} -
    -

    {% trans "Geographic and cultural informations" %}

    -
    -
    {% trans "Location" %}
    -
    {% if item.location %}{{ item.location.fullnames|join:"
    " }}{% endif %}
    - {% dl_field item "location_comment" %} - {% dl_field item "cultural_area" %} - {% dl_field item "language" %} - {% if item.language_iso %} -
    {% trans "Language ISO" %}
    -
    {{ item.language_iso.name|to_utf8 }}
    - {% endif %} - {% dl_field item "ethnic_group" placeholder %} -
    {% trans "Ethnographic context" %}
    -
    {{ item.context_comment|html_line_break|safe }}
    - {% dl_field item "keywords" join with ", " %} -
    -
    - {% endblock geoethnic_data %} -
    +
    - {% block musical_data %} + {% block legal_notices %}
    -

    {% trans "Musical informations" %}

    +

    {% trans "Legal notices" %}

    - {% dl_field item "vernacular_style" %} - {% dl_field item "generic_style" %} - {% dl_field item "author" %} +
    {% trans "Organization" %}
    +
    {% organization %}
    + {% dl_field item "public_access" %} + {% dl_field item "depositor" %} +
    {% trans "Rights" %}
    +
    {% if item.performances %} + {% for performance in item.performances.all %}{{ performance.instrument|default:"" }}, {% endfor %} + {% endif %}{{ item.author }} +
    - {% if item.performances %} -
    - - - - - - - - - - - {% for performance in item.performances.all %} - - - - - - - {% endfor %} - -
    {% field_label "MediaItemPerformance" "instruments_num" %}{% field_label "MediaItemPerformance" "instrument" %}{% field_label "MediaItemPerformance" "alias" %}{% field_label "MediaItemPerformance" "musicians" %}
    {{ performance.instruments_num }}{{ performance.instrument|default:"" }}{{ performance.alias|default:"" }}{{ performance.musicians }}
    -
    - {% endif %}
    - {% endblock musical_data %} + {% endblock legal_notices %}
    - {% block archive_data %} + {% block archive_data %}

    {% trans "Archiving data" %}

    {% dl_field item "code" %} {% dl_field item "old_code" %} - {% dl_field item "track" %} + {% if format %} + {% dl_field format "original_status" %} + {% dl_field format "original_number" %} + {% endif %} + {% dl_field item "recordist" %} + {% if format %} + {% dl_field format "original_location" %} + {% endif %} {% dl_field item "creator_reference" %}
    {% trans "Published references" %}
    {{ item.external_references|html_line_break|safe }}
    - {% dl_field item "public_access_label" %} + {% dl_field item "digitalist" %} + {% dl_field item "digitization_date" %} + {% dl_field item "publishing_date" %}
    {% endblock archive_data %}
    +
    {% block technical_data %}

    {% trans "Technical data" %}

    -
    {% trans "Media type" %}
    -
    {% trans mime_type|mime_to_media_type %}
    {% dl_field item "approx_duration" %} - {% if format %} {% dl_field format "physical_format" %} - {% dl_field format "original_code" %} - {% dl_field format "original_number" %} - {% dl_field format "original_status" %} - {% dl_field format "original_location" %} - {% dl_field format "original_state" %} - {% dl_field format "original_audio_quality" %} -
    {% trans "Comments" %}
    -
    {{ format.original_comments|html_line_break|safe }}
    - {% dl_field format "tape_wheel_diameter" %} - {% dl_field format "tape_thickness" %} + {% dl_field format "recording_system" %} + {% dl_field format "original_channels" %} {% dl_field format "tape_speed" %} + {% dl_field format "tape_wheel_diameter" %} {% dl_field format "tape_vendor" %} {% dl_field format "tape_reference" %} +
    {% trans "Comments" %}
    +
    {{ format.original_comments|html_line_break|safe }}
    + {% dl_field format "tape_thickness" %} {% dl_field format "sticker_presence" %} + {% dl_field format "original_state" %} + {% dl_field format "original_audio_quality" %} {% endif %}
    diff --git a/telemeta/templates/telemeta/mediaitem_edit.html b/telemeta/templates/telemeta/mediaitem_edit.html index e4c0148d..7b0414fb 100644 --- a/telemeta/templates/telemeta/mediaitem_edit.html +++ b/telemeta/templates/telemeta/mediaitem_edit.html @@ -7,7 +7,13 @@ {% endblock %} {% block title_buttons %} -{% trans "Cancel" %} +
    + {% trans "Cancel" %} + {% if perms.telemeta.change_mediaitem %} + {% trans "Save" %} + {% endif %} + +
    {% endblock %} {% block infos %} @@ -20,14 +26,14 @@ {% for field in form %} - {{ field.errors }} - {% if field.required %} + {{ field.errors }} + {% if field.blank %} {{ field.label_tag }}: {% else %} {{ field.label_tag }}: {% endif %} - {% if field.html_name == "collection" %} + {% if field.html_name == "item-collection" %}  {% trans "Title" %} : {{ item.collection.title }}
     {% trans "Code" %} : {{ item.collection.code }}
    {{ field }} @@ -35,6 +41,20 @@ {{ field }} {% endif %} + {% if form.prefix == "item" and forloop.last %} + + {% trans "Keywords" %}: + {% trans "Edit" %} {% trans "keywords" %} + + + {% trans "Performance" %}: + {% trans "Edit"%} {% trans "performance"%} + + + {% trans "Related media" %}: + {% trans "Edit"%} {% trans "related media"%} + + {% endif %} {% endfor %} {% endfor %} @@ -42,16 +62,9 @@
    {% trans "Cancel" %} {% if perms.telemeta.change_mediaitem %} - {% trans "Edit" %} {% trans "keywords" %} - {% endif %} - {% if perms.telemeta.change_mediaitem %} - {% trans "Edit"%} {% trans "performance"%} + {% trans "Save" %} {% endif %} - {% if perms.telemeta.change_mediaitem %} - {% trans "Edit"%} {% trans "related media"%} - {% endif %} - {% trans "Save" %} - +
    diff --git a/telemeta/templates/telemeta/mediaitem_keywords_edit.html b/telemeta/templates/telemeta/mediaitem_keywords_edit.html index a3db8c74..b3ee6bce 100644 --- a/telemeta/templates/telemeta/mediaitem_keywords_edit.html +++ b/telemeta/templates/telemeta/mediaitem_keywords_edit.html @@ -9,7 +9,8 @@ item

    Item : {{ item }}

    {% endblock %} {% block title_buttons %} - {% trans "Cancel" %} + {% trans "Cancel" %} + {% trans "Save" %} {% endblock %} {% block content %} @@ -37,8 +38,7 @@
    {% trans "Cancel" %} - {% trans "Save" %} + {% trans "Save" %}
    diff --git a/telemeta/templates/telemeta/mediaitem_performances_edit.html b/telemeta/templates/telemeta/mediaitem_performances_edit.html index 3b5fa30b..ab0d0227 100644 --- a/telemeta/templates/telemeta/mediaitem_performances_edit.html +++ b/telemeta/templates/telemeta/mediaitem_performances_edit.html @@ -9,7 +9,8 @@ {% endblock %} {% block title_buttons %} - {% trans "Cancel" %} + {% trans "Cancel" %} + {% trans "Save" %} {% endblock %} {% block content %} @@ -41,8 +42,7 @@
    {% trans "Cancel" %} - {% trans "Save" %} + {% trans "Save" %}
    diff --git a/telemeta/templates/telemeta/mediaitem_related_edit.html b/telemeta/templates/telemeta/mediaitem_related_edit.html index a7312a88..8714b215 100644 --- a/telemeta/templates/telemeta/mediaitem_related_edit.html +++ b/telemeta/templates/telemeta/mediaitem_related_edit.html @@ -9,7 +9,8 @@ {% endblock %} {% block title_buttons %} - {% trans "Cancel" %} + {% trans "Cancel" %} + {% trans "Save" %} {% endblock %} {% block content %} @@ -37,8 +38,7 @@
    {% trans "Cancel" %} - {% trans "Save" %} + {% trans "Save" %}
    diff --git a/telemeta/views/core.py b/telemeta/views/core.py index 922a4f47..d9febdcc 100644 --- a/telemeta/views/core.py +++ b/telemeta/views/core.py @@ -66,6 +66,7 @@ from django.contrib.auth.forms import UserChangeForm from django.core.exceptions import ObjectDoesNotExist from django.contrib.syndication.views import Feed from django.core.servers.basehttp import FileWrapper +from django.core.urlresolvers import reverse, reverse_lazy from telemeta.models import * import telemeta.models diff --git a/telemeta/views/item.py b/telemeta/views/item.py index a2199140..b64eb6e2 100644 --- a/telemeta/views/item.py +++ b/telemeta/views/item.py @@ -230,7 +230,7 @@ class ItemView(object): if formset.is_valid(): formset.save() item.set_revision(request.user) - return HttpResponseRedirect('/archives/items/'+public_id) + return redirect('telemeta-item-edit', item.public_id) else: formset = MediaItemRelatedFormSet(instance=item) @@ -567,7 +567,7 @@ class ItemView(object): formset = PerformanceFormSet(data=request.POST, instance=item) if formset.is_valid(): formset.save() - return HttpResponseRedirect('/archives/items/'+public_id) + return redirect('telemeta-item-edit', item.public_id) else: formset = PerformanceFormSet(instance=item) return render(request, template, {'item': item, 'formset': formset,}) @@ -580,7 +580,7 @@ class ItemView(object): formset = FormSet(data=request.POST, instance=item) if formset.is_valid(): formset.save() - return HttpResponseRedirect('/archives/items/'+public_id) + return redirect('telemeta-item-edit', item.public_id) else: formset = FormSet(instance=item) return render(request, template, {'item': item, 'formset': formset,})