--- a/integ/iri-buzz.html Tue Apr 30 18:22:21 2013 +0200
+++ b/integ/iri-buzz.html Thu May 02 14:52:38 2013 +0200
@@ -54,21 +54,6 @@
<div class="wrap-buzz">
- <div class="comment clearfix">
- <span class="comment-arrow"></span>
- <div class="avatar"><img src="img/profil_50_1.jpg" alt="" /></div>
- <div class="comment-right">
- <div class="comment-info clearfix">
- <span class="username">Angelo Chiacchio</span>
- <span class="date">il y a 23 heures</span>
- <ul class="rating rate-1">
- <li></li><li></li><li></li><li></li><li></li>
- </ul>
- </div>
- <p class="review-content">J’ai adoré ce film. Il fait sourire et pleurer au meme temps. Bien longtemps qu'on avait pas vu une comédie française aussi hilarante et émouvante.</p>
- </div>
- </div><!-- /comment -->
-
<div class="timeline-head clearfix">
<div class="timeline-head-wrap">
<div class="timer-wrap clearfix">
@@ -106,8 +91,23 @@
</nav>
<a href="#" class="logofoot" ><img src="img/logo-footer.png" alt="Cinégift" /></a>
</footer>
-
-
+
+ <div id="comment">
+ <div class="comment-content clearfix wanttosee">
+ <div class="avatar"><img src="" alt="Avatar" /></div>
+ <div class="comment-right">
+ <div class="comment-metadata">
+ <span class="username">{{auteur}}</span>
+ <span class="date">{{Date}}</span>
+ <ul class="stars-rating rate-3.5">
+ <li></li><li></li><li></li><li></li><li></li>
+ </ul>
+ </div>
+ <p class="review-content">veut voir ce film.</p>
+ </div>
+ </div>
+ <div class="comment-arrow"></div>
+ </div>;
<script src="js/libs/jquery-1.7.1.min.js"></script>
<script src="js/libs/jquery-ui-1.8.21.custom.min.js"></script>
--- a/integ/iri/css/iri-buzz.css Tue Apr 30 18:22:21 2013 +0200
+++ b/integ/iri/css/iri-buzz.css Thu May 02 14:52:38 2013 +0200
@@ -1,41 +1,231 @@
-.wrap-buzz{padding-top: 80px;}
+.wrap-buzz {
+ padding-top: 80px;
+}
-.timeline-head{position: fixed; width:100%; z-index:10; text-align: center;}
-.timeline-head-wrap{display: inline-block;}
-.timer-wrap{float:left;margin-right:34px;}
-.timer-bar{width: 500px; height: 8px; background-color: #151515; border-bottom: 1px solid #474747;}
-.timer-bar-value{width: 0; height: 100%; background-color: #6b6b6b;-webkit-box-shadow: inset 0px 1px 1px 0px #8d8d8d;box-shadow: inset 0px 1px 1px 0px #8d8d8d;}
-.hours {position: relative;}
-.hours li{position: absolute; top: 0; width: 50px; text-align: center; margin-left: -25px; text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.75);color:#919191; font-size: 12px;}
-.hours li:before {content:""; width: 1px; height: 5px; margin: 2px 24px; background: #909090; block-shadow: 0px 1px 2px rgba(0, 0, 0, 0.75); display: block;}
+.timeline-head {
+ position: fixed;
+ width: 100%;
+ z-index: 10;
+ text-align: center;
+}
+.timeline-head-wrap {
+ display: inline-block;
+}
+.timer-wrap {
+ float: left;
+ margin-right: 34px;
+}
+.timer-bar {
+ width: 500px;
+ height: 8px;
+ background-color: #151515;
+ border-bottom: 1px solid #474747;
+}
+.timer-bar-value {
+ width: 0;
+ height: 100%;
+ background-color: #6b6b6b;
+ -webkit-box-shadow: inset 0px 1px 1px 0px #8d8d8d;
+ box-shadow: inset 0px 1px 1px 0px #8d8d8d;
+}
+.hours {
+ position: relative;
+}
+.hours li {
+ position: absolute;
+ top: 0;
+ width: 50px;
+ text-align: center;
+ margin-left: -25px;
+ text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.75);
+ color: #919191;
+ font-size: 12px;
+}
+.hours li:before {
+ content: "";
+ width: 1px;
+ height: 5px;
+ margin: 2px 24px;
+ background: #909090;
+ block-shadow: 0px 1px 2px rgba(0, 0, 0, 0.75);
+ display: block;
+}
-a.rejouer{float:left;width: 92px; height: 32px; display: inline-block; text-align: center; line-height: 32px; font-size: 11px; font-weight: bold;text-shadow: 0px -1px 1px rgba(0, 0, 0, 0.8);-webkit-box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.75);-moz-box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.75);box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.75);-webkit-border-radius: 4px;-moz-border-radius: 4px;border-radius: 4px; background: #1899e1;background: -moz-linear-gradient(top, #1899e1 0%, #126ae3 100%);background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#1899e1), color-stop(100%,#126ae3));background: -webkit-linear-gradient(top, #1899e1 0%,#126ae3 100%);background: -o-linear-gradient(top, #1899e1 0%,#126ae3 100%);background: -ms-linear-gradient(top, #1899e1 0%,#126ae3 100%);background: linear-gradient(to bottom, #1899e1 0%,#126ae3 100%);filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#1899e1', endColorstr='#126ae3',GradientType=0 );}
-a.rejouer:hover{background: #126ae3;background: -moz-linear-gradient(top, #126ae3 0%, #1899e1 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#126ae3), color-stop(100%,#1899e1)); background: -webkit-linear-gradient(top, #126ae3 0%,#1899e1 100%);background: -o-linear-gradient(top, #126ae3 0%,#1899e1 100%); background: -ms-linear-gradient(top, #126ae3 0%,#1899e1 100%); background: linear-gradient(to bottom, #126ae3 0%,#1899e1 100%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#126ae3', endColorstr='#1899e1',GradientType=0 );}
+a.rejouer {
+ float: left;
+ width: 92px;
+ height: 32px;
+ display: inline-block;
+ text-align: center;
+ line-height: 32px;
+ font-size: 11px;
+ font-weight: bold;
+ text-shadow: 0px -1px 1px rgba(0, 0, 0, 0.8);
+ -webkit-box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.75);
+ -moz-box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.75);
+ box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.75);
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
+ background: #1899e1;
+ background: -moz-linear-gradient(top, #1899e1 0%, #126ae3 100%);
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#1899e1), color-stop(100%,#126ae3));
+ background: -webkit-linear-gradient(top, #1899e1 0%,#126ae3 100%);
+ background: -o-linear-gradient(top, #1899e1 0%,#126ae3 100%);
+ background: -ms-linear-gradient(top, #1899e1 0%,#126ae3 100%);
+ background: linear-gradient(to bottom, #1899e1 0%,#126ae3 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#1899e1', endColorstr='#126ae3',GradientType=0 );
+}
+a.rejouer:hover {
+ background: #126ae3;
+ background: -moz-linear-gradient(top, #126ae3 0%, #1899e1 100%);
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#126ae3), color-stop(100%,#1899e1));
+ background: -webkit-linear-gradient(top, #126ae3 0%,#1899e1 100%);
+ background: -o-linear-gradient(top, #126ae3 0%,#1899e1 100%);
+ background: -ms-linear-gradient(top, #126ae3 0%,#1899e1 100%);
+ background: linear-gradient(to bottom, #126ae3 0%,#1899e1 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#126ae3', endColorstr='#1899e1',GradientType=0 );
+}
-.posters li{float: left;width: 150px; height: 200px;overflow: hidden;}
+.posters li {
+ float: left;
+ width: 150px;
+ height: 200px;
+ overflow: hidden;
+}
-#data-viz{padding-top: 50px;line-height: 50px; text-align: center; color: #909090; font-weight: bold; font-size: 40px;}
+#data-viz {
+ padding-top: 50px;
+ line-height: 50px;
+ text-align: center;
+ color: #909090;
+ font-weight: bold;
+ font-size: 40px;
+}
-.comment{z-index:20;position:absolute;-webkit-border-radius: 6px;border-radius: 6px;border:2px solid #323232;width: 470px; min-height: 80px; background-color:rgba(0,0,0,.9); padding-top: 12px;}
-.comment-info{margin-bottom: 8px;}
-.comment .date{color: #626262; font-size: 10px;}
-.comment .username{color: #ffb500; font-size: 15px; font-weight: bold;}
-.comment .avatar{margin-left: 10px;float: left;width: 50px; height: 50px; border:1px solid #a4a3a8; overflow: hidden;}
-.comment-right{padding-bottom: 12px;width: 380px; padding-right: 15px;float: right;}
-.comment .rating{display: inline-block; float: right;}
-.comment .rating li{margin-right: 2px;background: url(../img/review-rating-star-sprite.png) top right no-repeat; width:19px; height: 16px;display: inline-block;}
-.comment .rating li:last-child{margin-right: 0;}
-.rating.rate-1 li:first-child{background-position: top left;}
-.rating.rate-1_5 li:first-child{background-position: top left;}.rating.rate-1_5 li:nth-child(2){background-position: top center;}
-.rating.rate-2 li:first-child,.rating.rate-2 li:nth-child(2){background-position: top left;}
-.rating.rate-2_5 li:first-child,.rating.rate-2_5 li:nth-child(2){background-position: top left;}.rating.rate-2_5 li:nth-child(3){background-position: top center;}
-.rating.rate-3 li:first-child,.rating.rate-3 li:nth-child(2),.rating.rate-3 li:nth-child(3){background-position: top left;}
-.rating.rate-3_5 li:first-child,.rating.rate-3_5 li:nth-child(2),.rating.rate-3_5 li:nth-child(3){background-position: top left;}.rating.rate-3_5 li:nth-child(4){background-position: top center;}
-.rating.rate-4 li:first-child,.rating.rate-4 li:nth-child(2),.rating.rate-4 li:nth-child(3),.rating.rate-4 li:nth-child(4){background-position: top left;}
-.rating.rate-4_5 li:first-child,.rating.rate-4_5 li:nth-child(2),.rating.rate-4_5 li:nth-child(3), .rating.rate-4_5 li:nth-child(4){background-position: top left;}.rating.rate-4_5 li:nth-child(5){background-position: top center;}
-.rating.rate-5 li{background-position: top left;}
-.comment p{color: #ededed; font-size: 13px; }
+#comment {
+ z-index: 20;
+ position: absolute;
+ display: none;
+}
+.comment-content {
+ -webkit-border-radius: 6px;
+ border-radius: 6px;
+ border: 2px solid #323232;
+ width: 470px;
+ background-color: rgba(0,0,0,.9);
+ padding-top: 12px;
+ position: absolute;
+ left: -235px;
+ top: 10px;
+ z-index: 1;
+}
+.left .comment-content {
+ left: -30px;
+}
+.right .comment-content {
+ left: -439px;
+}
+.comment-content .date {
+ color: #626262;
+ font-size: 10px;
+}
+.comment-content .username {
+ color: #ffb500;
+ font-size: 15px;
+ font-weight: bold;
+}
+.comment-content .avatar {
+ margin-left: 10px;
+ float: left;
+ border: 1px solid #a4a3a8;
+ overflow: hidden;
+}
+.comment-content .avatar img {
+ max-width: 50px;
+ max-height: 50px;
+ margin: 0 auto; display: block;
+}
+.comment-right {
+ padding-bottom: 12px;
+ width: 380px;
+ padding-right: 15px;
+ float: right;
+}
+.userreview .stars-rating {
+ float: right;
+}
+.userreview .stars-rating li {
+ margin-right: 2px;
+ background: url(../img/review-rating-star-sprite.png) top right no-repeat;
+ width: 19px;
+ height: 16px;
+ display: inline-block;
+}
+.rate .stars-rating li {
+ margin-right: 3px;
+ background: url(../img/rating-stars-large.png) top right no-repeat;
+ width: 21px;
+ height: 21px;
+ display: inline-block;
+}
+.wanttosee .stars-rating {
+ display: none;
+}
+.stars-rating li:last-child {
+ margin-right: 0;
+}
+.rate-1\.0 li:first-child,
+.rate-1\.5 li:first-child,
+.rate-2\.0 li:first-child,
+.rate-2\.0 li:nth-child(2),
+.rate-2\.5 li:first-child,
+.rate-2\.5 li:nth-child(2),
+.rate-3\.0 li:first-child,
+.rate-3\.0 li:nth-child(2),
+.rate-3\.0 li:nth-child(3),
+.rate-3\.5 li:first-child,
+.rate-3\.5 li:nth-child(2),
+.rate-3\.5 li:nth-child(3),
+.rate-4\.0 li:first-child,
+.rate-4\.0 li:nth-child(2),
+.rate-4\.0 li:nth-child(3),
+.rate-4\.0 li:nth-child(4),
+.rate-4\.5 li:first-child,
+.rate-4\.5 li:nth-child(2),
+.rate-4\.5 li:nth-child(3),
+.rate-4\.5 li:nth-child(4),
+.rate-5\.0 li {
+ background-position: top left;
+}
-.comment{display: none;}
-.comment-arrow{top:-10px; left:30px;display: block;width: 10px; height: 11px; background: url(../img/comment-arrow.png) 0 0 no-repeat; position: absolute;}
+.rate-1\.5 li:nth-child(2),
+.rate-2\.5 li:nth-child(3),
+.rate-3\.5 li:nth-child(4),
+.rate-4\.5 li:nth-child(5) {
+ background-position: top center;
+}
+
+.review-content {
+ clear: both;
+ color: #ededed;
+ font-size: 13px;
+ margin: 8px 0 4px;
+}
+.wanttosee .review-content {
+ line-height: 19px; height: 19px; padding-left: 30px;
+ background: url(../img/wanttosee.png) left no-repeat;
+}
+
+.comment-arrow {
+ top: 2px;
+ left: -5px;
+ display: block;
+ width: 10px;
+ height: 11px;
+ background: url(../img/comment-arrow.png) 0 0 no-repeat;
+ position: absolute;
+ z-index: 2;
+}
+
--- a/integ/iri/css/iri-creation-cinecard.css Tue Apr 30 18:22:21 2013 +0200
+++ b/integ/iri/css/iri-creation-cinecard.css Thu May 02 14:52:38 2013 +0200
@@ -59,18 +59,6 @@
.stickers img {
margin: -1px 0 0 -2px;
}
-a.eye {
- background-image: url(../img/eye-icon.png);
-}
-a.star {
- background-image: url(../img/star-icon.png);
-}
-a.like {
- background-image: url(../img/like-icon.png);
-}
-a.envelope {
- background-image: url(../img/envelope-icon.png);
-}
.stickers li:nth-child(3n+3) {
margin-right: 0;
}
--- a/integ/iri/fakedata/cinecard-00.json Tue Apr 30 18:22:21 2013 +0200
+++ b/integ/iri/fakedata/cinecard-00.json Thu May 02 14:52:38 2013 +0200
@@ -10,7 +10,7 @@
"x": -17,
"y": -189
},
- "image": "http://fr.web.img4.acsta.net/medias/nmedia/18/67/78/06/19028560.jpg",
+ "image": "http://fr.web.img4.acsta.net/r_800_600/medias/nmedia/18/67/78/06/19028560.jpg",
"created_by": null,
"size": 4
}, {
@@ -58,7 +58,7 @@
"x": 360.5,
"y": -208.5
},
- "image": "http://fr.web.img1.acsta.net/medias/nmedia/18/64/19/48/19965756.jpg",
+ "image": "http://fr.web.img1.acsta.net/r_800_600/medias/nmedia/18/64/19/48/19965756.jpg",
"created_by": null
}, {
"_id": "node-2013-04-25-509bb2788368d92e-0003",
@@ -69,7 +69,7 @@
"x": 374.5,
"y": -59.5
},
- "image": "http://fr.web.img4.acsta.net/medias/nmedia/18/35/25/26/19771362.jpg",
+ "image": "http://fr.web.img4.acsta.net/r_800_600/medias/nmedia/18/35/25/26/19771362.jpg",
"created_by": null
}, {
"_id": "node-2013-04-25-509bb2788368d92e-0005",
@@ -80,7 +80,7 @@
"x": -266.5,
"y": 50.5
},
- "image": "http://images.allocine.fr/medias/nmedia/18/67/78/06/18857734_fa3_vf.jpg",
+ "image": "http://images.allocine.fr/r_800_600/medias/nmedia/18/67/78/06/18857734_fa3_vf.jpg",
"created_by": null
}, {
"_id": "node-2013-04-25-509bb2788368d92e-0007",
@@ -91,7 +91,7 @@
"x": -118.5,
"y": 3.5
},
- "image": "http://fr.web.img2.acsta.net/medias/nmedia/18/67/78/06/19027640.jpg",
+ "image": "http://fr.web.img2.acsta.net/r_800_600/medias/nmedia/18/67/78/06/19027640.jpg",
"created_by": null
}
],
--- a/integ/iri/fakedata/cinecard-01.json Tue Apr 30 18:22:21 2013 +0200
+++ b/integ/iri/fakedata/cinecard-01.json Thu May 02 14:52:38 2013 +0200
@@ -10,7 +10,7 @@
"x": -313,
"y": -92
},
- "image": "http://fr.web.img1.acsta.net/medias/nmedia/18/79/08/93/19492940.jpg",
+ "image": "http://fr.web.img1.acsta.net/r_800_600/medias/nmedia/18/79/08/93/19492940.jpg",
"created_by": null,
"size": 4
}, {
@@ -46,7 +46,7 @@
"x": 18.37258300203049,
"y": -96.60050506338838
},
- "image": "http://fr.web.img4.acsta.net/medias/nmedia/18/35/27/21/19586745.jpg",
+ "image": "http://fr.web.img4.acsta.net/r_800_600/medias/nmedia/18/35/27/21/19586745.jpg",
"created_by": null,
"size": 5
}, {
@@ -138,7 +138,7 @@
"x": -204.91168824543132,
"y": -275.11522368914973
},
- "image": "http://fr.web.img5.acsta.net/medias/nmedia/18/35/21/54/19421449.jpg",
+ "image": "http://fr.web.img5.acsta.net/r_800_600/medias/nmedia/18/35/21/54/19421449.jpg",
"created_by": null
}
],
--- a/integ/iri/fakedata/cinecard-02.json Tue Apr 30 18:22:21 2013 +0200
+++ b/integ/iri/fakedata/cinecard-02.json Thu May 02 14:52:38 2013 +0200
@@ -10,7 +10,7 @@
"x": -3,
"y": -47
},
- "image": "http://fr.web.img1.acsta.net/medias/nmedia/18/82/69/17/19806656.jpg",
+ "image": "http://fr.web.img1.acsta.net/r_800_600/medias/nmedia/18/82/69/17/19806656.jpg",
"created_by": null,
"size": 4
}, {
@@ -58,7 +58,7 @@
"x": 350.5,
"y": -244.5
},
- "image": "http://fr.web.img3.acsta.net/medias/nmedia/18/35/37/68/19720412.jpg",
+ "image": "http://fr.web.img3.acsta.net/r_800_600/medias/nmedia/18/35/37/68/19720412.jpg",
"created_by": null
}, {
"_id": "node-2013-04-25-0992ad28371c37cf-0003",
@@ -69,7 +69,7 @@
"x": 358.5,
"y": -102.5
},
- "image": "http://fr.web.img2.acsta.net/medias/nmedia/18/62/46/44/19855609.jpg",
+ "image": "http://fr.web.img2.acsta.net/r_800_600/medias/nmedia/18/62/46/44/19855609.jpg",
"created_by": null
}, {
"_id": "node-2013-04-25-0992ad28371c37cf-0007",
@@ -80,7 +80,7 @@
"x": 374.5,
"y": 44.5
},
- "image": "http://fr.web.img6.acsta.net/medias/nmedia/18/89/54/33/20098514.JPG",
+ "image": "http://fr.web.img6.acsta.net/r_800_600/medias/nmedia/18/89/54/33/20098514.JPG",
"created_by": null
}, {
"_id": "node-2013-04-25-0992ad28371c37cf-0009",
@@ -91,7 +91,7 @@
"x": 280.5,
"y": 168.5
},
- "image": "http://fr.web.img1.acsta.net/medias/nmedia/18/89/54/33/20098515.JPG",
+ "image": "http://fr.web.img1.acsta.net/r_800_600/medias/nmedia/18/89/54/33/20098515.JPG",
"created_by": null
}, {
"_id": "node-2013-04-25-0992ad28371c37cf-000b",
Binary file integ/iri/img/envelope-icon.png has changed
Binary file integ/iri/img/eye-icon.png has changed
Binary file integ/iri/img/like-icon.png has changed
Binary file integ/iri/img/rating-stars-large.png has changed
Binary file integ/iri/img/star-icon.png has changed
Binary file integ/iri/img/wanttosee.png has changed
--- a/integ/iri/js/iri-buzz.js Tue Apr 30 18:22:21 2013 +0200
+++ b/integ/iri/js/iri-buzz.js Thu May 02 14:52:38 2013 +0200
@@ -78,6 +78,7 @@
return a._timestamp > b._timestamp;
});
$("#data-viz").html("").css("text-align","left");
+ var lastShownToken = null;
var barChartSettings = {
width : vsWidth,
height : vsHeight,
@@ -140,12 +141,18 @@
return {
category: opinion._column,
datetime: opinion.datetime,
+ timestamp: opinion._timestamp,
movie: opinion._movie,
colorId: opinion._colorId,
fillStyle: opinion._color,
+ avatar: (typeof opinion.actor.user.avatar === "undefined" ? "http://fr.web.img6.acsta.net/r_50_x/commons/emptymedia/AvatarAllocineMr.gif" : resizeAcPicture( opinion.actor.user.avatar, 50, "x" )),
+ username: opinion.actor.user.userName,
+ actiontype: opinion.action.type,
+ actionvalue: opinion.action.value,
+ content: ( opinion.action.type === "userreview" ? opinion.content.$ : (opinion.action.type === "wanttosee" ? "veut voir ce film." : "" ) ),
size: 30,
texture: {
- src: "iri/img/star-icon.png"
+ src: "iri/img/logo-iri.png"
},
strokeStyle: "rgba(255,255,255,.2)",
t: Math.floor((opinion._timestamp - originalStart) * timeScale / config.refreshRate),
@@ -155,13 +162,48 @@
height: config.tokenHeight / 2
},
callback:{
+ mouseover: function(token) {
+ if (token !== lastShownToken) {
+ var h = "Il y a ",
+ deltaT = Date.now() - token.attr("timestamp"),
+ deltaH = Math.round(deltaT / HOURS);
+ if (deltaH) {
+ h += deltaH + " heure";
+ if (deltaH > 1) {
+ h += "s";
+ }
+ } else {
+ var deltaM = Math.round(deltaT / MINUTES);
+ h += deltaM + " minute";
+ if (deltaM > 1) {
+ h += "s";
+ }
+ }
+ commentDiv.find(".comment-content").removeClass("userreview wanttosee rate").addClass(token.attr("actiontype"));
+ commentDiv.find(".stars-rating").attr("className","stars-rating rate-"+token.attr("actionvalue"));
+ commentDiv.find(".review-content").text(token.attr("content"));
+ commentDiv.find(".date").text(h);
+ commentDiv.find(".avatar img").attr("src", token.attr("avatar"));
+ commentDiv.find(".username").text(token.attr("username"));
+ commentDiv.show();
+ lastShownToken = token;
+ }
+ },
+ mouseout: function(token) {
+ lastShownToken = null;
+ setTimeout(function() {
+ if (!lastShownToken) {
+ commentDiv.hide();
+ }
+ }, 200);
+ },
suspension: function(token) {
var currentT = config.refreshRate * token.attr("t");
deltaT = Date.now() - currentT;
setTimeout(function() {
token.flocculate();
barChart.strata.update(barChart);
- }, 5000);
+ }, 8000);
}
}
}
@@ -254,16 +296,19 @@
function resizeAcPicture(pic, w, h) {
var path = pic.path || pic.href || pic || "";
- if (/^https?:\/\//.test(path)) {
+ if (/^https?:\/\/[\w\d\.]+\.acsta\.net\//.test(path)) {
path = path.replace(/^https?:\/\/[^\/]+/,'');
}
- return "http://fr.web.img"
- + ( 1 + (acimgserv++ % acimgservcount))
- + ".acsta.net/r_"
- + w
- + "_"
- + h
- + path;
+ if (path[0] === "/") {
+ return "http://fr.web.img"
+ + ( 1 + (acimgserv++ % acimgservcount))
+ + ".acsta.net/r_"
+ + w
+ + "_"
+ + h
+ + path;
+ }
+ return path;
}
$.getJSON(
@@ -281,7 +326,16 @@
tzDelta = .5 * HOURS * Math.round((Date.parse(d.feed.updated) - loadTime) / (.5 * HOURS));
tzSuffix = d.feed.updated.replace(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/,'');
- movies = d.feed.movie.map(function(movie, i) {
+ movies = [];
+ for (var i = 0; i < d.feed.movie.length; i++) {
+ var movie = d.feed.movie[i];
+ if (i % 2) {
+ movies.push(movie);
+ } else {
+ movies.splice(0,0,movie);
+ }
+ }
+ movies = movies.map(function(movie, i) {
return {
id: movie.code,
column: i,
@@ -312,6 +366,17 @@
$(".rejouer").click(function() {
startViz();
return false;
- })
+ });
+
+ var commentDiv = $("#comment");
+
+ $("#data-viz").mousemove(_.throttle(function(e) {
+ commentDiv
+ .css({
+ left: e.pageX,
+ top: e.pageY
+ })
+ .attr("className", (e.pageX < $(window).width() / 2 ? "left" : "right"))
+ }, 50));
});
\ No newline at end of file
