From d5af3b9246c83cf4fe9c935ff8caea83a7b8f527 Mon Sep 17 00:00:00 2001 From: Cameron Date: Fri, 20 Jan 2017 10:40:05 -0800 Subject: [PATCH] BS4 img-fluid --- e107_admin/image.php | 2 +- e107_core/shortcodes/batch/news_shortcodes.php | 8 ++++---- e107_handlers/e_parse_class.php | 6 +++--- e107_handlers/form_handler.php | 2 +- e107_handlers/mail.php | 2 +- e107_handlers/media_class.php | 2 +- e107_handlers/theme_handler.php | 2 +- e107_plugins/banner/e_shortcode.php | 2 +- e107_plugins/download/download_shortcodes.php | 6 +++--- e107_plugins/download/request.php | 6 +++--- e107_plugins/featurebox/includes/item.php | 2 +- e107_plugins/gallery/e_shortcode.php | 6 +++--- e107_plugins/news/templates/news_menu_template.php | 2 +- e107_plugins/siteinfo/e_shortcode.php | 2 +- e107_plugins/siteinfo/powered_by_menu.php | 2 +- e107_plugins/tinymce4/wysiwyg.php | 2 +- install.php | 2 +- 17 files changed, 28 insertions(+), 28 deletions(-) diff --git a/e107_admin/image.php b/e107_admin/image.php index 42ff11df9..740974413 100644 --- a/e107_admin/image.php +++ b/e107_admin/image.php @@ -2135,7 +2135,7 @@ class media_admin_ui extends e_admin_ui $img_src = "
- +
"; diff --git a/e107_core/shortcodes/batch/news_shortcodes.php b/e107_core/shortcodes/batch/news_shortcodes.php index 1200b7f79..73092b056 100644 --- a/e107_core/shortcodes/batch/news_shortcodes.php +++ b/e107_core/shortcodes/batch/news_shortcodes.php @@ -693,7 +693,7 @@ class news_shortcodes extends e_shortcode break; default: - return "news_item)."'>"; + return "news_item)."'>"; break; } } @@ -734,7 +734,7 @@ class news_shortcodes extends e_shortcode $parm['item'] = ($parm['item'] +1); if(empty($parm['class'])) { - $parm['class'] = 'img-responsive news-media news-media-'.$parm['item']; + $parm['class'] = 'img-responsive img-fluid news-media news-media-'.$parm['item']; } return $this->sc_newsimage($parm); } @@ -811,7 +811,7 @@ class news_shortcodes extends e_shortcode * Display News Images (but not video thumbnails ) * @param $parm array * @example {NEWSIMAGE: type=src&placeholder=true} - * @example {NEWSIMAGE: class=img-responsive} + * @example {NEWSIMAGE: class=img-responsive img-fluid} */ function sc_newsimage($parm = null) { @@ -826,7 +826,7 @@ class news_shortcodes extends e_shortcode $tmp = $this->handleMultiple($parm); $srcPath = $tmp['file']; - $class = (!empty($parm['class'])) ? $parm['class'] : "news_image news-image img-responsive img-rounded"; + $class = (!empty($parm['class'])) ? $parm['class'] : "news_image news-image img-responsive img-fluid img-rounded"; $class .= ' news-image-'.$tmp['count']; $dimensions = null; $srcset = null; diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php index 37e10e2fc..21ec2fc74 100644 --- a/e107_handlers/e_parse_class.php +++ b/e107_handlers/e_parse_class.php @@ -3903,7 +3903,7 @@ class e_parser $id = (!empty($parm['id'])) ? "id=\"".$parm['id']."\" " : "" ; - $class = (!empty($parm['class'])) ? $parm['class'] : "img-responsive"; + $class = (!empty($parm['class'])) ? $parm['class'] : "img-responsive img-fluid"; $alt = (!empty($parm['alt'])) ? $tp->toAttribute($parm['alt']) : basename($file); $style = (!empty($parm['style'])) ? "style=\"".$parm['style']."\" " : "" ; $srcset = (!empty($parm['srcset'])) ? "srcset=\"".$parm['srcset']."\" " : ""; @@ -4080,7 +4080,7 @@ class e_parser if($thumb == 'tag') { - return "Youtube Video"; + return "Youtube Video"; } if($thumb == 'email') @@ -4126,7 +4126,7 @@ class e_parser { $thumbSrc = e_IMAGE_ABS."generic/playlist_120.png"; } - return "".LAN_YOUTUBE_PLAYLIST.""; + return "".LAN_YOUTUBE_PLAYLIST.""; } diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index be09b6279..b388af166 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -1188,7 +1188,7 @@ class e_form $thpath = empty($default) || !empty($video) ? $default_url : $tp->thumbUrl($default_thumb, $att, true); //isset($sc_parameters['nothumb']) || vartrue($hide) ? - $label = "{$default_url}"; + $label = "{$default_url}"; if($cat != 'news' && $cat !='page' && $cat !='' && strpos($cat,'_image')===false) { diff --git a/e107_handlers/mail.php b/e107_handlers/mail.php index 81fa0835a..180955801 100644 --- a/e107_handlers/mail.php +++ b/e107_handlers/mail.php @@ -787,7 +787,7 @@ class e107Email extends PHPMailer { $size = isset($mediaParms[$nk]) ? "?w=".$mediaParms[$nk]['w'] : ''; //echo $nk.": ".$val['path'].$size."
"; - $eml['shortcodes'][$id] = "
"; + $eml['shortcodes'][$id] = "
"; } } diff --git a/e107_handlers/media_class.php b/e107_handlers/media_class.php index 84a3a77c5..adc0acdb0 100644 --- a/e107_handlers/media_class.php +++ b/e107_handlers/media_class.php @@ -1267,7 +1267,7 @@ class e_media if($data['type'] == 'image') { - $text .= ''; + $text .= ''; } elseif($data['type'] == 'glyph') { diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php index e9df4c2b3..12d77b775 100644 --- a/e107_handlers/theme_handler.php +++ b/e107_handlers/theme_handler.php @@ -1422,7 +1422,7 @@ class themeHandler $text .= "
- \"".$theme['name']."\" + \"".$theme['name']."\"
"; } diff --git a/e107_plugins/banner/e_shortcode.php b/e107_plugins/banner/e_shortcode.php index 5ad7ba6ee..8ba84db87 100644 --- a/e107_plugins/banner/e_shortcode.php +++ b/e107_plugins/banner/e_shortcode.php @@ -83,7 +83,7 @@ class banner_shortcodes extends e_shortcode default: - $class = empty($parm['class']) ? "e-banner img-responsive" : $parm['class']; + $class = empty($parm['class']) ? "e-banner img-responsive img-fluid" : $parm['class']; $ban_ret = $tp->toImage($row['banner_image'], array('class'=> $class , 'alt'=>basename($row['banner_image']), 'legacy'=>'{e_IMAGE}banners')); break; diff --git a/e107_plugins/download/download_shortcodes.php b/e107_plugins/download/download_shortcodes.php index e2f617788..046ff63e8 100644 --- a/e107_plugins/download/download_shortcodes.php +++ b/e107_plugins/download/download_shortcodes.php @@ -327,7 +327,7 @@ class download_shortcodes extends e_shortcode { $opts = array( 'legacy' => "{e_FILE}downloadthumbs/", - 'class' => 'download-image img-responsive', + 'class' => 'download-image img-responsive img-fluid', 'alt' => $this->var['download_name'] ); @@ -583,7 +583,7 @@ class download_shortcodes extends e_shortcode { $opts = array( 'legacy' => "{e_FILE}downloadthumbs/", - 'class' => 'download-image dl_image img-responsive' + 'class' => 'download-image dl_image img-responsive img-fluid' ); $image = $tp->toImage($this->var['download_thumb'], $opts); @@ -610,7 +610,7 @@ class download_shortcodes extends e_shortcode $opts = array( 'legacy' => "{e_FILE}downloadimages/", - 'class' => 'download-image dl_image download-view-image img-responsive '.vartrue($parm['class']), + 'class' => 'download-image dl_image download-view-image img-responsive img-fluid '.vartrue($parm['class']), 'alt' => basename($this->var['download_image']) ); diff --git a/e107_plugins/download/request.php b/e107_plugins/download/request.php index d739d0e79..979731318 100644 --- a/e107_plugins/download/request.php +++ b/e107_plugins/download/request.php @@ -321,16 +321,16 @@ else if (file_exists(e_FILE."download/{$image}")) { - $disp = "
"; + $disp = "
"; } else if(file_exists(e_FILE."downloadimages/{$image}")) { - $disp = "
"; + $disp = "
"; } else { $image = $tp->replaceConstants($image); - $disp = "
"; + $disp = "
"; } $disp .= "
".LAN_BACK."
"; diff --git a/e107_plugins/featurebox/includes/item.php b/e107_plugins/featurebox/includes/item.php index 2d6b2b35a..74d31fef8 100644 --- a/e107_plugins/featurebox/includes/item.php +++ b/e107_plugins/featurebox/includes/item.php @@ -156,7 +156,7 @@ class plugin_featurebox_item extends e_model { return $src; } - $tag = ''.$tp->toAttribute($this->get('fb_title')).''; + $tag = ''.$tp->toAttribute($this->get('fb_title')).''; if(isset($parm['nourl']) || !$this->get('fb_imageurl')) { return $tag; diff --git a/e107_plugins/gallery/e_shortcode.php b/e107_plugins/gallery/e_shortcode.php index 5bffb88bc..971ffaff0 100644 --- a/e107_plugins/gallery/e_shortcode.php +++ b/e107_plugins/gallery/e_shortcode.php @@ -103,7 +103,7 @@ class gallery_shortcodes extends e_shortcode $w = vartrue($parms['w']) ? $parms['w'] : $tp->thumbWidth(); // 190; // 160; $h = vartrue($parms['h']) ? $parms['h'] : $tp->thumbHeight(); // 130; - $class = ($this->slideMode == true) ? 'gallery-slideshow-thumb img-responsive img-rounded' : varset($parms['class'], 'gallery-thumb img-responsive'); + $class = ($this->slideMode == true) ? 'gallery-slideshow-thumb img-responsive img-fluid img-rounded' : varset($parms['class'], 'gallery-thumb img-responsive img-fluid'); $rel = ($this->slideMode == true) ? 'prettyPhoto[pp_gal]' : 'prettyPhoto[pp_gal]'; //$att = array('aw'=>$w, 'ah'=>$h, 'x'=>1, 'crop'=>1); @@ -186,7 +186,7 @@ class gallery_shortcodes extends e_shortcode } $text = ""; - $text .= ""; + $text .= ""; $text .= ""; return $text; } @@ -263,7 +263,7 @@ class gallery_shortcodes extends e_shortcode if(empty($template['item'])) { - $text .= $ns->tablerender('', $this->sc_gallery_thumb('class=gallery_thumb img-responsive img-home-portfolio'), 'gallery_portfolio', true); + $text .= $ns->tablerender('', $this->sc_gallery_thumb('class=gallery_thumb img-responsive img-fluid img-home-portfolio'), 'gallery_portfolio', true); } else { diff --git a/e107_plugins/news/templates/news_menu_template.php b/e107_plugins/news/templates/news_menu_template.php index 5a78e3a0a..853733492 100644 --- a/e107_plugins/news/templates/news_menu_template.php +++ b/e107_plugins/news/templates/news_menu_template.php @@ -124,7 +124,7 @@ $NEWS_MENU_TEMPLATE['carousel']['end'] = ' $NEWS_MENU_TEMPLATE['carousel']['item'] = '
{SETIMAGE: w=800&h=370&crop=1} - {NEWS_IMAGE: class=img-responsive} + {NEWS_IMAGE: class=img-responsive img-fluid}
{NEWS_DATE=dd MM, yyyy}

{NEWS_TITLE}

diff --git a/e107_plugins/siteinfo/e_shortcode.php b/e107_plugins/siteinfo/e_shortcode.php index 08691f507..7cef532d1 100644 --- a/e107_plugins/siteinfo/e_shortcode.php +++ b/e107_plugins/siteinfo/e_shortcode.php @@ -173,7 +173,7 @@ class siteinfo_shortcodes // must match the folder name of the plugin. $dimensions = getimagesize($path); } - $opts = array('alt'=>SITENAME, 'class'=>'logo img-responsive'); + $opts = array('alt'=>SITENAME, 'class'=>'logo img-responsive img-fluid'); if(!empty($dimensions[0])) { diff --git a/e107_plugins/siteinfo/powered_by_menu.php b/e107_plugins/siteinfo/powered_by_menu.php index 3e0b8ea04..f13f1f006 100644 --- a/e107_plugins/siteinfo/powered_by_menu.php +++ b/e107_plugins/siteinfo/powered_by_menu.php @@ -20,7 +20,7 @@ if (!defined('e107_INIT')) { exit; } $text = "
- e107 + e107
"; diff --git a/e107_plugins/tinymce4/wysiwyg.php b/e107_plugins/tinymce4/wysiwyg.php index a0b550a30..d31711f59 100644 --- a/e107_plugins/tinymce4/wysiwyg.php +++ b/e107_plugins/tinymce4/wysiwyg.php @@ -587,7 +587,7 @@ class wysiwyg ]}, {title: 'Bootstrap Images', items: [ - {title: 'Responsive (recommended)', selector: 'img', classes: 'img-responsive'}, + {title: 'Responsive (recommended)', selector: 'img', classes: 'img-responsive img-fluid'}, {title: 'Rounded', selector: 'img', classes: 'img-rounded'}, {title: 'Circle', selector: 'img', classes: 'img-circle'}, {title: 'Thumbnail', selector: 'img', classes: 'img-thumbnail'}, diff --git a/install.php b/install.php index 1bc98f403..05633cc87 100644 --- a/install.php +++ b/install.php @@ -1136,7 +1136,7 @@ class e_install continue; } - $thumbnail = "".$val.""; + $thumbnail = "".$val.""; $selected = ($val == 'landingzero') ? " checked" : "";