fix edit buttons and redirect

diff --git a/telemeta/templates/telemeta/mediaitem_add.html b/telemeta/templates/telemeta/mediaitem_add.html
index 1ba787989982c80fae8ebdaeb4b0a72bb876163c..6c12fe569859a3f6ea2f8b1ca093ba9e0603068b 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_add.html
+++ b/telemeta/templates/telemeta/mediaitem_add.html
@@ -10,14 +10,13 @@
 {% endblock %}
 
 {% block title_buttons %}
-    {% if perms.telemeta.add_mediaitem %}
       <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-img').style.display='block'; setTimeout(function(){d.getElementById('_addItemForm').submit();},300); return false;">{% trans "Save" %}</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" />
-    {% endif %}
 {% endblock %}
 
 {% block content %}
@@ -42,9 +41,10 @@
        <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-img2').style.display='block'; setTimeout(function(){d.getElementById('_addItemForm').submit();},300); return false;">{% trans "Save" %}</a>
-       <br /><br />
+   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>

diff --git a/telemeta/templates/telemeta/mediaitem_copy.html b/telemeta/templates/telemeta/mediaitem_copy.html
index c52e6703c79a9fe53af197f8683ce89cf4625551..2491c26f823fded6a1a624d17b32e088387e67d1 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_copy.html
+++ b/telemeta/templates/telemeta/mediaitem_copy.html
@@ -12,10 +12,13 @@
 {% endblock %}
 
 {% block title_buttons %}
+<div class="fixedWidthAsPlayer">
     <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-img').style.display='block'; setTimeout(function(){d.getElementById('_mediaItemCopyForm').submit();},300); return false;">{% trans "Save" %}</a>
-    <br /><br />
+    {% 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 %}
@@ -46,8 +49,7 @@
        </table>
        <div align="center" style="margin-top:3ex;">
          <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='block'; setTimeout(function(){d.getElementById('_mediaItemCopyForm').submit();},300); return false;">{% trans "Save" %}</a>
-        <br /><br />
+         <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>

diff --git a/telemeta/templates/telemeta/mediaitem_edit.html b/telemeta/templates/telemeta/mediaitem_edit.html
index 8d3cda29c8732f8cfd22ad1178895e42f4e6eb80..7b0414fbacb931d106c61d34b8014da40f429e09 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_edit.html
+++ b/telemeta/templates/telemeta/mediaitem_edit.html
@@ -7,10 +7,13 @@
 {% endblock %}
 
 {% block title_buttons %}
-<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="var d=document; d.getElementById('wait-img').style.display='block'; setTimeout(function(){d.getElementById('_editItemForm').submit();},300); return false;">{% trans "Save" %}</a>
-<br /><br />
-<img id="wait-img" style="display:none" style="vertical-align:middle" alt="wait" src="{{ STATIC_URL }}telemeta/images/wait.gif" />
+<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 %}
@@ -23,7 +26,7 @@
 
     {% for field in form %}
     <tr>
-    <tr><td class="error">{{ field.errors }}</td></tr>
+        <tr><td class="error">{{ field.errors }}</td></tr>
         <td>{% if field.blank %}
                 <span style="font-weight:bold">{{ field.label_tag }}:</span>
             {% else %}
@@ -38,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>
@@ -45,16 +62,8 @@
     <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>
-    {% 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>
+    <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 %}
-    <a href="#" class="component_icon button icon_save" onclick="var d=document; d.getElementById('wait-img2').style.display='block'; setTimeout(function(){d.getElementById('_editItemForm').submit();},300); return false;">{% trans "Save" %}</a>
-    <br /><br />
     <img id="wait-img2" style="display:none" style="vertical-align:middle" alt="wait" src="{{ STATIC_URL }}telemeta/images/wait.gif" />
     </div>
     </form>

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,})