From: yomguy <yomguy@parisson.com>
Date: Tue, 15 Mar 2011 09:25:33 +0000 (+0100)
Subject: modify user home and last changes
X-Git-Tag: 1.1~386
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=843997133ee5f3748ba8230332119084e17f73f3;p=telemeta.git

modify user home and last changes
---

diff --git a/telemeta/templates/telemeta_default/collection_detail.html b/telemeta/templates/telemeta_default/collection_detail.html
index d939e304..5abd52f0 100644
--- a/telemeta/templates/telemeta_default/collection_detail.html
+++ b/telemeta/templates/telemeta_default/collection_detail.html
@@ -12,19 +12,13 @@
 
 {% block submenu %}
     <div>
-<!--    <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>
-
+    <a href="{% url telemeta-collection-dublincore collection.public_id %}">Dublin Core</a>
+    
     {% if user.is_authenticated and perms.telemeta.change_mediacollection %}
      {% block tools %}
-     <!--<a href="{% url telemeta-collection-edit collection.public_id %}">
+     <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>
-
      {% endblock tools %}
     {% endif %}
     
diff --git a/telemeta/templates/telemeta_default/collection_list.html b/telemeta/templates/telemeta_default/collection_list.html
index 1528c049..7cf243b6 100644
--- a/telemeta/templates/telemeta_default/collection_list.html
+++ b/telemeta/templates/telemeta_default/collection_list.html
@@ -8,7 +8,7 @@
     <div class="buttons">  
     {% if user.is_authenticated and perms.telemeta.add_mediacollection %}
 <!--     <button><a href="{% url telemeta-collection-add %}">Add</a></button>-->
-      <a href="{% url telemeta-collection-add %}" class="mediaitem_button mediaitem_button_add">Add</a>
+      <a href="{% url telemeta-collection-add %}" class="roundBorder6 mediaitem_button mediaitem_button_add">Add</a>
 
     {% endif %}
     </div>
diff --git a/telemeta/templates/telemeta_default/home.html b/telemeta/templates/telemeta_default/home.html
index 815f0c46..e9d29efd 100644
--- a/telemeta/templates/telemeta_default/home.html
+++ b/telemeta/templates/telemeta_default/home.html
@@ -10,7 +10,7 @@
  <form method="POST" action="">{% csrf_token %}
   {% for playlist in playlists %}
   <li>{{ playlist.name }}</li>
-    <table class="listing" width="50%">
+    <table class="listing" width="75%">
         <tr>
             <th class="highlight">{% trans "Title" %}</th>
             <th>{% trans "Type" %}</th>
@@ -57,7 +57,7 @@
 <br />
 <div>
 <h3>Searches</h3>
-    <table class="listing">
+    <table class="listing" width="75%">
      <tr>
         <th class="highlight">Date</th>
         <th>Keywords</th>
@@ -76,31 +76,36 @@
 <br />
 <div>
 <h3>Last changes</h3>
-    <table class="listing">
-     <tr>
+    <table class="listing" width="75%">
+      <tr>
         <th class="highlight">Date</th>
-        <th>Code</th>
         <th>Type</th>
+        <th>{% trans "Title" %}</th>
         <th>Change type</th>
-       
-    </tr>
+        <th>User</th>
+      </tr>
     {% for r in revisions %}
-    <tr>
+     <tr>
         <td>{{ r.revision.time }}</td>
-        {% if r.revision.type == "item" %}
-         <td><a href="{% url telemeta-item-detail r.element.public_id %}">{{ r.element }}</td>
-        {% else %}
-         <td><a href="{% url telemeta-collection-detail r.element.public_id %}">{{ r.element }}</td>
-            {% endif %}
         <td>{{ r.revision.element_type }}</td>
-        <td>{{ r.revision.change_type }}</td>
-       
-    </tr>
+        {% if r.revision.type == "collection" %}
+          <td><a href="{% url telemeta-collection-detail r.element.public_id %}">{{ r.element }}</td>
+        {% else %}
+         {% if r.element %}
+          <td><a href="{% url telemeta-item-detail r.element.public_id %}">{{ r.element.title }}</td>
+         {% else %}
+          <td>{{ r.element }}</td>
+         {% endif %}
+        {% endif %}
+        {% if r.element %}
+         <td>{{ r.revision.change_type }}</td>
+        {% else %}
+         <td>delete</td>
+        {% endif %}
+         <td>{{ r.revision.user.username }}</td>
+     </tr>
     {% endfor %}
     </table>
-
-
-
 </div>
 
 </div>
diff --git a/telemeta/templates/telemeta_default/mediaitem_add.html b/telemeta/templates/telemeta_default/mediaitem_add.html
index 9f817cff..3b7eafc5 100644
--- a/telemeta/templates/telemeta_default/mediaitem_add.html
+++ b/telemeta/templates/telemeta_default/mediaitem_add.html
@@ -13,7 +13,7 @@
 <!--     <a href="{% url telemeta-item-detail item.public_id %}">
          <img src="images/edit_cancel.png" /></a>-->
  <a href="{% url telemeta-item-detail item.public_id %}"
-           class="mediaitem_button mediaitem_button_cancel">Cancel</a>
+           class="roundBorder6 mediaitem_button mediaitem_button_cancel">Cancel</a>
     {% endblock tools %}
     
     {% endif %}
@@ -41,8 +41,8 @@
          <img src="images/edit_cancel.png" style="vertical-align:middle" /></a>
         <input type="image" src="images/save_changes.png" style="vertical-align:middle" value="save" />-->
         <a href="{% url telemeta-item-detail item.public_id %}"
-           class="mediaitem_button mediaitem_button_cancel">Cancel</a>
-<a href="#" class="mediaitem_button mediaitem_button_save"
+           class="roundBorder6 mediaitem_button mediaitem_button_cancel">Cancel</a>
+<a href="#" class="roundBorder6 mediaitem_button mediaitem_button_save"
    onclick="document.getElementById('_addItemForm').submit(); return false;">Save</a>
        </div>
      </form>
diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html
index 20deac60..41f4aad4 100644
--- a/telemeta/templates/telemeta_default/mediaitem_detail.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail.html
@@ -33,7 +33,6 @@
     <script type='text/javascript'>var CURRENT_USER_NAME=undefined;</script>
 {% endif %}
 
-
 {% endblock %}
 
 
diff --git a/telemeta/templates/telemeta_default/mediaitem_detail_dc.html b/telemeta/templates/telemeta_default/mediaitem_detail_dc.html
index 493ee6b0..16a82f10 100644
--- a/telemeta/templates/telemeta_default/mediaitem_detail_dc.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail_dc.html
@@ -1,16 +1,13 @@
-{% extends "telemeta/base.html" %}
+{% extends "telemeta/mediaitem_detail.html" %}
 {% load telemeta_utils %}
 {% load i18n %}
 
-{% block head_title %}{% trans "Item" %}{{item|prepend:': '}} - {{ block.super }}{% endblock %}
-
 {% if item %}
 {% block submenu %}
-    <h3>Item: {{ item }}</h3>
     <div><a href="{% url telemeta-item-detail item.public_id %}">{% trans "Normal View" %}</a></div>
 {% endblock %}
 
-{% block content %}
+{% block infos %}
 {% with item|to_dublincore as resource %}
 {% include "telemeta/inc/dublincore.html" %}
 {% endwith %}
diff --git a/telemeta/templates/telemeta_default/mediaitem_list.html b/telemeta/templates/telemeta_default/mediaitem_list.html
index e0532763..5bbf9228 100644
--- a/telemeta/templates/telemeta_default/mediaitem_list.html
+++ b/telemeta/templates/telemeta_default/mediaitem_list.html
@@ -8,8 +8,7 @@
 {% block submenu %}
     <div class="buttons">  
     {% if user.is_authenticated and perms.telemeta.add_mediaitem %}
-    <!-- <button><a href="{% url telemeta-item-add %}">Add</a></button>-->
-     <a href="{% url telemeta-item-add %}" class="mediaitem_button mediaitem_button_add">Add</a>
+     <button><a href="{% url telemeta-item-add %}">Add</a></button>
     {% endif %}
     </div>
 {% endblock %}