integration/edition.html
changeset 26 7c394ea40f28
parent 25 eea45f9b124b
parent 24 1fbf7d835dc2
child 27 b2d068afdbd8
--- a/integration/edition.html	Mon Oct 29 18:02:10 2012 +0100
+++ b/integration/edition.html	Mon Oct 29 18:11:09 2012 +0100
@@ -111,8 +111,8 @@
                     <span>Le Mashup<br />Cliquable</span>
                 </a></h1>
                 <div class="title-video-wrap">
-                    <a class="open-popin" href="#update-title">Hashcut sans titre</a>
-                    <p class="time-length">Durée: <span>02:24</span></p>
+                    <a title="Modifier le titre et la description" class="open-popin" href="#update-title">Hashcut sans titre</a>
+                    <p class="time-length">Durée: <span>00:00</span></p>
                 </div>
                 <div class="profil-wrap">
                     <a href="#" class="all-hashcut">Tous les Hashcuts</a>
@@ -258,17 +258,19 @@
 
                         <div class="frise clearfix">
 
-                            <span class="indication" style="left:24%;">00:30</span>
-                            <span class="indication" style="left:44%;">00:30</span>
-                            <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:24%;">00:30</span>
+                                <span class="indication" style="left:44%;">00:30</span>
+                                <span class="indication" style="left:64%;">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:green;width:20%;"></div>
-                                <div class="segment" style="background-color:red;width:20%;"></div>
-                                <div class="segment" style="background-color:green;width:20%;"></div>
-                                <div class="segment" style="background-color:red;width:20%;"></div>
+                                <div class="segment" style="background-color:red;left:0;width:20%;"></div>
+                                <div class="segment" style="background-color:green;left:20%;width:20%;"></div>
+                                <div class="segment" style="background-color:red;left:40%;width:20%;"></div>
+                                <div class="segment" style="background-color:green;left:60%;width:20%;"></div>
+                                <div class="segment" style="background-color:red;left:80%;width:20%;"></div>
                             </div>
                             
                         </div>
@@ -277,10 +279,10 @@
                                 <img class="pointer" src="img/popin-triangle.png" alt="" />
                                 <div class="popin-content">
                                     <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>
+                                        <li><a title="éditer" class="edit" href="#"></a></li>
+                                        <li><a title="descendre" class="bottom" href="#"></a></li>
+                                        <li><a title="remonter" class="top" href="#"></a></li>
+                                        <li><a title="supprimer" class="delete" href="#"></a></li>
                                     </ul>
 
                                     <h2>Chargement de la capsule lunaire</h2>
@@ -310,17 +312,17 @@
                     <div class="liste-segment">
                         <h2>Liste des segments</h2>
                         <div class="frise clearfix">
-
+							<p class="aucun-segment">Aucun segment</p>
                             <div class="indications">
-                                <span class="indication" style="left:30%;">00:30</span>
+                                <span class="indication" style="left:64%;">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>
-                                 <div class="segment" style="background-color:blue;width:20%;"></div>
-                                 <div class="segment" style="background-color:green;width:20%;"></div>
-                                 <div class="segment" style="background-color:brown;width:20%;"></div>
+                                <div class="segment" style="background-color:red;left:0;width:20%;"></div>
+                                <div class="segment" style="background-color:yellow;left:20%;width:20%;"></div>
+                                <div class="segment" style="background-color:blue;left:40%;width:20%;"></div>
+                                <div class="segment" style="background-color:green;left:60%;width:20%;"></div>
+                                <div class="segment" style="background-color:brown;left:80%;width:20%;"></div>
                             </div>
 
                         </div>