From: yomguy <yomguy@parisson.com>
Date: Thu, 4 Oct 2012 10:49:30 +0000 (+0200)
Subject: move DC button
X-Git-Tag: 1.4.5~57^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=16bbd97ec6cad284d56dfe5f1dabf19228f79d48;p=telemeta.git

move DC button
---

diff --git a/telemeta/templates/telemeta/collection_detail.html b/telemeta/templates/telemeta/collection_detail.html
index 37624683..5f6aee15 100644
--- a/telemeta/templates/telemeta/collection_detail.html
+++ b/telemeta/templates/telemeta/collection_detail.html
@@ -48,7 +48,6 @@
     {% if user.is_authenticated %}
     <a href=# id ="_add_to_playlist" class="component_icon button icon_add_to_playlist">{% trans "Add to playlist" %}</a>
     {% endif %}
-    <a href="{% url telemeta-collection-dublincore collection.public_id %}" class="component_icon button icon_dublin_core">Dublin Core</a>
    </div>
 {% endblock %}
 
@@ -212,11 +211,11 @@
 {% endblock %}
 
 {% block delete %}
+<a href="{% url telemeta-collection-dublincore collection.public_id %}" style="float:left;margin-top:0.5em;margin-bottom:1em" class="component_icon button icon_dublin_core">Dublin Core</a>
 {% if user.is_authenticated and perms.telemeta.delete_mediacollection %}
  <a href="#" onclick="if(confirm(gettrans('delete the collection permanently?'))){window.location.href='{% url telemeta-collection-delete collection.public_id %}';};return false;"
         class="component_icon button icon_delete" style="float:right;margin-top:0.5em;margin-bottom:1em">{% trans "Delete" %}</a>
 {% endif %}
-
 {% endblock %}
 
 {% else %}
diff --git a/telemeta/templates/telemeta/collection_detail_dc.html b/telemeta/templates/telemeta/collection_detail_dc.html
index ea7c7af3..f2d91d28 100644
--- a/telemeta/templates/telemeta/collection_detail_dc.html
+++ b/telemeta/templates/telemeta/collection_detail_dc.html
@@ -16,8 +16,17 @@
 {% with collection|to_dublincore as resource %}
 {% include "telemeta/inc/dublincore.html" %}
 {% endwith %}
+{% endblock %}
 
+{% block delete %}
+<a href="{% url telemeta-collection-dublincore collection.public_id %}" style="float:left;margin-top:0.5em;margin-bottom:1em" class="component_icon button icon_dublin_core">Dublin Core</a>
+{% if user.is_authenticated and perms.telemeta.delete_mediacollection %}
+ <a href="#" onclick="if(confirm(gettrans('delete the collection permanently?'))){window.location.href='{% url telemeta-collection-delete collection.public_id %}';};return false;"
+        class="component_icon button icon_delete" style="float:right;margin-top:0.5em;margin-bottom:1em">{% trans "Delete" %}</a>
+{% endif %}
 {% endblock %}
+
 {% else %}
     <p>{% trans "No such collection" %}</p>
 {% endif %}
+
diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html
index 7614f28f..4279fbf0 100644
--- a/telemeta/templates/telemeta/mediaitem_detail.html
+++ b/telemeta/templates/telemeta/mediaitem_detail.html
@@ -105,7 +105,6 @@ Item : <a href="{% url telemeta-item-detail item.public_id %}">{{ item }}</a>
     {% endif %}
     <a href="{% url telemeta-item-detail previous %}" class="component_icon button icon_previous">{% trans "Previous" %}</a>
     <a href="{% url telemeta-item-detail next %}" class="component_icon button icon_next">{% trans "Next" %}</a>
-    <a href="{% url telemeta-item-dublincore item.public_id %}" class="component_icon button icon_dublin_core">Dublin Core</a>
 </div>
 {% endblock %}
 
@@ -326,7 +325,9 @@ Item : <a href="{% url telemeta-item-detail item.public_id %}">{{ item }}</a>
 
 {% endblock %}
 
+
 {% block delete %}
+<a href="{% url telemeta-item-dublincore item.public_id %}" style="float:left;margin-top:0.5em;margin-bottom:1em" class="component_icon button icon_dublin_core">Dublin Core</a>
 {% if user.is_authenticated and perms.telemeta.delete_mediaitem %}
  <a href="#" onclick="if(confirm(gettrans('delete the item permanently?'))){window.location.href='{% url telemeta-item-delete item.public_id %}';};return false;"
         class="component_icon button icon_delete" style="float:right;margin-top:0.5em;margin-bottom:1em">{% trans "Delete" %}</a>
diff --git a/telemeta/templates/telemeta/mediaitem_detail_dc.html b/telemeta/templates/telemeta/mediaitem_detail_dc.html
index d745dc67..95f07b8c 100644
--- a/telemeta/templates/telemeta/mediaitem_detail_dc.html
+++ b/telemeta/templates/telemeta/mediaitem_detail_dc.html
@@ -3,9 +3,6 @@
 {% load i18n %}
 
 {% if item %}
-{% block title_buttons %}
- <a class="component_icon button icon_previous" href="{% url telemeta-item-detail item.public_id %}">{% trans "Normal View" %}</a>
-{% endblock %}
 
 {% block infos %}
 {% with item|to_dublincore as resource %}
@@ -16,5 +13,14 @@
     <p>{% trans "No such item" %}</p>
 {% endif %}
 
+{% block delete %}
+<a class="component_icon button icon_previous" style="float:left;margin-top:0.5em;margin-bottom:1em" href="{% url telemeta-item-detail item.public_id %}">{% trans "Normal View" %}</a>
+{% if user.is_authenticated and perms.telemeta.delete_mediaitem %}
+ <a href="#" onclick="if(confirm(gettrans('delete the item permanently?'))){window.location.href='{% url telemeta-item-delete item.public_id %}';};return false;"
+        class="component_icon button icon_delete" style="float:right;margin-top:0.5em;margin-bottom:1em">{% trans "Delete" %}</a>
+{% endif %}
+{% endblock %}
+
+
 {% block related %}
 {% endblock related %}
diff --git a/telemeta/templates/telemeta/resource_detail.html b/telemeta/templates/telemeta/resource_detail.html
index dd1eb0fd..286994b3 100644
--- a/telemeta/templates/telemeta/resource_detail.html
+++ b/telemeta/templates/telemeta/resource_detail.html
@@ -46,7 +46,6 @@ jQuery(document).ready(function(){
     {% if user.is_authenticated %}
     <a href="#" id ="_add_to_playlist" class="component_icon button icon_add_to_playlist">{% trans "Add to playlist" %}</a>
     {% endif %}
-    <a href="{% url telemeta-resource-dublincore type resource.public_id %}" class="component_icon button icon_dublin_core">Dublin Core</a>
    </div>
 {% endblock %}
 
@@ -97,11 +96,11 @@ jQuery(document).ready(function(){
 {% endblock %}
 
 {% block delete %}
+<a href="{% url telemeta-resource-dublincore type resource.public_id %}" style="float:left;margin-top:0.5em;margin-bottom:1em" class="component_icon button icon_dublin_core">Dublin Core</a>
 {% if user.is_authenticated and perms.telemeta.delete_mediaresource %}
  <a href="#" onclick="if(confirm(gettrans('delete the resource permanently?'))){window.location.href='{% url telemeta-resource-delete type resource.public_id %}';};return false;"
         class="component_icon button icon_delete" style="float:right;margin-top:0.5em;margin-bottom:1em">{% trans "Delete" %}</a>
 {% endif %}
-
 {% endblock %}
 
 {% else %}
diff --git a/telemeta/templates/telemeta/resource_detail_dc.html b/telemeta/templates/telemeta/resource_detail_dc.html
index f2063f22..ec5c0754 100644
--- a/telemeta/templates/telemeta/resource_detail_dc.html
+++ b/telemeta/templates/telemeta/resource_detail_dc.html
@@ -3,18 +3,27 @@
 {% load i18n %}
 
 {% if item %}
-{% block title_buttons %}
- <a class="component_icon button icon_previous" href="{% url telemeta-resource-detail type resource.public_id %}">{% trans "Normal View" %}</a>
-{% endblock %}
 
-{% block infos %}
+{% block content %}
 {% with resource|to_dublincore as resource %}
 {% include "telemeta/inc/dublincore.html" %}
 {% endwith %}
 {% endblock %}
+
+{% block delete %}
+ <a class="component_icon button icon_previous" style="float:left;margin-top:0.5em;margin-bottom:1em" href="{% url telemeta-resource-detail type resource.public_id %}">{% trans "Normal View" %}</a>
+{% if user.is_authenticated and perms.telemeta.delete_mediaresource %}
+ <a href="#" onclick="if(confirm(gettrans('delete the resource permanently?'))){window.location.href='{% url telemeta-resource-delete type resource.public_id %}';};return false;"
+        class="component_icon button icon_delete" style="float:right;margin-top:0.5em;margin-bottom:1em">{% trans "Delete" %}</a>
+{% endif %}
+{% endblock %}
+
 {% else %}
     <p>{% trans "No such resource" %}</p>
 {% endif %}
 
+
+
+
 {% block related %}
 {% endblock related %}