# HG changeset patch # User grandjoncl # Date 1352729016 -3600 # Node ID e107b22256805bd992817fc0161f0611235eff51 # Parent a374c17243146c8fcfe941d323517ec73ecf75fb configuration of embed code over diff -r a374c1724314 -r e107b2225680 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 Thu Nov 08 17:59:14 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_iframe.html Mon Nov 12 15:03:36 2012 +0100 @@ -12,6 +12,12 @@ Ligne de Temps - IRI - Metadata Player +
@@ -64,14 +70,42 @@ live: true, provider: "rtmp", {% endif %} - height: 300, + height: '{{ player_height }}', autostart: true - } {% if polemic == 'all' %}, + } {% if polemic == 'all' or polemic == 'tweet' %}, { type: "Polemic", - annotation_type: false, + {% if polemic == 'all' %} + annotation_type: false, + {% endif %} + {% if polemic == 'tweet' %} + annotation_type: "tweet", + {% endif %} defaultcolor: "#{{ polemic_defaultColor }}", - foundcolor: "#{{ polemic_foundColor }}" + foundcolor: "#{{ polemic_foundColor }}", + + polemics : [ + { + "name" : "OK", + "keywords" : [ "++" ], + "color" : "#{{ polemic_okColor }}" + }, + { + "name" : "KO", + "keywords" : [ "--" ], + "color" : "#{{ polemic_koColor }}" + }, + { + "name" : "REF", + "keywords" : [ "==", "http://" ], + "color" : "#{{ polemic_refColor }}" + }, + { + "name" : "Q", + "keywords" : [ "?" ], + "color" : "#{{ polemic_qColor }}" + } + ] } {% endif %} {% if sparkline %} @@ -119,6 +153,11 @@ api_endpoint_template: "{{WEB_URL}}{% url api_dispatch_list resource_name='annotations' api_name='1.0' %}", api_method: "PUT", after_send_timeout: 8000, + {% if tag_titles %} + tag_titles : tag_titles_array, + {% else %} + tag_titles : false, + {% endif %} show_mic_record: {% if show_mic_record %}true{% else %}false{% endif %}, close_after_send: false, slice_annotation_type: ["chap","découpage"], diff -r a374c1724314 -r e107b2225680 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 Thu Nov 08 17:59:14 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_popup.html Mon Nov 12 15:03:36 2012 +0100 @@ -11,7 +11,7 @@ {{ content_form.media.js }} {% endblock %} - {% block js_declaration %} + {% block js_declaration %} - {% endblock %} - {% block css_import %} - {{ block.super }} - {{ content_form.media.css }} - - - - - - {% endblock %} + {% endblock %} + {% block css_import %} + {{ block.super }} + {{ content_form.media.css }} + + + + + + {% endblock %} {% block content %}
{% trans 'project id' %} ({% trans 'Select' %}) :
- {% trans 'Show Player' %} -
@@ -81,132 +73,145 @@
-

{% trans 'Integration mode' %} - {% trans 'div' %} - {% trans 'iframe' %}
-
- - - - {% trans 'Preset Modes' %} -
-
- {% trans 'basic configuration' %}
- {% trans 'polemic configuration' %}
- {% trans 'polemic configuration with slideshare and tagcloud' %}
-
+

{% trans 'Integration mode' %} + {% trans 'div' %} + {% trans 'iframe' %}
+
+
+ {% trans 'Player Size : ' %} + x +
- - - - - {% trans 'Create your own configuration' %} -
-
-
- - CreateAnnotation -
-
- - Show Mic Record -
-
+ + + + {% trans 'Preset Modes' %} +
+
+ {% trans 'Basic configuration' %}
+ {% trans 'Polemic configuration' %}
+ {% trans 'Polemic configuration with sparkline and tagcloud' %}
+
- - Segments -
- - AnnotationsList -
-
- - Polemic -
- - {% trans "personalize tweet's color" %} - -
-
- {% trans "default color" %} - - - - - - -
-
- {% trans "found color" %} - - - - - - - + + + + + {% trans 'Create your own configuration' %} +
+
+
+ + CreateAnnotation +
+
+ + {% trans 'Audio annotation' %} +
+ {% trans 'Use most used tags ' %} + + {%trans 'Set your own tags : ' %} + +
-
-
- - Sparkline -
- - {% trans "personalize sparkline's color" %} - -
-
- {% trans 'line color' %} - - - - - - -
- -
- {% trans 'fill color' %} - - - - - - + + Segments +
+ + AnnotationsList +
+
+ + Polemic +
+
+
{% trans 'Display in the polemic timeline : ' %} + {% trans 'only tweets' %} + {% trans 'all annotations' %}
+ + {% 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 -
-
- Url - Twitter - Facebook - Google Plus - {% trans 'share with email' %}
+ + Slideshare +
+
+ + Social +
+
+ Url + Twitter + Facebook + Google Plus + {% trans 'share with email' %}
+
+
+ + Annotation +
+ + Tweet +
+ + Tagcloud +
-
- - Annotation -
- - Tweet -
- - Tagcloud -
- -
- -
+ +
+ {% trans 'Show Player' %} + {% endblock %} {% analytics %} diff -r a374c1724314 -r e107b2225680 src/ldt/ldt/ldt_utils/views/workspace.py --- a/src/ldt/ldt/ldt_utils/views/workspace.py Thu Nov 08 17:59:14 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/views/workspace.py Mon Nov 12 15:03:36 2012 +0100 @@ -132,10 +132,16 @@ rend_dict = get_datas_for_embed(request, json_url, player_id, ldt_id) # Manage iframe options + rend_dict["player_height"]=request.GET.get("player_height") + rend_dict["player_width"]=request.GET.get("player_width") 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") + rend_dict["polemic_okColor"] = request.GET.get("polemic_okColor") + rend_dict["polemic_koColor"] = request.GET.get("polemic_koColor") + rend_dict["polemic_refColor"] = request.GET.get("polemic_refColor") + rend_dict["polemic_qColor"] = request.GET.get("polemic_qColor") 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()) @@ -144,6 +150,8 @@ rend_dict["player_width"] = 550 if request.GET.has_key("createannotation"): rend_dict["createannotation"] = {'true': True, 'false': False, "0": False, "1": True}.get(request.GET.get("createannotation").lower()) + if request.GET.has_key("tag_titles"): + rend_dict["tag_titles"] = request.GET.get("tag_titles") if request.GET.has_key("sparkline"): rend_dict["sparkline"] = request.GET.get("sparkline") rend_dict["sparkline_lineColor"] = request.GET.get("sparkline_lineColor") @@ -189,9 +197,6 @@ stream_mode = project.stream_mode if stream_mode != "video": stream_mode = 'radio' - - player_width = 550 - player_height = 380 if stream_mode == 'radio': player_height = 1 @@ -204,7 +209,7 @@ 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, + 'external_url': external_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} diff -r a374c1724314 -r e107b2225680 src/ldt/ldt/locale/fr/LC_MESSAGES/django.mo Binary file src/ldt/ldt/locale/fr/LC_MESSAGES/django.mo has changed diff -r a374c1724314 -r e107b2225680 src/ldt/ldt/locale/fr/LC_MESSAGES/django.po --- a/src/ldt/ldt/locale/fr/LC_MESSAGES/django.po Thu Nov 08 17:59:14 2012 +0100 +++ b/src/ldt/ldt/locale/fr/LC_MESSAGES/django.po Mon Nov 12 15:03:36 2012 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-08 16:55+0100\n" +"POT-Creation-Date: 2012-11-12 14:54+0100\n" "PO-Revision-Date: 2010-03-09 15:52+0100\n" "Last-Translator: Yves-Marie Haussonne \n" "Language-Team: LANGUAGE \n" @@ -655,7 +655,7 @@ msgstr "Créer un nouveau projet Ligne de Temps" #: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:23 -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:54 +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:208 msgid "Show Player" msgstr "Afficher le Lecteur métadata" @@ -663,132 +663,171 @@ msgid "Hide Player" msgstr "Masquer le Lecteur métadata " -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:52 +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:51 msgid "project id" msgstr "Identifiant du projet " -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:52 +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:51 msgid "Select" msgstr "Sélectionner" -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:64 +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:56 msgid "popup_player" msgstr "Code Lecteur métadata" -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:65 +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:57 msgid "popup_seo_body" msgstr "Code SEO" -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:66 +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:58 msgid "popup_seo_meta" msgstr "Code balise meta en-tête" -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:67 +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:59 msgid "popup_links" msgstr "Liste de liens" -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:84 +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:76 msgid "Integration mode" msgstr "Utiliser le mode d'intégration " -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:85 +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:77 msgid "div" msgstr "div" -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:86 +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:78 msgid "iframe" msgstr "iframe" -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:91 +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:81 +msgid "Player Size : " +msgstr "Taille de la vidéo : " + +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:88 msgid "Preset Modes" msgstr "Modes prédéfinis" -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:94 -msgid "basic configuration" +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:91 +msgid "Basic configuration" msgstr "Confirmation de base" -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:95 -msgid "polemic configuration" +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:92 +msgid "Polemic configuration" msgstr "Configuration avec widget polemic" -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:96 -msgid "polemic configuration with slideshare and tagcloud" -msgstr "Configuration avec widget polemic, slideshare et tagcloud" +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:93 +msgid "Polemic configuration with sparkline and tagcloud" +msgstr "Configuration avec widget polemic, sparkline et tagcloud" -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:103 +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:100 msgid "Create your own configuration" msgstr "Personnaliser votre configuration" -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:108 +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:105 msgid "Displays a form to create a new annotation" msgstr "Permet de créer une annotation en affichant un formulaire" -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:112 -msgid "allows the user to record an annotation" +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:108 +msgid "audio annotation" +msgstr "Annotation audio" + +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:109 +msgid "Audio annotation" +msgstr "Annotation audio" + +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:109 +msgid "Allows the user to record an annotation" msgstr "Permet à l'utilisateur d'enregistrer une annotation à l'aide d'un micro" -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:117 +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:111 +msgid "Use most used tags " +msgstr "Utiliser les tags les plus utilisés" + +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:113 +msgid "Set your own tags : " +msgstr "Ajouter vos propres tags" + +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:113 +msgid "Write your tags separeted by a comma" +msgstr "Ecrire la liste des tags séparés par une virgule" + +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:119 msgid "Displays segments of a media as rectangles on an horizontal line" msgstr "Affiche le chapitrage du média, en horizontal" -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:120 +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:122 msgid "Show a list of annotations" msgstr "Affiche une liste d’annotations " -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:124 -msgid "" -"Shows the polemical timeline, i.e. tweets colored according to the polemical syntax" +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:126 +msgid "Shows the polemical timeline, i.e. tweets colored according to the polemical syntax" msgstr "Affiche la timeline polémique, c’est à dire les tweets colorés en fonction de la syntaxe polémique " -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:127 -msgid "personalize tweet's color" +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:129 +msgid "Display in the polemic timeline : " +msgstr "Afficher dans la timeline polemic : " + +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:130 +msgid "only tweets" +msgstr "seulement les annotations de type tweet" + +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:131 +msgid "all annotations" +msgstr "toutes les annotations" + +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:133 +msgid "Personalize tweet's color" msgstr "Personnaliser les couleurs des tweets" -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:131 -msgid "default color" +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:138 +msgid "Default color" msgstr "Couleur des tweets sans annotation polémique : " -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:140 -msgid "found color" +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:142 +msgid "Polemic's color : ++ : " +msgstr "Couleur des tweets polémiques de type : ++ : " + +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:152 +msgid "Found color" msgstr "Couleur d'affichage des tweets lors d'une recherche : " -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:153 +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:160 msgid "Displays a curve showing the volume of tweets across time" msgstr "Affiche une courbe indiquant l’évolution du volume d’annotations au cours du temps" -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:156 +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:164 msgid "personalize sparkline's color" msgstr "Personnaliser les couleurs de la courbe" -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:160 +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:168 msgid "line color" msgstr "Couleur de la courbe : " -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:170 +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:173 msgid "fill color" msgstr "Couleur sous la courbe : " -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:181 +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:180 msgid "Displays a div in order to watch the slides displayed in the media" msgstr "Permet d'afficher les slides d'un média" -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:185 +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:184 msgid " Adds buttons to share an URL on social networks" msgstr "Affiche des boutons pour partager une URL sur les réseaux sociaux" -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:192 +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:191 msgid "share with email" msgstr "Partager par email" -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:196 -msgid "Displays information relative to a single segment/annotation while it is being played" +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:195 +msgid " Displays information relative to a single segment/annotation while it is being played" msgstr "Affiche les informations relatives à une annotation au moment où celle-ci est jouée" -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:199 +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:198 msgid "Show the contents on a tweet when clicked (in Polemic Widget)" msgstr "Affiche furtivement le contenu d’un tweet " -#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:202 +#: .\ldt_utils\templates\ldt\ldt_utils\embed_popup.html.py:201 msgid "Shows a tag cloud" msgstr "Affiche un nuage de mots-clés " @@ -1122,7 +1161,7 @@ msgstr "Echec lors du commit de la suppression du contenu" #: .\ldt_utils\views\json.py:40 .\ldt_utils\views\rdf.py:15 -#: .\ldt_utils\views\workspace.py:200 +#: .\ldt_utils\views\workspace.py:205 msgid "You can not access this project" msgstr "vous n'avez pas l'autorisation d'accéder à ce projet" diff -r a374c1724314 -r e107b2225680 src/ldt/ldt/static/ldt/css/embed_popup.css --- a/src/ldt/ldt/static/ldt/css/embed_popup.css Thu Nov 08 17:59:14 2012 +0100 +++ b/src/ldt/ldt/static/ldt/css/embed_popup.css Mon Nov 12 15:03:36 2012 +0100 @@ -25,92 +25,46 @@ } .codeColor_text{ - width: 46px; + width: 50px; text-align: center; color: #949494; font-size: 12px; padding: 3px; } -.blockCo { - border: 1px solid; - display: inline-block; - height: 13px; - padding: 0; - vertical-align: -2px; - width: 13px; - margin-right: 7px; -} - -.blockCo.grey{ - background-color: #585858; - border-color: #323232; -} - -.blockCo.purple { - background-color: #fc00ff; - border-color: #97009a; -} - - -.blockCo.orange { - background-color: #FF9933; - border-color: #CC6600; -} - - -.blockCo.lime { - background-color: #C9FF23; - border-color: #8EBC00; - -} - -.blockCo.fuschia { - background-color: #FF0179; - border-color: #9A0049; - +.number_area{ + width: 30px; + text-align: center; + padding: 3px; + font-size: 12px; + color: #7B8084; + border: 3px solid lightGrey; } -.blockCo.white { - background-color: #FFFFFF; - border-color: #CCCCCC; -} - -.blockCo.blue_grey{ - background-color: #7492b4; - border-color: #4d6c8f; +.tags_area{ + padding: 3px; + font-size: 12px; + color: #7B8084; + border: 3px solid lightGrey; } - -.blockCo.black{ - background-color: #050505; - border-color: #515151; +.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; } - -.blockCo.light_grey{ - background-color: #aeaeb8; - border-color: #858594; +.refresh_button:hover { + background-color:#fffaff; } -.blockCo.brown_orange{ - background-color: #ebc8a3; - border-color: #FF9933; -} - -.blockCo.pastel_green{ - background-color: #daf4af; - border-color: #a1d600; +.refresh_button:active { + position:relative; + top:1px; } - -.blockCo.pastel_fushia{ - background-color: #da7ba7; - border-color: #a72f66; -} - -.blockCo.dark_lime{ - background-color: #a1d600; - border-color: #678a00; -} - #button_row input { margin: 10px; } @@ -221,6 +175,10 @@ margin-left: 21px; } +.embedPersonnalisationSecondLevel{ + margin-left: 22px; +} + .expArrow { width:0px; height:0px; diff -r a374c1724314 -r e107b2225680 src/ldt/ldt/static/ldt/img/arrow_refresh.png Binary file src/ldt/ldt/static/ldt/img/arrow_refresh.png has changed diff -r a374c1724314 -r e107b2225680 src/ldt/ldt/static/ldt/img/refresh_button.jpg Binary file src/ldt/ldt/static/ldt/img/refresh_button.jpg has changed diff -r a374c1724314 -r e107b2225680 src/ldt/ldt/static/ldt/js/embed_popup.js --- a/src/ldt/ldt/static/ldt/js/embed_popup.js Thu Nov 08 17:59:14 2012 +0100 +++ b/src/ldt/ldt/static/ldt/js/embed_popup.js Mon Nov 12 15:03:36 2012 +0100 @@ -15,9 +15,10 @@ function init_events(){ toggle_display(); - mode1(); $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); @@ -25,16 +26,22 @@ $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("#polemic_color_options").toggle(false); + $j("#sparkline_color_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("#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"); $j("#createannotation_options").toggle(false); + mode1(); + $j("#project_id_select").click(function(){ $j("#project_id_input").focus(); $j("#project_id_input").select(); @@ -115,12 +122,12 @@ }); - $j("#displayPolemicOptions").click(function(){ - $j("#polemic_options").slideToggle("fast"); + $j("#displayPolemicColorOptions").click(function(){ + $j("#polemic_color_options").slideToggle("fast"); }); $j("#displaySparklineOptions").click(function(){ - $j("#sparkline_options").slideToggle("fast"); + $j("#sparkline_color_options").slideToggle("fast"); }); $('.infostooltip').each( function () { @@ -152,10 +159,12 @@ $j("#player_id_code").focus(); $j("#player_id_code").select(); } + function generate_base_embed_code(){ + var player_width_val=$j("#player_width").val(); base='\
\n \ -
\n\ +
\n\
\n\ \n\