# HG changeset patch
# User verrierj
# Date 1325521284 -3600
# Node ID f85caa66acf47a03e81a86176ed495c8cf611db9
# Parent  ea5fead4ea991eda0a2f35a5615b643acf36eeae
Fix bugs in new url organization

diff -r ea5fead4ea99 -r f85caa66acf4 src/ldt/ldt/ldt_utils/middleware/swfupload.py
--- a/src/ldt/ldt/ldt_utils/middleware/swfupload.py	Mon Jan 02 16:40:51 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/middleware/swfupload.py	Mon Jan 02 17:21:24 2012 +0100
@@ -10,7 +10,7 @@
 class SWFUploadMiddleware(object):
 
     def process_request(self, request):
-        if (request.method == 'POST') and (request.path == reverse('ldt.ldt_utils.views.upload')) and (settings.SESSION_COOKIE_NAME in request.POST):
+        if (request.method == 'POST') and (request.path == reverse('ldt.ldt_utils.views.content.upload')) and (settings.SESSION_COOKIE_NAME in request.POST):
             request.COOKIES[settings.SESSION_COOKIE_NAME] = request.POST[settings.SESSION_COOKIE_NAME] 
         
         if request.POST.has_key('csrfmiddlewaretoken'):           
diff -r ea5fead4ea99 -r f85caa66acf4 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html	Mon Jan 02 16:40:51 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html	Mon Jan 02 17:21:24 2012 +0100
@@ -57,6 +57,9 @@
             success: function(msg, textStatus, XMLHttpRequest) {
                 $('#projectslistcontainer').html(msg);
                 init_events(document);
+            },
+            error: function (jqXHR, textStatus, errorThrown) {
+            	alert(jqXHR.responseText());            	
             }
         });
     });    
diff -r ea5fead4ea99 -r f85caa66acf4 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_seo_meta.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_seo_meta.html	Mon Jan 02 16:40:51 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_seo_meta.html	Mon Jan 02 17:21:24 2012 +0100
@@ -1,3 +1,3 @@
 {% spaceless %}
-<link rel="meta" href="{{WEB_URL}}{% url ldt.ldt_utils.views.project.project_annotations_rdf ldt_id=ldt_id %}"/>
+<link rel="meta" href="{{WEB_URL}}{% url ldt.ldt_utils.views.rdf.project_annotations_rdf ldt_id=ldt_id %}"/>
 {% endspaceless %}
\ No newline at end of file
diff -r ea5fead4ea99 -r f85caa66acf4 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/workspace_base.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/workspace_base.html	Mon Jan 02 16:40:51 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/workspace_base.html	Mon Jan 02 17:21:24 2012 +0100
@@ -13,8 +13,8 @@
 
 var content_filter_url = "{% url ldt.ldt_utils.views.content.contents_filter filter='__FILTER__' %}";
 var project_filter_url = "{% url ldt.ldt_utils.views.project.projects_filter filter='__FILTER__' is_owner='true' status='0' %}";
-var publish_project_url = "{% url ldt.ldt_utils.views.project.publish '__PROJECT_ID__' 'false' %}";
-var unpublish_project_url = "{% url ldt.ldt_utils.views.project.unpublish '__PROJECT_ID__' 'false' %}";
+var publish_project_url = "{% url ldt.ldt_utils.views.project.publish '__PROJECT_ID__' %}";
+var unpublish_project_url = "{% url ldt.ldt_utils.views.project.unpublish '__PROJECT_ID__' %}";
 
 
 function init_events(base_node) {
diff -r ea5fead4ea99 -r f85caa66acf4 src/ldt/ldt/ldt_utils/urls.py
--- a/src/ldt/ldt/ldt_utils/urls.py	Mon Jan 02 16:40:51 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/urls.py	Mon Jan 02 17:21:24 2012 +0100
@@ -60,8 +60,8 @@
         url(r'^space/ldt/create/$', 'views.project.create_ldt_view'),
         url(r'^space/ldt/created_done/$', 'views.project.created_ldt'),
         url(r'^space/ldt/save/$', 'views.lignesdetemps.save_ldt_project'),
-        url(r'^space/ldt/publish/(?P<id>[\w-]*)(?:/(?P<redirect>true|false))?$', 'views.project.publish'),
-        url(r'^space/ldt/unpublish/(?P<id>[\w-]*)(?:/(?P<redirect>true|false))?$', 'views.project.unpublish'),
+        url(r'^space/ldt/publish/(?P<id>[\w-]*)$', 'views.project.publish'),
+        url(r'^space/ldt/unpublish/(?P<id>[\w-]*)$', 'views.project.unpublish'),
         url(r'^space/upload/$', 'views.content.upload'),
         url(r'^space/removetempfile/$', 'views.content.remove_temp_file'),
         url(r'^space/getduration/$', 'views.content.get_duration'),
diff -r ea5fead4ea99 -r f85caa66acf4 src/ldt/ldt/ldt_utils/views/lignesdetemps.py
--- a/src/ldt/ldt/ldt_utils/views/lignesdetemps.py	Mon Jan 02 16:40:51 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/views/lignesdetemps.py	Mon Jan 02 17:21:24 2012 +0100
@@ -99,7 +99,7 @@
 
 
 def index_segment(request, project_id, content_id, cutting_id, ensemble_id, segment_id):
-    url_str = settings.WEB_URL + reverse("ldt.ldt_utils.views.init_segment", args=[project_id, content_id, ensemble_id, cutting_id, segment_id])
+    url_str = settings.WEB_URL + reverse("ldt.ldt_utils.views.lignesdetemps.init_segment", args=[project_id, content_id, ensemble_id, cutting_id, segment_id])
     post_url = ""
     language_code = request.LANGUAGE_CODE[:2]
     readonly = 'true'
@@ -113,7 +113,7 @@
         get_object_or_404(Project.safe_objects, ldt_id=project_id)
     
     ldtgen = LdtUtils()
-    doc = ldtgen.generate_init([project_id, content_id, ensemble_id, cutting_id, segment_id], 'ldt.ldt_utils.views.ldt_segment', 'ldt.ldt_utils.views.highlight_segment')
+    doc = ldtgen.generate_init([project_id, content_id, ensemble_id, cutting_id, segment_id], 'ldt.ldt_utils.views.lignesdetemps.ldt_segment', 'ldt.ldt_utils.views.lignesdetemps.highlight_segment')
     
     return HttpResponse(lxml.etree.tostring(lxml.etree.ElementTree(doc), pretty_print=True), mimetype="text/xml;charset=utf-8")
 
@@ -199,7 +199,7 @@
 def index_project(request, id, full=False): 
 
     urlStr = settings.WEB_URL + reverse("ldt.ldt_utils.views.lignesdetemps.init", args=['ldt_project', id])
-    posturl = settings.WEB_URL + reverse("ldt.ldt_utils.lignesdetemps.views.save_ldt_project")
+    posturl = settings.WEB_URL + reverse("ldt.ldt_utils.views.lignesdetemps.save_ldt_project")
     language_code = request.LANGUAGE_CODE[:2]
     
     try:
@@ -223,7 +223,7 @@
 def init(request, method, url):
     ldtgen = LdtUtils()
 
-    doc = ldtgen.generate_init([url], 'ldt.ldt_utils.views.' + method, None)    
+    doc = ldtgen.generate_init([url], 'ldt.ldt_utils.views.lignesdetemps.' + method, None)    
 
     library = doc.xpath('/iri/files/library')[0]
     for c in Content.safe_objects.all():
diff -r ea5fead4ea99 -r f85caa66acf4 src/ldt/ldt/ldt_utils/views/project.py
--- a/src/ldt/ldt/ldt_utils/views/project.py	Mon Jan 02 16:40:51 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/views/project.py	Mon Jan 02 17:21:24 2012 +0100
@@ -169,9 +169,7 @@
                               {'projects': project_list, 'show_username':show_username,
                                'is_gecko': is_gecko, 'group_id':id_group},
                               context_instance=RequestContext(request))
-    
-    
-    
+       
 @login_required
 def publish(request, id):
     ldt = get_object_or_404(Project.safe_objects, ldt_id=id)
@@ -187,8 +185,6 @@
     return HttpResponse(simplejson.dumps({'res':True, 'ldt': {'id': ldt.id, 'state':ldt.state, 'ldt_id': ldt.ldt_id}}, ensure_ascii=False), mimetype='application/json')
 
 
-
-
 @login_required
 def create_ldt_view(request):
     groups = request.user.groups.exclude(name=settings.PUBLIC_GROUP_NAME)