diff options
| author | friendica <info@friendica.com> | 2013-12-25 01:05:46 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-12-25 01:05:46 -0800 |
| commit | b1ade138ff7fc47f2b70fb3fbf130127140b5271 (patch) | |
| tree | 92e40bec5aa450411225f6a16ded07d57dbe2a6e | |
| parent | 71dde7c6875c85e4bfbe6e2eadecaf0bbc9fd20c (diff) | |
| download | volse-hubzilla-b1ade138ff7fc47f2b70fb3fbf130127140b5271.tar.gz volse-hubzilla-b1ade138ff7fc47f2b70fb3fbf130127140b5271.tar.bz2 volse-hubzilla-b1ade138ff7fc47f2b70fb3fbf130127140b5271.zip | |
use colorbox for single photo viewing (replacing prettyPhoto, which may have license incompatibilities). Also set maximum size of a directory popup and let it scroll after that in case somebody set their profile keywords to the content of Webster's dictionary.
| -rw-r--r-- | doc/To-Do-Code.md | 2 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/js/mod_directory.js | 2 | ||||
| -rwxr-xr-x | view/tpl/photo_view.tpl | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/doc/To-Do-Code.md b/doc/To-Do-Code.md index 2d9228e88..403f6be30 100644 --- a/doc/To-Do-Code.md +++ b/doc/To-Do-Code.md @@ -13,6 +13,8 @@ We need much more than this, but here are areas where developers can help. Pleas * Integrate the "open site" list with the register page +* "mixed content warning" redirector so that if your server is https (as it should be) so are all your embedded content and media links + * Write more webpage layouts * Write more webpage widgets diff --git a/version.inc b/version.inc index 353e8ce82..bdcfdd8ad 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-12-23.535 +2013-12-25.537 diff --git a/view/js/mod_directory.js b/view/js/mod_directory.js index 96a38a109..291734b4f 100644 --- a/view/js/mod_directory.js +++ b/view/js/mod_directory.js @@ -1,7 +1,7 @@ function dirdetails(hash) { $.get('dirprofile' + '?f=&hash=' + hash, function( data ) { - $.colorbox({ html: data }); + $.colorbox({ maxWidth: "50%", maxHeight: "75%", html: data }); }); } diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index cdaae67e4..c3b697776 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -11,7 +11,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}}" rel="prettyPhoto"><img src="{{$photo.src}}" /></a></div> +<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;" ><img 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> |