# HG changeset patch
# User Anthony Ly <anthonyly.com@gmail.com>
# Date 1369663792 -7200
# Node ID 95e64fb6730fb0251a08a19f6bcbffa3e27371b1
# Parent  cc2a710abeafe64214373b7f8466bbf416182631
modal delete url

diff -r cc2a710abeaf -r 95e64fb6730f integration/css/style.css
--- a/integration/css/style.css	Mon May 27 16:08:26 2013 +0200
+++ b/integration/css/style.css	Mon May 27 16:09:52 2013 +0200
@@ -22,6 +22,7 @@
 .tab-behavior{text-align: center;}
 .tab-behavior li{display: inline-block; float: none;}
 td ul{margin-bottom: 0;}
+.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;}
diff -r cc2a710abeaf -r 95e64fb6730f integration/edition.html
--- a/integration/edition.html	Mon May 27 16:08:26 2013 +0200
+++ b/integration/edition.html	Mon May 27 16:09:52 2013 +0200
@@ -171,11 +171,11 @@
 								<div class="add-annotation-wrap section">
 									<h4 class="title-section"><i class="icon-bookmark"></i> <i class="icon-plus"></i> Ajouter une annotation de type</h4>
 									<div class="text-center">
-										<a href="#" title="Son" data-type="son" class="btn open-tab"><i class="icon-volume-up"></i> Son</a>
+										<a href="#" title="Son" data-type="sound" class="btn open-tab"><i class="icon-volume-up"></i> Son</a>
 										<a href="#" title="Vidéo" data-type="video" class="btn open-tab"><i class="icon-film"></i> Vidéo</a>
-										<a href="#" title="Diaporama" data-type="diaporama" class="btn open-tab"><i class="icon-picture"></i> Diaporama</a>
+										<a href="#" title="Diaporama" data-type="slideshow" class="btn open-tab"><i class="icon-picture"></i> Diaporama</a>
 										<a href="#" title="Texte" data-type="text" class="btn open-tab"><i class="icon-align-left"></i> Texte</a>
-										<a href="#" title="Lien" data-type="html" class="btn open-tab"><i class="icon-link"></i> Lien</a>
+										<a href="#" title="Lien" data-type="links" class="btn open-tab"><i class="icon-link"></i> Lien</a>
 									</div>
 								</div>
 								<div class="list-annotation-wrap">
@@ -286,6 +286,7 @@
 											</form>
 										</div>
 								</div>
+								
 	<!-- vidéo -->
 								<div class="edit-annotation-title row">
 									<h3 class="span3"><i class="icon-film"></i> Vidéo</h3>
diff -r cc2a710abeaf -r 95e64fb6730f integration/js/common.js
--- a/integration/js/common.js	Mon May 27 16:08:26 2013 +0200
+++ b/integration/js/common.js	Mon May 27 16:09:52 2013 +0200
@@ -43,8 +43,8 @@
         e.preventDefault();
         var titleMedia = $(this).attr('data-title'),
             textModal = $('<p>Êtes-vous sûr de vouloir supprimer <strong>'+titleMedia+'</strong> ?</p>'),
-            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 cc2a710abeaf -r 95e64fb6730f integration/js/edition.js
--- a/integration/js/edition.js	Mon May 27 16:08:26 2013 +0200
+++ b/integration/js/edition.js	Mon May 27 16:09:52 2013 +0200
@@ -386,6 +386,7 @@
             annotation.type = dataAnnotation.type;
             annotation.color = global.colors[(global.colorsIndex<global.colors.length) ? global.colorsIndex++ : (global.colorsIndex=0)];
             annotation.keywords = dataAnnotation.keywords;
+            annotation.content = getContentAnnotationByType(dataAnnotation.type);
 
         annotations.push(annotation);
         
@@ -519,19 +520,16 @@
 
             //particularité selon type
             switch(type){
-                case 'son':
+                case 'sound':
                     break;
                 case 'video':
                     break;
                 case 'text': 
                     var cledit = $(tabContent).find('.wysiwyg').cleditor(wysiwygConfig)[0];
-
-                    break;
-                case 'html': 
                     break;
-                case 'lien': 
+                case 'links': 
                     break;
-                case 'diaporama': 
+                case 'slideshow': 
                     $(tabContent).find('.number-spin').spin(spinParam);
                     $(tabContent).find('.ui-sortable').sortable({
                         stop : function(event, ui){
@@ -553,7 +551,7 @@
     function getIcon(type){
         var icon;
         switch(type){
-            case 'son': icon = 'volume-up';
+            case 'sound': icon = 'volume-up';
                 break;
             case 'video': icon = 'film';
                 break;
@@ -562,9 +560,9 @@
                 break;
             case 'html': icon = 'code';
                 break;
-            case 'lien': icon = 'link';
+            case 'links': icon = 'link';
                 break;
-            case 'diaporama': icon = 'picture';
+            case 'slideshow': icon = 'picture';
                 break;
         }
         return icon;
@@ -735,37 +733,49 @@
 
 }
 
-//content annotations
-var contentAnnotationText = {
-    mimetype : "application/x-ldt-text",
-    markup : "html",
-    text : ""
-};
-
-var contentAnnotationLinks = {
-    mimetype : "application/x-ldt-links",
-    markup : "html",
-    links : []
-};
+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
 
-var contentAnnotationVideo = {
-    mimetype : "application/x-ldt-video",
-    url : "",
-    embedcode : ""
-};
-
-var contentAnnotationSon = {
-    mimetype : "application/x-ldt-sound",
-    url : "",
-    embedcode : ""
-};
-
-var contentAnnotationDiaporama = {
-    mimetype : "application/x-ldt-slideshow",
-    duration : 1,
-    autostart : false,
-    images : []
-};
 
 //test
 a = $(".wysiwyg").cleditor(wysiwygConfig);
diff -r cc2a710abeaf -r 95e64fb6730f integration/liste-projet.html
--- a/integration/liste-projet.html	Mon May 27 16:08:26 2013 +0200
+++ b/integration/liste-projet.html	Mon May 27 16:09:52 2013 +0200
@@ -139,7 +139,7 @@
 		<div class="modal-body"></div>
 		<div class="modal-footer">
 			<button class="btn" data-dismiss="modal" aria-hidden="true">Annuler</button>
-			<button id="btn-delete-modal" class="btn btn-primary">Supprimer</button>
+			<a id="btn-delete-modal" class="btn btn-primary">Supprimer</a>
 		</div>
 	</div>
 
diff -r cc2a710abeaf -r 95e64fb6730f integration/liste-ressource.html
--- a/integration/liste-ressource.html	Mon May 27 16:08:26 2013 +0200
+++ b/integration/liste-ressource.html	Mon May 27 16:09:52 2013 +0200
@@ -207,7 +207,7 @@
 		<div class="modal-body"></div>
 		<div class="modal-footer">
 			<button class="btn" data-dismiss="modal" aria-hidden="true">Annuler</button>
-			<button id="btn-delete-modal" class="btn btn-primary">Supprimer</button>
+			<a id="btn-delete-modal" class="btn btn-primary">Supprimer</a>
 		</div>
 	</div>
 
diff -r cc2a710abeaf -r 95e64fb6730f integration/modal-bibliotheque-image.html
--- a/integration/modal-bibliotheque-image.html	Mon May 27 16:08:26 2013 +0200
+++ b/integration/modal-bibliotheque-image.html	Mon May 27 16:09:52 2013 +0200
@@ -10,6 +10,18 @@
 			<div class="span2">
 				<a href="#"><img src="img/140x140.gif" alt=""></a>
 				<h5>
+					<a href="#">Lorem ipsum dolor sit amet, consectetur adipisicing elit. </a>
+				</h5>
+			</div>
+			<div class="span2">
+				<a href="#"><img src="img/140x140.gif" alt=""></a>
+				<h5>
+					<a href="#">Titre du média</a>
+				</h5>
+			</div>
+			<div class="span2">
+				<a href="#"><img src="img/140x140.gif" alt=""></a>
+				<h5>
 					<a href="#">Titre du média</a>
 				</h5>
 			</div>
@@ -22,6 +34,24 @@
 			<div class="span2">
 				<a href="#"><img src="img/140x140.gif" alt=""></a>
 				<h5>
+					<a href="#">Titre du Lorem ipsum dolor sit amet, consectetur adipisicing elit. Magnam amet voluptatum repellendus soluta debitis at aliquid vitae facilis sint quisquam quos aut numquam culpa iste voluptatibus quidem esse. Molestiae pariatur? média</a>
+				</h5>
+			</div>
+			<div class="span2">
+				<a href="#"><img src="img/140x140.gif" alt=""></a>
+				<h5>
+					<a href="#">Titre du média</a>
+				</h5>
+			</div>
+			<div class="span2">
+				<a href="#"><img src="img/140x140.gif" alt=""></a>
+				<h5>
+					<a href="#">Titre du Lorem ipsum dolor sit amet, consectetur adipisicing elit. Nemo praesentium repellat iure non ullam earum quaerat? Sapiente numquam optio eius quae error voluptatem perferendis aspernatur nam temporibus? Assumenda aliquid ipsam!média</a>
+				</h5>
+			</div>
+			<div class="span2">
+				<a href="#"><img src="img/140x140.gif" alt=""></a>
+				<h5>
 					<a href="#">Titre du média</a>
 				</h5>
 			</div>
@@ -46,37 +76,7 @@
 			<div class="span2">
 				<a href="#"><img src="img/140x140.gif" alt=""></a>
 				<h5>
-					<a href="#">Titre du média</a>
-				</h5>
-			</div>
-			<div class="span2">
-				<a href="#"><img src="img/140x140.gif" alt=""></a>
-				<h5>
-					<a href="#">Titre du média</a>
-				</h5>
-			</div>
-			<div class="span2">
-				<a href="#"><img src="img/140x140.gif" alt=""></a>
-				<h5>
-					<a href="#">Titre du média</a>
-				</h5>
-			</div>
-			<div class="span2">
-				<a href="#"><img src="img/140x140.gif" alt=""></a>
-				<h5>
-					<a href="#">Titre du média</a>
-				</h5>
-			</div>
-			<div class="span2">
-				<a href="#"><img src="img/140x140.gif" alt=""></a>
-				<h5>
-					<a href="#">Titre du média</a>
-				</h5>
-			</div>
-			<div class="span2">
-				<a href="#"><img src="img/140x140.gif" alt=""></a>
-				<h5>
-					<a href="#">Titre du média</a>
+					<a href="#">Titre du Lorem ipsum dolor sit amet, consectetur adipisicing elit. Nulla recusandae iusto libero ipsam sed atque quis maxime laborum est consequuntur ut possimus aspernatur quas nobis maiores veniam officiis alias error.média</a>
 				</h5>
 			</div>
 		</div>
diff -r cc2a710abeaf -r 95e64fb6730f integration/template.html
--- a/integration/template.html	Mon May 27 16:08:26 2013 +0200
+++ b/integration/template.html	Mon May 27 16:09:52 2013 +0200
@@ -52,7 +52,7 @@
 </li>
 </script>
 
-<script id="tpl-son" type="text/html">
+<script id="tpl-sound" type="text/html">
 <div class="edit-annotation-title row">
 	<h3 class="span3"><i class="icon-volume-up"></i> Son</h3>
 </div>
@@ -115,7 +115,7 @@
 </div>
 </script>
 
-<script id="tpl-diaporama" type="text/html">
+<script id="tpl-slideshow" type="text/html">
 <div class="edit-annotation-title row">
 	<h3 class="span3"><i class="icon-picture"></i> Diaporama</h3>
 	<span class="span3">
@@ -157,6 +157,12 @@
 </div>
 </script>
 
+<script id="tpl-links" type="text/html">
+<div class="edit-annotation-title row">
+	<h3 class="span3"><i class="icon-link"></i> Liens</h3>
+</div>
+</script>
+
 <script id="tpl-diaporama-row" type="text/html">
 <tr id="rid-{{ridid}}" class="row-image-diaporama">
 	<td><img src="img/60x60.gif" alt=""> </td>