# HG changeset patch # User ymh # Date 1428509812 -7200 # Node ID 01b0a1f962851b4f74cbbfb229acb271076332da # Parent 08f25d0c9602150b3a8c1c0a858f536eea661f00 add absolute path for embed resources + correctly reorder slider and controller diff -r 08f25d0c9602 -r 01b0a1f96285 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html Wed Apr 08 16:14:42 2015 +0200 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed/mdplayer_config_base.html Wed Apr 08 18:16:52 2015 +0200 @@ -3,7 +3,7 @@ {% load front_tags %} {% load absurl %} {% load static %} -{% load static %} +{% load absstatic %} {% load analytics %} {% block js_import %} {{ block.super }} @@ -27,17 +27,17 @@ var json_url='{{json_url}}'; var json_url_concatenate='{{json_url_concatenate}}'; var player_id='{{player_id}}'; - var defaultDir='{% static "ldt/js/" %}'; - var jwPlayerSWF='{% static "ldt/swf/player.swf" %}'; - var recordMicSwf='{% static "ldt/swf/record_mic.swf" %}'; - var zeroClipboardSwf='{% static "ldt/swf/ZeroClipboard10.swf" %}'; - var cssjQueryUI='{% static "ldt/css/jq-css/themes/base/jquery-ui.css" %}'; - var widgetsDir='{% static "ldt/metadataplayer" %}'; - var configCss='{% static "ldt/metadataplayer/LdtPlayer-core.css" %}'; + var defaultDir='{% absstatic "ldt/js/" %}'; + var jwPlayerSWF='{% absstatic "ldt/swf/player.swf" %}'; + var recordMicSwf='{% absstatic "ldt/swf/record_mic.swf" %}'; + var zeroClipboardSwf='{% absstatic "ldt/swf/ZeroClipboard10.swf" %}'; + var cssjQueryUI='{% absstatic "ldt/css/jq-css/themes/base/jquery-ui.css" %}'; + var widgetsDir='{% absstatic "ldt/metadataplayer" %}'; + var configCss='{% absstatic "ldt/metadataplayer/LdtPlayer-core.css" %}'; var default_thumbnail='{% static "ldt/css/imgs/video_sequence.png" %}'; var segment_api="{% absurl '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 %}"; var annotation_api = "{% absurl 'api_dispatch_list' resource_name='annotations' api_name='1.0' %}"; - var LdtPlayer_core='{% static "ldt/metadataplayer/LdtPlayer-core.js" %}'; + var LdtPlayer_core='{% absstatic "ldt/metadataplayer/LdtPlayer-core.js" %}'; var creator_name='{{request.user.username}}'; $j(document).ready(function(){ diff -r 08f25d0c9602 -r 01b0a1f96285 src/ldt/ldt/static/ldt/js/embed/v2/embed.js --- a/src/ldt/ldt/static/ldt/js/embed/v2/embed.js Wed Apr 08 16:14:42 2015 +0200 +++ b/src/ldt/ldt/static/ldt/js/embed/v2/embed.js Wed Apr 08 18:16:52 2015 +0200 @@ -221,6 +221,13 @@ widget_code+='autostart: false\n\}'; } + widget_code += ',{\n' + + 'type: "Slider"\n' + + '},{\n' + + 'type: "Controller"\n' + + '},{\n' + + 'type: "Mediafragment"\n' + + '}\n'; if (polemic_val.checked){ defaultcolor= $j("#polemic_default_color").val(); @@ -315,13 +322,6 @@ }'; } - widget_code+=',{\n\ - type: "Slider"\n\ - },{\n\ - type: "Controller"\n\ - },{\n\ - type: "Mediafragment"\n\ - }'; if(createannotation_val.checked) { var tag_titles = ($j('input[name=annotation_tag]:checked').attr('id') === 'set_tags') ? $j('#tag_list').val() : false;