--- a/src/ldt/ldt/__init__.py Thu May 15 12:23:19 2014 +0200
+++ b/src/ldt/ldt/__init__.py Tue May 27 17:28:39 2014 +0200
@@ -1,6 +1,6 @@
__all__ = ["VERSION", "get_version", "__version__"]
-VERSION = (1, 53, 6, "final", 0)
+VERSION = (1, 53, 7, "final", 0)
def get_version():
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_iframe.html Thu May 15 12:23:19 2014 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_iframe.html Tue May 27 17:28:39 2014 +0200
@@ -42,8 +42,8 @@
if (typeof jQuery == "undefined") {
jQuery = IriSP.jQuery;
}
- var metadatas = {metadata: {url: '{{json_url}}'}};
- var metadata_key = "metadata";
+ var metadatas = {metadata: {url: '{{json_url}}'}};
+ var metadata_key = "metadata";
IriSP.libFiles.defaultDir = '{% static "ldt/js/" %}';
IriSP.libFiles.locations.jwPlayerSWF = '{% static "ldt/swf/player.swf" %}';
@@ -54,7 +54,7 @@
IriSP.widgetsDir = '{% static "ldt/metadataplayer" %}';
var _metadata = {
- url: metadatas[metadata_key].url + '?callback=?',
+ url: metadatas[metadata_key].url,
format: 'ldt'
};
var _config = {
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_popup.html Thu May 15 12:23:19 2014 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_popup.html Tue May 27 17:28:39 2014 +0200
@@ -228,6 +228,7 @@
<input type="checkbox" id="tagcloud_checkbox" value="tagcloud" onClick="put_new_code()">
<span class="infostooltip title" data-title="Tagcloud" data-desc="{% trans 'Shows a tag cloud' %}">Tagcloud</span>
</input><br>
+ <input type="checkbox" id="concatenate_projects_checkbox" value="concatenate_projects" onClick="put_new_code()" /><span>{% trans "All the content's projects concatenated" %}</span><br/>
</div>
<textarea id="player_id_code" readonly="readonly" class="ldt_player_code" onClick="select_code();"></textarea>
</div>
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html Thu May 15 12:23:19 2014 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html Tue May 27 17:28:39 2014 +0200
@@ -12,8 +12,8 @@
if (typeof jQuery == "undefined") {
jQuery = IriSP.jQuery;
}
- var metadatas = {metadata: {url: '{{json_url}}'}};
- var metadata_key = "metadata";
+var metadatas = {metadata: {url: '{{json_url}}'}};
+var metadata_key = "metadata";
IriSP.libFiles.defaultDir = '{% static "ldt/js/" %}';
IriSP.libFiles.locations.jwPlayerSWF = '{% static "ldt/swf/player.swf" %}';
--- a/src/ldt/ldt/ldt_utils/views/workspace.py Thu May 15 12:23:19 2014 +0200
+++ b/src/ldt/ldt/ldt_utils/views/workspace.py Tue May 27 17:28:39 2014 +0200
@@ -109,9 +109,9 @@
def iframe_embed(request):
+ content_id = request.GET.get("content_id")
project_id = request.GET.get("project_id")
if not project_id:
- content_id = request.GET.get("content_id")
try:
content = Content.safe_objects.get(iri_id=content_id)
except:
@@ -126,6 +126,17 @@
ldt_id = project_id
rend_dict = get_datas_for_embed(request, json_url, player_id, ldt_id)
+ # Test if concatenated projects has been asked
+ concatenate_projects = {'true': True, 'false': False, "0": False, "1": True}.get(request.GET.get("concatenate_projects", "").lower())
+ if concatenate_projects:
+ json_url = reverse("api_content_all_projects", kwargs={'api_name': '1.0', 'resource_name': 'contents', 'iri_id': content_id})
+ # add filter
+ group_id = request.GET.get("group")
+ if group_id is not None :
+ json_url += "?group=" + group_id
+ rend_dict["json_url"] = json_url
+
+
# Manage iframe options
if request.GET.has_key("player_height"):
rend_dict["player_height"]=request.GET.get("player_height")
--- a/src/ldt/ldt/static/ldt/js/embed_popup.js Thu May 15 12:23:19 2014 +0200
+++ b/src/ldt/ldt/static/ldt/js/embed_popup.js Tue May 27 17:28:39 2014 +0200
@@ -631,6 +631,7 @@
var sparkline_val=document.getElementById('sparkline_checkbox');
var tagcloud_val=document.getElementById('tagcloud_checkbox');
var createannotation_polemics_val=document.getElementById('createannotation_polemics_checkbox');
+ var concatenate_projects_val=document.getElementById('concatenate_projects_checkbox');
iframeUrl= iframe_url;
if($j("#player_height").val()!=300)
@@ -749,6 +750,9 @@
if(tagcloud_val.checked){
iframeUrl+="&tagcloud=True";
}
+ if(concatenate_projects_val.checked){
+ iframeUrl+="&concatenate_projects=True";
+ }
return iframeUrl;
}