fix marker delete, resize menu

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index 877da7b841fcd4b43e5bae20d0d25478b5d9531e..a75748c5847843d4f6a04a801f437f493aa3f467 100644 (file)
--- 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 fd5ffd68e3560316ffb1a6e3affd181fc1d71755..5e303f264604ed547f9336ffa8ea2345ea8234e6 100644 (file)
--- 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 8e0fbd0043f88ec3445ae21302df8ed913947e45..e87cad2b587dab2738615ffedfcf62be24bfca72 100644 (file)
--- 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')