# HG changeset patch
# User cavaliet
# Date 1348828590 -7200
# Node ID d764536e8eebce1eb60c8e650c47f1d660892983
# Parent  e7546394653c0f048b5f22995d5d0afdd3f30fcc# Parent  6957287fbde75845b37550e880f96d0316f19bcc
Merge with 6957287fbde75845b37550e880f96d0316f19bcc

diff -r e7546394653c -r d764536e8eeb src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/error_confirm_popup.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/error_confirm_popup.html	Fri Sep 28 12:36:30 2012 +0200
@@ -0,0 +1,61 @@
+{% extends "ldt/ldt_raw_base.html" %}
+
+{% load i18n %} {# form of creation of content #}
+
+{% block js_import %}
+	{{ block.super }}
+    <script type="text/javascript" src="{% url ldt.jsi18n packages='ldt' %}" ></script>	
+    <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/projectscontents.js"></script>
+{% endblock %}
+
+{% block css_import %}
+	{{ block.super }}
+	{{ content_form.media.css }}
+	<link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/ldt.css" />
+	<link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/ldtform.css" />
+{% endblock %}
+
+
+{% block js_declaration %}
+	<script type="text/javascript">
+	$(document).ready(function() {
+		resize_modal_window("#error", false);
+
+		$("#close_button").click(function(e) {
+			parent.$.nmTop().close();
+		});
+	});
+	</script>
+{% endblock %}
+
+{% block body %}
+	
+<div id="error">
+<div class="projectscontentstitle">{% if errors|length > 0 %}{% trans "error" %}{% else %}{% trans "confirm" %}{% endif %}</div>
+<div class="error_message">
+	{{ message }}
+		{% if errors|length > 0 %}
+		<ul>
+		{% for error_msg in errors %}
+			<li>{{ error_msg }}</li>	
+		{% endfor %}
+		</ul>
+	{% endif %}
+</div>
+
+<div id="submitcontent" >
+	<div id="submitcontent-buttons" >
+	{% if errors|length > 0 %}
+		<button id="close_button"  value="close">{% trans 'close_error' %}</button> 
+	{% else %}
+		<form method="post" enctype="application/x-www-form-urlencoded" action="{{ delete_action }}">
+			{% csrf_token %}
+			<button id="close_button"  value="close">{% trans 'close_cancel' %}</button>
+			<button type="submit" value="delete" name="submit_button" id="submit_button">{% trans "do_delete" %}</button>
+		</form>
+	{% endif %}
+	</div>
+</div>
+
+</div>	
+{% endblock %}
\ No newline at end of file
diff -r e7546394653c -r d764536e8eeb src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html	Fri Sep 28 12:20:10 2012 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html	Fri Sep 28 12:36:30 2012 +0200
@@ -2,7 +2,8 @@
 {% load i18n %}
 {% load thumbnail %}
 <div>
-<div id="{{ player_id }}_embed" class="iri_player_embed"></div>
+<div id="{{ player_id }}_embed" class="iri_player_embed">
+</div>
 <script type="text/javascript" src="{{WEB_URL}}{{LDT_MEDIA_PREFIX}}metadataplayer/LdtPlayer-core.js"></script>
 <script type="text/javascript">
   
@@ -100,5 +101,6 @@
 };
 
 _myPlayer = new IriSP.Metadataplayer(_config);
-</script></div>
+</script>
+</div>
 {% endspaceless %}
diff -r e7546394653c -r d764536e8eeb src/ldt/ldt/ldt_utils/views/content.py
--- a/src/ldt/ldt/ldt_utils/views/content.py	Fri Sep 28 12:20:10 2012 +0200
+++ b/src/ldt/ldt/ldt_utils/views/content.py	Fri Sep 28 12:36:30 2012 +0200
@@ -317,7 +317,10 @@
         if iri_id:
             content_temp = Content.objects.get(iri_id=iri_id)
             media_temp = content_temp.media_obj
-            member_list, admin_list = get_userlist_model(media_temp, request.user)
+            if media_temp:
+                member_list, admin_list = get_userlist_model(media_temp, request.user)
+            else:
+                member_list, admin_list = get_userlist_model(content_temp, request.user)
     if iri_id:
         create_content_action = reverse('ldt.ldt_utils.views.content.write_content', kwargs={'iri_id':iri_id})
         img_container = content_form.instance
diff -r e7546394653c -r d764536e8eeb src/ldt/ldt/ldt_utils/views/project.py
--- a/src/ldt/ldt/ldt_utils/views/project.py	Fri Sep 28 12:20:10 2012 +0200
+++ b/src/ldt/ldt/ldt_utils/views/project.py	Fri Sep 28 12:36:30 2012 +0200
@@ -124,7 +124,7 @@
             else:
                 message = _("please confirm deleting project %(title)s") % {'title':project.title}
                 title = _("confirm deletion")
-            return render_to_response('ldt/ldt_utils/error_confirm.html', {'errors':errors, 'message':message, 'title': title}, context_instance=RequestContext(request))
+            return render_to_response('ldt/ldt_utils/error_confirm_popup.html', {'errors':errors, 'message':message, 'title': title}, context_instance=RequestContext(request))
         elif submit_action == "delete":
             if project.state != 2:
                 project.delete()