diff -r 40909e8d6855 -r 5a5024bc74e6 integration/edition.html
--- a/integration/edition.html	Fri Nov 09 18:56:29 2012 +0100
+++ b/integration/edition.html	Fri Nov 16 19:23:20 2012 +0100
@@ -23,17 +23,15 @@
                 <div class="popin update-title" id="update-title">
                     <img class="pointer" src="img/popin-triangle.png" alt="" />
                     <div class="popin-content">
-                        <form class="clearfix" action="#" method="">
-                            <div class="form-left">
+                        <form class="clearfix" action="#" id="hashcut-form" method="">
+                            <p>
                                 <label for="hashcut-title">Titre :</label>
                                 <input type="text" id="hashcut-title" name="" value="Hashcut sans titre" />
-                                <label for="hashcut-tags">Tags :</label>
-                                <ul id="hashcut-tags"></ul>
-                            </div>
-                            <div class="form-right">
+                            </p>
+                            <p>
                                 <label for="hashcut-description">Description :</label>
                                 <textarea name="" id="hashcut-description"></textarea>
-                            </div>
+                            </p>
                         </form>
                     </div>
                 </div><!-- popin update-title -->
@@ -108,7 +106,9 @@
                     <span>Le Mashup<br />Cliquable</span>
                 </a></h1>
                 <div class="title-video-wrap">
-                    <a title="Modifier le titre et la description" class="open-popin" href="#update-title">Hashcut sans titre</a>
+                    <p class="title-video">
+                        <a title="Modifier le titre et la description" class="open-popin" href="#update-title">Hashcut sans titre</a>
+                    </p>
                     <p class="time-length">Durée: <span class="mashup-total-duration">00:00</span></p>
                 </div>
                 <div class="profil-wrap">
@@ -173,7 +173,7 @@
                                    <div class="Ldt-Ctrl-Time-Total" title="Temps total">00:00</div>
                                </div>
                                <div class="Ldt-Ctrl-spacer"></div>
-                               <div class="Ldt-Ctrl-button Ldt-Ctrl-Sound Ldt-Ctrl-Sound-Full Ldt-TraceMe" title="Couper/Activer le son"></div>
+                               <div class="Ldt-Ctrl-button Ldt-Ctrl-Sound Ldt-Ctrl-Sound-Full" title="Couper/Activer le son"></div>
                             </div>
                             <div class="Ldt-Ctrl-Volume-Control" title="Changer le volume">
                                <div class="Ldt-Ctrl-Volume-Bar"></div>
@@ -248,6 +248,10 @@
                                 </div>
                             </div>
                             <div class="frise-position"></div>
+                            <div class="mashup-tooltip segment-tooltip-wrapper">
+                                <div class="segment-tooltip"></div>
+                                <div class="segment-tooltip-tip"></div>
+                            </div>
                             
                         </div>
                             
@@ -297,6 +301,10 @@
                                 <div class="frise-indications">
                                 </div>
                             </div>
+                            <div class="mashup-tooltip segment-tooltip-wrapper">
+                                <div class="segment-tooltip"></div>
+                                <div class="segment-tooltip-tip"></div>
+                            </div>
 
                         </div>
                     </div>
@@ -329,6 +337,7 @@
         <script type="text/javascript" src="js/init.js"></script>
         <script type="text/javascript" src="js/ldt-serializer.js"></script>
         <script type="text/javascript" src="js/medialist-serializer.js"></script>
+        <script type="text/javascript" src="js/segmentapi-serializer.js"></script>
         <script type="text/javascript" src="js/model.js"></script>
         <script type="text/javascript" src="js/mashupcore.js"></script>
         <script type="text/javascript" src="js/editor.js"></script>
@@ -336,8 +345,9 @@
         <script type="text/javascript">
     $(function() {
         var hashcut = IriSP.editor({
-           url: "data/moon.json",
-           segment_api_endpoint: "http://capsicum/pf/ldtplatform/api/ldt/1.0/segments/bytimecode/",
+           //url: "data/bpidata.json",
+           url: "data/moon-local.json",
+           segment_api_endpoint: "http://capsicum/pf/ldtplatform/api/ldt/1.0/segments/",
            project_api_endpoint: "http://capsicum/pf/ldtplatform/api/ldt/1.0/projects/"
        });
     });