fix item edit, add, copy buttons and forms

diff --git a/telemeta/forms/media.py b/telemeta/forms/media.py
index a4a1b5bc3f9747986e80c8d2a17afea6ad01b2d5..d45d8e8fa1775554ada5ff98c25229ac438ce68c 100644 (file)
--- a/telemeta/forms/media.py
+++ b/telemeta/forms/media.py
@@ -77,6 +77,11 @@ class MediaItemForm(ModelForm):
     def clean_code(self):
         return self.cleaned_data['code'] or None
 
+    def __init__(self,*args,**kwargs):
+        super(MediaItemForm, self).__init__(*args, **kwargs)
+        self.fields.insert(2, 'code', self.fields['code'])
+        self.fields.insert(3, 'file', self.fields['file'])
+
 class MediaItemRelatedForm(ModelForm):
     class Meta:
         model = MediaItemRelated

diff --git a/telemeta/templates/telemeta/mediaitem_add.html b/telemeta/templates/telemeta/mediaitem_add.html
index 5d6ce3fd6e76b07c9b9b8e795b9d962bf2e36a3e..1ba787989982c80fae8ebdaeb4b0a72bb876163c 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_add.html
+++ b/telemeta/templates/telemeta/mediaitem_add.html
@@ -6,13 +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>
+      <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>
+      <br /><br />
+      <img id="wait-img" style="display:none" style="vertical-align:middle" alt="wait" src="{{ STATIC_URL }}telemeta/images/wait.gif" />
     {% endif %}
 {% endblock %}
 
@@ -23,21 +27,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 %}
@@ -46,8 +43,9 @@
         <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='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='block'; setTimeout(function(){d.getElementById('_addItemForm').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>
     </div>

diff --git a/telemeta/templates/telemeta/mediaitem_copy.html b/telemeta/templates/telemeta/mediaitem_copy.html
index 38c0caed061ef902f80e77ddc3f088d82003c29c..c52e6703c79a9fe53af197f8683ce89cf4625551 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_copy.html
+++ b/telemeta/templates/telemeta/mediaitem_copy.html
@@ -12,9 +12,10 @@
 {% 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>
-    {% endif %}
+    <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 />
+    <img id="wait-img" style="display:none" style="vertical-align:middle" alt="wait" src="{{ STATIC_URL }}telemeta/images/wait.gif" />
 {% endblock %}
 
 {% block content %}
@@ -31,7 +32,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 +45,10 @@
        {% 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='block'; setTimeout(function(){d.getElementById('_mediaItemCopyForm').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>
     </div>

diff --git a/telemeta/templates/telemeta/mediaitem_edit.html b/telemeta/templates/telemeta/mediaitem_edit.html
index e4c0148dac0859f3a5fcb0cd79d569139e9647df..8d3cda29c8732f8cfd22ad1178895e42f4e6eb80 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_edit.html
+++ b/telemeta/templates/telemeta/mediaitem_edit.html
@@ -8,6 +8,9 @@
 
 {% 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" />
 {% endblock %}
 
 {% block infos %}
@@ -21,13 +24,13 @@
     {% for field in form %}
     <tr>
     <tr><td class="error">{{ field.errors }}</td></tr>
-        <td>{% if field.required %}
+        <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>
@@ -50,8 +53,9 @@
     {% 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" />
+    <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>
 </div>