--- a/integration/hashcut.html Tue Nov 06 18:49:13 2012 +0100
+++ b/integration/hashcut.html Thu Nov 08 18:24:47 2012 +0100
@@ -158,13 +158,11 @@
</div>
</div>
- <div class="frise">
+ <div class="frise mashup-frise">
<div class="frise-overflow">
<div class="frise-segments">
- <div style="background-color:#9467bd; left:0%; width:41.02564102564102%;" class="frise-segment"></div><div style="background-color:#d62728; left:41.02564102564102%; width:58.97435897435897%;" class="frise-segment"></div>
</div>
<div class="frise-indications">
- <span style="left:12.82051282051282%;" class="frise-indication">15:00</span><span style="left:25.64102564102564%;" class="frise-indication">30:00</span><span style="left:38.46153846153846%;" class="frise-indication">45:00</span><span style="left:51.28205128205128%;" class="frise-indication">1:00:00</span><span style="left:64.1025641025641%;" class="frise-indication">1:15:00</span><span style="left:76.92307692307692%;" class="frise-indication">1:30:00</span><span style="left:89.74358974358974%;" class="frise-indication">1:45:00</span>
</div>
</div>
<div class="frise-position"></div>
@@ -197,7 +195,7 @@
<div class="right-content">
<h2>Plus d’informations</h2>
- <div class="more-info-wrap clearfix">
+ <div class="more-info-wrap">
<table class="more-info ">
<tbody>
<tr class="info-title">
@@ -206,20 +204,20 @@
</tr>
<tr class="info-duration">
<th>Durée :</th>
- <td>17:03</td>
+ <td></td>
</tr>
<tr class="info-author">
<th>Auteur : </th>
- <td><a href="#">Hashcutter75</a></td>
+ <td><a href="#"></a></td>
</tr>
<tr class="info-description">
<th>Description : </th>
- <td> An Atlas V rocket lofted the Juno spacecraft toward Jupiter from Space Launch Complex-41. The 4-ton Juno spacecraft will take five years to reach Jupiter on a mission to study its structure and decipher its history.</td>
+ <td></td>
</tr>
- <tr class="info-tags">
+<!-- <tr class="info-tags">
<th>Tags : </th>
<td>Mashup, Création, Art</td>
- </tr>
+ </tr> -->
</tbody>
</table>
<a href="#" class="button cloner">Cloner le Hashcut</a>
@@ -280,6 +278,18 @@
<script type="text/javascript" src="lib/jquery-ui.min.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/ldt-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/mashupplayer.js"></script>
<script type="text/javascript" src="js/common.js"></script>
+ <script type="text/javascript">
+ $(function() {
+ IriSP.player({
+ url: "data/moon-mashup.json"
+ })
+ })
+ </script>
</body>
</html>