--- 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 %}
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
@@ -14,11 +15,155 @@
</head>
<body id="init_embed_popup">
<div style="float:left; width:550px;" id="wrapper_{{player_id}}">
- {% include "ldt/ldt_utils/partial/embed_player.html" %}
+
+ <div>
+ <div id="{{ player_id }}_embed" class="iri_player_embed"></div>
+ <script type="text/javascript" src="{{WEB_URL}}{{LDT_MEDIA_PREFIX}}metadataplayer/LdtPlayer-core.js"></script>
+ <script type="text/javascript">
+
+ if (typeof jQuery == "undefined") {
+ jQuery = IriSP.jQuery;
+ }
+ var metadatas = {metadata: {url: '{{json_url}}'}};
+ var metadata_key = "metadata";
+
+ IriSP.libFiles.defaultDir = "{{WEB_URL}}{{LDT_MEDIA_PREFIX}}js/";
+ IriSP.libFiles.locations.jwPlayerSWF = "{{WEB_URL}}{{LDT_MEDIA_PREFIX}}swf/player.swf";
+ IriSP.libFiles.locations.recordMicSwf = "{{WEB_URL}}{{LDT_MEDIA_PREFIX}}swf/record_mic.swf";
+ IriSP.libFiles.locations.zeroClipboardSwf = "{{WEB_URL}}{{LDT_MEDIA_PREFIX}}swf/ZeroClipboard10.swf";
+ IriSP.libFiles.locations.cssjQueryUI = "{{WEB_URL}}{{LDT_MEDIA_PREFIX}}css/jq-css/themes/base/jquery-ui.css"
+ IriSP.language = '{{LANGUAGE_CODE}}';
+
+ IriSP.widgetsDir = "{{WEB_URL}}{{LDT_MEDIA_PREFIX}}metadataplayer";
+ var _metadata = {
+ url: metadatas[metadata_key].url + '?callback=?',
+ format: 'ldt'
+ };
+ var _config = {
+ width: '{{ player_width }}',
+ container: '{{ player_id }}_embed',
+ css: '{{WEB_URL}}{{LDT_MEDIA_PREFIX}}metadataplayer/LdtPlayer-core.css',
+ default_options: {
+ metadata: _metadata
+ },
+ widgets: [
+ {
+ {% if external_url %}
+ type: "AutoPlayer",
+ video: "{{ external_url }}",
+ {% else %}
+ type: "JwpPlayer",
+ streamer: function(_url) {
+ var _matches = _url.match(/^[^\/]+\/\/[^\/]+\/[^\/]+\//);
+ if (_matches) {
+ return _matches[0];
+ } else {
+ return _url;
+ }
+ },
+ live: true,
+ provider: "rtmp",
+ {% endif %}
+ height: 300,
+ autostart: true
+ } {% if polemic == 'all' %},
+ {
+ type: "Polemic",
+ annotation_type: false,
+ defaultcolor: "{{polemic_defaultColor}}",
+ foundcolor: "{{polemic_foundColor}}"
+ }
+ {% endif %}
+ {% if sparkline %}
+ ,{
+ type: "Sparkline"
+ }
+ {% endif %}
+ ,{
+ type: "Slider"
+ }
+
+ {% if annotations_list %},{
+ type: "AnnotationsList",
+ container: "AnnotationsList_ext",
+ ajax_url: "{{WEB_URL}}{% url segment_api_empty resource_name='segments' api_name='1.0' %}{% templatetag openvariable %}media{% templatetag closevariable %}/{% templatetag openvariable %}begin{% templatetag closevariable %}/{% templatetag openvariable %}end{% templatetag closevariable %}",
+ ajax_granularity : 300000,
+ default_thumbnail : "{{WEB_URL}}{{LDT_MEDIA_PREFIX}}css/imgs/video_sequence.png",
+ show_audio: true,
+ rtmp_streamer: "rtmp://media.iri.centrepompidou.fr/ddc_micro_record/"
+ }{% endif %},{
+ type: "Controller"
+ }
+ {% if segments %},{
+ type: "Segments",
+ annotation_type: ["chap","découpage"]
+ }
+ {% endif %}
+ {% if annotation%},{
+ type: "Annotation",
+ start_minimized: true,
+ site_name : "Lignes de Temps",
+ annotation_type: ["chap","découpage"]
+ }
+ {% endif %}
+ {% if tweet %},{
+ type: "Tweet",
+ hide_timeout: 5000
+ }
+ {% endif %}
+
+ {% if createannotation %},{
+ type: "CreateAnnotation",
+ api_endpoint_template: "{{WEB_URL}}{% url api_dispatch_list resource_name='annotations' api_name='1.0' %}",
+ api_method: "PUT",
+ after_send_timeout: 8000,
+ show_mic_record: {% if show_mic_record %}true{% else %}false{% endif %},
+ close_after_send: false,
+ 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 %}
+ {% if slideshare %},{
+ type: "Slideshare",
+ container: "Slideshare_ext",
+ embed_width: 400,
+ embed_height: 334,
+ annotation_type: "slide"
+ }
+ {% endif %},{
+ type: "Mediafragment"
+ }
+ {% if social %},{
+ type: "Social",
+ container: "Social_ext",
+ url: document.location.href.replace(/#.*$/,""),
+ text: document.title
+ }
+ {% endif %}
+
+ {% if tagcloud %},{
+ type: "Tagcloud"
+ }
+ {% endif %}
+ ]
+ };
+
+ _myPlayer = new IriSP.Metadataplayer(_config);
+ </script>
+ </div>
</div>
+ {% if social %}
+ <div id="Social_ext" class="Ldt-TraceMe Ldt-Widget" style="float:right; width:400px; height:24px;" widget-type="Social">
+ </div>
+ {% endif %}
+ {% if slideshare %}
+ <div id="Slideshare_ext" class="ext_widget Ldt-TraceMe Ldt-Widget" style="float:left; width:400px;" widget-type="Slideshare">
+ </div>
+ {% endif %}
{% if annotations_list %}
<div style="float:left; width:400px;" id="AnnotationsList_ext"></div>
{% endif %}
+
{% analytics %}
</body>
</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 %}
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{{LANGUAGE_CODE}}" lang="{{LANGUAGE_CODE}}">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta http-equiv="Cache-Control" content="no-cache, must-revalidate" />
- <meta http-equiv="Pragma" content="no-cache" />
- <meta http-equiv="Cache" content="no store" />
- <meta http-equiv="Expires" content="-1" />
- <title>Ligne de Temps - IRI</title>
+ {% block js_import %}
+ {{ block.super }}
<script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/jquery.min.js"></script>
<script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/jquery.qtip.min.js"></script>
+ <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/embed_popup.js"></script>
+ {{ content_form.media.js }}
+ {% endblock %}
+
+ {% block js_declaration %}
<script type="text/javascript">
var $j = jQuery.noConflict();
var iframe_url='{{iframe_url}}';
+ var external_url='{{external_url}}';
var polemic='{{polemic}}';
var show_mic_record='{{show_mic_record}}';
var annotations_list='{{annotations_list}}';
var player_id='{{player_id}}';
var translate_show="{% trans 'Show Player' %}";
var translate_hide="{% trans 'Hide Player' %}";
+ var WEB_URL='{{WEB_URL}}';
+ var LDT_MEDIA_PREFIX='{{LDT_MEDIA_PREFIX}}';
+ var LANGUAGE_CODE='{{LANGUAGE_CODE}}';
+ var json_url='{{json_url}}';
+ var player_width='{{player_width}}';
+ var player_id='{{player_id}}';
+ var segment_api='{% url segment_api_empty resource_name="segments" api_name="1.0" %}';
+ var creator_name='{{request.user.username}}';
$j(document).ready(function(){
init_events();
});
</script>
- <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/embed_popup.js"></script>
+ {% endblock %}
+ {% block css_import %}
+ {{ block.super }}
+ {{ content_form.media.css }}
+ <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/style.css" />
+ <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}/css/workspace.css" type="text/css"/>
+ <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/embed_popup.css" type="text/css"/>
+ <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/jq-css/jquery.qtip.css" type="text/css"/>
+ {% endblock %}
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/workspace.css" type="text/css"/>
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/embed_popup.css" type="text/css"/>
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/jq-css/jquery.qtip.css" type="text/css"/>
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/style.css" type="text/css"/>
-
-
- </head>
- <body id="init_embed_popup">
- <textarea id="embed_code_var" readonly="readonly" class="ldt_player_code" style="display:none">{{ embed_rendered.player }}</textarea>
+ {% block content %}
<div id='ldt_id'>
<div id='ldt_id_title'>{% trans 'project id' %} <span id="project_id_select">({% trans 'Select' %})</span> : <input id="project_id_input" value="{{ldt_id}}"/></div>
</div>
-
<a id="displayPlayer" href="javascript:toggle();">{% trans 'Show Player' %}</a>
<div class="ldt_player" id="wrapper_{{player_id}}" style="display:none">
</div>
+ <br>
<div id="button_row">
<div id="display_select">
- <input type="button" value="{% trans 'popup_player'%}" id="player_button"/><input id="seo_body_button" type="button" value="{% trans 'popup_seo_body' %}"/><input id="seo_meta_button" type="button" value="{% trans 'popup_seo_meta' %}"/><input id="links_button" type="button" value="{% trans 'popup_links' %}"/>
+ <input type="button" value="{% trans 'popup_player'%}" class="code_button" id="player_button"/><input id="seo_body_button" type="button" class="code_button" value="{% trans 'popup_seo_body' %}"/><input id="seo_meta_button" type="button" class="code_button" value="{% trans 'popup_seo_meta' %}"/><input id="links_button" type="button" class="code_button" value="{% trans 'popup_links' %}"/>
</div>
</div>
-
- <div>
- <br></br>
- <code id ="code_{{player_id}}" >
- <div id="player_code">
- <br><div id="embed_options"><br> {% trans 'Integration mode' %}
- <input type="radio" id="type_embed_div" name="player_code_type" value="div" checked onClick="div_event()" > {% trans 'div' %} </input>
- <input type="radio" id="type_embed_iframe" name="player_code_type" value="iframe" onClick="iframe_event()"> {% trans 'iframe' %} </input><br>
- </div></br>
- <textarea id="player_id_code" readonly="readonly" class="ldt_player_code">{{ embed_rendered.player }}</textarea>
- </div>
- <div id="seo_body_code"><textarea id="seo_body_id_code" readonly="readonly" class="ldt_player_code" >{{ embed_rendered.seo_body }}</textarea></div>
- <div id="seo_meta_code"><textarea id="seo_meta_id_code" readonly="readonly" class="ldt_player_code">{{ embed_rendered.seo_meta }}</textarea></div>
- </code>
- <br>
- <div id="links_code" class="ldt_player_code">{% include "ldt/ldt_utils/partial/embed_links.html" %}</div>
- </br>
+ <div style="float: left;">
+ <div id="player_code">
+ <div class="configuration">
+ <br><div id="embed_options"><br> {% trans 'Integration mode' %}
+ <input type="radio" id="type_embed_div" name="player_code_type" value="div" checked onClick="div_event()" > {% trans 'div' %} </input>
+ <input type="radio" id="type_embed_iframe" name="player_code_type" value="iframe" onClick="iframe_event()"> {% trans 'iframe' %} </input><br>
+ </div>
+ <a id="displayPreMode" class="OptionsEmbedDisplay">
+ <span id= "preModeExpArrow" class="expArrow"></span>
+ <span id= "preModeCollArrow" class="collArrow"></span>
+ <span class="title">Modes predefinis</span>
+ </a><br>
+ <div id="iframe_premode">
+ <input type="radio" id="mode_1" name="embed_mode" value="mode1" checked onClick="mode1()" > mode 1.1 </input><br>
+ <input type="radio" id="mode_2" name="embed_mode" value="mode2" onClick="mode2()"> mode 2.1 </input><br>
+ <input type="radio" id="mode_3" name="embed_mode" value="mode3" onClick="mode3()"> mode 3.1 </input><br>
+ <br>
+ </div>
+ <div id="div_premode">
+ <input type="radio" id="mode_1" name="embed_mode" value="mode1" checked onClick="mode1()" > mode 1 </input><br>
+ <input type="radio" id="mode_2" name="embed_mode" value="mode2" onClick="mode2()"> mode 2 </input><br>
+ <input type="radio" id="mode_3" name="embed_mode" value="mode3" onClick="mode3()"> mode 3 </input><br>
+ <br>
+ </div>
+ <a id="displayEmbedOptions" class="OptionsEmbedDisplay">
+ <span id= "optionsExpArrow" class="expArrow"></span>
+ <span id= "optionsCollArrow" class="collArrow"></span>
+ <span class="title">Personnaliser votre configuration</span>
+ </a><br>
+ <div id="embed_personnalisation" class="embedPersonnalisation">
+ <div id="createannotation_block">
+ <input type="checkbox" id="createannotation_checkbox" value="createannotation" onClick="put_new_code()" > Create Annotation </input><br>
+ </div>
+ <input type="checkbox" id="segments_checkbox" value="segments" onClick="put_new_code()" > Segments </input><br>
+ <input type="checkbox" id="annotations_list_checkbox" value="annotationslist" onClick="put_new_code()"> Annotationslist </input><br>
+ <input type="checkbox" id="slideshare_checkbox" value="slideshare" onClick="put_new_code()"> Slideshare </input><br>
+ <input type="checkbox" id="social_checkbox" value="social" onClick="put_new_code(); display_social();"> Social </input><br>
+ <div id="social_options" style="text-indent:25px;">
+ <input type="checkbox" id="show_url_checkbox" value="show_url" checked onClick="put_new_code()"> Url </input>
+ <input type="checkbox" id="show_twitter_checkbox" value="show_twitter" checked onClick="put_new_code()"> Twitter </input>
+ <input type="checkbox" id="show_fb_checkbox" value="show_fb" checked onClick="put_new_code()"> Facebook </input>
+ <input type="checkbox" id="show_gplus_checkbox" value="show_gplus" checked onClick="put_new_code()"> Google Plus </input>
+ <input type="checkbox" id="show_mail_checkbox" value="show_mail" checked onClick="put_new_code()"> Partager par email </input><br>
+ </div>
+ <input type="checkbox" id="annotation_checkbox" value="annotation" onClick="put_new_code()"> Annotation </input><br>
+ <input type="checkbox" id="tweet_checkbox" value="tweet" onClick="put_new_code()"> Tweet </input><br>
+ <input type="checkbox" id="sparkline_checkbox" value="sparkline" onClick="put_new_code(); display_sparkline();"> Sparkline </input><br>
+ <a id="displaySparklineOptions" class="AdvancedOptionsDisplay" style="margin:22px;">
+ <span class="title">Personnaliser les couleurs de la courbe</span>
+ </a>
+ <div id="sparkline_options">
+ <div id="color_line_options" style="text-indent:25px;">
+ <span class="title">Couleur de la courbe : </span>
+ <input type="button" class="color_block blue_grey" title="Blue-Grey" data-hex="7492b4" onClick='set_line_color("7462b4")'></input>
+ <input type="button" class="color_block orange" title="Orange" data-hex="ff9933" onClick='set_line_color("ff9933")'></input>
+ <input type="button" class="color_block dark_lime" title="Dark-lime" data-hex="a1d600" onClick='set_line_color("a1d600")'></input>
+ <input type="button" class="color_block fuschia" title="Fushia" data-hex="ff0179" onClick='set_line_color("ff0179")'></input>
+ <input type="button" class="color_block black" title="Black" data-hex="050505" onClick='set_line_color("050505")'></input>
+ <input id="sparkline_line_color" class="color_text" type="text" maxlength="7"></input>
+ </div>
+
+ <div id="fill_color_options" style="text-indent:25px;">
+ <span class="title">Couleur sous la courbe : </span>
+ <input type="button" class="color_block light_grey" title="Light-Grey" data-hex="aeaeb8" onClick='set_fill_color("aeaeb8")'></input>
+ <input type="button" class="color_block brown_orange" title="Brown_orange" data-hex="ebc8a3" onClick='set_fill_color("ebc8a3")'></input>
+ <input type="button" class="color_block pastel_green" title="Pastel_green" data-hex="daf4af" onClick='set_fill_color("daf4af")'></input>
+ <input type="button" class="color_block pastel_fushia" title="Pastel_fushia" data-hex="da7ba7" onClick='set_fill_color("da7ba7")'></input>
+ <input type="button" class="color_block white" title="White" data-hex="ffffff" onClick='set_fill_color("ffffff")'></input>
+ <input id="sparkline_fill_color" class="color_text" type="text" maxlength="7"></input>
+ </div>
+ </div>
+ <div>
+ <input type="checkbox" id="tagcloud_checkbox" value="tagcloud" onClick="put_new_code()"> Tagcloud </input><br>
+ </div>
+ <div id='polemic_bloc'>
+ <input type="checkbox" id="polemic_checkbox" value="polemic" onClick="put_new_code(); display_polemic();"> Polemic </input><br>
+ <a id="displayPolemicOptions" class="AdvancedOptionsDisplay" style="margin:22px;">
+ <span class="title">Personnaliser les couleurs des tweets</span>
+ </a>
+ <div id="polemic_options">
+ <div id="color_default_options" style="text-indent:25px;">
+ <span class="title">Couleur par default : </span>
+ <input type="button" class="color_block grey" title="Grey" data-hex="585858" onClick='set_default_color("585858")'></input>
+ <input type="button" class="color_block orange" title="Orange" data-hex="ff9933" onClick='set_default_color("ff9933")'></input>
+ <input type="button" class="color_block lime" title="Lime" data-hex="c9ff23" onClick='set_default_color("c9ff23")'></input>
+ <input type="button" class="color_block fuschia" title="Fuschia" data-hex="ff0179" onClick='set_default_color("ff0179")'></input>
+ <input type="button" class="color_block white" title="White" data-hex="ffffff" onClick='set_default_color("ffffff")'></input>
+ <input id="polemic_default_color" class="color_text" type="text" maxlength="7"></input>
+ </div>
+ <div id="color_found_options" style="text-indent:25px;">
+ <span class="title">Couleur des tweets trouves : </span>
+ <input type="button" class="color_block purple" title="Purple" data-hex="fc00ff" onClick='set_found_color("fc00ff")'></input>
+ <input type="button" class="color_block orange" title="Orange" data-hex="ff9933" onClick='set_found_color("ff9933")'></input>
+ <input type="button" class="color_block lime" title="Lime" data-hex="c9ff23" onClick='set_found_color("c9ff23")'></input>
+ <input type="button" class="color_block fuschia" title="Fuschia" data-hex="ff0179" onClick='set_found_color("ff0179")'></input>
+ <input type="button" class="color_block white" title="White" data-hex="ffffff" onClick='set_found_color("ffffff")'></input>
+ <input id="polemic_found_color" class="color_text" type="text" maxlength="7"></input>
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <textarea id="player_id_code" readonly="readonly" class="ldt_player_code"></textarea>
+ </div>
+ <div id="seo_body_code"><textarea id="seo_body_id_code" readonly="readonly" class="ldt_player_code" >{{ embed_rendered.seo_body }}</textarea></div>
+ <div id="seo_meta_code"><textarea id="seo_meta_id_code" readonly="readonly" class="ldt_player_code">{{ embed_rendered.seo_meta }}</textarea></div>
+ </code>
+ <br>
+ <div id="links_code" class="ldt_player_code">{% include "ldt/ldt_utils/partial/embed_links.html" %}</div>
+ </br>
</div>
+ {% endblock %}
{% analytics %}
- </body>
-</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,
--- 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 %}
<td class="cellimg"><div class="cellimgdiv"><img src="{{LDT_MEDIA_PREFIX}}img/page_copy.png" href="{% url ldt.ldt_utils.views.project.copy_project project.ldt_id group_id %}" class="ldt_link_copy_project" alt="{% trans 'copy project' %}" title="{% trans 'copy project' %}"/></div></td>
- <td class="cellimg"><div class="cellimgdiv"><img src="{{LDT_MEDIA_PREFIX}}img/plugin.png" href="{{WEB_URL}}{{json_url_id}}" id="player_project_{{project.ldt_id}}" class="ldt_link_embed" alt="{% trans 'link json by id' %}" title="{% trans 'link json by id' %}"/></div></td>
+ <td class="cellimg"><div class="cellimgdiv">
+ <a href='{% url ldt.ldt_utils.views.workspace.popup_embed %}?json_url={{WEB_URL}}{{json_url_id}}&player_id=player_project_{{project.ldt_id}}&ldt_id={{project.ldt_id}}'>
+ <img src="{{LDT_MEDIA_PREFIX}}img/plugin.png" id="player_project_{{project.ldt_id}}" class="ldt_link_embed" alt="{% trans 'link json by id' %}" title="{% trans 'link json by id' %}"/></div>
+ </a>
+ </td>
<td class="cellimg">
{% ifequal project.state 2 %}
<img src="{{LDT_MEDIA_PREFIX}}img/icon-yes.gif" {% if project.change %} alt="{% trans 'Project published, click to unpublish' %}" title="{% trans 'Project published, click to unpublish' %}" class="publishedproject qtiplink" {% else %} class="qtiplink" title="{% trans "You are not allowed to change this project" %}"{% endif %} id="project_{{project.ldt_id}}" /></div>
--- 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
--- 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;
+}
+
--- 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='\
+<div> \n \
+ <div id="'+player_id+'_embed" style="float:left; width:'+player_width+';" class="iri_player_embed">\n\
+ </div>\n\
+<script type="text/javascript" src="'+WEB_URL+LDT_MEDIA_PREFIX+'metadataplayer/LdtPlayer-core.js"></script>\n\
+<script type="text/javascript">\n\
+ if (typeof jQuery == "undefined") {\n\
+ jQuery = IriSP.jQuery;\n\
+ }\n\
+ var metadatas = {metadata: {url: "'+json_url+'"}};\n\
+ var metadata_key = "metadata";\n\
+ IriSP.libFiles.defaultDir = "'+WEB_URL+LDT_MEDIA_PREFIX+'js/";\n\
+ IriSP.libFiles.locations.jwPlayerSWF = "'+WEB_URL+LDT_MEDIA_PREFIX+'swf/player.swf";\n\
+ IriSP.libFiles.locations.recordMicSwf = "'+WEB_URL+LDT_MEDIA_PREFIX+'swf/record_mic.swf";\n\
+ IriSP.libFiles.locations.zeroClipboardSwf = "'+WEB_URL+LDT_MEDIA_PREFIX+'swf/ZeroClipboard10.swf";\n\
+ IriSP.libFiles.locations.cssjQueryUI = "'+WEB_URL+LDT_MEDIA_PREFIX+'css/jq-css/themes/base/jquery-ui.css"\n\
+ IriSP.language = "'+LANGUAGE_CODE+'";\n\
+\n\
+ IriSP.widgetsDir = "'+WEB_URL+LDT_MEDIA_PREFIX+'metadataplayer";\n\
+ var _metadata = {\n\
+ url: metadatas[metadata_key].url + "?callback=?",\n\
+ format: "ldt"\n\
+ };\n\
+ var _config = {\n\
+ width: "'+player_width+'",\n\
+ container: "'+player_id+'_embed",\n\
+ css: "'+WEB_URL+LDT_MEDIA_PREFIX+'metadataplayer/LdtPlayer-core.css",\n\
+ default_options: {\n\
+ metadata: _metadata\n\
+ },\n';
+
+ return base;
+
+}
+
+function generate_widget_code(){
+ 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');
+
+ widget_code='\
+ widgets: [\n\
+ {\n';
+ if (external_url!='None'){
+ widget_code+='\
+ type: "AutoPlayer",\n\
+ video: "'+external_url+'",\n';
+ }
+ else{
+ widget_code+='\
+ type: "JwpPlayer",\n\
+ streamer: function(_url) {\n\
+ var _matches = _url.match(/^[^\\/]+\\/\\/[^\\/]+\\/[^\\/]+\\//);\n\
+ if (_matches) {\n\
+ return _matches[0];\n\
+ } else {\n\
+ return _url;\n\
+ }\n\
+ },\n\
+ live: true,\n\
+ provider: "rtmp",\n';
+ }
+
+ widget_code+='\
+ height: 300,\n\
+ autostart: true\n\
+ }';
+ if (polemic_val.checked){
+ defaultcolor= $j("#polemic_default_color").val();
+ foundcolor=$j("#polemic_found_color").val();
+ widget_code+='\
+ ,{\n\
+ type: "Polemic",\n\
+ annotation_type: false,\n\
+ defaultcolor: "'+defaultcolor+'",\n\
+ foundcolor: "'+foundcolor+'"\n\
+ }';
+ }
+
+ if(sparkline_val.checked){
+ linecolor=$j("#sparkline_line_color").val();
+ fillcolor=$j("#sparkline_fill_color").val();
+ widget_code+=',{\n\
+ type: "Sparkline",\n\
+ lineColor: "'+linecolor+'",\n\
+ fillColor: "'+fillcolor+'"\n\
+ }';
+ }
+
+ if(segments_val.checked){
+ widget_code+=',{\n\
+ type: "Segments",\n\
+ annotation_type: ["chap","découpage"]\n\
+ }';
+ }
+ widget_code+=',{\n\
+ type: "Slider"\n\
+ },{\n\
+ type: "Controller"\n\
+ },{\n\
+ type: "Mediafragment"\n\
+ }';
+ if(slideshare_val.checked){
+ widget_code+='\
+ ,{\n\
+ type: "Slideshare",\n\
+ container: "Slideshare_ext",\n\
+ embed_width: 400,\n\
+ embed_height: 334,\n\
+ annotation_type: "slide"\n\
+ }';
+ }
+
+ if(social_val.checked){
+ show_url=document.getElementById("show_url_checkbox");
+ show_twitter=document.getElementById("show_twitter_checkbox");
+ show_fb=document.getElementById("show_fb_checkbox");
+ show_gplus=document.getElementById("show_gplus_checkbox");
+ show_mail=document.getElementById("show_mail_checkbox");
+
+ widget_code+='\
+ ,{\n\
+ type: "Social",\n\
+ container: "Social_ext",\n\
+ url: document.location.href.replace(/#.*$/,""),\n\
+ text: document.title,\n';
+
+ if(show_url.checked){
+ widget_code+='\
+ show_url: true,\n';
+ }
+ else{
+ widget_code+='\
+ show_url: false,\n';
+ }
+ if(show_twitter.checked){
+ widget_code+='\
+ show_twitter: true,\n';
+ }
+ else{
+ widget_code+='\
+ show_twitter: false,\n';
+ }
+ if(show_fb.checked){
+ widget_code+='\
+ show_fb: true,\n';
+ }
+ else{
+ widget_code+='\
+ show_fb: false,\n';
+ }
+ if(show_gplus.checked){
+ widget_code+='\
+ show_gplus: true,\n';
+ }
+ else{
+ widget_code+='\
+ show_gplus: false,\n';
+ }
+ if(show_mail.checked){
+ widget_code+='\
+ show_mail: true\n';
+ }
+ else{
+ widget_code+='\
+ show_mail: false\n';
+ }
+
+ widget_code+='}';
+ }
+ if(annotation_val.checked){
+ widget_code+='\
+ ,{\n\
+ type: "Annotation",\n\
+ start_minimized: true,\n\
+ site_name : "Lignes de Temps",\n\
+ annotation_type: ["chap","découpage"]\n\
+ }';
+ }
+ if(tweet_val.checked){
+ widget_code+='\
+ ,{\n\
+ type: "Tweet",\n\
+ hide_timeout: 5000\n\
+ }';
+ }
+
+ if(annotationslist_val.checked){
+ widget_code+=',{\n\
+ type: "AnnotationsList",\n\
+ container: "AnnotationsList_ext",\n\
+ ajax_granularity : 300000,\n\
+ default_thumbnail : "'+WEB_URL+LDT_MEDIA_PREFIX+'css/imgs/video_sequence.png",\n\
+ show_audio: true,\n\
+ rtmp_streamer: "rtmp://media.iri.centrepompidou.fr/ddc_micro_record/"\n\
+ }';
+ }
+
+ if(tagcloud_val.checked){
+ widget_code+=',{\n\
+ type: "Tagcloud",\n\
+ }';
+ }
+
+ widget_code+=']\n\
+ };\n';
+
+ return widget_code;
+
+}
+
+function generate_div_code(){
+ var annotationslist_val=document.getElementById('annotations_list_checkbox');
+ var slideshare_val=document.getElementById('slideshare_checkbox');
+ var social_val=document.getElementById('social_checkbox');
+ code=generate_base_embed_code();
+ code+=generate_widget_code();
+ code+='\n\
+ _myPlayer = new IriSP.Metadataplayer(_config);\n\
+ </script>\n';
+ if(social_val.checked){
+ code+='\
+ <div id="Social_ext" class="Ldt-TraceMe Ldt-Widget" style="float:right; width:400px; height:24px;" widget-type="Social">\n\
+ </div>\n';
+ }
+ if(slideshare_val.checked){
+ code+='\
+ <div id="Slideshare_ext" class="ext_widget Ldt-TraceMe Ldt-Widget" style="float:left; width:400px;" widget-type="Slideshare">\n\
+ </div>\n';
+ }
+
+ if(annotationslist_val.checked){
+ code+='\
+ <div id="AnnotationsList_ext" class="ext_widget Ldt-TraceMe Ldt-Widget" style="float:left; width:400px;" widget-type="AnnotationsList"></div>\n';
+ }
+
+ code+='\
+</div>\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="<iframe src='"+iframeUrl+"' width='"+player_width+"' height='"+player_height+"' seamless='seamless'></iframe>";
+
+ 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="<iframe src='"+iframeUrl+"' width='"+player_width+"' height='"+player_height+"' seamless='seamless'></iframe>";
- $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();
+}
+
--- 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);
- $('<a />', {
- 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() {