make collection player unified

diff --git a/telemeta/templates/telemeta_default/collection_detail.html b/telemeta/templates/telemeta_default/collection_detail.html
index 21703effb4bdb1ffef354e606d5944eb1525bd92..4e0166e31aa7bc0aac3be28f5237316b77ecfef4 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_detail.html
+++ b/telemeta/templates/telemeta_default/collection_detail.html
@@ -15,7 +15,10 @@
     <a href="{% url telemeta-collection-dublincore collection.public_id %}">Dublin Core</a>
     
     {% if user.is_authenticated %} 
-    <a href="{% url telemeta-collection-detail-edit collection.public_id %}"><img src="images/edit_page.png" alt="EDIT" style="vertical-align:middle" /></a>
+     {% block tools %}
+     <a href="{% url telemeta-collection-detail-edit collection.public_id %}">
+      <img src="images/edit_page.png" alt="EDIT" style="vertical-align:middle" /></a>
+     {% endblock tools %}
     {% endif %}
     
     </div>
@@ -45,6 +48,7 @@
             </div>
         </div>
         {% endif %}
+      {% block infos %}
         <div class="intro">
             <span>{% if collection.items.count %}{{ collection.items.count }} {% ifequal collection.items.count 1 %}item{% else %}items{% endifequal %}{% else %}No item{% endif %}</span>
         </div>
@@ -159,6 +163,7 @@
         {% endwith %}
         -->
         </div>
+        {% endblock infos %}
     </div>
 {% endblock %}
 {% else %}

diff --git a/telemeta/templates/telemeta_default/collection_detail_edit.html b/telemeta/templates/telemeta_default/collection_detail_edit.html
index f70d98cd07bf75bbff990c6c202c6d8d2c4452c4..1a8b17e4e8a1196a51ca55604fb8df527845e3f8 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_detail_edit.html
+++ b/telemeta/templates/telemeta_default/collection_detail_edit.html
@@ -1,29 +1,11 @@
-{% extends "telemeta/base.html" %}
-{% load telemeta_utils %}
-{% load i18n %}
+{% extends "telemeta/collection_detail.html" %}
 
-{% block head_title %}{% trans "Collection" %}{{collection|prepend:': '}} - {{ block.super }}{% endblock %}
-
-{% block stylesheets %}
-{{ block.super }}
-<link rel="stylesheet" type="text/css" href="{% url telemeta-timeside "css/timeside.css" %}" />
-<link rel="stylesheet" type="text/css" href="{% url telemeta-timeside "skins/lab/style.css" %}" />
-<link rel="stylesheet" type="text/css" href="{% url telemeta-css "player.css" %}" />
-{% endblock %}
-{% block extra_javascript %}
-{% endblock %}
-
-{% if collection %}
-
-{% block submenu %}
-    <div><a href="{% url telemeta-collection-dublincore collection.public_id %}">Dublin Core</a>
+{% block tools %}
     <a href="{% url telemeta-collection-detail collection.public_id %}">
      <img src="images/edit_cancel.png" style="vertical-align:middle" /></a>
-    </div>
 {% endblock %}
 
-{% block content %}
-    <h3>Collection: {{ collection }}</h3>
+{% block infos %}
         <div class="infos">
         <form method="POST" action="">{% csrf_token %}
         <table>
@@ -36,8 +18,4 @@
         </div>
         </form>
         </div>
-{% endblock %}
-{% else %}
-    <p>No such collection</p>
-{% endif %}
-
+{% endblock infos%}