--- a/integration/v2/14-creation_fragment.html Tue Jun 25 16:13:16 2013 +0200
+++ b/integration/v2/14-creation_fragment.html Tue Jun 25 17:24:41 2013 +0200
@@ -30,7 +30,7 @@
<input id="id_search" type="text" placeholder="Rechercher dans le site">
<label class="styled-select">
<select>
- <option selected="" value="/egonomy/allpictures/">Images</option>
+ <option selected value="/egonomy/allpictures/">Images</option>
<option value="/egonomy/allfragments/">Fragments</option>
</select>
</label>
@@ -67,6 +67,8 @@
<li><a class="go-to search" href="#"></a></li>
</ul>
<ul class="clearfix">
+ <li><a title="Effacer le tracé" href="#">×</a></li>
+ <li><a title="Revenir au tracé d'origine" href="#">↺</a></li>
<li>
<a class="icon plus" href="#">Ajouter à ma collection</a>
</li>
--- a/integration/v2/15-16-detail_fragment.html Tue Jun 25 16:13:16 2013 +0200
+++ b/integration/v2/15-16-detail_fragment.html Tue Jun 25 17:24:41 2013 +0200
@@ -57,10 +57,12 @@
<form method="GET" action="/egonomy/allpictures/">
<p>
<input id="id_search" type="text" placeholder="Rechercher dans le site">
- <select class="search-type">
- <option selected="" value="/egonomy/allpictures/">Images</option>
- <option value="/egonomy/allfragments/">Fragments</option>
- </select>
+ <label class="styled-select">
+ <select>
+ <option selected value="/egonomy/allpictures/">Images</option>
+ <option value="/egonomy/allfragments/">Fragments</option>
+ </select>
+ </label>
</p>
<input type="hidden" name="field" value="all">
</form>
@@ -101,7 +103,7 @@
<a class="icon trash" href="#">Supprimer ce fragment</a>
</li>
<li>
- <a class="icon save" href="#">Enregistrer sous</a>
+ <a class="icon copy" href="#">Dupliquer</a>
</li>
<li>
<a class="icon plus open-popin" href="#add-to-collection">Ajouter à ma collection</a>
@@ -131,8 +133,8 @@
<li><a title="Partager sur Facebook" href="#" class="tool facebook"></a></li>
</ul>
</div>
- <div class="info box-edition">
- <table>
+ <div class="info box-edition clearfix">
+ <table class="edition-table-left">
<tbody>
<tr>
<th>Auteur :</th>
@@ -148,6 +150,24 @@
</tr>
</tbody>
</table>
+ <table class="edition-table-right">
+ <tbody>
+ <tr><th>Voir le fragment seul :</th></tr>
+ <tr><td>
+ <div class="fragment-110">
+ <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" viewBox="0.3548 0.232193846154 0.357 0.276812307692" height="100%" width="100%" preserveAspectRatio="none">
+ <defs>
+ <clipPath id="fragment-clip68">
+ <path d="M0.3548 0.2603L0.4172 0.4461L0.7053 0.4809L0.7118 0.3532Z"/>
+ </clipPath>
+ </defs>
+ <image opacity=".3" height="1" width="1" preserveAspectRatio="none" y="0" x="0" xlink:href="http://egonomy.iri-research.org/static/media/images/27/99-007715.jpg"/>
+ <image clip-path="url(#fragment-clip68)" height="1" width="1" preserveAspectRatio="none" y="0" x="0" xlink:href="http://egonomy.iri-research.org/static/media/images/27/99-007715.jpg"/>
+ </svg>
+ </div><!-- ./fragment -->
+ </td></tr>
+ </tbody>
+ </table>
</div>
<div class="box-edition">
<table>
--- a/integration/v2/18-19-20-21-collection_vue_mosaique.html Tue Jun 25 16:13:16 2013 +0200
+++ b/integration/v2/18-19-20-21-collection_vue_mosaique.html Tue Jun 25 17:24:41 2013 +0200
@@ -55,17 +55,17 @@
</td>
</tr>
<tr>
- <th colspan="2">Description :</th>
+ <th colspan="2"><label for="description-collection">Description :</label></th>
</tr>
<tr>
<td colspan="2">
- <textarea name="" id=""></textarea>
+ <textarea name="" id="description-collection"></textarea>
</td>
</tr>
</tbody>
</table>
</div>
- <ul class="list-projets-2 in-popin">
+ <ul class="list-projets-2 clearfix">
<li>
<div class="top clearfix">
<img src="img/113x113.png" alt="">
@@ -157,16 +157,16 @@
<div class="filters-wrap float-left">
<ul class="filters">
<li class="box-shadow-2"><a class="display-keyword" data-keyword="azerty" href="#">
- Paris, musée Victor Hugo <a title="close" class="icon-action cross" href="#"></a>
+ Paris, musée Victor Hugo <a class="icon-action cross" href="#"></a>
</a></li>
<li class="box-shadow-2"><a class="display-keyword" data-keyword="lorem" href="#">
- Bonjour hello world lorem ipsum dolor <a title="circle" class="icon-action circle" href="#"></a>
+ Bonjour hello world lorem ipsum dolor <a class="icon-action cross" href="#"></a>
</a></li>
- <li class="box-shadow-2 disabled"><a href="#">
- Paris, musée Victor Hugo <a title="close" class="icon-action cross" href="#"></a>
+ <li class="box-shadow-2"><a class="display-keyword" data-keyword="ipsum" href="#">
+ ipsum tag <a class="icon-action cross" href="#"></a>
</a></li>
- <li class="box-shadow-2 disabled"><a href="#">
- Paris, musée Victor Hugo <a title="circle" class="icon-action circle" href="#"></a>
+ <li class="box-shadow-2"><a class="display-keyword" data-keyword="hello" href="#">
+ hello tag tag it <a class="icon-action cross" href="#"></a>
</a></li>
</ul>
</div>
@@ -198,7 +198,7 @@
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Minus aut nostrum omnis cumque maxime delectus numquam natus sapiente enim reiciendis nulla animi praesentium odio cupiditate temporibus! Nisi alias eius animi.</p>
</div>
</li>
- <li class="item-masonry keyword-lorem">
+ <li class="item-masonry keyword-ipsum">
<div class="curtain"></div>
<div class="visuel-project">
<img src="img/177x264.png" alt="">
@@ -250,7 +250,7 @@
<p>azerty qwerty allo hello azerty qwerty allo hello</p>
</div>
</li>
- <li class="item-masonry keyword-lorem">
+ <li class="item-masonry keyword-hello">
<div class="curtain"></div>
<div class="visuel-project">
<img src="img/177x224.png" alt="">
@@ -302,7 +302,7 @@
<p>Lorem ipsum dolor</p>
</div>
</li>
- <li class="item-masonry keyword-lorem">
+ <li class="item-masonry keyword-ipsum">
<div class="curtain"></div>
<div class="visuel-project">
<img src="img/177x232.png" alt="">
@@ -380,7 +380,7 @@
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Minus aut nostrum omnis cumque maxime delectus numquam natus sapiente enim reiciendis nulla animi praesentium odio cupiditate temporibus! Nisi alias eius animi.</p>
</div>
</li>
- <li class="item-masonry keyword-azerty">
+ <li class="item-masonry keyword-hello">
<div class="curtain"></div>
<div class="visuel-project">
<img src="img/177x264.png" alt="">
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/integration/v2/23-collection_geographique.html Tue Jun 25 17:24:41 2013 +0200
@@ -0,0 +1,99 @@
+<!DOCTYPE html>
+<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
+<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
+<!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
+<head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="description" content="eGonomy">
+ <title>eGonomy : Collectionner (non connecté)</title>
+
+ <link rel="stylesheet" href="css/reset.css">
+ <link rel="stylesheet" href="css/fonts.css">
+ <link rel="stylesheet" href="css/style.css">
+ <script src="js/vendor/modernizr-2.6.2.min.js"></script>
+</head>
+<body>
+
+
+ <div class="wrap">
+ <header class="clearfix">
+ <h1><a href="#">egonomy</a></h1>
+ <div class="col-right">
+ <ul class="head-login clearfix">
+ <li>
+ <form method="GET" action="/egonomy/allpictures/">
+ <p class="clearfix">
+ <input id="id_search" type="text" placeholder="Rechercher dans le site">
+ <label class="styled-select">
+ <select>
+ <option selected="" value="/egonomy/allpictures/">Images</option>
+ <option value="/egonomy/allfragments/">Fragments</option>
+ </select>
+ </label>
+ </p>
+ <input type="hidden" name="field" value="all">
+ </form>
+ </li>
+ <li class="hello-user">Bonjour Anthony Ly</li>
+ <li><span class="dot-6"></span></li>
+ <li><a class="login" href="#">Déconnexion</a></li>
+ </ul>
+ <nav>
+ <ul class="nav clearfix">
+ <li><a href="#" title="home"><img src="img/icon-home.png" alt="home"></a></li>
+ <li><span class="dot-10"></span></li>
+ <li><a href="#">explorer</a></li>
+ <li><span class="dot-10"></span></li>
+ <li><a href="#">collectionner</a></li>
+ <li><span class="dot-10"></span></li>
+ <li><a href="#">créer</a></li>
+ <li><span class="dot-10"></span></li>
+ <li><a href="#">mon profil</a></li>
+ </ul>
+ <ul class="sub-nav clearfix">
+ <li><span class="dot-6"></span></li>
+ <li><a href="#" class="active">mes collections</a></li>
+ <li><span class="dot-6"></span></li>
+ <li><a href="#">mes collages</a></li>
+ <li><span class="dot-6"></span></li>
+ <li><a href="#">mon profil</a></li>
+ </ul>
+ </nav>
+ </div>
+ </header>
+ <section>
+ <div class="title-page">
+ <h2>Romantisme noir</span></h2>
+ <ul class="sub-nav title-menu clearfix">
+ <li><a href="#">argumentaire</a></li>
+ <li><span class="dot-6"></span></li>
+ <li><a href="#">mosaïque</a></li>
+ <li><span class="dot-6"></span></li>
+ <li><a href="#" class="active">géographique</a></li>
+ <li><span class="dot-6"></span></li>
+ <li><a href="#">envoyer vers collage</a></li>
+ </ul>
+ </div>
+ <div class="bar-tools clearfix">
+ <ul class="clearfix">
+ <li><a href="#">imprimer la vue en PDF</a></li>
+ <li><a class="icon save" href="#">enregistrer sous</a></li>
+ <li><a class="open-popin" href="#collection-parameters">paramètres de la collection</a></li>
+ </ul>
+ </div>
+
+ </section>
+ <footer class="clearfix">
+ <h6>EGONOMY est un projet de l’IRI et de la réunion des Musées Nationaux</h6>
+ <p>Mai 2013</p>
+ </footer>
+ </div><!-- /.wrap -->
+
+ <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+ <script>window.jQuery || document.write('<script src="js/vendor/jquery-1.9.1.min.js"><\/script>')</script>
+ <script src="js/masonry.min.js"></script>
+ <script src="js/main.js"></script>
+</body>
+</html>
--- a/integration/v2/css/style.css Tue Jun 25 16:13:16 2013 +0200
+++ b/integration/v2/css/style.css Tue Jun 25 17:24:41 2013 +0200
@@ -3,7 +3,8 @@
.wrap{width: 950px; margin: 0 auto; }
.uppercase{text-transform: uppercase;}
.fragment{width: 225px; height: 225px;}
-.va-top{vertical-align: top;}
+.fragment-110{width: 110px; height: 110px; display: inline-block;}
+.va-top{vertical-align: top;padding-top: 4px;}
header, footer{width:100%;background: url(../img/border-bottom-header.png) center bottom no-repeat;}
footer{margin-bottom: 60px;background-position: top center; padding-top: 20px;font-size: 15px; font-family: 'Lato'; font-weight: 300;}
footer h6{float: left;}
@@ -39,6 +40,15 @@
.title-menu{ position: absolute; bottom: 0; right: 0;}
.title-menu li{float: left;}
+.edition-table-left{
+ width: 700px !important;
+ float: left;
+}
+.edition-table-right{
+ text-align: right;
+ width: 180px !important;
+ float: right;
+}
.bar-tools{margin-bottom: 12px; line-height: 35px; padding-bottom: 1px; font-family: 'Lato'; font-weight: 300; display:block;background-image: url(../img/border-bar-tools.png), url(../img/border-bar-tools.png); background-position: top center, bottom center; background-repeat: repeat-x;}
.bar-tools h3{ font-size: 18px; display: inline-block; text-transform: uppercase;}
.bar-tools ul{float: right;}
@@ -58,7 +68,7 @@
a.icon.plus{background-image: url(../img/icon-plus-15.png);}
a.icon.edit{background-image: url(../img/icon-pencil-15.png);}
a.icon.trash{background-image: url(../img/icon-trash-15.png);}
-
+a.icon.copy{background-image: url(../img/icon-copy-15.png);}
/* Home */
.w650{width: 650px;}
.our-images{margin-bottom: 38px; text-align: center; font-size: 12px; font-family: 'Lato'; font-weight : bold; font-style : italic; color: #58595A;}
@@ -164,7 +174,7 @@
.popin .buttons{text-align: right;}
.btn{cursor:pointer; border: none; vertical-align:middle; display: inline-block; color: #FFF; font-size: 12px; font-family: 'Lato'; height: 25px; line-height: 25px; padding: 0 12px; background-color: #666;}
.block{display: block;}
-.popin-wrap, .popin{display: none;}
+
.big-popin{width: 572px; margin-left: -286px;}
.popin th{ vertical-align:middle;font-family: 'Lato'; font-size: 12px; font-weight: 300; width: 110px; text-align: left;}
.popin .col-left{width: 316px; float: left; padding-left: 12px;}
@@ -187,6 +197,11 @@
.edition{font-family: 'Lato'; font-size: 14px; text-align: left;}
.big-popin form{padding: 8px 0 20px 0;}
+
+.popin-wrap, .popin{display: none;}
+
+
+
.edition th{color: #777; min-width: 140px; }
.edition td{width:100%;color: #000; line-height: 16px;}
.edition table{width: 100%; border-collapse:separate;border-spacing:0 5px;}
@@ -208,7 +223,7 @@
.box-edition:last-child{border-bottom: none;}
.edition input[type=text], .edition textarea{border: 1px solid #CACACA;}
.edition textarea{width:100%; max-width: 754px;}
-.edition input[type=text]{height: 23px; line-height: 23px; padding: 0 6px;}
+.edition input[type=text]{width: 742px; height: 23px; line-height: 23px; padding: 0 6px;}
.no-before:before{content:"" ; display: block;}
.tagit{font-family: 'Lato' !important;}
.ui-corner-all{-webkit-border-radius : 0 !important;-moz-border-radius : 0 !important;border-radius : 0 !important;}
@@ -249,7 +264,7 @@
.content-project{background-color: #eee;}
.content-project p{font-family: 'Lato'; font-size: 13px; font-weight: 300; line-height: 15px; padding: 10px;}
-
+body{overflow: auto !important;}
/* imported */
.square-fragment-225 {
Binary file integration/v2/img/icon-copy-15.png has changed
--- a/integration/v2/js/main.js Tue Jun 25 16:13:16 2013 +0200
+++ b/integration/v2/js/main.js Tue Jun 25 17:24:41 2013 +0200
@@ -76,16 +76,48 @@
$('.display-keyword').bind('click', function(e){
e.preventDefault();
- var li = $(this).parents('li'),
+ var ul = $(this).parents('ul'),
+ li = $(this).parents('li'),
+ iconAction = li.find('.icon-action'),
+ index = li.index(),
keyword = $(this).attr('data-keyword');
+ enabledDisplayKeyword(li, keyword, iconAction);
+
+ ul.find('li').each(function(k, v){
+ if(index != k){
+ var displayKeyword = $(v).find('.display-keyword'),
+ iconAction = $(v).find('.icon-action'),
+ keyword = displayKeyword.attr('data-keyword');
+ disabledDisplayKeyword($(v), keyword, iconAction);
+ }
+ });
+ });
+ $('.icon-action').bind('click', function(e){
+ e.preventDefault();
+ var li = $(this).parents('li');
+ toggleDisplayKeyword(li);
+ });
+ function toggleDisplayKeyword(li){
+ var displayKeyword = li.find('.display-keyword'),
+ iconAction = li.find('.icon-action'),
+ keyword = displayKeyword.attr('data-keyword');
if(li.hasClass('disabled')){
- $('li.keyword-'+keyword).find('.curtain').hide();
- li.removeClass('disabled');
+ enabledDisplayKeyword(li, keyword, iconAction);
}else{
- $('li.keyword-'+keyword).find('.curtain').show();
- li.addClass('disabled');
+ disabledDisplayKeyword(li, keyword, iconAction);
}
-
- });
+ }
+ function enabledDisplayKeyword(li, keyword, iconAction){
+ iconAction.removeClass('cross').removeClass('circle');
+ li.removeClass('disabled');
+ $('li.keyword-'+keyword).find('.curtain').hide();
+ iconAction.addClass('cross');
+ }
+ function disabledDisplayKeyword(li, keyword, iconAction){
+ iconAction.removeClass('cross').removeClass('circle');
+ li.addClass('disabled');
+ $('li.keyword-'+keyword).find('.curtain').show();
+ iconAction.addClass('circle');
+ }
});//ready