integration/edition.html
changeset 29 5ce5e26091ea
parent 27 b2d068afdbd8
child 32 47f9a2d63a0a
--- a/integration/edition.html	Tue Oct 30 18:45:16 2012 +0100
+++ b/integration/edition.html	Wed Oct 31 21:16:02 2012 +0100
@@ -154,8 +154,9 @@
                     </div>
 
                     <div class="widget">
-                        
-                        <div class="Ldt-Slider"></div>
+                        <div class="Ldt-Slider-Container">
+                            <div class="Ldt-Slider"></div>
+                        </div>
                         <div class="Ldt-Slider-Time">00:00</div>
     
                         <div class="Ldt-Ctrl">
@@ -189,7 +190,9 @@
                     <div class="bloc-segmentation">
                         <div class="Ldt-Slice"></div>
                         <div class="segment-info segmentation">
-                            <img class="pointer" src="img/popin-triangle.png" alt="" />
+                            <div class="pointer-padder">
+                                <img class="pointer" src="img/popin-triangle.png" alt="" />
+                            </div>
                             <div class="popin-content">
                                 <h2>
                                     <span class="create-or-edit">Créer un nouveau segment</span>
@@ -222,41 +225,18 @@
                                 </form>
                             </div>
                         </div><!-- popin segmentation -->
-<!-- //TODO: Add "Existing Segments"
-                        <div class="existant">
-                            <h2>Segments existants :</h2>
-                            <div class="segments">
-                                <div class="segment">
-                                    <div class="section" style="left:0%;width:20%;"></div>
-                                    <div class="popin segment-section">
-                                        <img style="left:20px;" class="pointer" src="img/popin-triangle.png" alt="" />
-                                        <div class="popin-content clearfix">
-                                            <div class="instant-description">
-                                                <h3>Le moment crucial où le maïs explose</h3>
-                                                <p>De: <span>00:43</span> à <span>01:20</span> (durée: <span>00:37</span>)</p>
-                                            </div>
-                                            <a href="#" class="button reprendre-segment">Reprendre le segment</a>
-                                        </div>
-                                    </div><!-- popin segment-section -->
-<!--
-                                    </div>
-                                <div class="segment">
-                                    <div class="section" style="left:20%;width:20%;"></div>
-                                </div>
-                                <div class="segment">
-                                    <div class="section" style="left:60%;width:20%;"></div>
-                                </div>
-                                <div class="segment">
-                                    <div class="section" style="left:80%;width:10%;"></div>
-                                </div>
+                        
+                        <div class="media-segments self-media-segments">
+                            <h2>Mes segments sur ce média :</h2>
+                            <div class="media-segments-list">
                             </div>
                         </div>
--->
+
                     </div><!-- bloc-segmentation -->
 
                     <div class="bloc-pvw">
 
-                        <div class="frise clearfix">
+                        <div class="frise">
                             <div class="frise-indications">
                             </div>
                             <div class="frise-segments">
@@ -266,7 +246,9 @@
                         </div>
                             
                             <div class="segment-info mashup-description">
-                                <img class="pointer" src="img/popin-triangle.png" alt="" />
+                                <div class="pointer-padder">
+                                    <img class="pointer" src="img/popin-triangle.png" alt="" />
+                                </div>
                                 <div class="popin-content">
                                     <ul class="tools">
                                         <li><a title="Éditer" class="edit" href="#"></a></li>
@@ -298,7 +280,7 @@
                 <div class="col-right">
                     <div class="liste-segment">
                         <h2>Liste des segments</h2>
-                        <div class="frise clearfix">
+                        <div class="frise">
 							<p class="aucun-segment">Aucun segment</p>
                             <div class="frise-indications">
                             </div>
@@ -340,7 +322,7 @@
         <script type="text/javascript" src="js/common.js"></script>
         <script type="text/javascript">
     $(function() {
-        var hashcut = new IriSP.Hashcut({url: "data/moon.json"});
+        var hashcut = new IriSP.Hashcut({url: "data/bpidata.json"});
     });
         </script>
     </body>