--- a/integration/css/common.css Fri Nov 16 19:23:20 2012 +0100
+++ b/integration/css/common.css Tue Nov 20 12:39:18 2012 +0100
@@ -62,7 +62,6 @@
/* custom reset */
body{
height: 100%;
- background: url(../img/bg.png) repeat-x 0 0;
}
a{
color:#000;
@@ -77,9 +76,13 @@
}
/* common */
+.wrapper{
+ background-color: #FFF;
+ background-image: url(../img/bg.png);
+ background-repeat: repeat-x;
+}
.wrap{
min-height:100%;
- background-color: #FFF;
width: 960px;
margin: 0 auto;
font-family: 'Open Sans';
@@ -88,12 +91,16 @@
font-size: 13px;
height: 100%;
}
-.wrap-header{
+.wrap-header-top{
padding-top: 5px;
background-color: #370078;
height: 53px;
margin-bottom: 1px;
}
+.wrap-header-top-content{
+ width: 960px;
+ margin: 0 auto;
+}
/* header - title-video-wrap */
.title-video-wrap{
width: 380px;
@@ -122,9 +129,14 @@
float: left;
height: 60px;
}
+
+.wrap-header{
+ background-color: #e2dbfd;
+}
.header{
position: relative;
- background-color: #e2dbfd;
+ width: 960px;
+ margin: 0 auto;
height: 60px;
}
.header .title-video-wrap,
--- a/integration/edition.html Fri Nov 16 19:23:20 2012 +0100
+++ b/integration/edition.html Tue Nov 20 12:39:18 2012 +0100
@@ -14,28 +14,19 @@
<link rel="stylesheet" href="css/edition.css" />
</head>
<body>
- <div class="wrap">
- <div class="wrap-header">
+
+ <div class="wrap-header-top">
+ <div class="wrap-header-top-content">
<a title="Bibliothèque Publique d'Information" href="#"><img src="img/pompidou-logo.png" alt="Bibliothèque centre Pompidou" /></a>
</div>
+ </div><!-- wrap-header-top -->
+
+
+ <div class="wrap-header">
<div class="header">
- <!-- popin header -->
- <div class="popin update-title" id="update-title">
- <img class="pointer" src="img/popin-triangle.png" alt="" />
- <div class="popin-content">
- <form class="clearfix" action="#" id="hashcut-form" method="">
- <p>
- <label for="hashcut-title">Titre :</label>
- <input type="text" id="hashcut-title" name="" value="Hashcut sans titre" />
- </p>
- <p>
- <label for="hashcut-description">Description :</label>
- <textarea name="" id="hashcut-description"></textarea>
- </p>
- </form>
- </div>
- </div><!-- popin update-title -->
+ <!-- popin user -->
+
<div class="popin user info" id="user">
<img class="pointer" src="img/popin-triangle.png" alt="" />
<div class="popin-content">
@@ -100,7 +91,27 @@
</div>
</div><!-- popin user login-->
-
+
+ <!-- /popin user -->
+
+ <!-- popin update-title -->
+ <div class="popin update-title" id="update-title">
+ <img class="pointer" src="img/popin-triangle.png" alt="" />
+ <div class="popin-content">
+ <form class="clearfix" action="#" id="hashcut-form" method="">
+ <p>
+ <label for="hashcut-title">Titre :</label>
+ <input type="text" id="hashcut-title" name="" value="Hashcut sans titre" />
+ </p>
+ <p>
+ <label for="hashcut-description">Description :</label>
+ <textarea name="" id="hashcut-description"></textarea>
+ </p>
+ </form>
+ </div>
+ </div>
+ <!-- /popin update-title -->
+
<h1><a title="Hashcut - Le Mashup cliquable" class="clearfix" href="#">
<img src="img/hashcut-logo.png" alt="Hashcut" />
<span>Le Mashup<br />Cliquable</span>
@@ -116,218 +127,225 @@
<a href="#user" class="my-profil open-popin">Mon profil</a>
</div>
</div><!-- header -->
- <div class="content clearfix">
- <div class="col-left">
- <div class="left-head">
- <h2>Sélectionner les vidéos</h2>
- <input type="text" name="" placeholder="Rechercher une vidéo" />
- </div>
- <ul class="list-video">
-
- </ul>
- </div><!-- col-left -->
-
- <div class="col-middle empty-mode">
-
- <div class="col-middle-header">
- <a href="#" class="tab tab-segment">Segmenter <span class="tab-media-title"></span></a>
- <a href="#" class="tab tab-pvw">Prévisualiser</a>
- </div>
-
- <div class="video">
- <div class="tutorial">
- <h2>Créer un Hashcut, c’est facile !</h2>
- <ol>
- <li>Commencez par choisir une vidéo dans le volet de gauche</li>
- <li>Créez un segment dans la vidéo et profitez-en pour annoter votre segment</li>
- <li>Ajoutez votre segment à la liste, réorganisez les segments entre eux</li>
- <li>Rajoutez quelques commentaires à votre Hashcut. Vous êtes prêts à publier !</li>
- </ol>
+ </div> <!-- wrap-header -->
+
+ <div class="wrapper">
+ <div class="wrap">
+ <div class="content clearfix">
+
+ <div class="col-left">
+ <div class="left-head">
+ <h2>Sélectionner les vidéos</h2>
+ <input type="text" name="" placeholder="Rechercher une vidéo" />
</div>
- <div class="video-wait"></div>
- <a class="publier-button disable" title="Publier" href="#"></a>
- </div>
+ <ul class="list-video">
+
+ </ul>
+ </div><!-- col-left -->
- <div class="widget">
- <div class="Ldt-Slider-Container">
- <div class="Ldt-Slider"></div>
- </div>
- <div class="Ldt-Slider-Time">00:00</div>
-
- <div class="Ldt-Ctrl">
- <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>
- <div class="Ldt-Ctrl-Time">
- <div class="Ldt-Ctrl-Time-Elapsed" title="Temps écoulé">00:00</div>
- <div class="Ldt-Ctrl-Time-Separator">/</div>
- <div class="Ldt-Ctrl-Time-Total" title="Temps total">00:00</div>
- </div>
- <div class="Ldt-Ctrl-spacer"></div>
- <div class="Ldt-Ctrl-button Ldt-Ctrl-Sound Ldt-Ctrl-Sound-Full" title="Couper/Activer le son"></div>
- </div>
- <div class="Ldt-Ctrl-Volume-Control" title="Changer le volume">
- <div class="Ldt-Ctrl-Volume-Bar"></div>
- </div>
+ <div class="col-middle empty-mode">
+
+ <div class="col-middle-header">
+ <a href="#" class="tab tab-segment">Segmenter <span class="tab-media-title"></span></a>
+ <a href="#" class="tab tab-pvw">Prévisualiser</a>
</div>
- </div>
-
- <div class="bloc-segmentation">
- <div class="Ldt-Slice"></div>
- <div class="segmentation">
- <div class="pointer-padder">
- <img class="pointer" src="img/popin-triangle.png" alt="" />
+ <div class="video">
+ <div class="tutorial">
+ <h2>Créer un Hashcut, c’est facile !</h2>
+ <ol>
+ <li>Commencez par choisir une vidéo dans le volet de gauche</li>
+ <li>Créez un segment dans la vidéo et profitez-en pour annoter votre segment</li>
+ <li>Ajoutez votre segment à la liste, réorganisez les segments entre eux</li>
+ <li>Rajoutez quelques commentaires à votre Hashcut. Vous êtes prêts à publier !</li>
+ </ol>
</div>
- <div class="popin-content">
- <div class="validate">
- <div class="validate-tooltip"></div>
- </div>
- <h2>
- <span class="create-or-edit">Créer un nouveau segment</span>
- de
- <span class="time-tangle tangle-start"></span>
- à
- <span class="time-tangle tangle-end"></span>
- (durée:
- <span class="time-tangle tangle-duration"></span>)
- </h2>
- <form action="#" id="segment-form">
- <div class="form-segment-left">
- <p>
- <label for="segment-title">Titre :</label>
- <input type="text" id="segment-title" />
- </p>
- <p>
- <label for="segment-tags">Tags :</label>
- <ul id="segment-tags"></ul>
- </p>
- </div>
- <div class="form-segment-right">
- <p>
- <label for="segment-description">Description :</label>
- <textarea id="segment-description"></textarea>
- </p>
- </div>
- <input class="button add-segment" type="submit" value="Ajouter au Hashcut" />
-
- </form>
- </div>
- </div><!-- popin segmentation -->
-
- <div class="media-segments self-media-segments">
- <h2>Mes segments sur ce média :</h2>
- <div class="media-segments-list">
- </div>
- </div>
-
- <div class="media-segments other-media-segments">
- <h2>Segments existants sur ce média :</h2>
- <div class="media-segments-list">
- </div>
+ <div class="video-wait"></div>
+ <a class="publier-button disable" title="Publier" href="#"></a>
</div>
- </div><!-- bloc-segmentation -->
-
- <div class="bloc-pvw">
-
- <div class="frise mashup-frise">
- <div class="frise-overflow">
- <div class="frise-segments">
+ <div class="widget">
+ <div class="Ldt-Slider-Container">
+ <div class="Ldt-Slider"></div>
+ </div>
+ <div class="Ldt-Slider-Time">00:00</div>
+
+ <div class="Ldt-Ctrl">
+ <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="frise-indications">
+ <div class="Ldt-Ctrl-Right">
+ <div class="Ldt-Ctrl-spacer"></div>
+ <div class="Ldt-Ctrl-Time">
+ <div class="Ldt-Ctrl-Time-Elapsed" title="Temps écoulé">00:00</div>
+ <div class="Ldt-Ctrl-Time-Separator">/</div>
+ <div class="Ldt-Ctrl-Time-Total" title="Temps total">00:00</div>
+ </div>
+ <div class="Ldt-Ctrl-spacer"></div>
+ <div class="Ldt-Ctrl-button Ldt-Ctrl-Sound Ldt-Ctrl-Sound-Full" title="Couper/Activer le son"></div>
</div>
- </div>
- <div class="frise-position"></div>
- <div class="mashup-tooltip segment-tooltip-wrapper">
- <div class="segment-tooltip"></div>
- <div class="segment-tooltip-tip"></div>
+ <div class="Ldt-Ctrl-Volume-Control" title="Changer le volume">
+ <div class="Ldt-Ctrl-Volume-Bar"></div>
+ </div>
</div>
</div>
-
- <div class="segment-info mashup-description">
+
+ <div class="bloc-segmentation">
+ <div class="Ldt-Slice"></div>
+ <div class="segmentation">
<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>
- </ul>
+ <div class="validate">
+ <div class="validate-tooltip"></div>
+ </div>
+ <h2>
+ <span class="create-or-edit">Créer un nouveau segment</span>
+ de
+ <span class="time-tangle tangle-start"></span>
+ à
+ <span class="time-tangle tangle-end"></span>
+ (durée:
+ <span class="time-tangle tangle-duration"></span>)
+ </h2>
+ <form action="#" id="segment-form">
+ <div class="form-segment-left">
+ <p>
+ <label for="segment-title">Titre :</label>
+ <input type="text" id="segment-title" />
+ </p>
+ <p>
+ <label for="segment-tags">Tags :</label>
+ <ul id="segment-tags"></ul>
+ </p>
+ </div>
+ <div class="form-segment-right">
+ <p>
+ <label for="segment-description">Description :</label>
+ <textarea id="segment-description"></textarea>
+ </p>
+ </div>
+ <input class="button add-segment" type="submit" value="Ajouter au Hashcut" />
- <h2><span class="annotation-title"></span></h2>
- <table>
- <tbody>
- <tr>
- <th>Extrait de :</th>
- <td><span class="annotation-media-title"></span> (<span class="annotation-time annotation-begin"></span> - <span class="annotation-time annotation-end"></span>)</td>
- </tr>
- <tr>
- <th>Description :</th>
- <td><span class="annotation-description"></span></td>
- </tr>
- <tr>
- <th>Tags :</th>
- <td><span class="annotation-tags"></span></td>
- </tr>
- </tbody>
- </table>
+ </form>
+ </div>
+ </div><!-- popin segmentation -->
+
+ <div class="media-segments self-media-segments">
+ <h2>Mes segments sur ce média :</h2>
+ <div class="media-segments-list">
+ </div>
+ </div>
+
+ <div class="media-segments other-media-segments">
+ <h2>Segments existants sur ce média :</h2>
+ <div class="media-segments-list">
</div>
</div>
- </div><!-- bloc-pvw -->
- </div><!-- col-middle -->
+ </div><!-- bloc-segmentation -->
+
+ <div class="bloc-pvw">
- <div class="col-right">
- <div class="liste-segment">
- <div class="validate critical">
- <div class="validate-tooltip"></div>
- </div>
- <h2>Liste des segments</h2>
- <div class="frise mashup-frise">
- <p class="aucun-segment">Aucun segment</p>
- <div class="frise-overflow">
- <div class="frise-segments">
+ <div class="frise mashup-frise">
+ <div class="frise-overflow">
+ <div class="frise-segments">
+ </div>
+ <div class="frise-indications">
+ </div>
+ </div>
+ <div class="frise-position"></div>
+ <div class="mashup-tooltip segment-tooltip-wrapper">
+ <div class="segment-tooltip"></div>
+ <div class="segment-tooltip-tip"></div>
</div>
- <div class="frise-indications">
- </div>
+
</div>
- <div class="mashup-tooltip segment-tooltip-wrapper">
- <div class="segment-tooltip"></div>
- <div class="segment-tooltip-tip"></div>
- </div>
+
+ <div class="segment-info mashup-description">
+ <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>
+ </ul>
- </div>
- </div>
+ <h2><span class="annotation-title"></span></h2>
+ <table>
+ <tbody>
+ <tr>
+ <th>Extrait de :</th>
+ <td><span class="annotation-media-title"></span> (<span class="annotation-time annotation-begin"></span> - <span class="annotation-time annotation-end"></span>)</td>
+ </tr>
+ <tr>
+ <th>Description :</th>
+ <td><span class="annotation-description"></span></td>
+ </tr>
+ <tr>
+ <th>Tags :</th>
+ <td><span class="annotation-tags"></span></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div><!-- bloc-pvw -->
- <ul class="list-video organize-segments">
-
- </ul>
- </div><!-- col-right -->
-
- </div><!-- content -->
+ </div><!-- col-middle -->
- <div class="footer clearfix">
- <ul class="links-left">
- <li><a href="#">Mentions légales</a></li>
- <li><a href="#">Contacts</a></li>
- </ul>
- <ul class="links-right">
- <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><!-- footer -->
- </div><!-- wrap -->
+ <div class="col-right">
+ <div class="liste-segment">
+ <div class="validate critical">
+ <div class="validate-tooltip"></div>
+ </div>
+ <h2>Liste des segments</h2>
+ <div class="frise mashup-frise">
+ <p class="aucun-segment">Aucun segment</p>
+ <div class="frise-overflow">
+ <div class="frise-segments">
+ </div>
+ <div class="frise-indications">
+ </div>
+ </div>
+ <div class="mashup-tooltip segment-tooltip-wrapper">
+ <div class="segment-tooltip"></div>
+ <div class="segment-tooltip-tip"></div>
+ </div>
+
+ </div>
+ </div>
+
+ <ul class="list-video organize-segments">
+
+ </ul>
+ </div><!-- col-right -->
+
+ </div><!-- content -->
+
+ <div class="footer clearfix">
+ <ul class="links-left">
+ <li><a href="#">Mentions légales</a></li>
+ <li><a href="#">Contacts</a></li>
+ </ul>
+ <ul class="links-right">
+ <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><!-- footer -->
+ </div><!-- wrap -->
+ </div><!-- wrapper -->
+
<!-- JavaScript -->
<script type="text/javascript" src="lib/jquery.min.js"></script>
<script type="text/javascript" src="lib/jquery-ui.min.js"></script>
--- a/integration/hashcut.html Fri Nov 16 19:23:20 2012 +0100
+++ b/integration/hashcut.html Tue Nov 20 12:39:18 2012 +0100
@@ -13,13 +13,17 @@
<link rel="stylesheet" href="css/hashcut.css" />
</head>
<body>
- <div class="wrap">
- <div class="wrap-header">
+
+ <div class="wrap-header-top">
+ <div class="wrap-header-top-content">
<a title="Bibliothèque Publique d'Information" href="#"><img src="img/pompidou-logo.png" alt="Bibliothèque centre Pompidou" /></a>
</div>
+ </div><!-- wrap-header-top -->
+
+ <div class="wrap-header">
<div class="header">
- <!-- popin header -->
+ <!-- popin user -->
<div class="popin user info" id="user">
<img class="pointer" src="img/popin-triangle.png" alt="" />
<div class="popin-content">
@@ -84,7 +88,9 @@
</div>
</div><!-- popin user login-->
-
+
+ <!-- /popin user -->
+
<h1><a title="Hashcut - Le Mashup cliquable" class="clearfix" href="#">
<img src="img/hashcut-logo.png" alt="Hashcut" />
<span>Le Mashup<br />Cliquable</span>
@@ -110,138 +116,142 @@
<a href="#user" class="my-profil open-popin">Mon profil</a>
</div>
</div><!-- header -->
+ </div><!-- wrap-header -->
- <div class="content clearfix">
+ <div class="wrapper">
+ <div class="wrap">
+ <div class="content clearfix">
- <div class="left-content">
- <h2>Lire le Hashcut</h2>
- <div class="bloc-video">
- <div class="video">
- <div class="video-wait"></div>
- </div>
- <div class="widget">
- <div class="Ldt-Slider-Container">
- <div class="Ldt-Slider"></div>
- </div>
- <div class="Ldt-Slider-Time"></div>
-
- <div class="Ldt-Ctrl">
- <div class="Ldt-Ctrl-Left">
- <div title="Lecture" class="Ldt-Ctrl-button Ldt-Ctrl-Play Ldt-Ctrl-Play-PlayState"></div>
- <div class="Ldt-Ctrl-spacer"></div>
- <div class="Ldt-Ctrl-InOutBlock">
- <div title="Débuter le segment ici" class="Ldt-Ctrl-button Ldt-Ctrl-SetIn"></div>
- <div class="Ldt-Ctrl-spacer"></div>
- <div title="Finir le segment ici" class="Ldt-Ctrl-button Ldt-Ctrl-SetOut"></div>
- <div class="Ldt-Ctrl-spacer"></div>
- </div>
+ <div class="left-content">
+ <h2>Lire le Hashcut</h2>
+ <div class="bloc-video">
+ <div class="video">
+ <div class="video-wait"></div>
+ </div>
+ <div class="widget">
+ <div class="Ldt-Slider-Container">
+ <div class="Ldt-Slider"></div>
</div>
- <div class="Ldt-Ctrl-Right">
- <div class="Ldt-Ctrl-spacer"></div>
- <div class="Ldt-Ctrl-Time">
- <div title="Temps écoulé" class="Ldt-Ctrl-Time-Elapsed">00:00</div>
- <div class="Ldt-Ctrl-Time-Separator">/</div>
- <div title="Temps total" class="Ldt-Ctrl-Time-Total">1:03:30</div>
- </div>
- <div class="Ldt-Ctrl-spacer"></div>
- <div title="Couper le son" class="Ldt-Ctrl-button Ldt-Ctrl-Sound Ldt-Ctrl-Sound-Full"></div>
- </div>
- <div title="Changer le volume" class="Ldt-Ctrl-Volume-Control">
- <div class="Ldt-Ctrl-Volume-Bar"></div>
- </div>
- </div>
-
- </div>
- <div class="frise mashup-frise">
- <div class="frise-overflow">
- <div class="frise-segments">
+ <div class="Ldt-Slider-Time"></div>
+
+ <div class="Ldt-Ctrl">
+ <div class="Ldt-Ctrl-Left">
+ <div title="Lecture" class="Ldt-Ctrl-button Ldt-Ctrl-Play Ldt-Ctrl-Play-PlayState"></div>
+ <div class="Ldt-Ctrl-spacer"></div>
+ <div class="Ldt-Ctrl-InOutBlock">
+ <div title="Débuter le segment ici" class="Ldt-Ctrl-button Ldt-Ctrl-SetIn"></div>
+ <div class="Ldt-Ctrl-spacer"></div>
+ <div title="Finir le segment ici" class="Ldt-Ctrl-button Ldt-Ctrl-SetOut"></div>
+ <div class="Ldt-Ctrl-spacer"></div>
+ </div>
</div>
- <div class="frise-indications">
+ <div class="Ldt-Ctrl-Right">
+ <div class="Ldt-Ctrl-spacer"></div>
+ <div class="Ldt-Ctrl-Time">
+ <div title="Temps écoulé" class="Ldt-Ctrl-Time-Elapsed">00:00</div>
+ <div class="Ldt-Ctrl-Time-Separator">/</div>
+ <div title="Temps total" class="Ldt-Ctrl-Time-Total">1:03:30</div>
+ </div>
+ <div class="Ldt-Ctrl-spacer"></div>
+ <div title="Couper le son" class="Ldt-Ctrl-button Ldt-Ctrl-Sound Ldt-Ctrl-Sound-Full"></div>
</div>
- </div>
- <div class="frise-position"></div>
- <div class="mashup-tooltip segment-tooltip-wrapper">
- <div class="segment-tooltip"></div>
- <div class="segment-tooltip-tip"></div>
+ <div title="Changer le volume" class="Ldt-Ctrl-Volume-Control">
+ <div class="Ldt-Ctrl-Volume-Bar"></div>
+ </div>
</div>
</div>
- <div class="segment-info mashup-description">
- <img alt="" src="img/popin-triangle.png" class="pointer" style="left: 50%;">
- <div class="popin-content">
- <h2><span class="annotation-title">Segment sans titre</span></h2>
- <table>
- <tbody>
- <tr>
- <th>Extrait de :</th>
- <td><span class="annotation-media-title">Firminy, le maire et l'architecte</span> (<span class="annotation-time annotation-begin">00:00</span> - <span class="annotation-time annotation-end">53:50</span>)</td>
- </tr>
- <tr>
- <th>Description :</th>
- <td><span class="annotation-description">Extrait de « Firminy, le maire et l'architecte »</span></td>
- </tr>
- <tr>
- <th>Tags :</th>
- <td><span class="annotation-tags">(fonctionnalité à venir)</span></td>
- </tr>
- </tbody>
- </table>
+ <div class="frise mashup-frise">
+ <div class="frise-overflow">
+ <div class="frise-segments">
+ </div>
+ <div class="frise-indications">
+ </div>
+ </div>
+ <div class="frise-position"></div>
+ <div class="mashup-tooltip segment-tooltip-wrapper">
+ <div class="segment-tooltip"></div>
+ <div class="segment-tooltip-tip"></div>
+ </div>
+
</div>
+ <div class="segment-info mashup-description">
+ <img alt="" src="img/popin-triangle.png" class="pointer" style="left: 50%;">
+ <div class="popin-content">
+ <h2><span class="annotation-title">Segment sans titre</span></h2>
+ <table>
+ <tbody>
+ <tr>
+ <th>Extrait de :</th>
+ <td><span class="annotation-media-title">Firminy, le maire et l'architecte</span> (<span class="annotation-time annotation-begin">00:00</span> - <span class="annotation-time annotation-end">53:50</span>)</td>
+ </tr>
+ <tr>
+ <th>Description :</th>
+ <td><span class="annotation-description">Extrait de « Firminy, le maire et l'architecte »</span></td>
+ </tr>
+ <tr>
+ <th>Tags :</th>
+ <td><span class="annotation-tags">(fonctionnalité à venir)</span></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div><!-- bloc-video -->
+ </div><!-- left-content -->
+
+ <div class="right-content">
+ <h2>Plus d’informations</h2>
+ <div class="more-info-wrap">
+ <table class="more-info ">
+ <tbody>
+ <tr class="info-title">
+ <th>Titre :</th>
+ <td><a href="#">Titre du Hashcut</a></td>
+ </tr>
+ <tr class="info-duration">
+ <th>Durée :</th>
+ <td></td>
+ </tr>
+ <tr class="info-author">
+ <th>Auteur : </th>
+ <td><a href="#"></a></td>
+ </tr>
+ <tr class="info-description">
+ <th>Description : </th>
+ <td></td>
+ </tr>
+ <!-- <tr class="info-tags">
+ <th>Tags : </th>
+ <td>Mashup, Création, Art</td>
+ </tr> -->
+ </tbody>
+ </table>
+ <a href="#" class="button cloner">Cloner le Hashcut</a>
</div>
- </div><!-- bloc-video -->
- </div><!-- left-content -->
-
- <div class="right-content">
- <h2>Plus d’informations</h2>
- <div class="more-info-wrap">
- <table class="more-info ">
- <tbody>
- <tr class="info-title">
- <th>Titre :</th>
- <td><a href="#">Titre du Hashcut</a></td>
- </tr>
- <tr class="info-duration">
- <th>Durée :</th>
- <td></td>
- </tr>
- <tr class="info-author">
- <th>Auteur : </th>
- <td><a href="#"></a></td>
- </tr>
- <tr class="info-description">
- <th>Description : </th>
- <td></td>
- </tr>
-<!-- <tr class="info-tags">
- <th>Tags : </th>
- <td>Mashup, Création, Art</td>
- </tr> -->
- </tbody>
- </table>
- <a href="#" class="button cloner">Cloner le Hashcut</a>
- </div>
- <h2>Médias utilisés dans le Hashcut</h2>
- <ul class="list-video">
-
- </ul>
- </div><!-- right-content -->
+ <h2>Médias utilisés dans le Hashcut</h2>
+ <ul class="list-video">
+
+ </ul>
+ </div><!-- right-content -->
- </div><!-- content -->
+ </div><!-- content -->
- <div class="footer clearfix">
- <ul class="links-left">
- <li><a href="#">Mentions légales</a></li>
- <li><a href="#">Contacts</a></li>
- </ul>
- <ul class="links-right">
- <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><!-- footer -->
- </div><!-- wrap -->
+ <div class="footer clearfix">
+ <ul class="links-left">
+ <li><a href="#">Mentions légales</a></li>
+ <li><a href="#">Contacts</a></li>
+ </ul>
+ <ul class="links-right">
+ <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><!-- footer -->
+ </div><!-- wrap -->
+ </div><!-- wrapper -->
<!-- JavaScript -->
<script type="text/javascript" src="lib/jquery.min.js"></script>
<script type="text/javascript" src="lib/jquery-ui.min.js"></script>
--- a/integration/home.html Fri Nov 16 19:23:20 2012 +0100
+++ b/integration/home.html Tue Nov 20 12:39:18 2012 +0100
@@ -12,12 +12,19 @@
<link rel="stylesheet" href="css/home.css" />
</head>
<body>
- <div class="wrap">
- <div class="wrap-header">
+
+ <div class="wrap-header-top">
+ <div class="wrap-header-top-content">
<a title="Bibliothèque Publique d'Information" href="#"><img src="img/pompidou-logo.png" alt="Bibliothèque centre Pompidou" /></a>
</div>
+ </div><!-- wrap-header-top -->
+
+
+ <div class="wrap-header">
<div class="header">
- <!-- popin header -->
+
+ <!-- popin user -->
+
<div class="popin user info" id="user">
<img class="pointer" src="img/popin-triangle.png" alt="" />
<div class="popin-content">
@@ -82,7 +89,9 @@
</div>
</div><!-- popin user login-->
-
+
+ <!-- /popin user -->
+
<h1><a title="Hashcut - Le Mashup cliquable" class="clearfix" href="#">
<img src="img/hashcut-logo.png" alt="Hashcut" />
<span>Le Mashup<br />Cliquable</span>
@@ -95,109 +104,113 @@
<a href="#user" class="my-profil open-popin">Mon profil</a>
</div>
</div><!-- header -->
-
- <div class="content">
- <div class="left-content">
- <h2>Hashcuts à la Une</h2>
- <div class="hashcut-video-wrap news">
- <div class="video-item">
- <a href="#" class="screenshot"><img src="img/visuel-home-news.jpg" alt=""/></a>
- <h3><strong>Mon Hashcut</strong> par <a href="#">Hashcutter</a> | <span>02:24</span> </h3>
- </div>
- <div class="video-item">
- <a href="#" class="screenshot"><img src="img/visuel-home-news.jpg" alt=""/></a>
- <h3><strong>Mon Hashcut</strong> par <a href="#">Hashcutter</a> | <span>02:24</span> </h3>
- </div>
- </div>
-
- <h2>Derniers Hashcuts</h2>
- <div class="hashcut-video-wrap last">
- <div class="video-item">
- <a href="#" class="screenshot"><img src="img/visuel-home-last.jpg" alt="" /></a>
- <h3><strong>Mon Hashcut</strong> par <a href="#">Hashcutter</a> | <span>02:24</span> </h3>
+ </div><!-- wrap-header -->
+
+ <div class="wrapper">
+ <div class="wrap">
+ <div class="content">
+ <div class="left-content">
+ <h2>Hashcuts à la Une</h2>
+ <div class="hashcut-video-wrap news">
+ <div class="video-item">
+ <a href="#" class="screenshot"><img src="img/visuel-home-news.jpg" alt=""/></a>
+ <h3><strong>Mon Hashcut</strong> par <a href="#">Hashcutter</a> | <span>02:24</span> </h3>
+ </div>
+ <div class="video-item">
+ <a href="#" class="screenshot"><img src="img/visuel-home-news.jpg" alt=""/></a>
+ <h3><strong>Mon Hashcut</strong> par <a href="#">Hashcutter</a> | <span>02:24</span> </h3>
+ </div>
</div>
- <div class="video-item">
- <a href="#" class="screenshot"><img src="img/visuel-home-last.jpg" alt="" /></a>
- <h3><strong>Mon Hashcut</strong> par <a href="#">Hashcutter</a> | <span>02:24</span> </h3>
- </div>
- <div class="video-item">
- <a href="#" class="screenshot"><img src="img/visuel-home-last.jpg" alt="" /></a>
- <h3><strong>Mon Hashcut</strong> par <a href="#">Hashcutter</a> | <span>02:24</span> </h3>
- </div>
- <div class="video-item">
- <a href="#" class="screenshot"><img src="img/visuel-home-last.jpg" alt="" /></a>
- <h3><strong>Mon Hashcut</strong> par <a href="#">Hashcutter</a> | <span>02:24</span> </h3>
- </div>
- <div class="video-item">
- <a href="#" class="screenshot"><img src="img/visuel-home-last.jpg" alt="" /></a>
- <h3><strong>Mon Hashcut</strong> par <a href="#">Hashcutter</a> | <span>02:24</span> </h3>
- </div>
- <div class="video-item">
- <a href="#" class="screenshot"><img src="img/visuel-home-last.jpg" alt="" /></a>
- <h3><strong>Mon Hashcut</strong> par <a href="#">Hashcutter</a> | <span>02:24</span> </h3>
- </div>
- <div class="video-item">
- <a href="#" class="screenshot"><img src="img/visuel-home-last.jpg" alt="" /></a>
- <h3><strong>Mon Hashcut</strong> par <a href="#">Hashcutter</a> | <span>02:24</span> </h3>
- </div>
- <div class="video-item">
- <a href="#" class="screenshot"><img src="img/visuel-home-last.jpg" alt="" /></a>
- <h3><strong>Mon Hashcut</strong> par <a href="#">Hashcutter</a> | <span>02:24</span> </h3>
+
+ <h2>Derniers Hashcuts</h2>
+ <div class="hashcut-video-wrap last">
+ <div class="video-item">
+ <a href="#" class="screenshot"><img src="img/visuel-home-last.jpg" alt="" /></a>
+ <h3><strong>Mon Hashcut</strong> par <a href="#">Hashcutter</a> | <span>02:24</span> </h3>
+ </div>
+ <div class="video-item">
+ <a href="#" class="screenshot"><img src="img/visuel-home-last.jpg" alt="" /></a>
+ <h3><strong>Mon Hashcut</strong> par <a href="#">Hashcutter</a> | <span>02:24</span> </h3>
+ </div>
+ <div class="video-item">
+ <a href="#" class="screenshot"><img src="img/visuel-home-last.jpg" alt="" /></a>
+ <h3><strong>Mon Hashcut</strong> par <a href="#">Hashcutter</a> | <span>02:24</span> </h3>
+ </div>
+ <div class="video-item">
+ <a href="#" class="screenshot"><img src="img/visuel-home-last.jpg" alt="" /></a>
+ <h3><strong>Mon Hashcut</strong> par <a href="#">Hashcutter</a> | <span>02:24</span> </h3>
+ </div>
+ <div class="video-item">
+ <a href="#" class="screenshot"><img src="img/visuel-home-last.jpg" alt="" /></a>
+ <h3><strong>Mon Hashcut</strong> par <a href="#">Hashcutter</a> | <span>02:24</span> </h3>
+ </div>
+ <div class="video-item">
+ <a href="#" class="screenshot"><img src="img/visuel-home-last.jpg" alt="" /></a>
+ <h3><strong>Mon Hashcut</strong> par <a href="#">Hashcutter</a> | <span>02:24</span> </h3>
+ </div>
+ <div class="video-item">
+ <a href="#" class="screenshot"><img src="img/visuel-home-last.jpg" alt="" /></a>
+ <h3><strong>Mon Hashcut</strong> par <a href="#">Hashcutter</a> | <span>02:24</span> </h3>
+ </div>
+ <div class="video-item">
+ <a href="#" class="screenshot"><img src="img/visuel-home-last.jpg" alt="" /></a>
+ <h3><strong>Mon Hashcut</strong> par <a href="#">Hashcutter</a> | <span>02:24</span> </h3>
+ </div>
</div>
- </div>
-
- <div class="pagination">
- <a href="#" class="active">1</a>
- <a href="#">2</a>
- <a href="#">3</a>
- <a href="#">4</a>
- <a href="#">5</a>
- <a href="#">6</a>
- <a href="#">Suivant</a>
- </div>
-
- </div><!-- left-content -->
- <div class="right-content">
- <div class="definition">
- <h2>Hashcuts ?</h2>
- <p>Un <strong>Hashcut</strong> est à la fois une <a href="#">Hypervidéo</a> (ensemble de vidéos cliquable, permettant une navigation entre vidéos) et un <a href="#">Mashup</a> (mélange de médias, de l’anglais mash, «purée»).</p>
- <p>Un <strong>Hashcut</strong> est un assemblage de citations de vidéos, mises bout à bout, sans altération des médias d’origine, et permet à chacun de proposer un nouveau regard, une porte d’entrée éditorialisée sur ces médias.</p>
- </div>
- <div class="how-to">
- <h2>Comment faire ?</h2>
- <ul>
- <li class="inscription">
- <h3>1. S’inscrire</h3>
- <p>Commencez par créer votre espace personnel sur cette plateforme !</p>
- </li>
- <li class="next-step"></li>
- <li class="creation">
- <h3>2. Créer un hashcut</h3>
- <p>Choisissez des médias, segmentez les, assemblez les segments et rajoutez des commentaires sur le Hashcut.</p>
- </li>
- <li class="next-step"></li>
- <li class="publier">
- <h3>3. Publier et partager</h3>
- <p>Une fois le hashcut terminé, publiez-le sur cette plateforme etpartagez votre création sur les réseaux sociaux</p>
- </li>
- </ul>
- </div>
-
- </div><!-- left-content -->
- </div><!-- content -->
+
+ <div class="pagination">
+ <a href="#" class="active">1</a>
+ <a href="#">2</a>
+ <a href="#">3</a>
+ <a href="#">4</a>
+ <a href="#">5</a>
+ <a href="#">6</a>
+ <a href="#">Suivant</a>
+ </div>
+
+ </div><!-- left-content -->
+ <div class="right-content">
+ <div class="definition">
+ <h2>Hashcuts ?</h2>
+ <p>Un <strong>Hashcut</strong> est à la fois une <a href="#">Hypervidéo</a> (ensemble de vidéos cliquable, permettant une navigation entre vidéos) et un <a href="#">Mashup</a> (mélange de médias, de l’anglais mash, «purée»).</p>
+ <p>Un <strong>Hashcut</strong> est un assemblage de citations de vidéos, mises bout à bout, sans altération des médias d’origine, et permet à chacun de proposer un nouveau regard, une porte d’entrée éditorialisée sur ces médias.</p>
+ </div>
+ <div class="how-to">
+ <h2>Comment faire ?</h2>
+ <ul>
+ <li class="inscription">
+ <h3>1. S’inscrire</h3>
+ <p>Commencez par créer votre espace personnel sur cette plateforme !</p>
+ </li>
+ <li class="next-step"></li>
+ <li class="creation">
+ <h3>2. Créer un hashcut</h3>
+ <p>Choisissez des médias, segmentez les, assemblez les segments et rajoutez des commentaires sur le Hashcut.</p>
+ </li>
+ <li class="next-step"></li>
+ <li class="publier">
+ <h3>3. Publier et partager</h3>
+ <p>Une fois le hashcut terminé, publiez-le sur cette plateforme etpartagez votre création sur les réseaux sociaux</p>
+ </li>
+ </ul>
+ </div>
+
+ </div><!-- left-content -->
+ </div><!-- content -->
- <div class="footer clearfix">
- <ul class="links-left">
- <li><a href="#">Mentions légales</a></li>
- <li><a href="#">Contacts</a></li>
- </ul>
- <ul class="links-right">
- <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><!-- footer -->
- </div><!-- wrap -->
+ <div class="footer clearfix">
+ <ul class="links-left">
+ <li><a href="#">Mentions légales</a></li>
+ <li><a href="#">Contacts</a></li>
+ </ul>
+ <ul class="links-right">
+ <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><!-- footer -->
+ </div><!-- wrap -->
+ </div><!-- wrapper -->
<!-- JavaScript -->
<script type="text/javascript" src="lib/jquery.min.js"></script>
<script type="text/javascript" src="lib/jquery-ui.min.js"></script>
Binary file integration/img/bg.png has changed
--- a/integration/profil.html Fri Nov 16 19:23:20 2012 +0100
+++ b/integration/profil.html Tue Nov 20 12:39:18 2012 +0100
@@ -12,12 +12,19 @@
<link rel="stylesheet" href="css/profil.css" />
</head>
<body>
- <div class="wrap">
- <div class="wrap-header">
+
+ <div class="wrap-header-top">
+ <div class="wrap-header-top-content">
<a title="Bibliothèque Publique d'Information" href="#"><img src="img/pompidou-logo.png" alt="Bibliothèque centre Pompidou" /></a>
</div>
+ </div><!-- wrap-header-top -->
+
+
+ <div class="wrap-header">
<div class="header">
- <!-- popin header -->
+
+ <!-- popin user -->
+
<div class="popin user info" id="user">
<img class="pointer" src="img/popin-triangle.png" alt="" />
<div class="popin-content">
@@ -83,6 +90,8 @@
</div>
</div><!-- popin user login-->
+ <!-- /popin user -->
+
<h1><a title="Hashcut - Le Mashup cliquable" class="clearfix" href="#">
<img src="img/hashcut-logo.png" alt="Hashcut" />
<span>Le Mashup<br />Cliquable</span>
@@ -93,59 +102,63 @@
<a href="#user" class="my-profil open-popin">Mon profil</a>
</div>
</div><!-- header -->
-
- <div class="content">
- <h2 class="title-content">Hashcuts de <a href="#">Hashcutter75</a></h2>
-
- <div class="hashcut-video-wrap profil">
- <div class="video-item">
- <a href="#" class="screenshot"><img src="img/visuel-home-news.jpg" alt=""/></a>
- <h3><strong>Mon Hashcut</strong> | <span>02:24</span> </h3>
- </div>
- <div class="video-item">
- <a href="#" class="screenshot"><img src="img/visuel-home-news.jpg" alt=""/></a>
- <h3><strong>Mon Hashcut</strong> | <span>02:24</span> </h3>
- </div>
- <div class="video-item">
- <a href="#" class="screenshot"><img src="img/visuel-home-news.jpg" alt=""/></a>
- <h3><strong>Mon Hashcut</strong> | <span>02:24</span> </h3>
- </div>
- <div class="video-item">
- <a href="#" class="screenshot"><img src="img/visuel-home-news.jpg" alt=""/></a>
- <h3><strong>Mon Hashcut</strong> | <span>02:24</span> </h3>
- </div>
- <div class="video-item">
- <a href="#" class="screenshot"><img src="img/visuel-home-news.jpg" alt=""/></a>
- <h3><strong>Mon Hashcut</strong> | <span>02:24</span> </h3>
+ </div><!-- wrap-header -->
+
+ <div class="wrapper">
+ <div class="wrap">
+ <div class="content">
+ <h2 class="title-content">Hashcuts de <a href="#">Hashcutter75</a></h2>
+
+ <div class="hashcut-video-wrap profil">
+ <div class="video-item">
+ <a href="#" class="screenshot"><img src="img/visuel-home-news.jpg" alt=""/></a>
+ <h3><strong>Mon Hashcut</strong> | <span>02:24</span> </h3>
+ </div>
+ <div class="video-item">
+ <a href="#" class="screenshot"><img src="img/visuel-home-news.jpg" alt=""/></a>
+ <h3><strong>Mon Hashcut</strong> | <span>02:24</span> </h3>
+ </div>
+ <div class="video-item">
+ <a href="#" class="screenshot"><img src="img/visuel-home-news.jpg" alt=""/></a>
+ <h3><strong>Mon Hashcut</strong> | <span>02:24</span> </h3>
+ </div>
+ <div class="video-item">
+ <a href="#" class="screenshot"><img src="img/visuel-home-news.jpg" alt=""/></a>
+ <h3><strong>Mon Hashcut</strong> | <span>02:24</span> </h3>
+ </div>
+ <div class="video-item">
+ <a href="#" class="screenshot"><img src="img/visuel-home-news.jpg" alt=""/></a>
+ <h3><strong>Mon Hashcut</strong> | <span>02:24</span> </h3>
+ </div>
+ <div class="video-item">
+ <a href="#" class="screenshot"><img src="img/visuel-home-news.jpg" alt=""/></a>
+ <h3><strong>Mon Hashcut</strong> | <span>02:24</span> </h3>
+ </div>
</div>
- <div class="video-item">
- <a href="#" class="screenshot"><img src="img/visuel-home-news.jpg" alt=""/></a>
- <h3><strong>Mon Hashcut</strong> | <span>02:24</span> </h3>
- </div>
- </div>
- <div class="pagination">
- <a href="#" class="active">1</a>
- <a href="#">2</a>
- <a href="#">3</a>
- <a href="#">4</a>
- <a href="#">5</a>
- <a href="#">6</a>
- <a href="#">Suivant</a>
- </div>
- </div><!-- content -->
+ <div class="pagination">
+ <a href="#" class="active">1</a>
+ <a href="#">2</a>
+ <a href="#">3</a>
+ <a href="#">4</a>
+ <a href="#">5</a>
+ <a href="#">6</a>
+ <a href="#">Suivant</a>
+ </div>
+ </div><!-- content -->
- <div class="footer clearfix">
- <ul class="links-left">
- <li><a href="#">Mentions légales</a></li>
- <li><a href="#">Contacts</a></li>
- </ul>
- <ul class="links-right">
- <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><!-- footer -->
- </div><!-- wrap -->
+ <div class="footer clearfix">
+ <ul class="links-left">
+ <li><a href="#">Mentions légales</a></li>
+ <li><a href="#">Contacts</a></li>
+ </ul>
+ <ul class="links-right">
+ <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><!-- footer -->
+ </div><!-- wrap -->
+ </div><!-- wrapper -->
<!-- JavaScript -->
<script type="text/javascript" src="lib/jquery.min.js"></script>
<script type="text/javascript" src="lib/jquery-ui.min.js"></script>
