rm dc from collection edit

diff --git a/telemeta/templates/telemeta_default/collection_detail.html b/telemeta/templates/telemeta_default/collection_detail.html
index 6363771334957a4770f202820db31198806b4722..b02796cebcb4d1fc791ee82acbec835b95463f07 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_detail.html
+++ b/telemeta/templates/telemeta_default/collection_detail.html
@@ -12,19 +12,20 @@
 
 {% block submenu %}
     <div>
+    {% block tools %}
     <!--<a href="{% url telemeta-collection-dublincore collection.public_id %}">Dublin Core</a>-->
     <a href="{% url telemeta-collection-dublincore collection.public_id %}" class="mediaitem_button mediaitem_button_dublin_core">Dublin Core</a>
     
     {% if user.is_authenticated and perms.telemeta.change_mediacollection %}
-     {% block tools %}
     <!-- <a href="{% url telemeta-collection-edit collection.public_id %}">
       <img src="images/edit_page.png" alt="EDIT" style="vertical-align:middle" /></a>
       <button><a href="{% url telemeta-collection-copy collection.public_id %}">Copy</a></button>-->
 
        <a href="{% url telemeta-collection-edit collection.public_id %}" class="mediaitem_button mediaitem_button_edit">Edit</a>
       <a href="{% url telemeta-collection-copy collection.public_id %}" class="mediaitem_button mediaitem_button_copy">Copy</a>
+     {% endif %}
      {% endblock tools %}
-    {% endif %}
+    
     
     </div>
 {% endblock %}

diff --git a/telemeta/templates/telemeta_default/home.html b/telemeta/templates/telemeta_default/home.html
index 07cb55ba705cab70ce3b52ca3ee51f9b5469cb41..11f2b2cd4deb242cf170e05ad3b82a2fb0f92697 100644 (file)
--- a/telemeta/templates/telemeta_default/home.html
+++ b/telemeta/templates/telemeta_default/home.html
@@ -5,7 +5,54 @@
 {% block content %}
 <div class="home-content">
 
-<div>
+<div class="module-set">
+
+{% block modules %}
+
+   <div id="module" class="module">
+   
+    <h3>Last changes</h3>
+    <table bgcolor="#FFFFFF">
+      <tr>
+        <th class="highlight">Date</th>
+        <th>Type</th>
+        <th>{% trans "Title" %}</th>
+        <th>Change type</th>
+        <th>User</th>
+      </tr>
+    {% for r in revisions %}
+     <tr>
+        <td>{{ r.revision.time }}</td>
+        <td>{{ r.revision.element_type }}</td>
+        <td>
+        {% if r.revision.element_type == "collection" %}
+          <a href="{% url telemeta-collection-detail r.element.public_id %}">{{ r.element.title }}</a>
+        {% endif %}
+        {% if r.revision.element_type == "item" %}
+         {% if r.element %}
+          <a href="{% url telemeta-item-detail r.element.public_id %}">{{ r.element.title }}</a>
+         {% else %}
+          {{ r.element }}
+         {% endif %}
+        {% endif %}
+        {% if r.revision.element_type == "marker" %}
+          {{ r.element.title }}
+        {% endif %}
+        </td>
+        <td>
+        {% if r.element %}
+         {{ r.revision.change_type }}
+        {% endif %}
+         </td>
+         <td>{{ r.revision.user.username }}</td>
+     </tr>
+    {% endfor %}
+    </table>
+   </div>
+
+{% endblock %}
+
+<div class="home-description">
 <h3>Playlists</h3>
  <form method="POST" action="">{% csrf_token %}
   {% for playlist in playlists %}
@@ -60,49 +107,6 @@
     </table>
    {% endfor %}
  </form>
-</div>
-
-
-<br />
-<div>
-<h3>Last changes</h3>
-    <table class="listing" width="75%">
-      <tr>
-        <th class="highlight">Date</th>
-        <th>Type</th>
-        <th>{% trans "Title" %}</th>
-        <th>Change type</th>
-        <th>User</th>
-      </tr>
-    {% for r in revisions %}
-     <tr {% if not forloop.counter0|divisibleby:"2" %}class="odd"{% endif %}>
-        <td>{{ r.revision.time }}</td>
-        <td>{{ r.revision.element_type }}</td>
-        <td>
-        {% if r.revision.element_type == "collection" %}
-          <a href="{% url telemeta-collection-detail r.element.public_id %}">{{ r.element.title }}</a>
-        {% endif %}
-        {% if r.revision.element_type == "item" %}
-         {% if r.element %}
-          <a href="{% url telemeta-item-detail r.element.public_id %}">{{ r.element.title }}</a>
-         {% else %}
-          {{ r.element }}
-         {% endif %}
-        {% endif %}
-        {% if r.revision.element_type == "marker" %}
-          {{ r.element.title }}
-        {% endif %}
-        </td>
-        <td>
-        {% if r.element %}
-         {{ r.revision.change_type }}
-        {% endif %}
-         </td>
-         <td>{{ r.revision.user.username }}</td>
-     </tr>
-    {% endfor %}
-    </table>
-</div>
 
 </div>
 {% endblock %}