--- a/integration/edition.html	Tue Nov 06 18:49:13 2012 +0100
+++ b/integration/edition.html	Thu Nov 08 18:24:47 2012 +0100
@@ -8,6 +8,7 @@
         <meta name="author" content="Anthony Ly, Raphaël Velt" />
         <title>Hashcut &gt; Edition</title>
         <link rel="stylesheet" href="lib/jquery-ui.css" />
+        <link rel="stylesheet" href="lib/jquery.tagit.css" />
         <link rel="stylesheet" href="css/reset.css" />
         <link rel="stylesheet" href="css/common.css" />
         <link rel="stylesheet" href="css/edition.css" />
@@ -24,19 +25,15 @@
                     <div class="popin-content">
                         <form class="clearfix" action="#" method="">
                             <div class="form-left">
-                                <p class="titre-wrap">
-                                    <label for="hashcut-title">Titre :</label>
-                                    <input type="text" id="hashcut-title" name="" value="Hashcut sans titre" />
-                                </p>
-                                <p>
-                                    <label for="hashcut-tags">Tags :</label>
-                                    <input type="text" id="hashcut-tags" name="" value="" />
-                                </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>
-                            <p class="form-right">
+                            <div class="form-right">
                                 <label for="hashcut-description">Description :</label>
                                 <textarea name="" id="hashcut-description"></textarea>
-                            </p>
+                            </div>
                         </form>
                     </div>
                 </div><!-- popin update-title -->
@@ -212,7 +209,7 @@
                                         </p>
                                         <p>
                                             <label for="segment-tags">Tags :</label>
-                                            <input type="text" id="segment-tags" />
+                                            <ul id="segment-tags"></ul>
                                         </p>
                                     </div>
                                     <div class="form-segment-right">
@@ -237,7 +234,7 @@
 
                     <div class="bloc-pvw">
 
-                        <div class="frise">
+                        <div class="frise mashup-frise">
                             <div class="frise-overflow">
                                 <div class="frise-segments">
                                 </div>
@@ -270,7 +267,7 @@
                                             </tr>
                                             <tr>
                                                 <th>Tags :</th>
-                                                <td><span class="annotation-tags">(fonctionnalité à venir)</span></td>
+                                                <td><span class="annotation-tags"></span></td>
                                             </tr>
                                         </tbody>
                                     </table>
@@ -286,7 +283,7 @@
                             <div class="validate-tooltip"></div>
                         </div>
                         <h2>Liste des segments</h2>
-                        <div class="frise">
+                        <div class="frise mashup-frise">
 							<p class="aucun-segment">Aucun segment</p>
                             <div class="frise-overflow">
                                 <div class="frise-segments">
@@ -320,16 +317,18 @@
         <!-- JavaScript -->
         <script type="text/javascript" src="lib/jquery.min.js"></script>
         <script type="text/javascript" src="lib/jquery-ui.min.js"></script>
+        <script type="text/javascript" src="lib/tag-it.js"></script>
         <script type="text/javascript" src="lib/underscore-min.js"></script>
         <script type="text/javascript" src="lib/popcorn-complete.min.js"></script>
         <script type="text/javascript" src="js/init.js"></script>
         <script type="text/javascript" src="js/medialist-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>
         <script type="text/javascript" src="js/common.js"></script>
         <script type="text/javascript">
     $(function() {
-        var hashcut = new IriSP.Hashcut({url: "data/bpidata.json"});
+        var hashcut = IriSP.editor({url: "data/moon.json"});
     });
         </script>
     </body>