--- a/integ/css/iri-buzz.css Thu Apr 18 11:33:19 2013 +0200
+++ b/integ/css/iri-buzz.css Thu Apr 18 11:56:24 2013 +0200
@@ -4,19 +4,19 @@
.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: 200px; height: 100%; background-color: #6b6b6b;-webkit-box-shadow: inset 0px 1px 1px 0px #8d8d8d;box-shadow: inset 0px 1px 1px 0px #8d8d8d;}
+.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 li{padding-top: 10px;float: left;text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.75);color:#919191; font-size: 12px;}
.hours li:last-child{float: right; margin-right: 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: #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:hover{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{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{ margin-top:-7px; margin-left: 5px;}
-.posters li{float: left;width: 100px; height: 130px;overflow: hidden;margin-right: 10px;}
-.posters img{}
+.posters li{float: left;width: 150px; height: 200px;overflow: hidden;margin-right: 10px;}
#data-viz{padding-top: 50px;}
-.comment{-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{display:none;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;}
--- a/integ/css/iri.css Thu Apr 18 11:33:19 2013 +0200
+++ b/integ/css/iri.css Thu Apr 18 11:56:24 2013 +0200
@@ -39,7 +39,7 @@
.videos li a{width: 80px; height: 64px;}
.videos li{overflow: hidden;margin: 0 8px 10px 0;border: 1px solid #767676; float: left;}
-.renkan{ position: relative;display: table-cell; padding-top:60px; vertical-align: top; background-color: #eee; width:100%; background: url(../img/bg-renkan.png) 0 0; min-width: 400px;}
+.renkan{ overflow:hidden;height:100%;position: relative;display: table-cell; padding-top:60px; vertical-align: top; background-color: #eee; width:100%; background: url(../img/bg-renkan.png) 0 0; min-width: 400px;}
.renkan .wrap-top{width: 100%; height: 56px; background-color:rgba(0,0,0,.4);}
.renkan .wrap-top h2{ font-size: 30px; padding-left: 18px; line-height: 56px; display: inline-block;}
@@ -71,3 +71,4 @@
div.rate_tooltip p{display: inline-block;}
.rate_tooltip .arrow_l {background: url("skin/arrow_l.png") no-repeat 0 0;height: 15px;top: 3px;position: absolute;left: -8px;width: 8px;}
+
--- a/integ/iri-buzz.html Thu Apr 18 11:33:19 2013 +0200
+++ b/integ/iri-buzz.html Thu Apr 18 11:56:24 2013 +0200
@@ -31,7 +31,8 @@
<li><a href="social.html">Social</a></li>
<li><a href="index.html">Discover</a></li>
<li><a href="#">Profile</a></li>
- <li class="current"><a href="#">Cadeaux</a></li>
+ <li><a href="#">Cadeaux</a></li>
+ <li class="current"><a href="#">Buzz</a></li>
</ul>
</nav>
@@ -76,19 +77,19 @@
<div class="timer-bar">
<div class="timer-bar-value"></div>
<ul class="hours">
- <li>0h</li>
- <li>2h</li>
- <li>4h</li>
- <li>6h</li>
- <li>8h</li>
- <li>10h</li>
- <li>12h</li>
- <li>14h</li>
- <li>16h</li>
- <li>18h</li>
- <li>20h</li>
- <li>22h</li>
- <li>24h</li>
+ <li></li>
+ <li></li>
+ <li></li>
+ <li></li>
+ <li></li>
+ <li></li>
+ <li></li>
+ <li></li>
+ <li></li>
+ <li></li>
+ <li></li>
+ <li></li>
+ <li></li>
</ul>
</div>
</div>
@@ -121,7 +122,7 @@
<a href="#" class="logofoot" ><img src="img/logo-footer.png" alt="Cinégift" /></a>
</footer>
- <div class="rate_tooltip "><p></p><span class="arrow_l"></span></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>
@@ -147,23 +148,12 @@
var getPartner = getURLParameter('partner');
var partnerCode = (getPartner != 'null') ? getPartner : 'B00015838755';
+
</script>
-<!-- RENKAN -->
-
-<script src="renkan/lib/jquery.mousewheel.min.js"></script>
-<script src="renkan/lib/underscore-min.js"></script>
-<script src="renkan/lib/backbone.js"></script>
-<script src="renkan/lib/backbone-relational.js"></script>
-<script src="renkan/lib/paper.js"></script>
-<script src="renkan/js/main.js"></script>
-<script src="renkan/js/defaults.js"></script>
-<script src="renkan/js/models.js"></script>
-<script src="renkan/js/i18n.js"></script>
-<script src="renkan/js/paper-renderer.js"></script>
-
<!-- IRI -->
+<script src="renkan/lib/underscore-min.js"></script>
<script src="js/vs/_VisualSedimentation.js"></script>
<script src="js/iri-buzz.js"></script>
--- a/integ/js/iri-buzz.js Thu Apr 18 11:33:19 2013 +0200
+++ b/integ/js/iri-buzz.js Thu Apr 18 11:56:24 2013 +0200
@@ -10,18 +10,29 @@
$(".sidebar .content").css('height', newHeight);
}
+*/
-$(".central").mCustomScrollbar({
- advanced:{
- updateOnContentResize: true
- }
-});
+
-*/
+var CONFIG = {
+ wChart : 150,
+ hVS : 200,
+ now : new Date(),
+ dayLimit : 1,
+ timelineMin : 5,
+ bar : []
+};
+
function init(){
var wWin = ($(window).width()>520) ? $(window).width() : 520;
$('.timer-bar').width(wWin - 170);
+ var stepHour = CONFIG.dayLimit * 24 / 12;
+ var hourText = 0;
+ $('.hours li').each(function(k, v){
+ $(v).text(hourText+'h');
+ hourText = hourText + stepHour;
+ });
var wTimerBar = $('.timer-bar').width(),
nbIndicator = $('.hours li').length-1;
@@ -32,6 +43,13 @@
var mr = mrIndicator - $('.hours li:last-child').width()/2 - $(v).width()/2;
$(v).css('margin-right', mr);
});
+
+
+ var spaceTop = 100, spaceBotPoster = 200;
+ CONFIG.hVS = $(window).height() - $('footer').height() - $('header').height() - spaceTop - spaceBotPoster;
+ CONFIG.hVS = (CONFIG.hVS>200) ? CONFIG.hVS : 200;
+
+ showHorloge();
}
init();
@@ -58,17 +76,11 @@
});
}
-var CONFIG = {
- wChart : 100,
- now : new Date(),
- dayLimit : 1,
- timelineMin : 5,
- bar : []
-};
+
var bcSettings = {
width : 960,
- height : 400,
+ height : CONFIG.hVS,
chart : {
spacer : 5
},
@@ -126,10 +138,12 @@
if(_.isUndefined(userReviewCount))userReviewCount = 0;
var initValue = userReviewCount;
+ initValue = 0;
+
bcSettings.data.strata.push([{initValue: initValue }]);
/*
var item = $('<li>').attr('data-poster', dataMovie.posterUrl).attr('id', 'movie-'+dataMovie.code ).attr('id', 'movie-'+dataMovie.code ).css('width', wItem);
- var nbReview = $('<span>').addClass('nbReview').text(userReviewCount);
+ var nbReview = $('').addClass('nbReview').text(userReviewCount);
item.append(nbReview);
item.appendTo('.info-movies');
*/
@@ -138,8 +152,9 @@
resizeImg('.posters');
barChart = $("#data-viz").vs(bcSettings).data('visualSedimentation');
+ barChart.settings.sedimentation.token.size.minimum=0;
});
-/*
+
var now = new Date();
function reviewAllowSince(dateReview){
@@ -159,33 +174,31 @@
}
function showHorloge(){
+
var timestampDateLimit = CONFIG.now.getTime() - ((CONFIG.dayLimit*24)*60*60*1000);
var dateLimit = new Date(timestampDateLimit);
+
var diff = CONFIG.now.getTime() - timestampDateLimit;
var oneHour = (CONFIG.timelineMin * 60 * 1000) / (CONFIG.dayLimit*24);
var oneMinute = oneHour / 60;
- displayHorloge(timestampDateLimit);
+
+ var wTimerBar = $('.timer-bar').width();
+ var timerBarValue = $('.timer-bar-value');
+ timerBarValue.width(0);
+ var indice = 0;
setInterval(function(){
- if(timestampDateLimit>=CONFIG.now.getTime()) return;
- timestampDateLimit = timestampDateLimit + (60 * 1000);
- displayHorloge(timestampDateLimit);
+ if(indice>=diff) return;
+ indice = indice + (60 * 1000);
+ var wTimerBarValue = wTimerBar * indice / diff;
+ timerBarValue.width(wTimerBarValue);
},oneMinute);
}
-function displayHorloge(timestampDateLimit){
- timestampDateLimit = timestampDateLimit+(60*1000);
- var dateLimit = new Date(timestampDateLimit);
- var horlogeHour = dateLimit.getHours();
- var horlogeMin = dateLimit.getMinutes();
- if(horlogeMin.toString().length==1)horlogeMin = '0'+horlogeMin;
- var horlogeDay = dateLimit.getDate();
- var horlogeMonth = dateLimit.getMonth()+1;
- $('.horloge').html(horlogeDay+' / '+horlogeMonth+'<br/>'+horlogeHour+'h'+horlogeMin);
-}
+
function getReviewsByFilm(codeFilm){
@@ -280,7 +293,12 @@
rating : rating,
author : author,
category:barCharCat,
- size:3,
+ size:1,
+shape:{
+ type:'box',
+ width:75,
+ height:2.5
+},
callback:{
mouseover:function(token){
var commentaire = token.attr('commentaire');
@@ -295,5 +313,20 @@
}
});
}
-*/
+
+$('a.rejouer').bind('click', function(e){
+ e.preventDefault();
+ addTokenTest()
+});
+
+function addTokenTest(){
+ barChart.addToken({
+ category:0,
+ size:1,
+
+ callback:{
+
+ }
+ });
+}
});//load
\ No newline at end of file