# HG changeset patch
# User rougeronj
# Date 1360855580 -3600
# Node ID 38afc7be4a886c9cdfe7a76abd5102488f25be8e
# Parent  06acfd436f2521fbcb4f081c7b63be25b07e9dd5# Parent  ebcdf4ce2e48cbd178a6d72e57f644e8aaef0638
Merge with ebcdf4ce2e48cbd178a6d72e57f644e8aaef0638

diff -r 06acfd436f25 -r 38afc7be4a88 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_content.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_content.html	Thu Feb 14 16:12:31 2013 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_content.html	Thu Feb 14 16:26:20 2013 +0100
@@ -43,8 +43,6 @@
 	chunked_uploads_endpoints = {
 		upload_url: '{{WEB_URL}}{% url upload %}',
 		done_url: '{{WEB_URL}}{% url upload_done uuid='00000000-0000-0000-0000-000000000000' %}',
-		username: '{{tmg_username}}',
-		api_key: '{{tmg_api_key}}',
     };
 	
 	$(function() {		
diff -r 06acfd436f25 -r 38afc7be4a88 src/ldt/ldt/ldt_utils/urls.py
diff -r 06acfd436f25 -r 38afc7be4a88 src/ldt/ldt/ldt_utils/views/content.py
--- a/src/ldt/ldt/ldt_utils/views/content.py	Thu Feb 14 16:12:31 2013 +0100
+++ b/src/ldt/ldt/ldt_utils/views/content.py	Thu Feb 14 16:26:20 2013 +0100
@@ -398,12 +398,10 @@
         group_list = group_list.exclude(name=settings.PUBLIC_GROUP_NAME)
         group_list = [{'name': u.name, 'id': u.id, 'type': 'group'} for u in group_list[0:settings.MAX_USERS_SEARCH]]
         elem_list = get_userlist(request.user) + group_list
-        tmg_username = settings.TMG_USERNAME
-        tmg_api_key = settings.TMG_API_KEY
         return render_to_response('ldt/ldt_utils/create_content.html', {'content_form': content_form, 'media_form': media_form, 'form_status': form_status, 'create_content_': create_content_action,
                                                                     'elem_list':elem_list, 'member_list': member_list, 'admin_list': admin_list,  'iri_id': iri_id, 'session_key':session_key,
                                                                     'cookie_name':cookie_name, 'img_container': img_container, 'profile_picture_form': picture_form,
-                                                                    'current_front_project':current_front_project, 'tmg_username':tmg_username, 'tmg_api_key':tmg_api_key}, context_instance=RequestContext(request))
+                                                                    'current_front_project':current_front_project}, context_instance=RequestContext(request))
 @login_required
 def prepare_delete_content(request, iri_id=None): 
     errors = []