merge lam edit buttons and redirect

diff --git a/telemeta/templates/telemeta/mediaitem_add.html b/telemeta/templates/telemeta/mediaitem_add.html
index 5d6ce3fd6e76b07c9b9b8e795b9d962bf2e36a3e..6c12fe569859a3f6ea2f8b1ca093ba9e0603068b 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_add.html
+++ b/telemeta/templates/telemeta/mediaitem_add.html
@@ -6,14 +6,17 @@
 
 {% if item %}
 {% block title %}
-    <img src="{{ STATIC_URL }}telemeta/images/images "item.png" alt="item" style="vertical-align:middle" /> Item : NEW
+    <img src="{{ STATIC_URL }}telemeta/images/item.png" alt="item" style="vertical-align:middle" /> Item : NEW
 {% endblock %}
 
 {% block title_buttons %}
-    {% if perms.telemeta.add_mediaitem %}
       <a href="{% url telemeta-items %}"
            class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+    {% if perms.telemeta.add_mediaitem %}
+      <a href="#" class="component_icon button icon_save" onclick="var d=document; d.getElementById('wait-img').style.display='inline'; setTimeout(function(){d.getElementById('_addItemForm').submit();},300); return false;">{% trans "Save" %}</a>
     {% endif %}
+      <br /><br />
+      <img id="wait-img" style="display:none" style="vertical-align:middle" alt="wait" src="{{ STATIC_URL }}telemeta/images/wait.gif" />
 {% endblock %}
 
 {% block content %}
@@ -23,21 +26,14 @@
        <ul>{% for error in form.non_field_errors %}<li class="error">{{ error }}</li>{% endfor %}</ul>
        <table>
        {% for form in forms %}
+       <tr><td colspan="2">{% for error in form.non_field_errors %}<li class="error">{{ error }}</li>{% endfor %}</td></tr>
+       <tr><td colspan="2"><h2>{{ form.prefix|capitalize }}</h2><hr /></td></tr>
+
         {% for field in form %}
             <tr>
-            {% if field.html_name in hidden_fields %}
-                <td>{{ field.label_tag.as_hidden }}{{ field.as_hidden }}</td>
-            {% else %}
                 <tr><td class="error">{{ field.errors }}</td></tr>
                 <td>{{ field.label_tag }}:</td>
-                    {% if field.html_name == "collection" %}
-                    <td>&nbsp;{% trans "Title" %} : {{ item.collection.title }}<br />
-                        &nbsp;{% trans "Code" %} : {{ item.collection.code }}<br />
-                        {{ field }}</td>
-                    {% else %}
-                    <td>{{ field }}</td>
-                    {% endif %}
-            {% endif %}
+                <td>{{ field }}</td>
             </tr>
         {% endfor %}
        {% endfor %}
@@ -45,9 +41,11 @@
        <div align="center" style="margin-top:3ex;">
         <a href="{% url telemeta-items %}"
            class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+        {% if perms.telemeta.add_mediaitem %}
         <a href="#" class="component_icon button icon_save"
-   onclick="var d=document; d.getElementById('wait-img').style.display='inline'; setTimeout(function(){d.getElementById('_addItemForm').submit();},300); return false;">{% trans "Save" %}</a>
-           <img id="wait-img" style="display:none" style="vertical-align:middle" alt="wait" src="{{ STATIC_URL }}telemeta/images/wait.gif" />
+   onclick="var d=document; d.getElementById('wait-img2').style.display='inline'; setTimeout(function(){d.getElementById('_addItemForm').submit();},300); return false;">{% trans "Save" %}</a>
+       {% endif %}
+       <img id="wait-img2" style="display:none" style="vertical-align:middle" alt="wait" src="{{ STATIC_URL }}telemeta/images/wait.gif" />
        </div>
      </form>
     </div>

diff --git a/telemeta/templates/telemeta/mediaitem_copy.html b/telemeta/templates/telemeta/mediaitem_copy.html
index 38c0caed061ef902f80e77ddc3f088d82003c29c..2491c26f823fded6a1a624d17b32e088387e67d1 100644 (file)
--- 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 %}
-    <a href="{% url telemeta-item-detail item.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+<div class="fixedWidthAsPlayer">
+    <a href="{% url telemeta-items %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+    {% if perms.telemeta.add_mediaitem %}
+    <a href="#" class="component_icon button icon_save" onclick="var d=document; d.getElementById('wait-img').style.display='inline'; setTimeout(function(){d.getElementById('_mediaItemCopyForm').submit();},300); return false;">{% trans "Save" %}</a>
     {% endif %}
+    <img id="wait-img" style="display:none" style="vertical-align:middle" alt="wait" src="{{ STATIC_URL }}telemeta/images/wait.gif" />
+</div>
 {% endblock %}
 
 {% block content %}
@@ -31,7 +35,7 @@
             {% else %}
                 <tr><td class="error">{{ field.errors }}</td></tr>
                 <td>{{ field.label_tag }}:</td>
-                    {% if field.html_name == "collection" %}
+                    {% if field.html_name == "item-collection" %}
                     <td>&nbsp;{% trans "Title" %} : {{ item.collection.title }}<br />
                         &nbsp;{% trans "Code" %} : {{ item.collection.code }}<br />
                         {{ field }}</td>
@@ -44,9 +48,9 @@
        {% endfor %}
        </table>
        <div align="center" style="margin-top:3ex;">
-           <a href="{% url telemeta-item-detail item.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
-         <a href="#" class="component_icon button icon_save"
-            onclick="document.getElementById('_mediaItemCopyForm').submit(); return false;">{% trans "Save" %}</a>
+         <a href="{% url telemeta-items %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+         <a href="#" class="component_icon button icon_save" onclick="var d=document; d.getElementById('wait-img2').style.display='inline'; setTimeout(function(){d.getElementById('_mediaItemCopyForm').submit();},300); return false;">{% trans "Save" %}</a>
+        <img id="wait-img2" style="display:none" style="vertical-align:middle" alt="wait" src="{{ STATIC_URL }}telemeta/images/wait.gif" />
        </div>
      </form>
     </div>

diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html
index 27250f4635929ad71d4790787eaf5fa699d3017d..7614f28f6632952e9d1916f82a090132078bc7af 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_detail.html
+++ b/telemeta/templates/telemeta/mediaitem_detail.html
@@ -192,127 +192,120 @@ Item : <a href="{% url telemeta-item-detail item.public_id %}">{{ item }}</a>
         {% block general_info %}
         <dl class="listing">
             {% dl_field item "title" placeholder %}
-            {% dl_field item "alt_title" %}
+
+            <dt>{% trans "Instruments" %}</dt>
+            <dd>
+            {% if item.performances %}
+             {% for performance in item.performances.all %}{{ performance.instrument|default:"" }}, {% endfor %}
+            {% endif %}
+            </dd>
+
+            <dt>{% trans "Recording date" %}</dt>
+            <dd>{% 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 %}</dd>
+
             {% dl_field item "collector" placeholder %}
+
             <dt>{% field_label item "collection" %}</dt>
             <dd><a href="{% url telemeta-collection-detail item.collection.public_id %}">{{ item.collection }}</a></dd>
-            <dt>{% trans "Recording date" %}</dt>
 
-            <dd>{% 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 %}</dd>
+            <dt>{% trans "Location" %}</dt>
+            <dd>{% if item.location %}{{ item.location.fullnames|join:"<br/>" }}{% endif %}</dd>
+
+            {% dl_field item "summary" %}
+            {% dl_field item "scientist" %}
+            {% dl_field item "contributor" %}
+
+            <dt>{% trans "Interprets" %}</dt>
+            {% if item.performances %}
+             <dd>{% for performance in item.performances.all %}{{ performance.musicians|default:"" }}, {% endfor %}</dd>
+            {% endif %}
+
+            {% dl_field item "author" %}
+            {% dl_field item "topic" %}
 
             <dt>{% trans "Remarks" %}</dt>
             <dd>{{ item.comment|html_line_break|safe }}</dd>
 
+            {% dl_field item "keywords" join with ", " %}
+
+            <dt>{% trans "Media type" %}</dt>
+            <dd>{% trans mime_type|mime_to_media_type %}</dd>
+
             {% if last_revision %}
-            <dt>{% trans "Last modification" %}</dt>
-            <dd>{{ last_revision.time }} {% if user.is_authenticated %}(<a href="{% url telemeta-profile-detail last_revision.user.username %}">{{last_revision.user.username}}</a>){% endif %}</dd>
+                <dt>{% trans "Last modification" %}</dt>
+                <dd>{{ last_revision.time }} {% if user.is_authenticated %}(<a href="{% url telemeta-profile-detail last_revision.user.username %}">{{last_revision.user.username}}</a>){% endif %}</dd>
             {% endif %}
-
         </dl>
         {% endblock general_info %}
     </div>
-    <div class="extraInfos">
-        {% block geoethnic_data %}
-        <div>
-            <h4><a href="#">{% trans "Geographic and cultural informations" %}</a></h4>
-            <dl class="listing">
-                <dt>{% trans "Location" %}</dt>
-                <dd>{% if item.location %}{{ item.location.fullnames|join:"<br/>" }}{% endif %}</dd>
-                {% dl_field item "location_comment" %}
-                {% dl_field item "cultural_area" %}
-                {% dl_field item "language" %}
-                {% if item.language_iso %}
-                <dt>{% trans "Language ISO" %}</dt>
-                <dd>{{ item.language_iso.name|to_utf8 }}</dd>
-                {% endif %}
-                {% dl_field item "ethnic_group" placeholder %}
-                <dt>{% trans "Ethnographic context" %}</dt>
-                <dd>{{ item.context_comment|html_line_break|safe }}</dd>
-                {% dl_field item "keywords" join with ", " %}
-            </dl>
-        </div>
-        {% endblock geoethnic_data %}
-    </div>
+
 
     <div class="extraInfos">
-        {% block musical_data %}
+        {% block legal_notices %}
         <div>
-            <h4><a href="#">{% trans "Musical informations" %}</a></h4>
+            <h4><a href="#">{% trans "Legal notices" %}</a></h4>
             <dl class="listing">
-                {% dl_field item "vernacular_style" %}
-                {% dl_field item "generic_style" %}
-                {% dl_field item "author" %}
+             <dt>{% trans "Organization" %}</dt>
+             <dd>{% organization %}</dd>
+             {% dl_field item "public_access" %}
+             {% dl_field item "depositor" %}
+             <dt>{% trans "Rights" %}</dt>
+             <dd>{% if item.performances %}
+             {% for performance in item.performances.all %}{{ performance.instrument|default:"" }}, {% endfor %}
+             {% endif %}{{ item.author }}
+            </dd>
             </dl>
-            {% if item.performances %}
-            <div class="instruments">
-                <table class="instruments">
-                    <thead>
-                        <tr>
-                            <td>{% field_label "MediaItemPerformance" "instruments_num" %}</td>
-                            <td>{% field_label "MediaItemPerformance" "instrument" %}</td>
-                            <td>{% field_label "MediaItemPerformance" "alias" %}</td>
-                            <td>{% field_label "MediaItemPerformance" "musicians" %}</td>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {% for performance in item.performances.all %}
-                        <tr>
-                            <td>{{ performance.instruments_num }}</td>
-                            <td>{{ performance.instrument|default:"" }}</td>
-                            <td>{{ performance.alias|default:"" }}</td>
-                            <td>{{ performance.musicians }}</td>
-                        </tr>
-                        {% endfor %}
-                    </tbody>
-                </table>
-            </div>
-            {% endif %}
         </div>
-        {% endblock musical_data %}
+        {% endblock legal_notices %}
     </div>
 
     <div class="extraInfos">
-        {% block archive_data %}
+    {% block archive_data %}
         <div>
             <h4><a href="#">{% trans "Archiving data" %}</a></h4>
             <dl class="listing">
                 {% 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" %}
                 <dt>{% trans "Published references" %}</dt>
                 <dd>{{ item.external_references|html_line_break|safe }}</dd>
-                {% dl_field item "public_access_label" %}
+                {% dl_field item "digitalist" %}
+                {% dl_field item "digitization_date" %}
+                {% dl_field item "publishing_date" %}
             </dl>
         </div>
         {% endblock archive_data %}
     </div>
+
     <div class="extraInfos">
         {% block technical_data %}
         <div>
             <h4><a href="#">{% trans "Technical data" %}</a></h4>
             <div>
                 <dl class="listing">
-                    <dt>{% trans "Media type" %}</dt>
-                    <dd>{% trans mime_type|mime_to_media_type %}</dd>
                     {% 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" %}
-                     <dt>{% trans "Comments" %}</dt>
-                     <dd>{{ format.original_comments|html_line_break|safe }}</dd>
-                     {% 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" %}
+                     <dt>{% trans "Comments" %}</dt>
+                     <dd>{{ format.original_comments|html_line_break|safe }}</dd>
+                     {% dl_field format "tape_thickness" %}
                      {% dl_field format "sticker_presence" %}
+                     {% dl_field format "original_state" %}
+                     {% dl_field format "original_audio_quality" %}
                     {% endif %}
                 </dl>
 

diff --git a/telemeta/templates/telemeta/mediaitem_edit.html b/telemeta/templates/telemeta/mediaitem_edit.html
index e4c0148dac0859f3a5fcb0cd79d569139e9647df..7b0414fbacb931d106c61d34b8014da40f429e09 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_edit.html
+++ b/telemeta/templates/telemeta/mediaitem_edit.html
@@ -7,7 +7,13 @@
 {% endblock %}
 
 {% block title_buttons %}
-<a href="{% url telemeta-item-detail item.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+<div class="fixedWidthAsPlayer">
+    <a href="{% url telemeta-item-detail item.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+    {% if perms.telemeta.change_mediaitem %}
+    <a href="#" class="component_icon button icon_save" onclick="var d=document; d.getElementById('wait-img').style.display='inline'; setTimeout(function(){d.getElementById('_editItemForm').submit();},300); return false;">{% trans "Save" %}</a>
+    {% endif %}
+    <img id="wait-img" style="display:none" style="vertical-align:middle" alt="wait" src="{{ STATIC_URL }}telemeta/images/wait.gif" />
+</div>
 {% endblock %}
 
 {% block infos %}
@@ -20,14 +26,14 @@
 
     {% for field in form %}
     <tr>
-    <tr><td class="error">{{ field.errors }}</td></tr>
-        <td>{% if field.required %}
+        <tr><td class="error">{{ field.errors }}</td></tr>
+        <td>{% if field.blank %}
                 <span style="font-weight:bold">{{ field.label_tag }}:</span>
             {% else %}
                 {{ field.label_tag }}:
             {% endif %}
             </td>
-            {% if field.html_name == "collection" %}
+            {% if field.html_name == "item-collection" %}
             <td>&nbsp;{% trans "Title" %} : {{ item.collection.title }}<br />
                 &nbsp;{% trans "Code" %} : {{ item.collection.code }}<br />
                 {{ field }}</td>
@@ -35,6 +41,20 @@
             <td>{{ field }}</td>
             {% endif %}
     </tr>
+    {% if form.prefix == "item" and forloop.last %}
+    <tr>
+      <td style="padding-top: 1em">{% trans "Keywords" %}:</td>
+      <td style="padding-top: 1em"><a href="{% url telemeta-item-keywords_edit item.public_id %}" class="component_icon button icon_edit">{% trans "Edit" %} {% trans "keywords" %}</a></td>
+    </tr>
+    <tr>
+      <td style="padding-top: 1em">{% trans "Performance" %}:</td>
+      <td style="padding-top: 1em"><a href="{% url telemeta-item-performances_edit item.public_id %}" class="component_icon button icon_edit">{% trans "Edit"%} {% trans "performance"%}</a></td>
+    </tr>
+    <tr>
+      <td style="padding-top: 1em">{% trans "Related media" %}:</td>
+      <td style="padding-top: 1em"><a href="{% url telemeta-item-related_edit item.public_id %}" class="component_icon button icon_edit">{% trans "Edit"%} {% trans "related media"%}</a></td>
+    </tr>
+    {% endif %}
     {% endfor %}
     {% endfor %}
     </table>
@@ -42,16 +62,9 @@
     <div align="center" style="margin-top:3ex;">
     <a href="{% url telemeta-item-detail item.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
     {% if perms.telemeta.change_mediaitem %}
-    <a href="{% url telemeta-item-keywords_edit item.public_id %}" class="component_icon button icon_edit">{% trans "Edit" %} {% trans "keywords" %}</a>
-    {% endif %}
-    {% if perms.telemeta.change_mediaitem %}
-    <a href="{% url telemeta-item-performances_edit item.public_id %}" class="component_icon button icon_edit">{% trans "Edit"%} {% trans "performance"%}</a>
+    <a href="#" class="component_icon button icon_save" onclick="var d=document; d.getElementById('wait-img2').style.display='inline';  setTimeout(function(){d.getElementById('_editItemForm').submit();},300); return false;">{% trans "Save" %}</a>
     {% endif %}
-    {% if perms.telemeta.change_mediaitem %}
-    <a href="{% url telemeta-item-related_edit item.public_id %}" class="component_icon button icon_edit">{% trans "Edit"%} {% trans "related media"%}</a>
-    {% endif %}
-    <a href="#" class="component_icon button icon_save" onclick="var d=document; d.getElementById('wait-img').style.display='inline'; setTimeout(function(){d.getElementById('_editItemForm').submit();},300); return false;">{% trans "Save" %}</a>
-    <img id="wait-img" style="display:none" style="vertical-align:middle" alt="wait" src="{{ STATIC_URL }}telemeta/images/wait.gif" />
+    <img id="wait-img2" style="display:none" style="vertical-align:middle" alt="wait" src="{{ STATIC_URL }}telemeta/images/wait.gif" />
     </div>
     </form>
 </div>

diff --git a/telemeta/templates/telemeta/mediaitem_keywords_edit.html b/telemeta/templates/telemeta/mediaitem_keywords_edit.html
index a3db8c744b6d7b5b0b757fb3a95e2c70e4324e84..b3ee6bce3379bf71f019ff8e88b963fe8904505e 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_keywords_edit.html
+++ b/telemeta/templates/telemeta/mediaitem_keywords_edit.html
@@ -9,7 +9,8 @@
     <img src="{{ STATIC_URL }}telemeta/images/item.png" alt="item" style="vertical-align:middle" /> <h1>Item : {{ item }}</h1>
   {% endblock %}
   {% block title_buttons %}
-   <a href="{% url telemeta-item-detail item.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+   <a href="{% url telemeta-item-edit item.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+   <a href="#" class="component_icon button icon_save" onclick="document.getElementById('_editForm').submit(); return false;">{% trans "Save" %}</a>
   {% endblock %}
 
 {% block content %}
@@ -37,8 +38,7 @@
       <div align="center">
         <a href="{% url telemeta-item-detail item.public_id %}"
            class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
-        <a href="#" class="component_icon button icon_save"
-   onclick="document.getElementById('_editForm').submit(); return false;">{% trans "Save" %}</a>
+        <a href="#" class="component_icon button icon_save" onclick="document.getElementById('_editForm').submit(); return false;">{% trans "Save" %}</a>
        </div>
 
      </form>

diff --git a/telemeta/templates/telemeta/mediaitem_performances_edit.html b/telemeta/templates/telemeta/mediaitem_performances_edit.html
index 3b5fa30b319fd031471c93bafe998aa5f8753147..ab0d0227e057c4be5c53124364f4dd5b618d468c 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_performances_edit.html
+++ b/telemeta/templates/telemeta/mediaitem_performances_edit.html
@@ -9,7 +9,8 @@
 {% endblock %}
 
 {% block title_buttons %}
- <a href="{% url telemeta-item-detail item.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+ <a href="{% url telemeta-item-edit item.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+ <a href="#" class="component_icon button icon_save" onclick="document.getElementById('_editPerformanceForm').submit(); return false;">{% trans "Save" %}</a>
 {% endblock %}
 
 {% block content %}
@@ -41,8 +42,7 @@
       <div align="center">
         <a href="{% url telemeta-item-detail item.public_id %}"
            class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
-        <a href="#" class="component_icon button icon_save"
-   onclick="document.getElementById('_editPerformanceForm').submit(); return false;">{% trans "Save" %}</a>
+        <a href="#" class="component_icon button icon_save" onclick="document.getElementById('_editPerformanceForm').submit(); return false;">{% trans "Save" %}</a>
        </div>
      </form>
     </div>

diff --git a/telemeta/templates/telemeta/mediaitem_related_edit.html b/telemeta/templates/telemeta/mediaitem_related_edit.html
index a7312a88f892c0a7633b74a00c36b0be19dc3227..8714b21520f3dd6e08fc7ddb4c8eba4666156f6e 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_related_edit.html
+++ b/telemeta/templates/telemeta/mediaitem_related_edit.html
@@ -9,7 +9,8 @@
 {% endblock %}
 
 {% block title_buttons %}
- <a href="{% url telemeta-item-detail item.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+ <a href="{% url telemeta-item-edit item.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
+ <a href="#" class="component_icon button icon_save" onclick="document.getElementById('_editMediaItemRelatedFileForm').submit(); return false;">{% trans "Save" %}</a>
 {% endblock %}
 
 {% block content %}
@@ -37,8 +38,7 @@
       <div align="center">
         <a href="{% url telemeta-item-detail item.public_id %}"
            class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
-        <a href="#" class="component_icon button icon_save"
-   onclick="document.getElementById('_editMediaItemRelatedFileForm').submit(); return false;">{% trans "Save" %}</a>
+        <a href="#" class="component_icon button icon_save" onclick="document.getElementById('_editMediaItemRelatedFileForm').submit(); return false;">{% trans "Save" %}</a>
        </div>
      </form>
     </div>

diff --git a/telemeta/views/core.py b/telemeta/views/core.py
index 922a4f47a2c7237cf3298d0432a4a80bd6c33274..d9febdccdaa5f447a8c0d06dfaeeab7ff9dfe6d1 100644 (file)
--- 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 a2199140885732e89c7688cddb22fa3a73dcc3a4..b64eb6e20b0bdf54040f67f0556337edf9e85af7 100644 (file)
--- 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,})