# HG changeset patch # User cavaliet # Date 1369665556 -7200 # Node ID dbe02b725ed7b141c6a91baf5cd67c9431b79313 # Parent e01c18ee5de74ff7129088f1fbff4787b9b574a9 import modif from integration. diff -r e01c18ee5de7 -r dbe02b725ed7 src/metadatacomposer/static/metadatacomposer/css/style.css --- a/src/metadatacomposer/static/metadatacomposer/css/style.css Mon May 27 16:24:42 2013 +0200 +++ b/src/metadatacomposer/static/metadatacomposer/css/style.css Mon May 27 16:39:16 2013 +0200 @@ -22,8 +22,9 @@ .tab-behavior{text-align: center;} .tab-behavior li{display: inline-block; float: none;} td ul{margin-bottom: 0;} -.modal.popup{width: 970px; margin-left: -485px;} -.popup .modal-body{max-height: none;} +.bibliotheque-image .span2:nth-child(4n+1){clear: left;} +.modal.popup{width: 970px; margin-left: -485px; height: 80%;} +.popup .modal-body{max-height: none; background-color: #fff; height: 80%;} .previsualisation img{max-height: 400px;} .modal-menu{margin: 0;} .modal h4{border-bottom: 1px solid #EEE; padding-bottom: 8px;} @@ -36,27 +37,28 @@ .project-title-editor{line-height: 28px; } .project-title-editor-form{margin: 0;} .project-action a:last-child{margin-right: 20px;} -.chapter-widget-info{} +.chapter-widget-info{margin-bottom: 20px;} .chapter-widget form{ margin: 0;} .chapter-widget input, .form-info-general-annotation input, .form-info-general-annotation textarea{width: 196px; max-width: 196px; } -.chapter-widget textarea{width: 426px; max-width: 426px; min-width: 426px; height: 20px; --webkit-transition: height .3s ease; --moz-transition: height .3s ease; -transition: height .3s ease; -} -.form-chapter-edit{padding-top: 10px;} +.chapter-widget textarea{width: 426px; max-width: 426px; min-width: 426px; height: 20px;-webkit-transition: height .3s ease;-moz-transition: height .3s ease;transition: height .3s ease;} +.form-chapter-edit{} .chapter-widget-info table{margin: 0; padding-top: 40px; } .chapter-widget table td{} .chapter-widget textarea:focus{height: 100px;} .chapitre-cut-wrap{position: relative; height: 50px; margin-bottom: 10px;} .btn-cut-chapter{position: absolute;top: 20px;left: 11px;} -.indicateur-chapter{z-index:100; left:10px; width: 1px; height: 100%;background-color: #000; position: absolute;} +.indicateur-chapter, .indicateur-annotation{z-index:100; left:10px; width: 1px; height: 100%;background-color: #000; position: absolute;} .chapter-segments {width: 100%; height: 20px; margin: 0;} .chapter-segments li{cursor:pointer; float: left; list-style: none; line-height: 20px; height: 20px; text-align: center; overflow: hidden;} -.list-chapter-wrap{} -.list-chapter-wrap h4{padding: 10px; border-bottom: 1px solid; margin-bottom: 10px;} -.add-annotation-wrap, form.form-info-general-annotation{padding: 10px 0; background-color: #1abc9c;} -.add-annotation-wrap strong{padding-left: 10px;} +.list-chapter-wrap, .list-annotation-wrap, .section{background-color: #F5F5F5; border: 1px solid #E5E5E5;} +.list-chapter-wrap table, .list-annotation-wrap table{margin-bottom: 0;} +.list-chapter-wrap h4, .form-chapter-edit h4, .list-annotation-wrap h4, .title-section{padding: 10px; border-bottom: 1px solid; margin-bottom: 10px;} +.add-annotation-wrap, form.form-info-general-annotation{padding: 10px 0;} +form.form-info-general-annotation ul.tagit {margin-left: 0px;width: 195px;} +form.form-info-general-annotation textarea{min-height:100px; height: 100px;min-width: 196px;} + +.add-annotation-wrap {margin-bottom: 20px; padding-top: 0;} + .slider-duration{width: 435px;display: inline-block; margin-bottom: 10px;} .btn-save-annotation{margin-right: 10px;} .edit-annotation-diaporama{} @@ -79,19 +81,29 @@ .close-tab:hover{color:#2c3e50;} .html-apercu{overflow: auto; margin-top: 10px;} .input-image-url{display: none;} -.timeline-annotation-widget{width: 460px;height: 40px;background-color: #ecf0f1; position: relative;} -.timeline-annotation-widget .annotation{width: 10px; height: 10px; background-color: #c0392b; position: absolute; top:15px;} +.timeline-annotations-wrap{position: relative;background-color: #ecf0f1;} +.timeline-annotations{width: 460px;height: 40px; position: relative;} +.timeline-annotations .annotation{width: 10px; height: 10px; background-color: #c0392b; position: absolute; top:15px;} ul.tagit{margin-left: 10px;-webkit-border-radius: 0px; -moz-border-radius: 0px; border-radius: 0px;} +.video-wrap{position: relative;} +.annotations-display{} +.annotation-display-view{display:none;text-align:center; line-height:200px;background-color: #fff;position: absolute; width: 200px; margin-left: -100px; height: 200px; margin-top: -100px; top: 50%; left: 50%;} +.list-current-annotations{position: absolute;bottom: 40px; left: 20px; margin: 0;} +.list-current-annotations li{list-style: none; margin-top: 4px;} +.list-current-annotations a{text-align:center; line-height:20px; color:#FFF;display: inline-block; background-color: #589; width: 20px; height: 20px; } +.list-current-annotations a:hover{text-decoration: none;} +.annotation-son-content textarea{max-width: 206px;} /* Tangle */ .time-tangle { color: #2c3e50; cursor: w-resize; position: relative; + border-bottom: 1px dashed #2c3e50; } .time-tangle:hover, .time-tangle.active { - color: #c0392b; border-bottom: 1px dashed #2c3e50; + color: #c0392b; } .time-tangle:hover:after, .time-tangle.active:after { @@ -113,4 +125,4 @@ .loader { background: url(../img/loader.gif) center no-repeat; background-size: 25px 25px; -} \ No newline at end of file +} diff -r e01c18ee5de7 -r dbe02b725ed7 src/metadatacomposer/static/metadatacomposer/js/common.js --- a/src/metadatacomposer/static/metadatacomposer/js/common.js Mon May 27 16:24:42 2013 +0200 +++ b/src/metadatacomposer/static/metadatacomposer/js/common.js Mon May 27 16:39:16 2013 +0200 @@ -43,8 +43,8 @@ e.preventDefault(); var titleMedia = $(this).attr('data-title'), textModal = $('

Êtes-vous sûr de vouloir supprimer '+titleMedia+' ?

'), - eltDelete = $(this).attr('href'); - $("#modal-confirm #btn-delete-modal").attr('data-id-elt-delete', eltDelete).focus(); + urlDelete = $(this).attr('href'); + $("#modal-confirm #btn-delete-modal").attr('href', urlDelete).focus(); $("#modal-confirm .modal-body").empty().append(textModal); $("#modal-confirm").modal('show'); }); @@ -54,10 +54,7 @@ }); $("#modal-confirm").on('click', '#btn-delete-modal', function(e){ - e.preventDefault(); - var idEltDelete = $(this).attr('data-id-elt-delete'); - $(idEltDelete).remove(); - $("#modal-confirm").modal('hide'); + }); }); \ No newline at end of file diff -r e01c18ee5de7 -r dbe02b725ed7 src/metadatacomposer/static/metadatacomposer/js/edition.js --- a/src/metadatacomposer/static/metadatacomposer/js/edition.js Mon May 27 16:24:42 2013 +0200 +++ b/src/metadatacomposer/static/metadatacomposer/js/edition.js Mon May 27 16:39:16 2013 +0200 @@ -1,5 +1,6 @@ var myMedia = null, currentChapter = null, + currentAnnotation = null, chapters = [], annotations = []; @@ -17,15 +18,15 @@ }; - - myProject.onLoad(function() { $(".project-title").text(myProject.title); myMedia = myProject.getCurrentMedia(); + //chargement des chapitres et annotations existants loadInitChapters(); + loadInitAnnotation() IriSP.htmlPlayer( myMedia, @@ -45,19 +46,74 @@ pos = wContainer * t / myMedia.duration, btnCutChapter = $('.btn-cut-chapter'), wBtnCutChapter = btnCutChapter.outerWidth(); - - $(".indicateur-chapter").css("left",pos); + + $(".indicateur-chapter, .indicateur-annotation").css("left",pos); if(pos+wBtnCutChapter>wContainer){ btnCutChapter.css("left",(pos - wBtnCutChapter)); }else{ btnCutChapter.css("left",pos); } + + //annotations view + var currentAnnotationsDisplay = new Array(); + $.each(annotations, function(k, v){ + + if(v.begin <= t && v.end >= t){ + currentAnnotationsDisplay.push(v.id); + if(!$('#item-current-annotation-'+v.id).length){ + var itemAnnotation = + $('
  • ') + .attr('id', 'item-current-annotation-'+v.id) + .attr('data-id', v.id) + .append( + $('') + .css('backgroundColor', v.color) + .attr('data-id', v.id) + .attr('href', '#') + .append( + $('').addClass('icon-'+getIcon(v.type)) + ) + ); + $('.list-current-annotations').append(itemAnnotation) + } + } + }); + $.each($('.list-current-annotations li'), function(k, v){ + var idAnnotation = $(this).attr('data-id'), + annotationDisplayView = $('.annotation-display-view'); + if($.inArray(idAnnotation, currentAnnotationsDisplay)<0){//il ne doit plus être affiché + $('#item-current-annotation-'+idAnnotation).remove(); + if(annotationDisplayView.attr('data-id') == idAnnotation && annotationDisplayView.is(":visible")){ + annotationDisplayView.hide(); + } + } + }); + + });//timeupdate });//myProject.onLoad +//display annotation view +$('.list-current-annotations').on('click', 'a', function(e){ + e.preventDefault(); + var annotationDisplayView = $('.annotation-display-view'), + idAnnotation = $(this).attr('data-id'); + var annotation = _.find(annotations, function(c){ return c.id == idAnnotation; }); -//modal + if(annotationDisplayView.attr('data-id') == idAnnotation && annotationDisplayView.is(":visible")){ + annotationDisplayView.hide(); + }else{ + annotationDisplayView + .attr('data-id', idAnnotation) + .css('backgroundColor', annotation.color) + .text(annotation.type) + .show(); + } +}); + +//########### modal + $(document).on('click', 'a.open-modal', function(e){ var diaporama = $(this).attr('data-diaporama'), idAnnotation = $(this).attr('data-id'); @@ -83,8 +139,9 @@ e.preventDefault(); $('.popup').modal('hide'); $.get('template.html', function(templates){ - var videoWrap = $('#'+global.idAnnotation).find('.annotation-video-content'), + var videoWrap = $('#tab-'+global.idAnnotation).find('.annotation-video-content'), tplVideo = $(templates).filter('#tpl-video-row').html(); + console.log(videoWrap) videoWrap.empty().append(tplVideo); }); @@ -97,24 +154,14 @@ $('.popup').modal('hide'); }); - $(document).on('click','.btn-delete-annotation', function(e){ - e.preventDefault(); - //si c'est une annotation et que la tab est ouverte, on la ferme - var type = $(this).attr('data-type'); - - var idAnnotation = $(this).attr('data-id'); - $('a[href=#annotation-'+idAnnotation+']').closest('li').remove(); - $('.tab-content #annotation'+idAnnotation).remove(); - $('#tab-list-annotation').tab('show'); - - }); + //confirmation suppression $("#modal-confirm").on('click', '#btn-delete-modal', function(e){ }); -//title-editor +//--title-editor $('.project-title-editor ._popover').bind('click',function(e){e.preventDefault()}); $('.project-title-editor ._popover').popover({ html : true, @@ -145,7 +192,7 @@ $('.project-title').html($(this).val()); }); -//--chapter +//######################## chapter //edit $('.list-chapter-wrap').on('click', '.btn-edit-chapter', function(e){ @@ -170,17 +217,7 @@ } }); - function onTagItChange(e, ui) { - var idChapter = $(this).parents('form').attr('data-chapter-id'), - value = $('input[name=keywords]').val(); - currentChapter.keywords = value; - $('#row-list-chapter-'+idChapter).find('.list-chapter-tags').text(value); - } - var tagitParam = { - afterTagRemoved : onTagItChange, - afterTagAdded : onTagItChange - } function loadFormChapter(idChapter){ currentChapter = _.find(chapters, function(c){ return c.id == idChapter; }); @@ -251,7 +288,7 @@ begin : myMedia.currentTime, end : organizeNewChapter(myMedia.currentTime), description : 'description', - keywords : 'tag1,tag2' + keywords : ['tag1','tag2'] }; newChapter(dataChapter); @@ -316,14 +353,81 @@ begin : 0, end : myMedia.duration, description : 'description', - keywords : 'tag1,tag2' + keywords : ['tag1','tag2'] }; newChapter(dataChapter); } +//######################## annotation + + function loadInitAnnotation(){//nouveau projet, 1 chapitre + var dataAnnotation = { + title : 'Titre azerty', + begin : myMedia.duration/5, + end : myMedia.duration/3, + description : 'description', + type : 'video', + keywords : ['ideal', 'tag'] + }; + newAnnotation(dataAnnotation); + renderAnnotation(); + } + + function newAnnotation(dataAnnotation){ + var annotation = new IriSP.Model.Annotation(false, myProject); + annotation.setMedia(myMedia.id); + annotation.setBegin(dataAnnotation.begin); + annotation.setEnd(dataAnnotation.end); + annotation.title = dataAnnotation.title; + annotation.description = dataAnnotation.description; + annotation.type = dataAnnotation.type; + annotation.color = global.colors[(global.colorsIndex').css({ + left : left, + width : width, + backgroundColor : v.color + }).addClass('annotation').attr('id', 'annotation-timeline-'+v.id); + + timeline.append(segment); + + //liste + $.get('template.html', function(templates){ + var tplAnnotationRow = $(templates).filter('#tpl-list-annotation-row').html(); + tplAnnotationRow = Mustache.render(tplAnnotationRow, v); + annotationList.append(tplAnnotationRow); + + }); + + }); + } //edit annotation $('#list-annotations').on('click', 'a.btn-edit-annotation', function(e){ @@ -331,17 +435,38 @@ var idAnnotation = $(this).attr('data-id'); //si il est déjà ouvert - if($('#annotation-'+idAnnotation).length){ - $('a[href=#annotation-'+idAnnotation+']').tab('show'); + if($('#tab-annotation-'+idAnnotation).length){ + $('a[href=#tab-annotation-'+idAnnotation+']').tab('show'); }else{ - var typeAnnotation = $(this).attr('data-type'), - data = {id:idAnnotation}; - openNewTab(typeAnnotation, data); + var data = _.find(annotations, function(c){ return c.id == idAnnotation; }); + openTab(data.type, data); } }); + $('.tab-content').on('keyup', 'input[name=title], textarea', function(e){ + var name = $(this).attr('name'), + value = $(this).val(); + currentAnnotation[name] = value; + if(name == 'title'){ + var idAnnotation = $(this).parents('form').attr('data-id'); + $('#onglet-title-'+idAnnotation).text(value); + } + }); + + //delete annotation + $(document).on('click','.btn-delete-annotation', function(e){ + e.preventDefault(); + + var idAnnotation = $(this).attr('data-id'); + annotations = _(annotations).reject(function(c) { return c.id == idAnnotation; }); + closeTab(idAnnotation); + if(!$(this).hasAttr('data-no-render'))//si on ferme à partir de la tab renderAnnotation sera appelé 2 fois + renderAnnotation(); + + }); + //tab - $('#annotation-tab').on('click', 'a', function(e){ + $('#onglet-annotations').on('click', 'a', function(e){ e.preventDefault(); $(this).tab('show'); }); @@ -350,31 +475,44 @@ $(document).on('click', '.open-tab', function(e){ e.preventDefault(); var type = $(this).attr('data-type'); - var data = $(this).attr('data-data'); // à définir - openNewTab(type); + openTab(type); }); - function openNewTab(type, data){ + function openTab(type, data){ + + var dataView; + if(_.isUndefined(data)){//nouveau + var currentTimePlusUnMin = 60 * 1000 + myMedia.currentTime, + endAnnotation = (currentTimePlusUnMin'), + var idAnnotation = dataView.id, + tabContent = $('
    '), iconTab; + currentAnnotation = _.find(annotations, function(c){ return c.id == idAnnotation; }); $.get('template.html', function(templates){ //head commun à tous - var view = { - titre : "un titre mustache", - id : uniqId - }; var tplHead = $(templates).filter('#tpl-head').html(); - var output = Mustache.render(tplHead, view); + var output = Mustache.render(tplHead, dataView); $(tabContent).append(output); - $(tabContent).find(".slider-duration").slider(configSlider); - + $(tabContent).find(".slider-duration").slider(configSlider(dataView)); + $(tabContent).find('.tag-it').tagit(tagitParam); //type - var viewType = {id : uniqId}; + var viewType = {id : idAnnotation}; var tpl = $(templates).filter('#tpl-'+type).html(); tpl = Mustache.render(tpl, viewType); $(tabContent).append(tpl); @@ -382,15 +520,16 @@ //particularité selon type switch(type){ - case 'video': iconTab = 'film'; + case 'sound': + break; + case 'video': break; case 'text': - iconTab = 'align-left'; - $(tabContent).find('.wysiwyg').cleditor(wysiwygConfig); + var cledit = $(tabContent).find('.wysiwyg').cleditor(wysiwygConfig)[0]; break; - case 'html': iconTab = 'link'; + case 'links': break; - case 'diaporama': iconTab = 'picture'; + case 'slideshow': $(tabContent).find('.number-spin').spin(spinParam); $(tabContent).find('.ui-sortable').sortable({ stop : function(event, ui){ @@ -399,20 +538,65 @@ }); break; } - $(".nav-tabs li:last-child").after('
  • New ×
    • '); - $('a[href=#annotation-'+idAnnotation+']').tab('show'); + + dataView.iconTab = getIcon(type); + var tplOnglet = $(templates).filter('#tpl-onglet').html(); + var onglet = Mustache.render(tplOnglet, dataView); + + $(".nav-tabs li:last-child").after(onglet); + $('a[href=#tab-annotation-'+idAnnotation+']').tab('show'); }); - }//openNewTab() + }//openTab() + + function getIcon(type){ + var icon; + switch(type){ + case 'sound': icon = 'volume-up'; + break; + case 'video': icon = 'film'; + break; + case 'text': + icon = 'align-left'; + break; + case 'html': icon = 'code'; + break; + case 'links': icon = 'link'; + break; + case 'slideshow': icon = 'picture'; + break; + } + return icon; + } + + //définit currentAnnotation quand la tab s'ouvre + $('#onglet-annotations').on('show', 'a[data-toggle="annotation"]', function (e) { + var idAnnotation = $(e.target).attr('data-id'); + currentAnnotation = _.find(annotations, function(c){ return c.id == idAnnotation; }); + }); + + //rafraichit annotations au retour sur la liste + $('#onglet-annotations').on('show', 'a[data-toggle="list-annotations"]', function (e) { + renderAnnotation(); + }); //fermer tab - $('#annotation-tab').on('click', 'span.close-tab', function(e){ + $('#onglet-annotations').on('click', 'span.close-tab', function(e){ e.preventDefault();e.stopPropagation(); - var idTab = $(this).parents('a').attr('href'); - $(this).closest('li').remove(); - $('.tab-content '+idTab).remove(); - $('#tab-list-annotation').tab('show'); + var idAnnotation = $(this).parents('a').attr('data-id'); + closeTab(idAnnotation); }); + $('.tab-content').on('click', '.btn-save-annotation', function(e){ + e.preventDefault(); + var idAnnotation = $(this).attr('data-id'); + closeTab(idAnnotation); + }); + + function closeTab(idAnnotation){ + $('#onglet-'+idAnnotation).remove(); + $('.tab-content #tab-annotation-'+idAnnotation).remove(); + $('#tab-list-annotation').tab('show'); + } //diaporama function addImageToDiaporama(diaporama){ @@ -448,11 +632,7 @@ -//sauvegarder annotation -$('.tab-content').on('click', '.btn-save-annotation', function(e){ - e.preventDefault(); - var idAnnotation = $(this).attr('data-id'); -}); + //annotation html $('.tab-content').on('click', '.btn-html-apercu', function(e){ @@ -464,17 +644,44 @@ apercuWrap.empty().html(htmlTextarea.val()); }); +//annotation texte +$(document).on('keyup', ".cleditorMain iframe", function(){ + + var v = $(this).text(); // or .html() if desired + $('#x').html(v); +}); //annotation > diaporama (spin) -//config +//################ config + +//tagit +function onTagItChange(e, ui) { + var tagitType = $(this).attr('data-type'), + value = $(this).val(); + + if(tagitType == 'chapter'){ + var idChapter = $(this).parents('form').attr('data-chapter-id'); + currentChapter.keywords = value.split(','); + $('#row-list-chapter-'+idChapter).find('.list-chapter-tags').text(value); + }else{ + currentAnnotation.keywords = value.split(','); + } + +} + +var tagitParam = { + afterTagRemoved : onTagItChange, + afterTagAdded : onTagItChange +} + //CLEditor annotation > text (wysiwyg) //http://premiumsoftware.net/cleditor/docs/GettingStarted.html#optionalParameters var wysiwygConfig = { width: 456, height: 250, controls: "bold italic underline strikethrough | font size " + - "style | color highlight removeformat | bullets numbering | outdent ", + "style | color highlight removeformat | bullets numbering | source", fonts: "Arial,Arial Black,Comic Sans MS,Courier New,Narrow,Garamond," + "Georgia,Impact,Sans Serif,Serif,Tahoma,Trebuchet MS,Verdana", sizes: "1,2,3,4,5,6,7", @@ -482,81 +689,97 @@ ["Header 3", "

    "], ["Header 4","

    "], ["Header 5","

    "], ["Header 6","
    "]], docType: '', - bodyStyle: "margin:0; font-family: 'Helvetica Neue',​Helvetica,​Arial,​sans-serif;" -}; + bodyStyle: "margin:0; font-family: 'Helvetica Neue',​Helvetica,​Arial,​sans-serif;", + updateTextArea : function(text){ -//slider -var configSlider = { - range: true, - values: [ 0, 1*60*1000 ], - min: 0, - max: 10*60*1000, - slide: function( event, ui ) { - - var debutString = millisecondsToString(ui.values[0]); - var endString = millisecondsToString(ui.values[1]); - var durationString = millisecondsToString(ui.values[1] - ui.values[0]); - - var idSlider = $(this).attr('data-id'); - - $( '#'+ idSlider +'-begin' ).html(debutString); - $( '#'+ idSlider +'-duration' ).html(durationString); - $( '#'+ idSlider +'-end' ).html(endString); - + return text; + }, + updateFrame: function(text){ + + return text; } }; -//milliseconds To 12h12m12s -function millisecondsToString(milliseconds) { - var oneHour = 3600000; - var oneMinute = 60000; - var oneSecond = 1000; - var seconds = 0; - var minutes = 0; - var hours = 0; - var result; +//slider +function configSlider(data){ - if (milliseconds >= oneHour) { - hours = Math.floor(milliseconds / oneHour); - } - - milliseconds = hours > 0 ? (milliseconds - hours * oneHour) : milliseconds; - - if (milliseconds >= oneMinute) { - minutes = Math.floor(milliseconds / oneMinute); - } - - milliseconds = minutes > 0 ? (milliseconds - minutes * oneMinute) : milliseconds; + return { + range: true, + values: [ data.begin.milliseconds, data.end.milliseconds ], + min: 0, + max: myMedia.duration.milliseconds, + slide: function( event, ui ) { + + data.setBegin(ui.values[0]); + data.setEnd(ui.values[1]); - if (milliseconds >= oneSecond) { - seconds = Math.floor(milliseconds / oneSecond); - } - - milliseconds = seconds > 0 ? (milliseconds - seconds * oneSecond) : milliseconds; - - if (hours > 0) { - result = (hours > 9 ? hours : "0" + hours) + "h"; - } else { - result = ""; - } + var idSlider = $(this).attr('data-id'), + wTimeline = $('.timeline-annotations').width(), + annotationTimeline = $('#annotation-timeline-'+ data.id), + width = Math.floor(data.getDuration() * wTimeline / myMedia.duration), + left = Math.floor(data.begin * wTimeline / myMedia.duration); - if (minutes > 0) { - result += (minutes > 9 ? minutes : "0" + minutes) + "m"; - } else { - result += "00m"; - } + $( '#'+ idSlider +'-begin' ).html(data.begin.toString()); + $( '#'+ idSlider +'-duration' ).html(data.getDuration().toString()); + $( '#'+ idSlider +'-end' ).html(data.end.toString()); - if (seconds > 0) { - result += (seconds > 9 ? seconds : "0" + seconds) + "s"; - } else { - result += "00s"; - } + annotationTimeline.css({ + left : left, + width :width + }); - return result; + } + }; + } +function getContentAnnotationByType(type){ + var content; + switch(type){ + case 'sound': + content = { + mimetype : "application/x-ldt-sound", + url : "", + embedcode : "" + }; + break; + case 'video': + content = { + mimetype : "application/x-ldt-video", + url : "", + embedcode : "" + }; + break; + case 'text': + content = { + mimetype : "application/x-ldt-text", + markup : "html", + text : "" + }; + break; + case 'links': + content = { + mimetype : "application/x-ldt-links", + markup : "html", + links : [] + }; + break; + case 'slideshow': + content = { + mimetype : "application/x-ldt-slideshow", + duration : 1, + autostart : false, + images : [] + }; + break; + } + return content; +}//getContentAnnotationByType + + //test -$(".wysiwyg").cleditor(wysiwygConfig); +a = $(".wysiwyg").cleditor(wysiwygConfig); + $('.number-spin').spin(spinParam); @@ -569,8 +792,6 @@ $('.slider-duration').slider(configSlider); -$('#annotation-tab a:last-child').tab('show'); - $(".tag-it").tagit(); });//ready \ No newline at end of file diff -r e01c18ee5de7 -r dbe02b725ed7 src/metadatacomposer/templates/metadatacomposer_project_list.html --- a/src/metadatacomposer/templates/metadatacomposer_project_list.html Mon May 27 16:24:42 2013 +0200 +++ b/src/metadatacomposer/templates/metadatacomposer_project_list.html Mon May 27 16:39:16 2013 +0200 @@ -84,6 +84,19 @@ {% endblock %} +{% block modal_divs %} + +{% endblock %} {% block js_page %} diff -r e01c18ee5de7 -r dbe02b725ed7 src/metadatacomposer/templates/metadatacomposer_resource_list.html --- a/src/metadatacomposer/templates/metadatacomposer_resource_list.html Mon May 27 16:24:42 2013 +0200 +++ b/src/metadatacomposer/templates/metadatacomposer_resource_list.html Mon May 27 16:39:16 2013 +0200 @@ -67,7 +67,7 @@
    - + Supprimer
    {% endblock %} diff -r e01c18ee5de7 -r dbe02b725ed7 src/metadatacomposer/templates/partial/resource_content_list.html --- a/src/metadatacomposer/templates/partial/resource_content_list.html Mon May 27 16:24:42 2013 +0200 +++ b/src/metadatacomposer/templates/partial/resource_content_list.html Mon May 27 16:39:16 2013 +0200 @@ -27,7 +27,7 @@ {{ res.content.update_date|date:"Y/m/d" }} - + diff -r e01c18ee5de7 -r dbe02b725ed7 src/metadatacomposer/templates/partial/resource_image_list.html --- a/src/metadatacomposer/templates/partial/resource_image_list.html Mon May 27 16:24:42 2013 +0200 +++ b/src/metadatacomposer/templates/partial/resource_image_list.html Mon May 27 16:39:16 2013 +0200 @@ -25,7 +25,7 @@ {{ res.modification_date|date:"Y/m/d" }} - +