--- a/integration/edition.html Wed Oct 17 18:24:00 2012 +0200
+++ b/integration/edition.html Tue Oct 23 18:39:37 2012 +0200
@@ -15,7 +15,7 @@
<body>
<div class="wrap">
<div class="wrap-header">
- <a title="Bibliothèque centre Pompidou" href="#"><img src="img/pompidou-logo.jpg" alt="Bibliothèque centre Pompidou" /></a>
+ <a title="Bibliothèque centre Pompidou" href="#"><img src="img/pompidou-logo.png" alt="Bibliothèque centre Pompidou" /></a>
</div>
<div class="header">
<!-- popin header -->
@@ -72,13 +72,40 @@
<label for="signup-password">Confirmer le mot de passe : </label>
<input type="password" id="signup-password" name="" />
</p>
+ <p>
+ <input type="submit" value="Créer le compte">
+ </p>
</form>
</div>
</div><!-- popin user signup-->
+ <div class="popin user login" id="user">
+ <img class="pointer" src="img/popin-triangle.png" alt="" />
+ <div class="popin-content">
+ <h2>Connexion :</h2>
+ <form action="#">
+ <p>
+ <label for="signup-pseudo">E-mail : </label>
+ <input type="text" id="signup-pseudo" name="" />
+ </p>
+ <p >
+ <label for="signup-email">Mot de passe : </label>
+ <input type="password" id="signup-email" name="" />
+ </p>
+ <p>
+ <input type="submit" value="Se connecter">
+ </p>
+ <p>
+ <a class="signup-button" href="#">Créer un compte</a>
+ </p>
+ </form>
+
+ </div>
+ </div><!-- popin user login-->
+
<h1><a title="Hashcut - Le Mashup cliquable" class="clearfix" href="#">
- <img src="img/hashcut-logo.jpg" alt="Hashcut" />
+ <img src="img/hashcut-logo.png" alt="Hashcut" />
<span>Le Mashup<br />Cliquable</span>
</a></h1>
<div class="title-video-wrap">
@@ -137,6 +164,75 @@
</div><!-- col-left -->
<div class="col-middle">
+ <div class="bloc-segmentation">
+ <div class="col-middle-header disable">
+ <a href="#" class="segmenter ">Segmenter <em>La cuisine du Popcorn</em></a>
+ <a href="#" class="previsualiser disable">Prévisualiser</a>
+ </div>
+ <div class="video">
+ <a class="publier-button" title="Publier" href="#"></a>
+ <img src="img/visuel-player.png" alt="" />
+ </div>
+ <div class="segment">
+ <img src="img/visuel-segment.png" alt="">
+ </div>
+ <div class="popin segmentation" id="">
+ <img class="pointer" src="img/popin-triangle.png" alt="" />
+ <div class="popin-content">
+ <h2>Créer un nouveau segment de <span>02:27</span> à <span>02:27</span> (durée: <span>02:27</span>)</h2>
+ <form action="#">
+ <div class="form-segment-left">
+ <p>
+ <label for="titre">Titre :</label>
+ <input type="text" id="titre" />
+ </p>
+ <p>
+ <label for="tags">Tags :</label>
+ <input type="text" id="tags" />
+ </p>
+ </div>
+ <div class="form-segment-right">
+ <p>
+ <label for="description">Description :</label>
+ <textarea id="description"></textarea>
+ </p>
+ <p>
+ <input type="submit" value="Ajouter au Hashcut" />
+ </p>
+ </div>
+
+ </form>
+ </div>
+ </div><!-- popin segmentation -->
+
+ <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" id="">
+ <img style="left:20px;" class="pointer" src="img/popin-triangle.png" alt="" />
+ <div class="popin-content clearfix">
+ <div class="instant-description">
+ <h2>Le moment crucial où le maïs explose</h2>
+ <p>De: <span>00:43</span> à <span>01:20</span> (durée: <span>00:37</span>)</p>
+ </div>
+ <a href="#" class="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>
+ </div>
+ </div><!-- bloc-segmentation -->
<div class="bloc-pvw">
<div class="col-middle-header">
@@ -277,8 +373,8 @@
<li><a href="#">Contacts</a></li>
</ul>
<ul class="links-right">
- <li><a title="IRI" href="#"> <img src="img/logo-iri.png" alt="iri" /></a></li>
- <li><a title="cinecast" href="#"><img src="img/logo-cinecast.png" alt="cinecast" /></a></li>
+ <li><a title="IRI" href="http://www.iri.centrepompidou.fr/"> <img src="img/logo-iri.png" alt="iri" /></a></li>
+ <li><a title="cinecast" href="http://cinecast.fr/"><img src="img/logo-cinecast.png" alt="cinecast" /></a></li>
<li>© 2012</li>
</ul>
</div>