mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 05:37:32 +02:00
Code Issues Releases Wiki Activity

Video thumbnail fix. Use bootstrap css as default on Tinymce tables.

Browse Source
This commit is contained in:
Cameron
2015-04-02 03:36:45 -07:00
parent f253d00560
commit 80c9e440e4
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
e107_handlers/e_parse_class.php
View File

@@ -3003,10 +3003,11 @@ class e_parser
$ytqry = http_build_query($ytpref); $ytqry = http_build_query($ytpref);
if($type == 'youtube') if($type == 'youtube')
{ {
// $thumbSrc = "https://i1.ytimg.com/vi/".$id."/0.jpg";
$video = '<iframe width="560" height="315" src="//www.youtube.com/embed/'.$id.'?'.$ytqry.'" style="border:0px" allowfullscreen></iframe>'; $thumbSrc = "http://i1.ytimg.com/vi/".$id."/mqdefault.jpg";
$thumbSrc = "https://i1.ytimg.com/vi/".$id."/0.jpg"; $video = '<iframe width="560" height="315" src="//www.youtube.com/embed/'.$id.'?'.$ytqry.'" style="background-size: 100%;background-image: url('.$thumbSrc.');border:0px" allowfullscreen></iframe>';
if($thumb == 'tag') if($thumb == 'tag')
{ {

3
e107_plugins/tinymce4/templates/admin.xml
View File

@@ -4,7 +4,8 @@
insertdatetime media nonbreaking save table contextmenu directionality emoticons template paste textcolor</plugins> insertdatetime media nonbreaking save table contextmenu directionality emoticons template paste textcolor</plugins>
<menubar>edit view format insert table tools</menubar> <menubar>edit view format insert table tools</menubar>
<toolbar1>undo redo | styleselect | bold italic forecolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image | e107-image e107-video e107-glyph | preview</toolbar1> <toolbar1>undo redo | styleselect | bold italic forecolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image | e107-image e107-video e107-glyph | preview</toolbar1>
<external_plugins>e107 example</external_plugins> <external_plugins>e107 example compat3x</external_plugins>
<image_advtab>true</image_advtab> <image_advtab>true</image_advtab>
<extended_valid_elements>i[*], object[*],embed[*],bbcode[*]</extended_valid_elements> <extended_valid_elements>i[*], object[*],embed[*],bbcode[*]</extended_valid_elements>
<table_default_attributes>{ class: 'table table-striped table-bordered' }</table_default_attributes>
</tinymce> </tinymce>

3
e107_plugins/tinymce4/templates/mainadmin.xml
View File

@@ -19,5 +19,6 @@
description: "Adds an example." description: "Adds an example."
} }
] ]
</templates> </templates>
<table_default_attributes>{ class: 'table table-striped table-bordered' }</table_default_attributes>
</tinymce> </tinymce>

8
e107_plugins/tinymce4/wysiwyg.php
View File

@@ -233,6 +233,11 @@ class wysiwyg
function convertBoolean($string) function convertBoolean($string)
{ {
if(substr($string,0,1) == '{')
{
return $string;
}
if(is_string($string)) if(is_string($string))
{ {
@@ -319,6 +324,9 @@ class wysiwyg
$ret['relative_urls'] = false; //Media Manager prefers it like this. $ret['relative_urls'] = false; //Media Manager prefers it like this.
$ret['preformatted'] = true; $ret['preformatted'] = true;
$ret['document_base_url'] = SITEURL; $ret['document_base_url'] = SITEURL;
// $ret['table_default_attributes'] = json_encode(array('class'=>'table table-striped' ));
if(!empty($ret['templates'])) if(!empty($ret['templates']))
{ {