logo fond blanc, youtube autoplay

This commit is contained in:
2017-03-02 18:34:05 +01:00
parent 32c264371e
commit a4bd434e68
12 changed files with 139 additions and 79 deletions
@@ -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'] = '<iframe class="' . check_plain($class) . '" width="' . check_plain($settings['width']) . '" height="' . check_plain($settings['height']) . '" src="//www.youtube.com/embed/' . $id . '?' . $settings_str . '" frameborder="0" allowfullscreen></iframe>';
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);
}
}
+7 -1
View File
@@ -1,3 +1,9 @@
# Field group # Modules Patched
## Field group
compatibility with php 7 compatibility with php 7
https://www.drupal.org/node/2661484 https://www.drupal.org/node/2661484
## video embed
youtube autoplay
https://www.drupal.org/node/2685721#comment-11032685
@@ -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'] = '<iframe class="' . check_plain($class) . '" width="' . check_plain($settings['width']) . '" height="' . check_plain($settings['height']) . '" src="//www.youtube.com/embed/' . $id . '?' . $settings_str . '" frameborder="0" allowfullscreen></iframe>';
@@ -195,7 +195,7 @@ function video_embed_field_handle_youtube($url, $settings) {
// Construct the embed code. // Construct the embed code.
$settings['wmode'] = 'opaque'; $settings['wmode'] = 'opaque';
$settings_str = urlencode(_video_embed_code_get_settings_str($settings)); $settings_str = _video_embed_code_get_settings_str($settings);
$output['#markup'] = '<iframe class="' . check_plain($class) . '" width="' . check_plain($settings['width']) . '" height="' . check_plain($settings['height']) . '" src="//www.youtube.com/embed/' . $id . '?' . $settings_str . '" frameborder="0" allowfullscreen></iframe>'; $output['#markup'] = '<iframe class="' . check_plain($class) . '" width="' . check_plain($settings['width']) . '" height="' . check_plain($settings['height']) . '" src="//www.youtube.com/embed/' . $id . '?' . $settings_str . '" frameborder="0" allowfullscreen></iframe>';
@@ -617,7 +617,7 @@ function _video_embed_code_get_settings_str($settings = array()) {
$values[] = $name; $values[] = $name;
} }
else { else {
$values[] = $name . '=' . $value; $values[] = $name . '=' . urlencode($value);
} }
} }
@@ -70,11 +70,18 @@
width:w, width:w,
height:h, height:h,
windowSourceID:"#videoframe", windowSourceID:"#videoframe",
functionCallOnClose:true, // functionCallOnClose:function(){
functionCallAfterClose:function(){ // console.log('overlay closed');
$('#videoframe').remove(); // $('#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(){ function onCloseOverlay(){
@@ -33,7 +33,7 @@ function _clameursmod_getemvidfield(){
$data['test'] = "OK"; $data['test'] = "OK";
$data['src'] = $_GET['src']; $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); drupal_json_output($data);
} }
@@ -81,7 +81,8 @@ input {
#header h2 { #header h2 {
text-align: center; text-align: center;
color: #20c498; color: #20c498;
font-size: 1em; } font-size: 1em;
font-weight: 500; }
@media only screen and (min-width: 62.5625em) { @media only screen and (min-width: 62.5625em) {
#header h2 { #header h2 {
font-size: 2em; } } font-size: 2em; } }
@@ -385,7 +386,7 @@ input {
display: block; } } display: block; } }
.node-thematique .content article.main .field-name-body .value p { .node-thematique .content article.main .field-name-body .value p {
font-size: 1em; font-size: 1em;
padding: 1em 1em 0; padding: 1em 1em 0 1.5em;
line-height: 1.3; line-height: 1.3;
margin: 0; margin: 0;
background-color: #fff; } background-color: #fff; }
@@ -146,6 +146,7 @@ $header_height_large:400px;
text-align: center; text-align: center;
color:$vert; color:$vert;
font-size: 1em; font-size: 1em;
font-weight: 500;
@media #{$large-up} { @media #{$large-up} {
font-size: 2em; font-size: 2em;
} }
@@ -442,7 +443,7 @@ $header_height_large:400px;
background-color: #fff; background-color: #fff;
overflow: hidden; overflow: hidden;
p{ 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; background-color: #fff;
} }
} }
Binary file not shown.

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 63 KiB

@@ -16,7 +16,7 @@
viewBox="0 0 105.83333 88.63542" viewBox="0 0 105.83333 88.63542"
version="1.1" version="1.1"
id="svg11621" id="svg11621"
inkscape:version="0.92.0 r" inkscape:version="0.92.1 r"
sodipodi:docname="logo.svg" sodipodi:docname="logo.svg"
inkscape:export-filename="/home/bach/Sites/clameurs.org/sites/all/themes/figureslibres/clameurs/images/logo.png" inkscape:export-filename="/home/bach/Sites/clameurs.org/sites/all/themes/figureslibres/clameurs/images/logo.png"
inkscape:export-xdpi="97.139999" inkscape:export-xdpi="97.139999"
@@ -3239,9 +3239,9 @@
borderopacity="1.0" borderopacity="1.0"
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="2.8" inkscape:zoom="1.4"
inkscape:cx="120.57866" inkscape:cx="184.17994"
inkscape:cy="-8.7275343" inkscape:cy="202.6864"
inkscape:document-units="mm" inkscape:document-units="mm"
inkscape:current-layer="layer1" inkscape:current-layer="layer1"
showgrid="false" showgrid="false"
@@ -3250,7 +3250,8 @@
inkscape:window-height="1025" inkscape:window-height="1025"
inkscape:window-x="0" inkscape:window-x="0"
inkscape:window-y="28" inkscape:window-y="28"
inkscape:window-maximized="1" /> inkscape:window-maximized="1"
inkscape:pagecheckerboard="true" />
<metadata <metadata
id="metadata11618"> id="metadata11618">
<rdf:RDF> <rdf:RDF>
@@ -3259,7 +3260,7 @@
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
<dc:type <dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title /> <dc:title></dc:title>
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
@@ -3268,6 +3269,13 @@
inkscape:groupmode="layer" inkscape:groupmode="layer"
id="layer1" id="layer1"
transform="translate(0,-208.36456)"> transform="translate(0,-208.36456)">
<rect
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.85208333;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
id="rect5019"
width="88.167168"
height="55.940956"
x="11.150297"
y="233.87796" />
<g <g
id="g13367" id="g13367"
transform="translate(-6.1392243,202.36529)"> transform="translate(-6.1392243,202.36529)">

Before

Width:  |  Height:  |  Size: 113 KiB

After

Width:  |  Height:  |  Size: 113 KiB