fix marker urls, fix menu style

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index ca9df22b429315050a93994edc3dba901d49fd77..e570e3c4ab788c748f8cd9f0a6d30c0a818d34fd 100644 (file)
--- a/telemeta/htdocs/css/telemeta.css
+++ b/telemeta/htdocs/css/telemeta.css
@@ -396,9 +396,9 @@ form.login .submit {
 #menu {
     background-color: #6a0307 ;
     font: normal verdana,'Bitstream Vera Sans',helvetica,arial,sans-serif;
-    padding: 0em 0em 0.75em 0em;
+    padding: 0em 0em 9px 0em;
     border-bottom: .5em solid #6a0307;
-    border-top: .7em solid #6a0307;
+    border-top: .75em solid #6a0307;
 }
 
 #menu li { background-color: #6a0307; padding: .5em 0; }

diff --git a/telemeta/models/query.py b/telemeta/models/query.py
index 7e1906933cfb65a512fa7730493d1f3bc32f4d46..9c01f9ad8585c577cba89ae88e342b6d67b75419 100644 (file)
--- a/telemeta/models/query.py
+++ b/telemeta/models/query.py
@@ -1,4 +1,4 @@
-    # -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 # Copyright (C) 2007-2010 Samalyse SARL
 #
 # This software is a computer program whose purpose is to backup, analyse,

diff --git a/telemeta/templates/telemeta_default/home.html b/telemeta/templates/telemeta_default/home.html
index e4a50acd0ed009fb2a880552b9ffeded2cdb9281..2dae5dcb54457221a8d4a8169296015dffdf53d4 100644 (file)
--- a/telemeta/templates/telemeta_default/home.html
+++ b/telemeta/templates/telemeta_default/home.html
@@ -41,7 +41,7 @@
          {% endif %}
         {% endif %}
         {% if r.revision.element_type == "marker" %}
-          {{ r.element.title }}
+          <a href="{% url telemeta-item-detail-marker r.element.public_id %}">{{ r.element.title }}</a>
         {% endif %}
         </td>
         <td>{{ r.revision.element_type }}</td>

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index 36ac79792370a067c8c7e1acdf3a59dd3fd54887..ebb58d13dec983e65fbc4cdd68152acfdf2643e3 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -222,8 +222,9 @@ class WebView(object):
     def item_detail(self, request, public_id=None, marker_id=None, template='telemeta/mediaitem_detail.html'):
         """Show the details of a given item"""
         if not public_id and marker_id:
-            marker = MediaItemMarker(public_id=marker_id)
-            item = marker.item
+            marker = MediaItemMarker.objects.get(public_id=marker_id)
+            item_id = marker.item_id
+            item = MediaItem.objects.get(id=item_id)
         else:
             item = MediaItem.objects.get(public_id=public_id)