diff -r ebbb23d32748 -r c0e4d761bcb6 integration/js/edition.js --- a/integration/js/edition.js Mon Jun 10 17:48:05 2013 +0200 +++ b/integration/js/edition.js Mon Jun 10 18:02:41 2013 +0200 @@ -4,15 +4,26 @@ currentSlider = undefined, secMiniChapter = 10; + + + $(function(){ + var annotationsColors = { + 'video' : '#BE4477', + 'text' : '#5E90CB', + 'slideshow' : '#F69058', + 'audio' : '#63BE6C', + 'links' : '#8985BB' + } + var global = { colorsIndex : 0, colors : - ['#1abc9c', '#3498db', '#9b59b6', '#2ecc71', - '#f1c40f', '#ecf0f1', '#e67e22', '#e74c3c', '#95a5a6', - '#16a085', '#2980b9', '#8e44ad', '#27ae60', - '#f39c12', '#c0392b', '#bdc3c7', '#d35400', '#7f8c8d'] + ['#FF6138', '#FFFF9D', '#BEEB9F', '#79BD8F', '#00A388', + '#1695A3', '#ACF0F2', '#F3FFE2', '#EB7F00', '#FF8000', + '#FFD933', '#CCCC52', '#8FB359', '#FFD393', '#F54F29' + ] }; function getTemplate(idTpl){ @@ -38,6 +49,16 @@ //load Chapitre chapters = chapterAnnType.getAnnotations(); + if(!chapters.length){ + var dataChapter = { + title : '', + begin : 0, + end : myMedia.duration, + description : '', + keywords : [] + }; + newChapter(dataChapter, true); + } $.each(chapters, function(k, v){ v.color = getRandomColor(); }); @@ -58,7 +79,7 @@ var type = v.content.mimetype.split('-'); type = type[type.length-1] v.type = type; - v.color = getRandomColor(); + v.color = annotationsColors[type]; }); renderAnnotation(); @@ -423,7 +444,7 @@ annotation.title = dataAnnotation.title; annotation.description = dataAnnotation.description; annotation.type = dataAnnotation.type; - annotation.color = global.colors[(global.colorsIndex