@@ -160,38 +138,7 @@

diff -r b00fdbef41d4 -r 16413123bc8c integration/img/photo.jpg Binary file integration/img/photo.jpg has changed diff -r b00fdbef41d4 -r 16413123bc8c integration/img/plus-button.png Binary file integration/img/plus-button.png has changed diff -r b00fdbef41d4 -r 16413123bc8c integration/img/zoom-button.png Binary file integration/img/zoom-button.png has changed diff -r b00fdbef41d4 -r 16413123bc8c integration/js/main.js --- a/integration/js/main.js Tue Oct 09 16:31:25 2012 +0200 +++ b/integration/js/main.js Wed Oct 10 15:16:59 2012 +0200 @@ -75,6 +75,17 @@ $(this).addClass('active'); } }); + //DATE PICKER + $(".dateBegin").datepicker({ + onSelect: function( selectedDate ) { + $( ".dateEnd" ).datepicker( "option", "minDate", selectedDate ); + } + }); + $(".dateEnd").datepicker({ + onSelect: function( selectedDate ) { + $( ".dateBegin" ).datepicker( "option", "maxDate", selectedDate ); + } + }); //VOLET DOCUMENTAIRE $("div.dossier-documentaire").hide(); $("div.header a.dossier-button").bind("click",function(e){ @@ -94,22 +105,33 @@ //FRISE //valeurs init du slider à définir var valSlider1 = 75; - var valSlider2 = 500; + var valSlider2 = 300; + var diffSlide = valSlider2-valSlider1; var widthFrise = $('.frise').width(); - $( "#slider-range" ).slider({ + + $( "#slider-range" ).dragslider({ range: true, + rangeDrag: true, min: 0, max: widthFrise, values: [ valSlider1, valSlider2 ], create: function(event, ui){ - $(".voile-left").width(valSlider1); $(".voile-right").width(widthFrise-valSlider2); }, slide: function( event, ui ) { + //if(ui.values[1]-ui.values[ 0 ]!= diffSlide){ + // return false; + //} $(".voile-left").width(ui.values[ 0 ]); $(".voile-right").width(widthFrise-ui.values[ 1 ]); + }, + change: function( event, ui ){ + //console.log("change") } }); + + + });//jQuery diff -r b00fdbef41d4 -r 16413123bc8c integration/js/vendor/dragslider.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/integration/js/vendor/dragslider.js Wed Oct 10 15:16:59 2012 +0200 @@ -0,0 +1,104 @@ +//this code solves this problem: http://stackoverflow.com/questions/5955343/ + +(function( $, undefined ) { + +$.widget("ui.dragslider", $.ui.slider, { + + options: $.extend({},$.ui.slider.prototype.options,{rangeDrag:false}), + + _create: function() { + $.ui.slider.prototype._create.apply(this,arguments); + this._rangeCapture = false; + }, + + _mouseCapture: function( event ) { + var o = this.options; + + if ( o.disabled ) return false; + + if(event.target == this.range.get(0) && o.rangeDrag == true && o.range == true) { + this._rangeCapture = true; + this._rangeStart = null; + } + else { + this._rangeCapture = false; + } + + $.ui.slider.prototype._mouseCapture.apply(this,arguments); + + if(this._rangeCapture == true) { + this.handles.removeClass("ui-state-active").blur(); + } + + return true; + }, + + _mouseStop: function( event ) { + this._rangeStart = null; + return $.ui.slider.prototype._mouseStop.apply(this,arguments); + }, + + _slide: function( event, index, newVal ) { + if(!this._rangeCapture) { + return $.ui.slider.prototype._slide.apply(this,arguments); + } + + if(this._rangeStart == null) { + this._rangeStart = newVal; + } + + var oldValLeft = this.options.values[0], + oldValRight = this.options.values[1], + slideDist = newVal - this._rangeStart, + newValueLeft = oldValLeft + slideDist, + newValueRight = oldValRight + slideDist, + allowed; + + if ( this.options.values && this.options.values.length ) { + if(newValueRight > this._valueMax() && slideDist > 0) { + slideDist -= (newValueRight-this._valueMax()); + newValueLeft = oldValLeft + slideDist; + newValueRight = oldValRight + slideDist; + } + + if(newValueLeft < this._valueMin()) { + slideDist += (this._valueMin()-newValueLeft); + newValueLeft = oldValLeft + slideDist; + newValueRight = oldValRight + slideDist; + } + + if ( slideDist != 0 ) { + newValues = this.values(); + newValues[ 0 ] = newValueLeft; + newValues[ 1 ] = newValueRight; + + // A slide can be canceled by returning false from the slide callback + allowed = this._trigger( "slide", event, { + handle: this.handles[ index ], + value: slideDist, + values: newValues + } ); + + if ( allowed !== false ) { + this.values( 0, newValueLeft, true ); + this.values( 1, newValueRight, true ); + } + this._rangeStart = newVal; + } + } + + + + }, + + + /* + //only for testing purpose + value: function(input) { + console.log("this is working!"); + $.ui.slider.prototype.value.apply(this,arguments); + } + */ +}); + +})(jQuery); \ No newline at end of file diff -r b00fdbef41d4 -r 16413123bc8c integration/mediapart/une.html --- a/integration/mediapart/une.html Tue Oct 09 16:31:25 2012 +0200 +++ b/integration/mediapart/une.html Wed Oct 10 15:16:59 2012 +0200 @@ -31,9 +31,10 @@

diff -r b00fdbef41d4 -r 16413123bc8c integration/mediapart/une_files/header/photo.jpg Binary file integration/mediapart/une_files/header/photo.jpg has changed diff -r b00fdbef41d4 -r 16413123bc8c integration/mediapart/une_files/header/plus-button.png Binary file integration/mediapart/une_files/header/plus-button.png has changed diff -r b00fdbef41d4 -r 16413123bc8c integration/mediapart/une_files/header/style.css --- a/integration/mediapart/une_files/header/style.css Tue Oct 09 16:31:25 2012 +0200 +++ b/integration/mediapart/une_files/header/style.css Wed Oct 10 15:16:59 2012 +0200 @@ -49,20 +49,74 @@ ul.navigation-dossier{ position: absolute; right: 0; - top: 0; + top: 9px; +} +ul.navigation-dossier li{ + float: left; + + + +} +ul.navigation-dossier li a{ + -webkit-border-radius: 2px; + -moz-border-radius: 2px; + border-radius: 2px; + border: 1px solid #197caa; + height: 24px; + display: block; +} +ul.navigation-dossier li a:hover{ + border: 1px solid #000; } +ul.navigation-dossier li a.file { + font-size: 18px; + font-weight: bold; + color: #197caa; + padding: 0 4px 0 20px; + line-height: 24px; +} +ul.navigation-dossier li a.prev, ul.navigation-dossier li a.top, ul.navigation-dossier li a.next{ + width: 26px; + height: 24px; + background-position: 5px 4px; + background-repeat: no-repeat; +} +ul.navigation-dossier li a.prev{ + background-image: url(header-left-arrow.jpg); +} +ul.navigation-dossier li a.next{ + background-image: url(header-right-arrow.jpg); +} +ul.navigation-dossier li a.top{ + background-position: 9px 4px; + background-image: url(header-top-arrow.jpg); +} + +div.recherche-wrap form p{ + margin: 0; + position: relative; +} + div.recherche-wrap input.input-recherche{ - width: 238px; + width: 218px; height: 24px; - padding: 0 6px; + padding: 0 30px 0 6px; border: 1px solid black; margin-right: 2px; } -div.recherche-wrap form p{ - margin: 0; -} div.recherche-wrap form p input, div.recherche-wrap form p a{ float: left; + +} + +div.recherche-wrap form p a.photo{ + position: absolute; + width: 18px; + height: 18px; + background: url(photo.jpg) no-repeat 2px 4px; + left: 230px; + top: 2px; + z-index: 2; } div.recherche-wrap input.recherche-submit{ width: 54px; @@ -70,7 +124,22 @@ cursor: pointer; border: none; margin-right: 6px; - background: url(zoom-button.jpg) no-repeat 0 0; + background-color: #000; + background-image: url(zoom-button.png); + background-repeat: no-repeat; + background-position: 20px 6px; +} +div.recherche-wrap p a.plus-button{ + width: 30px; + height: 26px; + display: block; + background-color: #000; + background-image: url(plus-button.png); + background-repeat: no-repeat; + background-position: 8px 6px; +} +div.recherche-wrap p a.plus-button:hover, div.recherche-wrap input.recherche-submit:hover{ + background-color: #333; } div.header div.nav{ diff -r b00fdbef41d4 -r 16413123bc8c integration/mediapart/une_files/header/zoom-button.png Binary file integration/mediapart/une_files/header/zoom-button.png has changed

Catégories :

Catégories :

L'affaire Sarkozy »

+ L'affaire Sarkozy » +

TOUTES MES ANNOTATIONS

FILTRES

Catégories :

DOSSIER ASSOCIES

AFFICHAGE

FILTRES

Catégories :

DOSSIER ASSOCIES

AFFICHAGE