diff -r c9dc489913af -r eea45f9b124b integration/edition.html
--- a/integration/edition.html	Fri Oct 26 18:54:20 2012 +0200
+++ b/integration/edition.html	Mon Oct 29 18:02:10 2012 +0100
@@ -25,17 +25,17 @@
                         <form class="clearfix" action="#" method="">
                             <div class="form-left">
                                 <p class="titre-wrap">
-                                    <label for="titre-video">Titre :</label>
-                                    <input type="text" id="titre-video" name="" value="Mon Hashcut" />
+                                    <label for="hashcut-title">Titre :</label>
+                                    <input type="text" id="hashcut-title" name="" value="Mon Hashcut" />
                                 </p>
                                 <p>
-                                    <label for="tags-video">Tags :</label>
-                                    <input type="text" id="tags-video" name="" value="Lune, Espace, Lune" />
+                                    <label for="hashcut-tags">Tags :</label>
+                                    <input type="text" id="hashcut-tags" name="" value="Lune, Espace, Lune" />
                                 </p>
                             </div>
                             <p class="form-right">
-                                <label for="description-video">Description :</label>
-                                <textarea name="" id="description-video" cols="30" rows="10"></textarea>
+                                <label for="hashcut-description">Description :</label>
+                                <textarea name="" id="hashcut-description"></textarea>
                             </p>
                         </form>
                     </div>
@@ -162,6 +162,12 @@
                             <div class="Ldt-Ctrl-Left">
                                 <div class="Ldt-Ctrl-button Ldt-Ctrl-Play Ldt-Ctrl-Play-PlayState" title="Lecture/Pause"></div>
                                 <div class="Ldt-Ctrl-spacer"></div>
+                                <div class="Ldt-Ctrl-InOutBlock">
+                                    <div class="Ldt-Ctrl-button Ldt-Ctrl-SetIn" title="Débuter le segment ici"></div>
+                                    <div class="Ldt-Ctrl-spacer"></div>
+                                    <div class="Ldt-Ctrl-button Ldt-Ctrl-SetOut" title="Finir le segment ici"></div>
+                                    <div class="Ldt-Ctrl-spacer"></div>
+                                </div>
                             </div>
                             <div class="Ldt-Ctrl-Right">
                                <div class="Ldt-Ctrl-spacer"></div>
@@ -194,21 +200,21 @@
                                     (durée:
                                     <span class="time-tangle tangle-duration"></span>)
                                 </h2>
-                                <form action="#">
+                                <form action="#" id="segment-form">
                                     <div class="form-segment-left">
                                         <p>
-                                            <label for="titre">Titre :</label>
-                                            <input type="text" id="titre" />
+                                            <label for="segment-title">Titre :</label>
+                                            <input type="text" id="segment-title" />
                                         </p>
                                         <p>
-                                            <label for="tags">Tags :</label>
-                                            <input type="text" id="tags" />
+                                            <label for="segment-tags">Tags :</label>
+                                            <input type="text" id="segment-tags" />
                                         </p>
                                     </div>
                                     <div class="form-segment-right">
                                         <p>
-                                            <label for="description">Description :</label>
-                                            <textarea id="description"></textarea>
+                                            <label for="segment-description">Description :</label>
+                                            <textarea id="segment-description"></textarea>
                                         </p>
                                     </div>
                                     <input class="button add-segment" type="submit" value="Ajouter au Hashcut" />
@@ -216,7 +222,7 @@
                                 </form>
                             </div>
                         </div><!-- popin segmentation -->
-
+<!-- //TODO: Add "Existing Segments"
                         <div class="existant">
                             <h2>Segments existants :</h2>
                             <div class="segments">
@@ -232,7 +238,8 @@
                                             <a href="#" class="button reprendre-segment">Reprendre le segment</a>
                                         </div>
                                     </div><!-- popin segment-section -->
-                                </div>
+<!--
+                                    </div>
                                 <div class="segment">
                                     <div class="section" style="left:20%;width:20%;"></div>
                                 </div>
@@ -244,6 +251,7 @@
                                 </div>
                             </div>
                         </div>
+-->
                     </div><!-- bloc-segmentation -->
 
                     <div class="bloc-pvw">
@@ -303,8 +311,10 @@
                         <h2>Liste des segments</h2>
                         <div class="frise clearfix">
 
-                            <span class="indication" style="left:64%;">00:30</span>
-                            <span class="indication" style="left:84%;">00:30</span>
+                            <div class="indications">
+                                <span class="indication" style="left:30%;">00:30</span>
+                                <span class="indication" style="left:84%;">00:30</span>
+                            </div>
                             <div class="segments">
                                  <div class="segment" style="background-color:red;width:20%;"></div>
                                  <div class="segment" style="background-color:yellow;width:20%;"></div>
@@ -312,52 +322,11 @@
                                  <div class="segment" style="background-color:green;width:20%;"></div>
                                  <div class="segment" style="background-color:brown;width:20%;"></div>
                             </div>
+
                         </div>
                     </div>
 
                     <ul class="list-video organize-segments">
-                        <li class="item-video">
-                            <img src="img/apercu-video.jpg" alt="aperçu" />
-                            <span class="video-info">
-                                <span class="title-video">Voyage à la Lune 1</span>
-                                <span class="subtitle">Chargement de la Capsule</span>
-                                <span class="duration">01:17 - 02:01 (00:44)</span>
-                                <ul class="tools">
-                                    <li><a class="edit" href="#"></a></li>
-                                    <li><a class="bottom" href="#"></a></li>
-                                    <li><a class="top" href="#"></a></li>
-                                    <li><a class="delete" href="#"></a></li>
-                                </ul>
-                            </span>
-                        </li><!-- item-video -->
-                        <li class="item-video">
-                            <img src="img/apercu-video.jpg" alt="aperçu" />
-                            <span class="video-info">
-                                <span class="title-video">Voyage à la Lune 2</span>
-                                <span class="subtitle">Chargement de la Capsule</span>
-                                <span class="duration">01:17 - 02:01 (00:44)</span>
-                                <ul class="tools">
-                                    <li><a class="edit" href="#"></a></li>
-                                    <li><a class="bottom" href="#"></a></li>
-                                    <li><a class="top" href="#"></a></li>
-                                    <li><a class="delete" href="#"></a></li>
-                                </ul>
-                            </span>
-                        </li><!-- item-video -->
-                        <li class="item-video">
-                            <img src="img/apercu-video.jpg" alt="aperçu" />
-                            <span class="video-info">
-                                <span class="title-video">Voyage à la Lune 3</span>
-                                <span class="subtitle">Chargement de la Capsule</span>
-                                <span class="duration">01:17 - 02:01 (00:44)</span>
-                                <ul class="tools">
-                                    <li><a class="edit" href="#"></a></li>
-                                    <li><a class="bottom" href="#"></a></li>
-                                    <li><a class="top" href="#"></a></li>
-                                    <li><a class="delete" href="#"></a></li>
-                                </ul>
-                            </span>
-                        </li><!-- item-video -->
                         
                     </ul>
                 </div><!-- col-right -->