From: yomguy <yomguy@parisson.com>
Date: Mon, 16 May 2011 16:28:34 +0000 (+0200)
Subject: fix marker delete, resize menu
X-Git-Tag: 1.1~177
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=25f6fc06423d67f6a54c67638e53a9f389ce4b11;p=telemeta.git

fix marker delete, resize menu
---

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index 877da7b8..a75748c5 100644
--- a/telemeta/htdocs/css/telemeta.css
+++ b/telemeta/htdocs/css/telemeta.css
@@ -433,7 +433,7 @@ form.login .submit {
 #menu {
     background-color: #6a0307 ;
     font: normal verdana,'Bitstream Vera Sans',helvetica,arial,sans-serif;
-    border-top: .5em solid #6a0307;
+    border-top: .25em solid #6a0307;
     padding-left:26px;
 }
 
diff --git a/telemeta/pages/fr/help.rst b/telemeta/pages/fr/help.rst
index fd5ffd68..5e303f26 100644
--- a/telemeta/pages/fr/help.rst
+++ b/telemeta/pages/fr/help.rst
@@ -21,7 +21,7 @@ Prise en main
 Connexion
 -----------
 
-
+    
 ezfezff
 ---------
 
diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index 8e0fbd00..e87cad2b 100644
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -894,8 +894,8 @@ class WebView(object):
             raise 'Error : Bad marker dictionnary'
 
     @jsonrpc_method('telemeta.del_marker')
-    def del_marker(request, item_id):
-        m = MediaItemMarker.objects.get(id=item_id)
+    def del_marker(request, public_id):
+        m = MediaItemMarker.objects.get(public_id=public_id)
         m.delete()
         
     @jsonrpc_method('telemeta.get_markers')