+ {% block content %} +

{% trans 'Share the project' %} : {{ project.title }}

{% trans "List of the project's contents" %}:

{% trans 'project id' %} ({% trans 'Select' %}) :

{% trans 'The project in Lignes de Temps' %} : {% trans 'See' %} - {% trans 'Select' %} :

-
-

- - - - - -

- - -

{% include "ldt/ldt_utils/partial/embed_links.html" %}

- - {% endblock %} - {% analytics %} \ No newline at end of file +

+ {% endblock %} + {% analytics %} \ No newline at end of file diff -r 033173b1de1e -r c1eb7dda4fe4 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 Wed Mar 25 18:40:48 2015 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed/v2/mdplayer_config.html Tue Apr 07 18:20:43 2015 +0200 @@ -6,143 +6,143 @@ {% load static %} {% load analytics %} {% block js_import %} - {{ block.super }} - + {{ block.super }} + {% endblock %} - + {% block js_declaration %} - {{ block.super }} + {{ block.super }} {% endblock %} {% block css_import %} - {{ block.super }} + {{ block.super }} {% endblock %} {% block embed_widget_config %} - {% trans 'Widgets' %}
-

- - CreateAnnotation -
-

- - {% trans 'Audio annotation' %} -
- {% trans 'Use most used tags ' %} - - {%trans 'Set your own tags : ' %} - -
- - {% trans '4 polemics buttons' %} ++/--/??/== - -

- - Segments -
-

- {% trans 'Display annotation types: (annotation types must be separated by commas, leave blank to display everything) '%}
-
-

- - MultiSegments -
-

- - AnnotationsList -
-

- - Polemic -
-

- {% trans 'Display annotation types: (annotation types must be separated by commas, leave blank to display everything) '%}
-
- - {% trans "Personalize tweet's color" %} - -

- {% trans "Default color" %} - -

- {% trans "Polemic's color : ++ : " %} - - -- : - - == : - - ? : - -

- {% trans "Found color" %} - -

- - Sparkline -
-

- - {% trans "personalize sparkline's color" %} - -

- {% trans 'line color' %} - -

- -

- {% trans 'fill color' %} - -

- - Slideshare -
-

- - Social -
- -

- - Annotation -
- - Tweet -
- - Tagcloud -

- {% trans 'Other settings' %}
- - Autostart -
+ {% trans 'Widgets' %}
+

+ + CreateAnnotation +
+

+ + {% trans 'Audio annotation' %} +
+ {% trans 'Use most used tags ' %} + + {%trans 'Set your own tags : ' %} + +
+ + {% trans '4 polemics buttons' %} ++/--/??/== + +

+ + Segments +
+

+ {% trans 'Display annotation types: (annotation types must be separated by commas, leave blank to display everything) '%}
+
+

+ + MultiSegments +
+

+ + AnnotationsList +
+

+ + Polemic +
+

+ {% trans 'Display annotation types: (annotation types must be separated by commas, leave blank to display everything) '%}
+
+ + {% trans "Personalize tweet's color" %} + +

+ {% trans "Default color" %} + +

+ {% trans "Polemic's color : ++ : " %} + + -- : + + == : + + ? : + +

+ {% trans "Found color" %} + +

+ + Sparkline +
+

+ + {% trans "personalize sparkline's color" %} + +

+ {% trans 'line color' %} + +

+ +

+ {% trans 'fill color' %} + +

+ + Slideshare +
+

+ + Social +
+ +

+ + Annotation +
+ + Tweet +
+ + Tagcloud +

+ {% trans 'Other settings' %}
+ + Autostart +
- {% trans "Concatenate all projects using this content" %} + {% trans "Concatenate all projects using this content" %} {% endblock %} {% block content %} - {{ block.super }} + {{ block.super }} {% endblock %} {% analytics %} \ No newline at end of file diff -r 033173b1de1e -r c1eb7dda4fe4 src/ldt/ldt/static/ldt/css/embed_popup.css --- a/src/ldt/ldt/static/ldt/css/embed_popup.css Wed Mar 25 18:40:48 2015 +0100 +++ b/src/ldt/ldt/static/ldt/css/embed_popup.css Tue Apr 07 18:20:43 2015 +0200 @@ -7,118 +7,118 @@ } .margin0{ - margin:0 0 0 0; + margin:0 0 0 0; } .large_text{ font-size: 1.5em; } .middle_text{ - font-size: 0.9em; + font-size: 0.9em; } input { - background: #ededed; + background: #ededed; } .embed_checkbox{ - text-indent:25px; - + text-indent:25px; + } .code_button { - background-color: #656565; - color: white; - width: auto; - font-weight: bold; - padding: 5px 10px; + background-color: #656565; + color: white; + width: auto; + font-weight: bold; + padding: 5px 10px; } .codeColor_text{ - width: 50px; - text-align: center; + width: 50px; + text-align: center; color: #949494; font-size: 12px; - padding: 3px; + padding: 3px; } .number_area{ - width: 30px; - text-align: center; - padding: 3px; - font-size: 12px; - color: #7B8084; - border: 3px solid lightGrey; + width: 30px; + text-align: center; + padding: 3px; + font-size: 12px; + color: #7B8084; + border: 3px solid lightGrey; } .tags_area{ - padding: 3px; - font-size: 12px; - color: #7B8084; - border: 3px solid lightGrey; + padding: 3px; + font-size: 12px; + color: #7B8084; + border: 3px solid lightGrey; } .refresh_button{ - background-color:#fcfcfc; - -moz-border-radius:6px; - -webkit-border-radius:6px; - border-radius:6px; - border:1px solid #dcdcdc; - display:inline-block; - color:#777777; - padding:6px 6px; + background-color:#fcfcfc; + -moz-border-radius:6px; + -webkit-border-radius:6px; + border-radius:6px; + border:1px solid #dcdcdc; + display:inline-block; + color:#777777; + padding:6px 6px; } .refresh_button:hover { - background-color:#fffaff; + background-color:#fffaff; } .refresh_button:active { - position:relative; - top:1px; + position:relative; + top:1px; } #button_row input { - margin: 10px; + margin: 10px; } #display_select { - float: left; + float: left; } #copy_div { - float: right; + float: right; } #ldt_id { - color: #949494; - font-family: Arial, Helvetica, sans serif; - font-weight: lighter; - font-style: normal; - font-size: 14px; - text-align: left; - + color: #949494; + font-family: Arial, Helvetica, sans serif; + font-weight: lighter; + font-style: normal; + font-size: 14px; + text-align: left; + } #ldt_id_row { - height: 20px; - vertical-align: middle; - font-size: 1.5em; - font-style: normal; - text-align: left; - + height: 20px; + vertical-align: middle; + font-size: 1.5em; + font-style: normal; + text-align: left; + } #ldt_id_id { - float: left; + float: left; } #clipboard_button { - height: 20px; - width: 20px; - float: left; - background-image:url('../img/clipboard.png'); - background-repeat:no-repeat; - background-position:center; - cursor: pointer; - margin-right: 10px; - padding: 2px; + height: 20px; + width: 20px; + float: left; + background-image:url('../img/clipboard.png'); + background-repeat:no-repeat; + background-position:center; + cursor: pointer; + margin-right: 10px; + padding: 2px; } .click_to_select { font-size: 0.9em; @@ -137,92 +137,111 @@ } .configuration { - color: #949494; - font-family: Arial, Helvetica, sans serif; - font-weight: lighter; - font-style: normal; - font-size: 12px; - text-align: left; + color: #949494; + font-family: Arial, Helvetica, sans serif; + font-weight: lighter; + font-style: normal; + font-size: 12px; + text-align: left; } + +#embed_options_wrapper:after { + content:''; + display:block; + clear: both; +} #embed_options .title { font-weight: bold; margin-right: 9px; } +#embed_options { + float: left; +} + + +#refresh_button_div { + float: right; +} + +#refresh_player_button { + display: none; +} + .OptionsEmbedDisplay { - color: #949494; - font-family: Arial, Helvetica, sans serif; - font-weight: lighter; - font-style: normal; - font-size: 12px; - text-align: left; - cursor: pointer; + 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; + vertical-align: top; } .AdvancedOptionsDisplay{ - color: #949494; - font-family: Arial, Helvetica, sans serif; - font-weight: lighter; - font-style: normal; - font-size: 12px; - text-align: left; - cursor: pointer; + color: #949494; + font-family: Arial, Helvetica, sans serif; + font-weight: lighter; + font-style: normal; + font-size: 12px; + text-align: left; + cursor: pointer; margin-right: 9px; text-decoration: none; line-height: 12px; top: 10px; - vertical-align: top; + vertical-align: top; } .OptionsSubtitle{ - margin-left: 6px; - font-weight: bold; + margin-left: 6px; + font-weight: bold; } .embedPersonnalisation{ - margin-left: 21px; + margin-left: 21px; } .embedPersonnalisationSecondLevel{ - margin-left: 22px; + margin-left: 22px; } .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; + 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; + 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 033173b1de1e -r c1eb7dda4fe4 src/ldt/ldt/static/ldt/js/embed/v2/embed.js --- a/src/ldt/ldt/static/ldt/js/embed/v2/embed.js Wed Mar 25 18:40:48 2015 +0100 +++ b/src/ldt/ldt/static/ldt/js/embed/v2/embed.js Tue Apr 07 18:20:43 2015 +0200 @@ -1,922 +1,934 @@ +"use strict"; + var display_state = "player"; function toggle_display() { - $j.each(["player","ldt_iframe","seo_body","seo_meta","links"], function(i,display_str) { + $j.each(["player","ldt_iframe","seo_body","seo_meta","links"], function(i,display_str) { - var div_selector = "#"+display_str+"_code"; - if(display_str === display_state) { - $j(div_selector).show(); - } - else { - $j(div_selector).hide(); - } - }); + var div_selector = "#"+display_str+"_code"; + if(display_str === display_state) { + $j(div_selector).show(); + } + else { + $j(div_selector).hide(); + } + }); } function init_events(){ - toggle_display(); - $j("#iframe_div_premode").toggle(false); - $j("#embed_personnalisation").toggle(false); - $j("#player_width").val(550); - $j("#player_height").val(300); - $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").select(); - $j("#polemic_color_options").toggle(false); - $j("#sparkline_color_options").toggle(false); - $j("#social_options").toggle(false); - $j("#displaySegmentsOptions").toggle(false); - $j("#displayPolemicOptions").toggle(false); - $j("#displaySparklineOptions").toggle(false); - $j("#polemic_default_color").val("#585858"); - $j("#polemic_found_color").val("#fc00ff"); - $j("#polemic_ok_color").val("#1d973d"); - $j("#polemic_ko_color").val("#ce0a15"); - $j("#polemic_ref_color").val("#c5a62d"); - $j("#polemic_q_color").val("#036aae"); - $j("#sparkline_line_color").val("#7492b4"); - $j("#sparkline_fill_color").val("#aeaeb8"); - var type_embed=document.getElementById("type_embed_div"); - type_embed.checked=true; - $j("#createannotation_options").toggle(false); - mode1(); - - $j(".click_to_select").click(function(){ - var i = $j(this).parent().find("input"); - i.select(); - }); - - $j('.ldt_json_link').click(function(e) { - e.preventDefault(); - link = $j(e.target); - $j("#res_link_{{player_id}}").load(link.attr("href")); - $j("#res_link_{{player_id}}").show(); - return false; + toggle_display(); + $j("#iframe_div_premode").toggle(false); + $j("#embed_personnalisation").toggle(false); + $j("#player_width").val(550); + $j("#player_height").val(300); + $j("#optionsExpArrow").toggle(true); + $j("#optionsCollArrow").toggle(false); + $j("#preModeExpArrow").toggle(true); + $j("#preModeCollArrow").toggle(false); + $j("#createannotation_block").toggle(true); + $j("#player_id_code").select(); + $j("#polemic_color_options").toggle(false); + $j("#sparkline_color_options").toggle(false); + $j("#social_options").toggle(false); + $j("#displaySegmentsOptions").toggle(false); + $j("#displayPolemicOptions").toggle(false); + $j("#displaySparklineOptions").toggle(false); + $j("#polemic_default_color").val("#585858"); + $j("#polemic_found_color").val("#fc00ff"); + $j("#polemic_ok_color").val("#1d973d"); + $j("#polemic_ko_color").val("#ce0a15"); + $j("#polemic_ref_color").val("#c5a62d"); + $j("#polemic_q_color").val("#036aae"); + $j("#sparkline_line_color").val("#7492b4"); + $j("#sparkline_fill_color").val("#aeaeb8"); + var type_embed=document.getElementById("type_embed_div"); + type_embed.checked=true; + $j("#createannotation_options").toggle(false); + mode1(); + + $j(".click_to_select").click(function(){ + var i = $j(this).parent().find("input"); + i.select(); + }); + + $j('.ldt_json_link').click(function(e) { + e.preventDefault(); + link = $j(e.target); + $j("#res_link_{{player_id}}").load(link.attr("href")); + $j("#res_link_{{player_id}}").show(); + return false; }); $j('#player_button').click(function(e) { - display_state = "player"; - toggle_display(); - $j("#player_id_code").select(); + display_state = "player"; + toggle_display(); + $j("#player_id_code").select(); }); $j('#ldt_iframe_button').click(function(e) { - display_state = "ldt_iframe"; - toggle_display(); - $j("#ldt_iframe_id_code").select(); + display_state = "ldt_iframe"; + toggle_display(); + $j("#ldt_iframe_id_code").select(); }); $j('#seo_body_button').click(function(e) { - display_state = "seo_body"; - toggle_display(); - $j("#seo_body_id_code").select(); + display_state = "seo_body"; + toggle_display(); + $j("#seo_body_id_code").select(); }); $j('#seo_meta_button').click(function(e) { - display_state = "seo_meta"; - toggle_display(); - $j("#seo_meta_id_code").select(); + display_state = "seo_meta"; + toggle_display(); + $j("#seo_meta_id_code").select(); }); $j('#links_button').click(function(e) { - display_state = "links"; - toggle_display(); + display_state = "links"; + toggle_display(); + }); + + $j("#copy_button").click(function(e) { + alert($j("#"+display_state+"_code").html()); + }); + + $j("#refresh_player_button").click(function(e){ + refresh_player(); + $j("#player_id_code").select(); + }); + + + $j('#links_button').click(function() { + var range = document.createRange(); + range.selectNode(document.getElementById('links_code')); + window.getSelection().addRange(range); }); - $j("#copy_button").click(function(e) { - alert($j("#"+display_state+"_code").html()); - }); - - $j("#refresh_player_button").click(function(e){ - refresh_player(); - $j("#player_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(){ - $j("#iframe_div_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("#displayPolemicColorOptions").click(function(){ - $j("#polemic_color_options").slideToggle("fast"); - }); - - $j("#displaySparklineOptions").click(function(){ - $j("#sparkline_color_options").slideToggle("fast"); - }); - - $('.infostooltip').each( function () { - var desc = $(this).attr('data-desc'); - if (desc == 'None') { - desc = ''; - } - $(this).qtip({ - content : { - text: '' + $(this).attr('data-title') + '
' + desc - }, - style: { - classes: 'ui-tooltip-dark ui-tooltip-rounded qtipldt' - }, - border: { - 'width': 0, - 'color': '#505050' - }, - position: { - my: 'top left', - at: 'bottom left' - } - }); - }); - + $j('#displayPreMode').click(function(){ + $j("#iframe_div_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("#displayPolemicColorOptions").click(function(){ + $j("#polemic_color_options").slideToggle("fast"); + }); + + $j("#displaySparklineOptions").click(function(){ + $j("#sparkline_color_options").slideToggle("fast"); + }); + + $('.infostooltip').each( function () { + var desc = $(this).attr('data-desc'); + if (desc == 'None') { + desc = ''; + } + $(this).qtip({ + content : { + text: '' + $(this).attr('data-title') + '
' + desc + }, + style: { + classes: 'ui-tooltip-dark ui-tooltip-rounded qtipldt' + }, + border: { + 'width': 0, + 'color': '#505050' + }, + position: { + my: 'top left', + at: 'bottom left' + } + }); + }); + } 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='\ -

\n \ -

\n\ -

\n\ -\n\ -\n\ + \n'; - if(social_val.checked){ - code+='\ - \n'; - } - if(slideshare_val.checked){ - code+='\ - \n'; - } - - if(annotationslist_val.checked){ - code+='\ - \n'; - } + var annotationslist_val=document.getElementById('annotations_list_checkbox'); + var slideshare_val=document.getElementById('slideshare_checkbox'); + var social_val=document.getElementById('social_checkbox'); + var code = generate_base_embed_code(); + code += generate_widget_code(); + code += '\n\ + _myPlayer = new IriSP.Metadataplayer(_config);\n\ + \n'; + if(social_val.checked){ + code+='\ + \n'; + } + if(slideshare_val.checked){ + code+='\ + \n'; + } - code+='\ -

\n'; - return code; + if(annotationslist_val.checked){ + code+='\ + \n'; + } + + code+='\ +