# HG changeset patch # User grandjoncl # Date 1352195571 -3600 # Node ID f5fe14b94ef5dc72d7d84c7fc4f5b592fe338863 # Parent 1b2ea7f6cda0f6a2ef383f2e81dfaeb4da3d78ae amelioration iframe embed diff -r 1b2ea7f6cda0 -r f5fe14b94ef5 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_iframe.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_iframe.html Tue Nov 06 10:12:47 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_iframe.html Tue Nov 06 10:52:51 2012 +0100 @@ -99,7 +99,7 @@ annotation_type: ["chap","découpage"] } {% endif %} - {% if annotation%},{ + {% if annotation %},{ type: "Annotation", start_minimized: true, site_name : "Lignes de Temps", diff -r 1b2ea7f6cda0 -r f5fe14b94ef5 src/ldt/ldt/ldt_utils/views/workspace.py --- a/src/ldt/ldt/ldt_utils/views/workspace.py Tue Nov 06 10:12:47 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/views/workspace.py Tue Nov 06 10:52:51 2012 +0100 @@ -141,21 +141,21 @@ rend_dict["annotations_list"] = {'true': True, 'false': False, "0": False, "1": True}.get(request.GET.get("annotations_list").lower()) rend_dict["player_width"] = 550 if request.GET.has_key("createannotation"): - rend_dict["createannotation"] = request.GET.get("createannotation") + rend_dict["createannotation"] = {'true': True, 'false': False, "0": False, "1": True}.get(request.GET.get("createannotation").lower()) if request.GET.has_key("sparkline"): - rend_dict["sparkline"] = request.GET.get("sparkline") + rend_dict["sparkline"] = {'true': True, 'false': False, "0": False, "1": True}.get(request.GET.get("sparkline").lower()) if request.GET.has_key("slideshare"): - rend_dict["slideshare"] = request.GET.get("slideshare") + rend_dict["slideshare"] = {'true': True, 'false': False, "0": False, "1": True}.get(request.GET.get("slideshare").lower()) if request.GET.has_key("social"): - rend_dict["social"] = request.GET.get("social") + rend_dict["social"] = {'true': True, 'false': False, "0": False, "1": True}.get(request.GET.get("social").lower()) if request.GET.has_key("annotation"): - rend_dict["annotation"] = request.GET.get("annotation") + rend_dict["annotation"] = {'true': True, 'false': False, "0": False, "1": True}.get(request.GET.get("annotation").lower()) if request.GET.has_key("tweet"): - rend_dict["tweet"] = request.GET.get("tweet") + rend_dict["tweet"] ={'true': True, 'false': False, "0": False, "1": True}.get(request.GET.get("tweet").lower()) if request.GET.has_key("segments"): - rend_dict["segments"] = request.GET.get("segments") + rend_dict["segments"] = {'true': True, 'false': False, "0": False, "1": True}.get(request.GET.get("segments").lower()) if request.GET.has_key("tagcloud"): - rend_dict["tagcloud"] = request.GET.get("tagcloud") + rend_dict["tagcloud"] = {'true': True, 'false': False, "0": False, "1": True}.get(request.GET.get("tagcloud").lower()) return render_to_response("ldt/ldt_utils/embed_iframe.html", rend_dict, context_instance=RequestContext(request))