diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/default/js/photos/tidypics.php | 10 | ||||
| -rw-r--r-- | views/default/object/image/full.php | 4 | ||||
| -rw-r--r-- | views/default/object/image/summary.php | 6 | ||||
| -rw-r--r-- | views/default/photos/css.php | 1 | ||||
| -rw-r--r-- | views/default/river/object/album/create.php | 10 | ||||
| -rw-r--r-- | views/default/river/object/image/create.php | 5 | ||||
| -rw-r--r-- | views/default/river/object/tidypics_batch/create.php | 10 |
7 files changed, 34 insertions, 12 deletions
diff --git a/views/default/js/photos/tidypics.php b/views/default/js/photos/tidypics.php index c97a1eadb..20dcc403e 100644 --- a/views/default/js/photos/tidypics.php +++ b/views/default/js/photos/tidypics.php @@ -9,8 +9,14 @@ elgg.provide('elgg.tidypics'); elgg.tidypics.init = function() { - if ($(".tidypics-lightbox").length) { - $(".tidypics-lightbox").fancybox({'type': 'image'}); + if ($.colorbox) { + $(".elgg-gallery .tidypics-lightbox").colorbox({ + onComplete: function() { + $('#cboxLoadedContent .elgg-page-topbar, #cboxLoadedContent .elgg-page-header, ' + + '#cboxLoadedContent .elgg-page-footer, #cboxLoadedContent .elgg-sidebar').css('display', 'none'); + $('#cboxLoadedContent .elgg-layout').css('background-image', 'none'); + } + }); } $("#tidypics-sort").sortable({ diff --git a/views/default/object/image/full.php b/views/default/object/image/full.php index 175519c16..9b5c1315a 100644 --- a/views/default/object/image/full.php +++ b/views/default/object/image/full.php @@ -13,10 +13,8 @@ $image = $photo = $vars['entity']; $img = elgg_view_entity_icon($image, 'large', array( 'href' => $image->getIconURL('master'), 'img_class' => 'tidypics-photo', - 'link_class' => 'tidypics-lightbox', + 'link_class' => 'tidypics-lightbox elgg-lightbox-photo', )); -elgg_load_js('lightbox'); -elgg_load_css('lightbox'); $owner_link = elgg_view('output/url', array( 'href' => "photos/owner/" . $photo->getOwnerEntity()->username, diff --git a/views/default/object/image/summary.php b/views/default/object/image/summary.php index ed8ceff38..34a726353 100644 --- a/views/default/object/image/summary.php +++ b/views/default/object/image/summary.php @@ -10,7 +10,6 @@ $image = elgg_extract('entity', $vars); -$img = elgg_view_entity_icon($image, 'small'); $header = elgg_view('output/url', array( 'text' => $image->getTitle(), @@ -19,11 +18,12 @@ $header = elgg_view('output/url', array( 'class' => 'tidypics-heading', )); -$body = elgg_view('output/url', array( - 'text' => $img, +$body = elgg_view_entity_icon($image, 'small', array( 'href' => $image->getURL(), + 'img_class' => 'tidypics-photo', 'encode_text' => false, 'is_trusted' => true, + 'link_class' => 'tidypics-lightbox elgg-lightbox', )); /* diff --git a/views/default/photos/css.php b/views/default/photos/css.php index 2290e1f9a..8fa7f730c 100644 --- a/views/default/photos/css.php +++ b/views/default/photos/css.php @@ -18,6 +18,7 @@ } .elgg-module-tidypics-image { margin: 5px auto; + height: 80%; } .tidypics-gallery-widget > li { diff --git a/views/default/river/object/album/create.php b/views/default/river/object/album/create.php index c8c79f406..2269b2eb6 100644 --- a/views/default/river/object/album/create.php +++ b/views/default/river/object/album/create.php @@ -6,6 +6,10 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2 */ +elgg_load_css('lightbox'); +elgg_load_js('lightbox'); +elgg_load_js('tidypics'); + $album = $vars['item']->getObjectEntity(); $album_river_view = elgg_get_plugin_setting('album_river_view', 'tidypics'); @@ -18,10 +22,12 @@ if ($album_river_view == "cover") { $images = $album->getImages(7); if (count($images)) { - $attachments = '<ul class="tidypics-river-list">'; + $attachments = '<ul class="tidypics-river-list elgg-lightbox-gallery">'; foreach($images as $image) { $attachments .= '<li class="tidypics-photo-item">'; - $attachments .= elgg_view_entity_icon($image, 'tiny'); + $attachments .= elgg_view_entity_icon($image, 'tiny', array( + 'link_class' => 'tidypics-lightbox elgg-lightbox', + )); $attachments .= '</li>'; } $attachments .= '</ul>'; diff --git a/views/default/river/object/image/create.php b/views/default/river/object/image/create.php index 08cfdc550..c34e6b309 100644 --- a/views/default/river/object/image/create.php +++ b/views/default/river/object/image/create.php @@ -6,6 +6,10 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2 */ +elgg_load_css('lightbox'); +elgg_load_js('lightbox'); +elgg_load_js('tidypics'); + $subject = $vars['item']->getSubjectEntity(); $subject_link = elgg_view('output/url', array( 'href' => $subject->getURL(), @@ -21,6 +25,7 @@ $image_link = elgg_view('output/url', array( 'href' => $image->getURL(), 'text' => $image->getTitle(), 'is_trusted' => true, + 'class' => 'elgg-lightbox', )); $album_link = elgg_view('output/url', array( diff --git a/views/default/river/object/tidypics_batch/create.php b/views/default/river/object/tidypics_batch/create.php index dc47284d2..3908f824d 100644 --- a/views/default/river/object/tidypics_batch/create.php +++ b/views/default/river/object/tidypics_batch/create.php @@ -6,6 +6,10 @@ * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2 */ +elgg_load_css('lightbox'); +elgg_load_js('lightbox'); +elgg_load_js('tidypics'); + $batch = $vars['item']->getObjectEntity(); // Get images related to this batch @@ -38,10 +42,12 @@ $subject_link = elgg_view('output/url', array( )); if (count($images)) { - $attachments = '<ul class="tidypics-river-list">'; + $attachments = '<ul class="tidypics-river-list elgg-lightbox-gallery">'; foreach($images as $image) { $attachments .= '<li class="tidypics-photo-item">'; - $attachments .= elgg_view_entity_icon($image, 'tiny'); + $attachments .= elgg_view_entity_icon($image, 'tiny', array( + 'link_class' => 'tidypics-lightbox elgg-lightbox', + )); $attachments .= '</li>'; } $attachments .= '</ul>'; |