Embed_player is now the same as Raphael's version
Correction of the error_confirm page in case of popup (for projects' popup)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/error_confirm_popup.html Thu Sep 27 11:35:06 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
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html Wed Sep 26 18:02:43 2012 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html Thu Sep 27 11:35:06 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">
@@ -63,13 +64,6 @@
type: "Segments",
annotation_type: ["chap","découpage"]
},{
- type: "Slice",
- start_visible : false,
- live_update : true
- },{
- type: "Arrow",
- base_height: 3
- },{
type: "Annotation",
start_minimized: true,
site_name : "Lignes de Temps",
@@ -85,7 +79,8 @@
close_after_send: false,
tag_titles: ["#amateur", "#digital-humanities"],
creator_name: '{{request.user.username}}',
- creator_avatar: '{% thumbnail request.user.get_profile.image "48x48" format="PNG" crop="center" as im %}{{WEB_URL}}{{ im.url }}{% endthumbnail %}' || "https://si0.twimg.com/sticky/default_profile_images/default_profile_1_normal.png"
+ creator_avatar: '{% thumbnail request.user.get_profile.image "48x48" format="PNG" crop="center" as im %}{{WEB_URL}}{{ im.url }}{% endthumbnail %}' || "https://si0.twimg.com/sticky/default_profile_images/default_profile_1_normal.png",
+ slice_annotation_type: ["chap","découpage"]
},{
type: "Slideshare",
container: "Slideshare_ext",
@@ -104,5 +99,6 @@
};
_myPlayer = new IriSP.Metadataplayer(_config);
-</script></div>
+</script>
+</div>
{% endspaceless %}
--- a/src/ldt/ldt/ldt_utils/views/project.py Wed Sep 26 18:02:43 2012 +0200
+++ b/src/ldt/ldt/ldt_utils/views/project.py Thu Sep 27 11:35:06 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()