diff --git a/patches.d/youtube_autoplay-2685721-4.patch b/patches.d/youtube_autoplay-2685721-4.patch new file mode 100644 index 00000000..d5385fc6 --- /dev/null +++ b/patches.d/youtube_autoplay-2685721-4.patch @@ -0,0 +1,26 @@ +diff --git a/video_embed_field.handlers.inc b/video_embed_field.handlers.inc +index 1962008..b9fe593 100644 +--- a/video_embed_field.handlers.inc ++++ b/video_embed_field.handlers.inc +@@ -195,7 +195,7 @@ function video_embed_field_handle_youtube($url, $settings) { + + // Construct the embed code. + $settings['wmode'] = 'opaque'; +- $settings_str = urlencode(_video_embed_code_get_settings_str($settings)); ++ $settings_str = _video_embed_code_get_settings_str($settings); + + $output['#markup'] = ''; + +diff --git a/video_embed_field.module b/video_embed_field.module +index 8826ead..e4f4282 100644 +--- a/video_embed_field.module ++++ b/video_embed_field.module +@@ -617,7 +617,7 @@ function _video_embed_code_get_settings_str($settings = array()) { + $values[] = $name; + } + else { +- $values[] = $name . '=' . $value; ++ $values[] = $name . '=' . urlencode($value); + } + } + diff --git a/patches.md b/patches.md index 325a3d7b..8dee8813 100644 --- a/patches.md +++ b/patches.md @@ -1,3 +1,9 @@ -# Field group +# Modules Patched + +## Field group compatibility with php 7 https://www.drupal.org/node/2661484 + +## video embed +youtube autoplay +https://www.drupal.org/node/2685721#comment-11032685 diff --git a/sites/all/libraries/jquery.domwindow/jquery.DOMWindow.js b/sites/all/libraries/jquery.domwindow/jquery.DOMWindow.js index 0d542221..af02e3f7 100644 --- a/sites/all/libraries/jquery.domwindow/jquery.DOMWindow.js +++ b/sites/all/libraries/jquery.domwindow/jquery.DOMWindow.js @@ -1,17 +1,17 @@ (function($){ - + //closeDOMWindow $.fn.closeDOMWindow = function(settings){ - + if(!settings){settings={};} - + var run = function(passingThis){ - + if(settings.anchoredClassName){ var $anchorClassName = $('.'+settings.anchoredClassName); $anchorClassName.fadeOut('fast',function(){ if($.fn.draggable){ - $anchorClassName.draggable('destory').trigger("unload").remove(); + $anchorClassName.draggable('destory').trigger("unload").remove(); }else{ $anchorClassName.trigger("unload").remove(); } @@ -21,7 +21,7 @@ var $DOMWindowOverlay = $('#DOMWindowOverlay'); var $DOMWindow = $('#DOMWindow'); $DOMWindowOverlay.fadeOut('fast',function(){ - $DOMWindowOverlay.trigger('unload').unbind().remove(); + $DOMWindowOverlay.trigger('unload').unbind().remove(); }); $DOMWindow.fadeOut('fast',function(){ if($.fn.draggable){ @@ -30,15 +30,15 @@ $DOMWindow.trigger("unload").remove(); } }); - + $(window).unbind('scroll.DOMWindow'); $(window).unbind('resize.DOMWindow'); - + if($.fn.openDOMWindow.isIE6){$('#DOMWindowIE6FixIframe').remove();} if(settings.functionCallOnClose){settings.functionCallAfterClose();} - } + } }; - + if(settings.eventType){//if used with $(). return this.each(function(index){ $(this).bind(settings.eventType, function(){ @@ -49,19 +49,19 @@ }else{//else called as $.function run(); } - + }; - + //allow for public call, pass settings $.closeDOMWindow = function(s){$.fn.closeDOMWindow(s);}; - + //openDOMWindow - $.fn.openDOMWindow = function(instanceSettings){ - + $.fn.openDOMWindow = function(instanceSettings){ + var shortcut = $.fn.openDOMWindow; - + //default settings combined with callerSettings//////////////////////////////////////////////////////////////////////// - + shortcut.defaultsSettings = { anchoredClassName:'', anchoredSelector:'', @@ -84,7 +84,7 @@ positionLeft:0, positionTop:0, positionType:'centered', // centered, anchored, absolute, fixed - width:500, + width:500, windowBGColor:'#fff', windowBGImage:null, // http path windowHTTPType:'get', @@ -94,19 +94,19 @@ windowSourceURL:'', windowSourceAttrURL:'href' }; - + var settings = $.extend({}, $.fn.openDOMWindow.defaultsSettings , instanceSettings || {}); - + //Public functions - + shortcut.viewPortHeight = function(){ return self.innerHeight || document.documentElement.clientHeight || document.body.clientHeight;}; shortcut.viewPortWidth = function(){ return self.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;}; shortcut.scrollOffsetHeight = function(){ return self.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop;}; shortcut.scrollOffsetWidth = function(){ return self.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft;}; shortcut.isIE6 = typeof document.body.style.maxHeight === "undefined"; - + //Private Functions///////////////////////////////////////////////////////////////////////////////////////////////////////// - + var sizeOverlay = function(){ var $DOMWindowOverlay = $('#DOMWindowOverlay'); if(shortcut.isIE6){//if IE 6 @@ -115,15 +115,15 @@ $DOMWindowOverlay.css({'height':overlayViewportHeight +'px','width':overlayViewportWidth+'px'}); }else{//else Firefox, safari, opera, IE 7+ $DOMWindowOverlay.css({'height':'100%','width':'100%','position':'fixed'}); - } + } }; - + var sizeIE6Iframe = function(){ var overlayViewportHeight = document.documentElement.offsetHeight + document.documentElement.scrollTop - 4; var overlayViewportWidth = document.documentElement.offsetWidth - 21; $('#DOMWindowIE6FixIframe').css({'height':overlayViewportHeight +'px','width':overlayViewportWidth+'px'}); }; - + var centerDOMWindow = function() { var $DOMWindow = $('#DOMWindow'); if(settings.height + 50 > shortcut.viewPortHeight()){//added 50 to be safe @@ -133,7 +133,7 @@ $DOMWindow.css('top',Math.round(shortcut.viewPortHeight()/2) + shortcut.scrollOffsetHeight() - Math.round(($DOMWindow.outerHeight())/2)); } }; - + var centerLoader = function() { var $DOMWindowLoader = $('#DOMWindowLoader'); if(shortcut.isIE6){//if IE 6 @@ -142,34 +142,34 @@ }else{ $DOMWindowLoader.css({'left':'50%','top':'50%','position':'fixed'}); } - + }; - + var fixedDOMWindow = function(){ var $DOMWindow = $('#DOMWindow'); $DOMWindow.css('left', settings.positionLeft + shortcut.scrollOffsetWidth()); $DOMWindow.css('top', + settings.positionTop + shortcut.scrollOffsetHeight()); }; - + var showDOMWindow = function(instance){ if(arguments[0]){ $('.'+instance+' #DOMWindowLoader').remove(); $('.'+instance+' #DOMWindowContent').fadeIn('fast',function(){if(settings.functionCallOnOpen){settings.functionCallOnOpen();}}); $('.'+instance+ '.closeDOMWindow').click(function(){ - $.closeDOMWindow(); + $.closeDOMWindow(); return false; }); }else{ $('#DOMWindowLoader').remove(); $('#DOMWindow').fadeIn('fast',function(){if(settings.functionCallOnOpen){settings.functionCallOnOpen();}}); - $('#DOMWindow .closeDOMWindow').click(function(){ + $('#DOMWindow .closeDOMWindow').click(function(){ $.closeDOMWindow(); return false; }); } - + }; - + var urlQueryToObject = function(s){ var query = {}; s.replace(/b([^&=]*)=([^&=]*)b/g, function (m, a, d) { @@ -181,38 +181,38 @@ }); return query; }; - + //Run Routine /////////////////////////////////////////////////////////////////////////////////////////////////////////////// var run = function(passingThis){ - + //get values from element clicked, or assume its passed as an option settings.windowSourceID = $(passingThis).attr('href') || settings.windowSourceID; settings.windowSourceURL = $(passingThis).attr(settings.windowSourceAttrURL) || settings.windowSourceURL; settings.windowBGImage = settings.windowBGImage ? 'background-image:url('+settings.windowBGImage+')' : ''; var urlOnly, urlQueryObject; - + if(settings.positionType == 'anchored'){//anchored DOM window - + var anchoredPositions = $(settings.anchoredSelector).position(); var anchoredPositionX = anchoredPositions.left + settings.positionLeft; var anchoredPositionY = anchoredPositions.top + settings.positionTop; - - $('body').append('
'); + + $('body').append('
'); //loader if(settings.loader && settings.loaderImagePath !== ''){ $('.'+settings.anchoredClassName).append('
'); - + } if($.fn.draggable){ if(settings.draggable){$('.' + settings.anchoredClassName).draggable({cursor:'move'});} } - + switch(settings.windowSource){ case 'inline'://////////////////////////////// inline ////////////////////////////////////////// $('.' + settings.anchoredClassName+" #DOMWindowContent").append($(settings.windowSourceID).children()); $('.' + settings.anchoredClassName).unload(function(){// move elements back when you're finished - $('.' + settings.windowSourceID).append( $('.' + settings.anchoredClassName+" #DOMWindowContent").children()); + $('.' + settings.windowSourceID).append( $('.' + settings.anchoredClassName+" #DOMWindowContent").children()); }); showDOMWindow(settings.anchoredClassName); break; @@ -220,9 +220,9 @@ $('.' + settings.anchoredClassName+" #DOMWindowContent").append(''); $('.'+settings.anchoredClassName+'Iframe').load(showDOMWindow(settings.anchoredClassName)); break; - case 'ajax'://////////////////////////////// ajax ////////////////////////////////////////// + case 'ajax'://////////////////////////////// ajax ////////////////////////////////////////// if(settings.windowHTTPType == 'post'){ - + if(settings.windowSourceURL.indexOf("?") !== -1){//has a query string urlOnly = settings.windowSourceURL.substr(0, settings.windowSourceURL.indexOf("?")); urlQueryObject = urlQueryToObject(settings.windowSourceURL); @@ -244,9 +244,9 @@ } break; } - + }else{//centered, fixed, absolute DOM window - + //overlay & modal if(settings.overlay){ $('body').append(''); @@ -259,7 +259,7 @@ $DOMWindowOverlay.fadeIn('fast'); if(!settings.modal){$DOMWindowOverlay.click(function(){$.closeDOMWindow();});} } - + //loader if(settings.loader && settings.loaderImagePath !== ''){ $('body').append('
'); @@ -268,7 +268,7 @@ //add DOMwindow $('body').append(''); - + var $DOMWindow = $('#DOMWindow'); //centered, absolute, or fixed switch(settings.positionType){ @@ -292,10 +292,10 @@ var anchoredPositionX = anchoredPositions.left + settings.positionLeft; var anchoredPositionY = anchoredPositions.top + settings.positionTop; $DOMWindow.css({'top':anchoredPositionY + 'px','left':anchoredPositionX+'px'}); - + break; } - + $(window).bind('scroll.DOMWindow',function(){ if(settings.overlay){sizeOverlay();} if(shortcut.isIE6){sizeIE6Iframe();} @@ -308,12 +308,12 @@ if(settings.overlay){sizeOverlay();} if(settings.positionType == 'centered'){centerDOMWindow();} }); - + switch(settings.windowSource){ case 'inline'://////////////////////////////// inline ////////////////////////////////////////// $DOMWindow.append($(settings.windowSourceID).children()); $DOMWindow.unload(function(){// move elements back when you're finished - $(settings.windowSourceID).append($DOMWindow.children()); + $(settings.windowSourceID).append($DOMWindow.children()); }); showDOMWindow(); break; @@ -323,7 +323,7 @@ break; case 'ajax'://////////////////////////////// ajax ////////////////////////////////////////// if(settings.windowHTTPType == 'post'){ - + if(settings.windowSourceURL.indexOf("?") !== -1){//has a query string urlOnly = settings.windowSourceURL.substr(0, settings.windowSourceURL.indexOf("?")); urlQueryObject = urlQueryToObject(settings.windowSourceURL); @@ -345,25 +345,25 @@ } break; } - + }//end if anchored, or absolute, fixed, centered - + };//end run() - + if(settings.eventType){//if used with $(). - return this.each(function(index){ + return this.each(function(index){ $(this).bind(settings.eventType,function(){ run(this); return false; }); - }); + }); }else{//else called as $.function run(); } - + };//end function openDOMWindow - + //allow for public call, pass settings $.openDOMWindow = function(s){$.fn.openDOMWindow(s);}; - + })(jQuery); diff --git a/sites/all/modules/contrib/fields/video_embed_field/.rej b/sites/all/modules/contrib/fields/video_embed_field/.rej new file mode 100644 index 00000000..b9df0a5f --- /dev/null +++ b/sites/all/modules/contrib/fields/video_embed_field/.rej @@ -0,0 +1,11 @@ +--- video_embed_field.handlers.inc ++++ video_embed_field.handlers.inc +@@ -195,7 +195,7 @@ function video_embed_field_handle_youtube($url, $settings) { + + // Construct the embed code. + $settings['wmode'] = 'opaque'; +- $settings_str = urlencode(_video_embed_code_get_settings_str($settings)); ++ $settings_str = _video_embed_code_get_settings_str($settings); + + $output['#markup'] = ''; + diff --git a/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.handlers.inc b/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.handlers.inc index 19620082..b9fe5933 100644 --- a/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.handlers.inc +++ b/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.handlers.inc @@ -195,7 +195,7 @@ function video_embed_field_handle_youtube($url, $settings) { // Construct the embed code. $settings['wmode'] = 'opaque'; - $settings_str = urlencode(_video_embed_code_get_settings_str($settings)); + $settings_str = _video_embed_code_get_settings_str($settings); $output['#markup'] = ''; diff --git a/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.module b/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.module index 8826eada..e4f42825 100644 --- a/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.module +++ b/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.module @@ -617,7 +617,7 @@ function _video_embed_code_get_settings_str($settings = array()) { $values[] = $name; } else { - $values[] = $name . '=' . $value; + $values[] = $name . '=' . urlencode($value); } } diff --git a/sites/all/modules/figureslibres/clameursmod/clameursmod.js b/sites/all/modules/figureslibres/clameursmod/clameursmod.js index 71fb1c59..a53abbfe 100644 --- a/sites/all/modules/figureslibres/clameursmod/clameursmod.js +++ b/sites/all/modules/figureslibres/clameursmod/clameursmod.js @@ -70,11 +70,18 @@ width:w, height:h, windowSourceID:"#videoframe", - functionCallOnClose:true, - functionCallAfterClose:function(){ - $('#videoframe').remove(); - } + // functionCallOnClose:function(){ + // console.log('overlay closed'); + // $('#videoframe').remove(); + // }, + // functionCallAfterClose:function(){ + // console.log('overlay closed'); + // $('#videoframe').remove(); + // } }); + + // autoplay vid youtube + // see patch https://www.drupal.org/node/2685721#comment-11032685 }; function onCloseOverlay(){ diff --git a/sites/all/modules/figureslibres/clameursmod/clameursmod.module b/sites/all/modules/figureslibres/clameursmod/clameursmod.module index 54e4f7bd..acb6f41e 100644 --- a/sites/all/modules/figureslibres/clameursmod/clameursmod.module +++ b/sites/all/modules/figureslibres/clameursmod/clameursmod.module @@ -33,7 +33,7 @@ function _clameursmod_getemvidfield(){ $data['test'] = "OK"; $data['src'] = $_GET['src']; - $data['embed'] = theme('video_embed_field_embed_code', array('url'=>$data['src'])); + $data['embed'] = theme('video_embed_field_embed_code', array('url'=>$data['src'], 'style'=>'normal')); drupal_json_output($data); } diff --git a/sites/all/themes/figureslibres/clameurs/css/dist/styles.css b/sites/all/themes/figureslibres/clameurs/css/dist/styles.css index d4c6633f..34914e56 100755 --- a/sites/all/themes/figureslibres/clameurs/css/dist/styles.css +++ b/sites/all/themes/figureslibres/clameurs/css/dist/styles.css @@ -81,7 +81,8 @@ input { #header h2 { text-align: center; color: #20c498; - font-size: 1em; } + font-size: 1em; + font-weight: 500; } @media only screen and (min-width: 62.5625em) { #header h2 { font-size: 2em; } } @@ -385,7 +386,7 @@ input { display: block; } } .node-thematique .content article.main .field-name-body .value p { font-size: 1em; - padding: 1em 1em 0; + padding: 1em 1em 0 1.5em; line-height: 1.3; margin: 0; background-color: #fff; } diff --git a/sites/all/themes/figureslibres/clameurs/css/styles.scss b/sites/all/themes/figureslibres/clameurs/css/styles.scss index 542f590c..bf946220 100755 --- a/sites/all/themes/figureslibres/clameurs/css/styles.scss +++ b/sites/all/themes/figureslibres/clameurs/css/styles.scss @@ -146,6 +146,7 @@ $header_height_large:400px; text-align: center; color:$vert; font-size: 1em; + font-weight: 500; @media #{$large-up} { font-size: 2em; } @@ -442,7 +443,7 @@ $header_height_large:400px; background-color: #fff; overflow: hidden; p{ - font-size: 1em; padding: 1em 1em 0; line-height: 1.3; margin:0; + font-size: 1em; padding: 1em 1em 0 1.5em; line-height: 1.3; margin:0; background-color: #fff; } } diff --git a/sites/all/themes/figureslibres/clameurs/images/logo.png b/sites/all/themes/figureslibres/clameurs/images/logo.png index 8bd1ea19..9075d5f5 100644 Binary files a/sites/all/themes/figureslibres/clameurs/images/logo.png and b/sites/all/themes/figureslibres/clameurs/images/logo.png differ diff --git a/sites/all/themes/figureslibres/clameurs/images/logo.svg b/sites/all/themes/figureslibres/clameurs/images/logo.svg index dbd05678..7627849b 100644 --- a/sites/all/themes/figureslibres/clameurs/images/logo.svg +++ b/sites/all/themes/figureslibres/clameurs/images/logo.svg @@ -16,7 +16,7 @@ viewBox="0 0 105.83333 88.63542" version="1.1" id="svg11621" - inkscape:version="0.92.0 r" + inkscape:version="0.92.1 r" sodipodi:docname="logo.svg" inkscape:export-filename="/home/bach/Sites/clameurs.org/sites/all/themes/figureslibres/clameurs/images/logo.png" inkscape:export-xdpi="97.139999" @@ -3239,9 +3239,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="2.8" - inkscape:cx="120.57866" - inkscape:cy="-8.7275343" + inkscape:zoom="1.4" + inkscape:cx="184.17994" + inkscape:cy="202.6864" inkscape:document-units="mm" inkscape:current-layer="layer1" showgrid="false" @@ -3250,7 +3250,8 @@ inkscape:window-height="1025" inkscape:window-x="0" inkscape:window-y="28" - inkscape:window-maximized="1" /> + inkscape:window-maximized="1" + inkscape:pagecheckerboard="true" /> @@ -3259,7 +3260,7 @@ image/svg+xml - + @@ -3268,6 +3269,13 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-208.36456)"> +