diff options
| author | root <root@bawker.net> | 2014-05-07 12:01:12 -0700 |
|---|---|---|
| committer | root <root@bawker.net> | 2014-05-07 12:01:12 -0700 |
| commit | 711719ce0ce340fbcda7559bf20582e85e4b1e3d (patch) | |
| tree | 75729ee320e212856f8f334949754b4518336b86 | |
| parent | 92be2e108180176d4406aa83fc9cee03f0d117e9 (diff) | |
| download | volse-hubzilla-711719ce0ce340fbcda7559bf20582e85e4b1e3d.tar.gz volse-hubzilla-711719ce0ce340fbcda7559bf20582e85e4b1e3d.tar.bz2 volse-hubzilla-711719ce0ce340fbcda7559bf20582e85e4b1e3d.zip | |
Made some changes to img tags to enforce max-width everywhere, and to the page headers to allow user scaling.
| -rw-r--r-- | include/bbcode.php | 12 | ||||
| -rwxr-xr-x | view/tpl/head.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/photo_view.tpl | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 326676b72..92d979638 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -606,24 +606,24 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { // Images // [img]pathtoimage[/img] if (strpos($Text,'[/img]') !== false) { - $Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '<img src="$1" alt="' . t('Image/photo') . '" />', $Text); + $Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '<img style="max-width=100%;" src="$1" alt="' . t('Image/photo') . '" />', $Text); } if (strpos($Text,'[/zmg]') !== false) { - $Text = preg_replace("/\[zmg\](.*?)\[\/zmg\]/ism", '<img class="zrl" src="$1" alt="' . t('Image/photo') . '" />', $Text); + $Text = preg_replace("/\[zmg\](.*?)\[\/zmg\]/ism", '<img class="zrl" style="max-width=100%;" src="$1" alt="' . t('Image/photo') . '" />', $Text); } // [img float={left, right}]pathtoimage[/img] if (strpos($Text,'[/img]') !== false) { - $Text = preg_replace("/\[img float=left\](.*?)\[\/img\]/ism", '<img src="$1" style="float: left;" alt="' . t('Image/photo') . '" />', $Text); + $Text = preg_replace("/\[img float=left\](.*?)\[\/img\]/ism", '<img style="max-width=100%;" src="$1" style="float: left;" alt="' . t('Image/photo') . '" />', $Text); } if (strpos($Text,'[/img]') !== false) { - $Text = preg_replace("/\[img float=right\](.*?)\[\/img\]/ism", '<img src="$1" style="float: right;" alt="' . t('Image/photo') . '" />', $Text); + $Text = preg_replace("/\[img float=right\](.*?)\[\/img\]/ism", '<img style="max-width=100%;" src="$1" style="float: right;" alt="' . t('Image/photo') . '" />', $Text); } if (strpos($Text,'[/zmg]') !== false) { - $Text = preg_replace("/\[zmg float=left\](.*?)\[\/zmg\]/ism", '<img class="zrl" src="$1" style="float: left;" alt="' . t('Image/photo') . '" />', $Text); + $Text = preg_replace("/\[zmg float=left\](.*?)\[\/zmg\]/ism", '<img style="max-width=100%;" class="zrl" src="$1" style="float: left;" alt="' . t('Image/photo') . '" />', $Text); } if (strpos($Text,'[/zmg]') !== false) { - $Text = preg_replace("/\[zmg float=right\](.*?)\[\/zmg\]/ism", '<img class="zrl" src="$1" style="float: right;" alt="' . t('Image/photo') . '" />', $Text); + $Text = preg_replace("/\[zmg float=right\](.*?)\[\/zmg\]/ism", '<img style="max-width=100%;" class="zrl" src="$1" style="float: right;" alt="' . t('Image/photo') . '" />', $Text); } // [img=widthxheight]pathtoimage[/img] diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index e7b41523f..54aa5d41c 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -1,6 +1,6 @@ <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <base href="{{$baseurl}}/" /> -<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable=0"> +<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable=1"> <meta name="generator" content="{{$generator}}" /> <!--[if IE]> diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 01f135522..099c5cd17 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -9,7 +9,7 @@ </div> {{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}"><i class="icon-backward photo-icons"></i></div>{{/if}} -<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;" ><img src="{{$photo.src}}" /></a></div> +<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}"; return false;" ><img style="max-width: 100%;" src="{{$photo.src}}" /></a></div> {{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}"><i class="icon-forward photo-icons"></i></a></div>{{/if}} <div id="photo-photo-end"></div> <div id="photo-caption">{{$desc}}</div> |