# HG changeset patch
# User ndurand
# Date 1427217188 -3600
# Node ID 840fdb2306caf0e55e1b44b48f680571a956b527
# Parent  44949ddd7f785f5913492ba28ecd1dcba85068ad
Cleaned imports + fixed concatenate all content for div embed + separated widget config from other settings config + fixed un-selectionable text

diff -r 44949ddd7f78 -r 840fdb2306ca src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed/iframe_base.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed/iframe_base.html	Tue Mar 17 17:59:10 2015 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed/iframe_base.html	Tue Mar 24 18:13:08 2015 +0100
@@ -42,7 +42,7 @@
 			if (typeof jQuery == "undefined") {
 				jQuery = IriSP.jQuery;
 			}
-			var metadatas = {metadata: {url: '{{json_url}}'}};
+			var metadatas = {metadata: {url: "{{json_url}}"}};
 			var metadata_key = "metadata";
 			
 			IriSP.libFiles.defaultDir = '{% static "ldt/js/" %}';
@@ -62,7 +62,6 @@
 			{% endblock mdplayer_config %}
 			
 			_myPlayer = new IriSP.Metadataplayer(_config);
-			
 			</script>
 			</div>
 		</div>
diff -r 44949ddd7f78 -r 840fdb2306ca src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html	Tue Mar 17 17:59:10 2015 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html	Tue Mar 24 18:13:08 2015 +0100
@@ -25,6 +25,7 @@
         	var translate_hide="{% trans 'Hide Player' %}";
         	var LANGUAGE_CODE='{{LANGUAGE_CODE}}';
         	var json_url='{{json_url}}';
+        	var json_url_concatenate='{{json_url_concatenate}}';
         	var player_id='{{player_id}}';
         	var defaultDir='{% static "ldt/js/" %}';
         	var jwPlayerSWF='{% static "ldt/swf/player.swf" %}';
@@ -124,7 +125,7 @@
 								{% block embed_widget_config %}
 								{% endblock embed_widget_config %}
 							</div>
-					<textarea id="player_id_code" readonly="readonly" class="ldt_player_code" onClick="select_code();"></textarea>
+					<textarea id="player_id_code" readonly="readonly" class="ldt_player_code"></textarea>
 				</div>
 			</div>
             <a id="displayPlayer" href="javascript:toggle();">{% trans 'Show Player' %}</a>
diff -r 44949ddd7f78 -r 840fdb2306ca src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html	Tue Mar 17 17:59:10 2015 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html	Tue Mar 24 18:13:08 2015 +0100
@@ -17,9 +17,7 @@
 	{{ block.super }}
 {% endblock %}
 {% block embed_widget_config %}
-	<input type="checkbox" id="autostart_checkbox" value="autostart" onClick="put_new_code()">
-		<span class="infostooltip title" data-title="AutoStart" data-desc="{% trans 'The video starts automatically' %}">Autostart</span>	
-	</input><br>
+	<span class="OptionsSubtitle">{% trans 'Widgets' %}</span><br>
 	<div id="createannotation_block">
 		<input type="checkbox" id="createannotation_checkbox" value="createannotation" onClick="put_new_code(); display_createannotation();" > 
 			<span class="infostooltip title" data-title="createAnnotation" data-desc="{% trans 'Displays a form to create a new annotation' %}">CreateAnnotation</span>
@@ -127,8 +125,14 @@
 	</input><br>
 	<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><br>
-    <input type="checkbox" id="concatenate_projects_checkbox" value="concatenate_projects" onClick="put_new_code()" /><span>{% trans "Concatenate all projects using this content" %}</span><br/>
+	</input><br><br>	
+	<span class="OptionsSubtitle">{% trans 'Other settings' %}</span><br>
+	<input type="checkbox" id="autostart_checkbox" value="autostart" onClick="put_new_code()">
+		<span class="infostooltip title" data-title="AutoStart" data-desc="{% trans 'The video starts automatically' %}">Autostart</span>	
+	</input><br>
+    <input type="checkbox" id="concatenate_projects_checkbox" value="concatenate_projects" onClick="put_new_code()">
+    	<span>{% trans "Concatenate all projects using this content" %}</span>
+    </input>
 {% endblock %}
 {% block content %}
 	{{ block.super }}
diff -r 44949ddd7f78 -r 840fdb2306ca src/ldt/ldt/ldt_utils/views/embed/meta.py
--- a/src/ldt/ldt/ldt_utils/views/embed/meta.py	Tue Mar 17 17:59:10 2015 +0100
+++ b/src/ldt/ldt/ldt_utils/views/embed/meta.py	Tue Mar 24 18:13:08 2015 +0100
@@ -1,15 +1,22 @@
-from django.views.generic import View
+import logging
+
+from django.conf import settings
 from django.core.urlresolvers import reverse
-from django.http import (HttpResponseForbidden, HttpResponseNotFound, 
+from django.http import (HttpResponseForbidden, HttpResponseNotFound,
     HttpResponseRedirect)
 from django.shortcuts import render_to_response
 from django.template import RequestContext
 from django.template.loader import render_to_string
 from django.utils.html import escape
 from django.utils.translation import ugettext as _
+from django.views.generic import View
 
+from ldt.utils.web_url_management import get_web_url
 from utils import get_datas_for_embed
 
+
+logger = logging.getLogger(__name__)
+
 class ConfigView(View):
     """
         Meta class for generating metadataplayer config view. 
@@ -24,11 +31,15 @@
         player_id = request.GET.get("player_id")
         ldt_id = request.GET.get("ldt_id")
         rend_dict = get_datas_for_embed(request, json_url, player_id, ldt_id, self.iframe_base_url)
-        
         embed_rendered = dict((typestr,
                                (lambda s:escape(render_to_string("ldt/ldt_utils/partial/embed_%s.html" % (s), rend_dict, context_instance=RequestContext(request))))(typestr))
                                for typestr in ('seo_body', 'seo_meta', 'links'))
-    
+        json_url_concatenate = str(reverse("api_content_all_projects", kwargs={'api_name': '1.0', 'resource_name': 'contents', 'iri_id': rend_dict["content_id"]}))
+        # add filter
+        group_id = request.GET.get("group")
+        if group_id is not None :
+            json_url_concatenate += "?group=" + group_id
+        rend_dict["json_url_concatenate"] = json_url_concatenate
         rend_dict['embed_rendered'] = embed_rendered
         return render_to_response(self.template_name, rend_dict, context_instance=RequestContext(request))
     
@@ -69,7 +80,6 @@
             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"):
diff -r 44949ddd7f78 -r 840fdb2306ca src/ldt/ldt/ldt_utils/views/embed/utils.py
--- a/src/ldt/ldt/ldt_utils/views/embed/utils.py	Tue Mar 17 17:59:10 2015 +0100
+++ b/src/ldt/ldt/ldt_utils/views/embed/utils.py	Tue Mar 24 18:13:08 2015 +0100
@@ -38,7 +38,7 @@
         ps = ProjectJsonSerializer(project, from_contents=True, from_display=True)
         annotations = ps.get_annotations(first_cutting=True)
         rend_dict = {'project':project, 'contents':project_contents, 'json_url':json_url, 'player_id':player_id, 'annotations':annotations, 'ldt_id': ldt_id, 'stream_mode': stream_mode,  
-                    'external_url': external_url,
+                    'external_url': external_url, 'content_id': content.iri_id,
                      'polemic':False, 'show_mic_record':False, 'annotations_list':False, 'iframe_url':iframe_url, 'WEB_URL':WEB_URL,
                     'LANGUAGE_CODE':LANGUAGE_CODE}
         return rend_dict
\ No newline at end of file
diff -r 44949ddd7f78 -r 840fdb2306ca src/ldt/ldt/ldt_utils/views/embed/v1/urls.py
--- a/src/ldt/ldt/ldt_utils/views/embed/v1/urls.py	Tue Mar 17 17:59:10 2015 +0100
+++ b/src/ldt/ldt/ldt_utils/views/embed/v1/urls.py	Tue Mar 24 18:13:08 2015 +0100
@@ -1,6 +1,8 @@
 from django.conf.urls import patterns, url, include
+
 from views import ConfigViewV1, IframeViewV1
 
+
 urlpatterns = patterns('ldt.ldt_utils.views.embed.v1',
     url(r'^config/?$', ConfigViewV1.as_view()),
     url(r'^iframe/?$', IframeViewV1.as_view())
diff -r 44949ddd7f78 -r 840fdb2306ca src/ldt/ldt/ldt_utils/views/embed/v1/views.py
--- a/src/ldt/ldt/ldt_utils/views/embed/v1/views.py	Tue Mar 17 17:59:10 2015 +0100
+++ b/src/ldt/ldt/ldt_utils/views/embed/v1/views.py	Tue Mar 24 18:13:08 2015 +0100
@@ -1,6 +1,8 @@
 from django.core.urlresolvers import reverse_lazy
+
 from ldt.ldt_utils.views.embed.meta import ConfigView, IframeView
 
+
 class ConfigViewV1(ConfigView):
     template_name = "ldt/ldt_utils/embed/v1/mdplayer_config.html"
     iframe_base_url = reverse_lazy("embed_iframe_v1", urlconf="ldtplatform.urls")
diff -r 44949ddd7f78 -r 840fdb2306ca src/ldt/ldt/ldt_utils/views/embed/v2/urls.py
--- a/src/ldt/ldt/ldt_utils/views/embed/v2/urls.py	Tue Mar 17 17:59:10 2015 +0100
+++ b/src/ldt/ldt/ldt_utils/views/embed/v2/urls.py	Tue Mar 24 18:13:08 2015 +0100
@@ -1,6 +1,8 @@
 from django.conf.urls import patterns, url, include
+
 from views import ConfigViewV2, IframeViewV2
 
+
 urlpatterns = patterns('ldt.ldt_utils.views.embed.v2',
     url(r'^config/?$', ConfigViewV2.as_view(), name="embed_config_v2"),
     url(r'^iframe/?$', IframeViewV2.as_view(), name="embed_iframe_v2")
diff -r 44949ddd7f78 -r 840fdb2306ca src/ldt/ldt/ldt_utils/views/embed/v2/views.py
--- a/src/ldt/ldt/ldt_utils/views/embed/v2/views.py	Tue Mar 17 17:59:10 2015 +0100
+++ b/src/ldt/ldt/ldt_utils/views/embed/v2/views.py	Tue Mar 24 18:13:08 2015 +0100
@@ -1,15 +1,21 @@
-from django.views.generic import View
-from django.http import (HttpResponseForbidden, HttpResponseNotFound, 
+import logging
+
+from django.core.urlresolvers import reverse_lazy, reverse
+from django.http import (HttpResponseForbidden, HttpResponseNotFound,
     HttpResponseRedirect)
 from django.shortcuts import render_to_response
 from django.template import RequestContext
 from django.template.loader import render_to_string
 from django.utils.html import escape
 from django.utils.translation import ugettext as _
-from django.core.urlresolvers import reverse_lazy, reverse
+from django.views.generic import View
 
 from ldt.ldt_utils.views.embed.meta import ConfigView, IframeView
 from ldt.ldt_utils.views.embed.utils import get_datas_for_embed
+from ldt.utils.web_url_management import get_web_url
+
+
+logger = logging.getLogger(__name__)
 
 class ConfigViewV2(ConfigView):
     template_name = "ldt/ldt_utils/embed/v2/mdplayer_config.html"
@@ -46,7 +52,8 @@
             if group_id is not None :
                 json_url += "?group=" + group_id
             rend_dict["json_url"] = json_url
-            
+        
+        logger.debug("json_url for iframe is "+json_url)
         
         # Manage iframe options
         if request.GET.has_key("player_height"):
diff -r 44949ddd7f78 -r 840fdb2306ca src/ldt/ldt/ldt_utils/views/workspace.py
--- a/src/ldt/ldt/ldt_utils/views/workspace.py	Tue Mar 17 17:59:10 2015 +0100
+++ b/src/ldt/ldt/ldt_utils/views/workspace.py	Tue Mar 24 18:13:08 2015 +0100
@@ -1,14 +1,15 @@
 import base64
 from itertools import groupby
+import lxml.etree
 from operator import itemgetter
 
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import Group
 from django.core.paginator import Paginator, InvalidPage, EmptyPage
-from django.core.urlresolvers import reverse #, resolve
+from django.core.urlresolvers import reverse  # , resolve
 from django.db import transaction
-from django.http import (HttpResponseForbidden, HttpResponseNotFound, 
+from django.http import (HttpResponseForbidden, HttpResponseNotFound,
     HttpResponseRedirect)
 from django.shortcuts import render_to_response
 from django.template import RequestContext
@@ -16,7 +17,6 @@
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext as _
-import lxml.etree
 
 import ldt.auth as ldt_auth
 from ldt.indexation import get_results_with_context, highlight_documents
@@ -26,7 +26,7 @@
 from ldt.ldt_utils.projectserializer import ProjectJsonSerializer
 from ldt.ldt_utils.utils import boolean_convert
 from ldt.ldt_utils.views.content import get_contents_page
-from ldt.ldt_utils.views.project import (get_projects_page, 
+from ldt.ldt_utils.views.project import (get_projects_page,
     get_published_projects_page)
 from ldt.security.utils import add_change_attr, get_userlist
 from ldt.utils.url import static, absurl
diff -r 44949ddd7f78 -r 840fdb2306ca src/ldt/ldt/static/ldt/css/embed_popup.css
--- a/src/ldt/ldt/static/ldt/css/embed_popup.css	Tue Mar 17 17:59:10 2015 +0100
+++ b/src/ldt/ldt/static/ldt/css/embed_popup.css	Tue Mar 24 18:13:08 2015 +0100
@@ -181,6 +181,12 @@
     top: 10px;
 	vertical-align: top;
 }
+
+.OptionsSubtitle{
+	margin-left: 6px;
+	font-weight: bold;
+}
+
 .embedPersonnalisation{
 	margin-left: 21px;
 }
diff -r 44949ddd7f78 -r 840fdb2306ca src/ldt/ldt/static/ldt/js/embed/v2/embed.js
--- a/src/ldt/ldt/static/ldt/js/embed/v2/embed.js	Tue Mar 17 17:59:10 2015 +0100
+++ b/src/ldt/ldt/static/ldt/js/embed/v2/embed.js	Tue Mar 24 18:13:08 2015 +0100
@@ -143,12 +143,15 @@
  
 }
 
-function select_code(){
-	$j("#player_id_code").select();
-}
-
 function generate_base_embed_code(){
+	var concatenate_projects_val = document.getElementById("concatenate_projects_checkbox");
 	var player_width_val=$j("#player_width").val();
+	if (concatenate_projects_val.checked){
+		json_url_embed=json_url_concatenate;
+	}
+	else {
+		json_url_embed=json_url;
+	}
 	base='\
 <div> \n \
 		<div id="'+player_id+'_embed" style="float:left; width:'+player_width_val+';" class="iri_player_embed">\n\
@@ -158,18 +161,18 @@
 	if (typeof jQuery == "undefined") {\n\
 		jQuery = IriSP.jQuery;\n\
 	}\n\
-	var metadatas = {metadata: {url: "'+json_url+'"}};\n\
+	var metadatas = {metadata: {url: "'+json_url_embed+'"}};\n\
 	var metadata_key = "metadata";\n\
 	IriSP.libFiles.defaultDir = "'+defaultDir+'";\n\
 	IriSP.libFiles.locations.jwPlayerSWF = "'+jwPlayerSWF+'";\n\
 	IriSP.libFiles.locations.recordMicSwf = "'+recordMicSwf+'";\n\
 	IriSP.libFiles.locations.zeroClipboardSwf = "'+zeroClipboardSwf+'";\n\
-	IriSP.libFiles.locations.cssjQueryUI = "'+cssjQueryUI+'"\n\
+	IriSP.libFiles.locations.cssjQueryUI = "'+cssjQueryUI+'";\n\
 	IriSP.language = "'+LANGUAGE_CODE+'";\n\
 \n\
 	IriSP.widgetsDir = "'+widgetsDir+'";\n\
 	var _metadata = {\n\
-    	url: metadatas[metadata_key].url + "?callback=?",\n\
+    	url: metadatas[metadata_key].url,\n\
     	format: "ldt"\n\
 	};\n\
 	var _config = {\n\
@@ -648,7 +651,7 @@
 	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;
+	iframeUrl=iframe_url;
 	
 	if($j("#player_height").val()!=300)
 		iframeUrl+="&player_height="+$j("#player_height").val();