# HG changeset patch # User grandjoncl # Date 1352193167 -3600 # Node ID 1b2ea7f6cda0f6a2ef383f2e81dfaeb4da3d78ae # Parent 9eae65727f546ea101539f39361fce894da0b791 Starting 'embed_config' branch diff -r 9eae65727f54 -r 1b2ea7f6cda0 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 Mon Oct 29 12:04:20 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_iframe.html Tue Nov 06 10:12:47 2012 +0100 @@ -1,4 +1,5 @@ {% load i18n %} +{% load thumbnail %} {% load analytics %}
- {% include "ldt/ldt_utils/partial/embed_player.html" %} + +
+
+ + +
+ {% if social %} +
+
+ {% endif %} + {% if slideshare %} +
+
+ {% endif %} {% if annotations_list %}
{% endif %} + {% analytics %} diff -r 9eae65727f54 -r 1b2ea7f6cda0 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_popup.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_popup.html Mon Oct 29 12:04:20 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_popup.html Tue Nov 06 10:12:47 2012 +0100 @@ -1,77 +1,176 @@ +{% extends "ldt/ldt_utils/workspace_base.html" %} {% load i18n %} {% load analytics %} - - - - - - - - - - Ligne de Temps - IRI + {% block js_import %} + {{ block.super }} + + {{ content_form.media.js }} + {% endblock %} + + {% block js_declaration %} - + {% endblock %} + {% block css_import %} + {{ block.super }} + {{ content_form.media.css }} + + + + + {% endblock %} - - - - - - - - - + {% block content %}
{% trans 'project id' %} ({% trans 'Select' %}) :
- {% trans 'Show Player' %} +
- +
- -
-

- -
-

{% trans 'Integration mode' %} - {% trans 'div' %} - {% trans 'iframe' %}
-

- -
-
-
-
-
- -
+
+
+
+

{% trans 'Integration mode' %} + {% trans 'div' %} + {% trans 'iframe' %}
+
+ + + + Modes predefinis +
+
+ mode 1.1
+ mode 2.1
+ mode 3.1
+
+
+
+ mode 1
+ mode 2
+ mode 3
+
+
+ + + + Personnaliser votre configuration +
+
+
+ Create Annotation
+
+ Segments
+ Annotationslist
+ Slideshare
+ Social
+
+ Url + Twitter + Facebook + Google Plus + Partager par email
+
+ Annotation
+ Tweet
+ Sparkline
+ + Personnaliser les couleurs de la courbe + +
+
+ Couleur de la courbe : + + + + + + +
+ +
+ Couleur sous la courbe : + + + + + + +
+
+
+ Tagcloud
+
+
+ Polemic
+ + Personnaliser les couleurs des tweets + +
+
+ Couleur par default : + + + + + + +
+
+ Couleur des tweets trouves : + + + + + + +
+
+ +
+
+ +
+
+
+ +
+ +
+ {% endblock %} {% analytics %} - - + diff -r 9eae65727f54 -r 1b2ea7f6cda0 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 Mon Oct 29 12:04:20 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html Tue Nov 06 10:12:47 2012 +0100 @@ -87,7 +87,7 @@ },{ type: "Tweet", hide_timeout: 5000 - },{% if annotation_block %}{ + },{ type: "CreateAnnotation", api_endpoint_template: "{{WEB_URL}}{% url api_dispatch_list resource_name='annotations' api_name='1.0' %}", api_method: "PUT", @@ -97,7 +97,7 @@ slice_annotation_type: ["chap","découpage"], 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" - },{% endif %}{ + },{ type: "Slideshare", container: "Slideshare_ext", embed_width: 400, diff -r 9eae65727f54 -r 1b2ea7f6cda0 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html Mon Oct 29 12:04:20 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html Tue Nov 06 10:12:47 2012 +0100 @@ -38,7 +38,11 @@ {% endif %}
{% trans 'copy project' %}
-
{% trans 'link json by id' %}
+
+ + {% trans 'link json by id' %}
+ + {% ifequal project.state 2 %} {% trans 'Project published, click to unpublish' %}
diff -r 9eae65727f54 -r 1b2ea7f6cda0 src/ldt/ldt/ldt_utils/views/workspace.py --- a/src/ldt/ldt/ldt_utils/views/workspace.py Mon Oct 29 12:04:20 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/views/workspace.py Tue Nov 06 10:12:47 2012 +0100 @@ -105,8 +105,9 @@ 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 ('player', 'seo_body', 'seo_meta', 'links')) + for typestr in ('seo_body', 'seo_meta', 'links')) rend_dict['embed_rendered'] = embed_rendered + return render_to_response("ldt/ldt_utils/embed_popup.html", rend_dict, context_instance=RequestContext(request)) @@ -132,15 +133,29 @@ # Manage iframe options if request.GET.has_key("polemic"): rend_dict["polemic"] = request.GET.get("polemic") + rend_dict["polemic_defaultColor"] = request.GET.get("polemic_defaultColor") + rend_dict["polemic_foundColor"] = request.GET.get("polemic_foundColor") if request.GET.has_key("show_mic_record"): rend_dict["show_mic_record"] = {'true': True, 'false': False, "0": False, "1": True}.get(request.GET.get("show_mic_record").lower()) if request.GET.has_key("annotations_list"): rend_dict["annotations_list"] = {'true': True, 'false': False, "0": False, "1": True}.get(request.GET.get("annotations_list").lower()) rend_dict["player_width"] = 550 - - rend_dict["annotation_block"]= True - - + if request.GET.has_key("createannotation"): + rend_dict["createannotation"] = request.GET.get("createannotation") + if request.GET.has_key("sparkline"): + rend_dict["sparkline"] = request.GET.get("sparkline") + if request.GET.has_key("slideshare"): + rend_dict["slideshare"] = request.GET.get("slideshare") + if request.GET.has_key("social"): + rend_dict["social"] = request.GET.get("social") + if request.GET.has_key("annotation"): + rend_dict["annotation"] = request.GET.get("annotation") + if request.GET.has_key("tweet"): + rend_dict["tweet"] = request.GET.get("tweet") + if request.GET.has_key("segments"): + rend_dict["segments"] = request.GET.get("segments") + if request.GET.has_key("tagcloud"): + rend_dict["tagcloud"] = request.GET.get("tagcloud") return render_to_response("ldt/ldt_utils/embed_iframe.html", rend_dict, context_instance=RequestContext(request)) @@ -161,20 +176,23 @@ if stream_mode != "video": stream_mode = 'radio' - player_width = 650 - player_height = 480 + player_width = 550 + player_height = 380 if stream_mode == 'radio': player_height = 1 if not ldt_auth.check_access(request.user, project): return HttpResponseForbidden(_("You can not access this project")) - + WEB_URL=settings.WEB_URL + LDT_MEDIA_PREFIX=settings.LDT_MEDIA_PREFIX + LANGUAGE_CODE=settings.LANGUAGE_CODE ps = ProjectSerializer(project, from_contents=True, from_display=True) annotations = ps.get_annotations(first_cutting=True) rend_dict = {'json_url':json_url, 'player_id':player_id, 'annotations':annotations, 'ldt_id': ldt_id, 'stream_mode': stream_mode, 'player_width': player_width, 'player_height': player_height, 'external_url': external_url, - 'polemic':False, 'show_mic_record':False, 'annotations_list':False, 'iframe_url':iframe_url} + 'polemic':False, 'show_mic_record':False, 'annotations_list':False, 'iframe_url':iframe_url, 'WEB_URL':WEB_URL, + 'LDT_MEDIA_PREFIX':LDT_MEDIA_PREFIX, 'LANGUAGE_CODE':LANGUAGE_CODE} return rend_dict diff -r 9eae65727f54 -r 1b2ea7f6cda0 src/ldt/ldt/static/ldt/css/embed_popup.css --- a/src/ldt/ldt/static/ldt/css/embed_popup.css Mon Oct 29 12:04:20 2012 +0100 +++ b/src/ldt/ldt/static/ldt/css/embed_popup.css Tue Nov 06 10:12:47 2012 +0100 @@ -6,12 +6,17 @@ word-wrap: break-word; /* Internet Explorer 5.5+ */ } + input { background: #ededed; } - -input[type="button"] { +.embed_checkbox{ + text-indent:25px; + +} +.code_button +{ background-color: #656565; color: white; width: auto; @@ -19,6 +24,93 @@ padding: 5px 10px; } +.color_text{ + width: 46px; + text-align: center; + color: #949494; + font-size: 12px; + padding: 3px; +} + +.color_block { + border: 1px solid; + display: inline-block; + height: 13px; + padding: 0; + vertical-align: -2px; + width: 13px; + margin-right: 7px; +} + +.color_block.grey{ + background-color: #585858; + border-color: #323232; +} + +.color_block.purple { + background-color: #fc00ff; + border-color: #97009a; +} + + +.color_block.orange { + background-color: #FF9933; + border-color: #CC6600; +} + + +.color_block.lime { + background-color: #C9FF23; + border-color: #8EBC00; + +} + +.color_block.fuschia { + background-color: #FF0179; + border-color: #9A0049; + +} + +.color_block.white { + background-color: #FFFFFF; + border-color: #CCCCCC; +} + +.color_block.blue_grey{ + background-color: #7492b4; + border-color: #4d6c8f; +} + +.color_block.black{ + background-color: #050505; + border-color: #515151; +} + +.color_block.light_grey{ + background-color: #aeaeb8; + border-color: #858594; +} + +.color_block.brown_orange{ + background-color: #ebc8a3; + border-color: #FF9933; +} + +.color_block.pastel_green{ + background-color: #daf4af; + border-color: #a1d600; +} + +.color_block.pastel_fushia{ + background-color: #da7ba7; + border-color: #a72f66; +} + +.color_block.dark_lime{ + background-color: #a1d600; + border-color: #678a00; +} + #button_row input { margin: 10px; } @@ -80,11 +172,83 @@ margin-bottom: 5px; } -#embed_options { +.configuration { + color: #949494; + font-family: Arial, Helvetica, sans serif; + font-weight: lighter; + font-style: normal; + font-size: 12px; + text-align: left; +} + +#embed_options .title { + font-weight: bold; + margin-right: 9px; +} + +.OptionsEmbedDisplay { + color: #949494; + font-family: Arial, Helvetica, sans serif; + font-weight: lighter; + font-style: normal; + font-size: 12px; + text-align: left; + cursor: pointer; + font-weight: bold; + margin-right: 9px; + text-decoration: none; + line-height: 12px; + top: 10px; + vertical-align: top; + +} + +.AdvancedOptionsDisplay{ color: #949494; font-family: Arial, Helvetica, sans serif; font-weight: lighter; font-style: normal; font-size: 12px; text-align: left; -} \ No newline at end of file + cursor: pointer; + margin-right: 9px; + text-decoration: none; + line-height: 12px; + top: 10px; + vertical-align: top; +} +.embedPersonnalisation{ + margin-left: 21px; +} + +.expArrow { + width:0px; + height:0px; + border-bottom:6px solid transparent; /* left arrow slant */ + border-top:6px solid transparent; /* right arrow slant */ + border-left:6px solid #949494; /* bottom, add background color here */ + font-size:0px; + line-height:12px; + margin-right: 8px; + position: relative; + top: 0px; + vertical-align: top; + display: inline-block; + +} + +.collArrow { + width:0px; + height:0px; + border-left:6px solid transparent; + border-right:6px solid transparent; + border-top:6px solid #949494; + font-size:0px; + line-height:12px; + margin-right: 8px; + position: relative; + top: 5px; + vertical-align: top; + display: inline-block; +} + diff -r 9eae65727f54 -r 1b2ea7f6cda0 src/ldt/ldt/static/ldt/js/embed_popup.js --- a/src/ldt/ldt/static/ldt/js/embed_popup.js Mon Oct 29 12:04:20 2012 +0100 +++ b/src/ldt/ldt/static/ldt/js/embed_popup.js Tue Nov 06 10:12:47 2012 +0100 @@ -14,10 +14,27 @@ } function init_events(){ - toggle_display(); + mode1(); + $j("#iframe_premode").toggle(false); + $j("#div_premode").toggle(false); + $j("#embed_personnalisation").toggle(false); + $j("#optionsExpArrow").toggle(true); + $j("#optionsCollArrow").toggle(false); + $j("#preModeExpArrow").toggle(true); + $j("#preModeCollArrow").toggle(false); + $j("#createannotation_block").toggle(false); $j("#player_id_code").focus(); $j("#player_id_code").select(); + $j("#polemic_options").toggle(false); + $j("#sparkline_options").toggle(false); + $j("#social_options").toggle(false); + $j("#displayPolemicOptions").toggle(false); + $j("#displaySparklineOptions").toggle(false); + $j("#polemic_default_color").val("#585858"); + $j("#polemic_found_color").val("#fc00ff"); + $j("#sparkline_line_color").val("#7492b4"); + $j("#sparkline_fill_color").val("#aeaeb8"); $j("#project_id_select").click(function(){ $j("#project_id_input").focus(); @@ -61,19 +78,329 @@ $j("#seo_body_button").click(function(){ $j("#seo_body_id_code").focus(); $j("#seo_body_id_code").select(); + }); $j("#seo_meta_button").click(function(){ $j("#seo_meta_id_code").focus(); $j("#seo_meta_id_code").select(); - }); + }); $j('#links_button').click(function() { var range = document.createRange(); range.selectNode(document.getElementById('links_code')); window.getSelection().addRange(range); }); + + $j('#displayPreMode').click(function(){ + var type_embed=document.getElementById("type_embed_div"); + if(type_embed.checked){ + $j("#div_premode").slideToggle("fast"); + + } + else{ + $j("#iframe_premode").slideToggle("fast"); + } + $j("#preModeExpArrow").toggle(); + $j("#preModeCollArrow").toggle(); + + }); + + $j("#displayEmbedOptions").click(function(){ + $j("#embed_personnalisation").slideToggle("fast"); + $j("#optionsExpArrow").toggle(); + $j("#optionsCollArrow").toggle(); + + }); + + $j("#displayPolemicOptions").click(function(){ + $j("#polemic_options").slideToggle("fast"); + }); + $j("#displaySparklineOptions").click(function(){ + $j("#sparkline_options").slideToggle("fast"); + }); +} + +function generate_base_embed_code(){ + base='\ +
\n \ +
\n\ +
\n\ +\n\ +\n'; + if(social_val.checked){ + code+='\ +
\n\ +
\n'; + } + if(slideshare_val.checked){ + code+='\ +
\n\ +
\n'; + } + + if(annotationslist_val.checked){ + code+='\ +
\n'; + } + + code+='\ +
\n'; + return code; +} + +function put_new_code(){ + var type_embed=document.getElementById("type_embed_div"); + wrapper = "wrapper_"+player_id; + wrapper_id = "#"+wrapper; + var element = document.getElementById(wrapper); + var code_embed=document.getElementById("player_id_code"); + if(type_embed.checked){ + var new_code=generate_div_code(); + if(element.style.display=="block"){ + $j(wrapper_id).html(new_code); + } + + } + else{ + var new_code=generate_iframe_code(); + if(element.style.display=="block"){ + display_iframe_player(); + } + } + code_embed.value= new_code; + $j("#player_id_code").focus(); + $j("#player_id_code").select(); +} + +function div_event(){ + $j("#iframe_premode").toggle(false); + $j("#div_premode").toggle(false); + $j("#preModeExpArrow").toggle(true); + $j("#preModeCollArrow").toggle(false); + $j("#createannotation_block").toggle(false); + put_new_code(); } function toggle() { @@ -84,33 +411,11 @@ var type_embed=document.getElementById("type_embed_div"); if(element.style.display==="none") { if (type_embed.checked){ - var new_code=document.getElementById("embed_code_var").value; + var new_code=generate_div_code(); $j(wrapper_id).html(new_code); } else{ - wrapper = "#wrapper_"+player_id; - iframeUrl= iframe_url+"&polemic="+polemic+"&show_mic_record="+show_mic_record+"&annotations_list="+annotations_list+""; - player_width=570; - player_height=678; - if(annotations_list!='False'){ - player_width+=430; - } - if(polemic!='False'){ - player_height+=100; - - } - if(show_mic_record!='False'){ - - player_height+=55; - } - frame = document.createElement("iframe"); - frame.width = player_width; - frame.height = player_height; - frame.src = iframeUrl; - frame.frameBorder = 0; - frame.seamless = "seamless"; - $j(wrapper).html(frame); - + display_iframe_player(); } element.style.display="block"; text.innerHTML = translate_hide; @@ -122,32 +427,205 @@ } } -function div_event(){ - wrapper = "wrapper_"+player_id; - wrapper_id = "#"+wrapper; +function display_polemic(){ + $j("#displayPolemicOptions").slideToggle("fast"); + $j("#polemic_options").toggle(false); +} + +function display_sparkline(){ + $j("#displaySparklineOptions").slideToggle("fast"); + $j("#sparkline_options").toggle(false); +} + +function display_social(){ + $j("#social_options").slideToggle("fast"); +} +function mode1(){ + var annotationslist_val=document.getElementById('annotations_list_checkbox'); + var slideshare_val=document.getElementById('slideshare_checkbox'); + var social_val=document.getElementById('social_checkbox'); + var annotation_val=document.getElementById('annotation_checkbox'); + var tweet_val=document.getElementById('tweet_checkbox'); + var segments_val=document.getElementById('segments_checkbox'); + var polemic_val=document.getElementById('polemic_checkbox'); + var sparkline_val=document.getElementById('sparkline_checkbox'); + var tagcloud_val=document.getElementById('tagcloud_checkbox'); + var createannotation_val=document.getElementById('createannotation_checkbox'); + + var type_embed=document.getElementById("type_embed_div"); + + if(type_embed.checked){ + createannotation_val.checked=false; + } + else{ + createannotation_val.checked=true; + } + $j("#displayPolemicOptions").toggle(false); + $j("#displaySparklineOptions").toggle(false); + $j("#social_options").toggle(false); + $j("#sparkline_options").toggle(false); + polemic_val.checked=false; + segments_val.checked=true; + annotationslist_val.checked=false; + slideshare_val.checked=false; + social_val.checked=false; + annotation_val.checked=false; + tweet_val.checked=false; + sparkline_val.checked=false; + tagcloud_val.checked=false; + put_new_code(); +} + +function mode2(){ + var annotationslist_val=document.getElementById('annotations_list_checkbox'); + var slideshare_val=document.getElementById('slideshare_checkbox'); + var social_val=document.getElementById('social_checkbox'); + var annotation_val=document.getElementById('annotation_checkbox'); + var tweet_val=document.getElementById('tweet_checkbox'); + var segments_val=document.getElementById('segments_checkbox'); + var polemic_val=document.getElementById('polemic_checkbox'); + var sparkline_val=document.getElementById('sparkline_checkbox'); + var tagcloud_val=document.getElementById('tagcloud_checkbox'); + var createannotation_val=document.getElementById('createannotation_checkbox'); + var type_embed=document.getElementById("type_embed_div"); + $j("#displayPolemicOptions").toggle(false); + $j("#displaySparklineOptions").toggle(false); + $j("#social_options").toggle(false); + $j("#sparkline_options").toggle(false); + display_polemic(); + display_sparkline(); + if(type_embed.checked){ + createannotation_val.checked=false; + } + else{ + createannotation_val.checked=true; + } + polemic_val.checked=true; + segments_val.checked=true; + annotationslist_val.checked=false; + slideshare_val.checked=false; + social_val.checked=false; + annotation_val.checked=true; + sparkline_val.checked=true; + tweet_val.checked=false; + tagcloud_val.checked=false; + put_new_code(); + +} + +function mode3(){ + var annotationslist_val=document.getElementById('annotations_list_checkbox'); + var slideshare_val=document.getElementById('slideshare_checkbox'); + var social_val=document.getElementById('social_checkbox'); + var annotation_val=document.getElementById('annotation_checkbox'); + var tweet_val=document.getElementById('tweet_checkbox'); + var segments_val=document.getElementById('segments_checkbox'); + var polemic_val=document.getElementById('polemic_checkbox'); + var sparkline_val=document.getElementById('sparkline_checkbox'); + var tagcloud_val=document.getElementById('tagcloud_checkbox'); + var createannotation_val=document.getElementById('createannotation_checkbox'); + var type_embed=document.getElementById("type_embed_div"); + $j("#displayPolemicOptions").toggle(false); + $j("#displaySparklineOptions").toggle(false); + $j("#social_options").toggle(false); + $j("#sparkline_options").toggle(false); + display_polemic(); + display_social(); + display_sparkline(); + if(type_embed.checked){ + createannotation_val.checked=false; + } + else{ + createannotation_val.checked=true; + } + polemic_val.checked=true; + segments_val.checked=true; + annotationslist_val.checked=true; + slideshare_val.checked=false; + social_val.checked=true; + annotation_val.checked=true; + tweet_val.checked=false; + sparkline_val.checked=true; + tagcloud_val.checked=true; + put_new_code(); + +} +function iframe_event(){ + $j("#createannotation_block").toggle(true); var element = document.getElementById(wrapper); - var new_code=document.getElementById("embed_code_var").value; - var code_embed=document.getElementById("player_id_code"); + var createannotation_val=document.getElementById('createannotation_checkbox'); + createannotation_val.checked=true; if(element.style.display=="block"){ - $j(wrapper_id).html(new_code); + display_iframe_player(); } - code_embed.value= new_code; + iframe_code=generate_iframe_code(); + $j("#player_id_code").val(iframe_code); $j("#player_id_code").focus(); - $j("#player_id_code").select(); + $j("#player_id_code").select(); + } -function iframe_event(){ - var code_embed=document.getElementById("player_id_code"); - wrapper = "wrapper_"+player_id; - wrapper_id = "#"+wrapper; - var element = document.getElementById(wrapper); - iframeUrl= iframe_url+"&polemic="+polemic+"&show_mic_record="+show_mic_record+"&annotations_list="+annotations_list+""; +function generate_iframeUrl(){ + var createannotation_val=document.getElementById('createannotation_checkbox'); + var annotationslist_val=document.getElementById('annotations_list_checkbox'); + var slideshare_val=document.getElementById('slideshare_checkbox'); + var social_val=document.getElementById('social_checkbox'); + var annotation_val=document.getElementById('annotation_checkbox'); + var tweet_val=document.getElementById('tweet_checkbox'); + var segments_val=document.getElementById('segments_checkbox'); + var polemic_val=document.getElementById('polemic_checkbox'); + var sparkline_val=document.getElementById('sparkline_checkbox'); + var tagcloud_val=document.getElementById('tagcloud_checkbox'); + iframeUrl= iframe_url; + if(createannotation_val.checked){ + iframeUrl+="&createannotation=True"; + } + if (polemic_val.checked){ + iframeUrl+="&polemic=all"; + } + else{ + iframeUrl+="&polemic=False"; + } + if(annotationslist_val.checked){ + iframeUrl+="&annotations_list=True"; + } + if(slideshare_val.checked){ + iframeUrl+="&slideshare=True"; + } + if(social_val.checked){ + iframeUrl+="&social=True"; + } + if(tweet_val.checked){ + iframeUrl+="&tweet=True"; + } + if(segments_val.checked){ + iframeUrl+="&segments=True"; + } + if(sparkline_val.checked){ + iframeUrl+="&sparkline=True"; + } + if(tagcloud_val.checked){ + iframeUrl+="&tagcloud=True"; + } + iframeUrl+= "&show_mic_record="+show_mic_record+""; + + return iframeUrl; +} + +function generate_iframe_code(){ + var createannotation_val=document.getElementById('createannotation_checkbox'); + var annotationslist_val=document.getElementById('annotations_list_checkbox'); + var polemic_val=document.getElementById('polemic_checkbox'); + iframeUrl=generate_iframeUrl(); player_width=570; - player_height=678; - if(annotations_list!='False'){ + player_height=430; + if (createannotation_val.checked){ + player_height+=281; + } + if(annotationslist_val.checked){ player_width+=430; } - if(polemic!='False'){ + if(polemic_val.checked){ player_height+=100; } @@ -155,18 +633,65 @@ player_height+=55; } - - if(element.style.display=="block"){ - frame = document.createElement("iframe"); - frame.width = player_width; - frame.height = player_height; - frame.src = iframeUrl; - frame.frameBorder = 0; - frame.seamless = "seamless"; - $j(wrapper_id).html(frame); + iframe_code=""; + + return iframe_code; +} + +function display_iframe_player(){ + var createannotation_val=document.getElementById('createannotation_checkbox'); + var annotationslist_val=document.getElementById('annotations_list_checkbox'); + var polemic_val=document.getElementById('polemic_checkbox'); + var code_embed=document.getElementById("player_id_code"); + $j("#iframe_premode").toggle(false); + $j("#div_premode").toggle(false); + $j("#preModeExpArrow").toggle(true); + $j("#preModeCollArrow").toggle(false); + wrapper = "wrapper_"+player_id; + wrapper_id = "#"+wrapper; + iframeUrl= generate_iframeUrl(); + player_width=570; + player_height=430; + if (createannotation_val.checked){ + player_height+=281; + } + if(annotationslist_val.checked){ + player_width+=430; + } + if(polemic_val.checked){ + player_height+=100; + } - iframe_code=""; - $j("#player_id_code").val(iframe_code); - $j("#player_id_code").focus(); - $j("#player_id_code").select(); -} + if(show_mic_record!='False'){ + + player_height+=55; + } + frame = document.createElement("iframe"); + frame.width = player_width; + frame.height = player_height; + frame.src = iframeUrl; + frame.frameBorder = 0; + frame.seamless = "seamless"; + $j(wrapper_id).html(frame); +} + +function set_default_color(code){ + $j("#polemic_default_color").val("#"+code); + put_new_code(); +} + +function set_found_color(code){ + $j("#polemic_found_color").val("#"+code); + put_new_code(); +} + +function set_line_color(code){ + $j("#sparkline_line_color").val("#"+code); + put_new_code(); +} + +function set_fill_color(code){ + $j("#sparkline_fill_color").val("#"+code); + put_new_code(); +} + diff -r 9eae65727f54 -r 1b2ea7f6cda0 src/ldt/ldt/static/ldt/js/projectscontents.js --- a/src/ldt/ldt/static/ldt/js/projectscontents.js Mon Oct 29 12:04:20 2012 +0100 +++ b/src/ldt/ldt/static/ldt/js/projectscontents.js Tue Nov 06 10:12:47 2012 +0100 @@ -1,32 +1,6 @@  function init_events_base(base_node, embed_url) { - $('.ldt_link_embed',base_node).click(function(e) { - e.preventDefault(); - var link = $(e.target); - var json_url = link.attr("href"); - var player_id = link.attr("id"); - var ldt_id = player_id.substring(15); - $('', { - href: embed_url+'?json_url='+escape(json_url)+'&player_id='+escape(player_id)+'&ldt_id='+escape(ldt_id), - target: "_blank" - }).nyroModal({ - filters: ['iframe'], - sizes: { - minW: '750', - minH: '662' - }, - callbacks: { - afterShowCont: function(nm) { - nm.store.iframe.height(662); - nm.store.iframe.width(750); - } - } - }).trigger('nyroModal'); - return false; - }); - - $('.imageline',base_node).each(function(i) { var tr = $(this); tr.mouseover(function() {