# HG changeset patch # User Anthony Ly # Date 1370958422 -7200 # Node ID a56fad1ada355fa555d01b9756017a3a146529e5 # Parent fedc0d054b556f0937657aa3973bb978a87ccbb2# Parent dbd3a1441943f2ca41d77be32cea748911879e08 Merge diff -r fedc0d054b55 -r a56fad1ada35 src/metadatacomposer/static/metadatacomposer/css/style.css --- a/src/metadatacomposer/static/metadatacomposer/css/style.css Tue Jun 11 15:46:43 2013 +0200 +++ b/src/metadatacomposer/static/metadatacomposer/css/style.css Tue Jun 11 15:47:02 2013 +0200 @@ -75,6 +75,7 @@ .table td{vertical-align: middle;} .table td td{padding: 1px; border: none;} .table td td a{width: 12px;display: block;} +.table th.copy-url{width: 135px;} .config-diaporama{color: #FFF;} .config-diaporama form{background-color: #34495e; padding: 4px 0; margin: 0; overflow: hidden; line-height: 28px;} .config-diaporama form label{display: inline-block; padding-left: 10px;} @@ -117,7 +118,7 @@ .description-slideshow-row span{max-height: 100px; display: inline-block; overflow: auto;} .description-slideshow-row textarea{width: 164px; max-width: 164px; height: 100px;} .label-modify-video, .label-add-video{display: none;} -.shadow {background-color: #00FFFF !important;} +.shadow {background-color: #54D0ED !important;} .alert-message{display: none;} .alert{display: none;} /* Tangle */ @@ -129,6 +130,13 @@ .time-tangle.deactivate:hover {border: none; color: #2c3e50;} .time-tangle.deactivate:hover:after {display: none;} +a.open-tab{text-shadow:none;} +a.open-tab:hover{background-color: #E6E6E6;} +.open-tab.video{background-color: #BE4477;} +.open-tab.text{background-color:#5E90CB;} +.open-tab.slideshow{background-color:#F69058;} +.open-tab.audio{background-color:#63BE6C;} +.open-tab.links{background-color:#8985BB;} .loader { background: url(../img/loader.gif) center no-repeat; background-size: 25px 25px; diff -r fedc0d054b55 -r a56fad1ada35 src/metadatacomposer/static/metadatacomposer/js/edition.js --- a/src/metadatacomposer/static/metadatacomposer/js/edition.js Tue Jun 11 15:46:43 2013 +0200 +++ b/src/metadatacomposer/static/metadatacomposer/js/edition.js Tue Jun 11 15:47:02 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){ @@ -29,14 +40,25 @@ var anntypes = myProject.getAnnotationTypes().searchByTitle("chapitrage"); if (!anntypes.length) { - chapterAnnType = new IriSP.AnnotationType(false, myProject); + chapterAnnType = new IriSP.Model.AnnotationType(false, myProject); chapterAnnType.title = "chapitrage"; + myProject.getAnnotationTypes().push(chapterAnnType); } else { chapterAnnType = anntypes[0]; } //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(); }); @@ -45,8 +67,9 @@ //load Annotations var anntypes = myProject.getAnnotationTypes().searchByTitle("annotations"); if (!anntypes.length) { - annotationsAnnType = new IriSP.AnnotationType(false, myProject); + annotationsAnnType = new IriSP.Model.AnnotationType(false, myProject); annotationsAnnType.title = "annotations"; + myProject.getAnnotationTypes().push(annotationsAnnType); } else { annotationsAnnType = anntypes[0]; } @@ -56,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(); @@ -421,7 +444,7 @@ annotation.title = dataAnnotation.title; annotation.description = dataAnnotation.description; annotation.type = dataAnnotation.type; - annotation.color = global.colors[(global.colorsIndex
-
+
0:00 @@ -133,11 +133,11 @@

Ajouter une annotation de type

- Son - Vidéo - Diaporama - Texte - Liens + Son + Vidéo + Diaporama + Texte + Liens
@@ -269,7 +269,7 @@
- + @@ -355,7 +355,7 @@ - +
Titre annotation 1 Lorem ipsum dolor sit amet, consectetur adipisicing elit. Officiis aliquid non placeat consequuntur fugit minima. @@ -432,14 +432,14 @@
- - - - + + + +
- - + + @@ -626,7 +626,7 @@ + {% endblock %} diff -r fedc0d054b55 -r a56fad1ada35 src/metadatacomposer/views.py --- a/src/metadatacomposer/views.py Tue Jun 11 15:46:43 2013 +0200 +++ b/src/metadatacomposer/views.py Tue Jun 11 15:47:02 2013 +0200 @@ -10,7 +10,7 @@ from guardian.shortcuts import assign from ldt.ldt_utils.models import Project, Content from ldt.ldt_utils.views.content import write_content_base, delete_content -from ldt.ldt_utils.utils import generate_uuid +from ldt.ldt_utils.utils import generate_uuid, copy_ldt from ldt.security.permissionchecker import check_object_perm_for_user from metadatacomposer.forms import ImageUploadModelForm from metadatacomposer.models import Image @@ -582,8 +582,9 @@ user=u, contents=proj.contents.all(), description=proj.description, set_icon=False) + # Copy project (copies xml/ldt data and updates the xml with the good new ldt_id) + newproj = copy_ldt(proj, newproj, u) # Save ldt content and set project state to "published" and save - newproj.ldt = proj.ldt newproj.state = 2 newproj.save() assign('view_project', u, newproj)