From: riccardo <riccardo@parisson.com>
Date: Tue, 8 Mar 2011 17:54:19 +0000 (+0100)
Subject: added user authentication in order to edit add move markers (bzr coinflicts resolved... 
X-Git-Tag: 1.1~400
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d21782408ee7e7647aefbf08c3fb2e9d9b16b02f;p=telemeta.git

added user authentication in order to edit add move markers (bzr coinflicts resolved, hopefully...)
---

diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html
index fd06fad0..4eab3a36 100644
--- a/telemeta/templates/telemeta_default/mediaitem_detail.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail.html
@@ -25,7 +25,7 @@
     load_player({{ item.approx_duration.as_seconds }});
     
 </script>
-<<<<<<< TREE
+
 
 {% if user.is_authenticated and perms.telemeta.change_mediaitem %}
     <script type='text/javascript'>var CURRENT_USER_NAME="{{ user.username }}";</script>
@@ -33,10 +33,9 @@
     <script type='text/javascript'>var CURRENT_USER_NAME=undefined;</script>
 {% endif %}
 
-    {% endblock %}
-=======
+
 {% endblock %}
->>>>>>> MERGE-SOURCE
+
 
 {% if item %}
 {% block submenu %}