aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2012-08-01 20:32:15 +0200
committerSem <sembrestels@riseup.net>2012-08-01 20:32:15 +0200
commit77a70ff27576649f455358b6ff18c2ad1c786f6c (patch)
treea5bcd472b6b7b7691964f48df1731b75d32029a8
parent6ef62a444fbcebea25cf475613d5cab0c43b58c8 (diff)
downloadelgg-77a70ff27576649f455358b6ff18c2ad1c786f6c.tar.gz
elgg-77a70ff27576649f455358b6ff18c2ad1c786f6c.tar.bz2
Ajax views was messy and wasn't resizing well, moved to only images.
-rw-r--r--start.php2
-rw-r--r--views/default/js/photos/tidypics.php14
-rw-r--r--views/default/object/image/summary.php2
-rw-r--r--views/default/river/object/album/create.php2
-rw-r--r--views/default/river/object/image/create.php2
-rw-r--r--views/default/river/object/tidypics_batch/create.php2
6 files changed, 13 insertions, 11 deletions
diff --git a/start.php b/start.php
index 7de36b29f..b47b71d81 100644
--- a/start.php
+++ b/start.php
@@ -44,7 +44,7 @@ function tidypics_init() {
$js = elgg_get_simplecache_url('js', 'photos/uploading');
elgg_register_simplecache_view('js/photos/uploading');
elgg_register_js('tidypics:uploading', $js, 'footer');
-
+
elgg_register_js('swfobject', 'mod/tidypics/vendors/uploadify/swfobject.js', 'footer');
elgg_register_js('jquery.uploadify-tp', 'mod/tidypics/vendors/uploadify/jquery.uploadify.v2.1.1.min.js', 'footer');
diff --git a/views/default/js/photos/tidypics.php b/views/default/js/photos/tidypics.php
index 20dcc403e..869089850 100644
--- a/views/default/js/photos/tidypics.php
+++ b/views/default/js/photos/tidypics.php
@@ -9,12 +9,14 @@ elgg.provide('elgg.tidypics');
elgg.tidypics.init = function() {
- 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');
+ if (elgg.ui.lightbox) {
+ $('.elgg-lightbox, .elgg-lightbox-photo').colorbox({
+ href: function() {
+ var guid = (new RegExp("photos/image/[0-9]+", 'i')).exec($(this).attr('href')).toString().substr("photos/image/".length);
+ return elgg.config.wwwroot + "photos/thumbnail/" + guid + "/large";
+ },
+ title: function() {
+ return '<h3 style="display: inline">'+ $(this).find('img').attr('title') +'</h3> - <a href="'+ $(this).attr('href') +'">'+ elgg.echo('comments') +'</a>';
}
});
}
diff --git a/views/default/object/image/summary.php b/views/default/object/image/summary.php
index 34a726353..0fa03cbe8 100644
--- a/views/default/object/image/summary.php
+++ b/views/default/object/image/summary.php
@@ -23,7 +23,7 @@ $body = elgg_view_entity_icon($image, 'small', array(
'img_class' => 'tidypics-photo',
'encode_text' => false,
'is_trusted' => true,
- 'link_class' => 'tidypics-lightbox elgg-lightbox',
+ 'link_class' => 'tidypics-lightbox elgg-lightbox-photo',
));
/*
diff --git a/views/default/river/object/album/create.php b/views/default/river/object/album/create.php
index 2269b2eb6..29620041f 100644
--- a/views/default/river/object/album/create.php
+++ b/views/default/river/object/album/create.php
@@ -26,7 +26,7 @@ if ($album_river_view == "cover") {
foreach($images as $image) {
$attachments .= '<li class="tidypics-photo-item">';
$attachments .= elgg_view_entity_icon($image, 'tiny', array(
- 'link_class' => 'tidypics-lightbox elgg-lightbox',
+ 'link_class' => 'tidypics-lightbox elgg-lightbox-photo',
));
$attachments .= '</li>';
}
diff --git a/views/default/river/object/image/create.php b/views/default/river/object/image/create.php
index c34e6b309..6b68b4d68 100644
--- a/views/default/river/object/image/create.php
+++ b/views/default/river/object/image/create.php
@@ -25,7 +25,7 @@ $image_link = elgg_view('output/url', array(
'href' => $image->getURL(),
'text' => $image->getTitle(),
'is_trusted' => true,
- 'class' => 'elgg-lightbox',
+ 'class' => 'elgg-lightbox-photo',
));
$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 3908f824d..b97c853a3 100644
--- a/views/default/river/object/tidypics_batch/create.php
+++ b/views/default/river/object/tidypics_batch/create.php
@@ -46,7 +46,7 @@ if (count($images)) {
foreach($images as $image) {
$attachments .= '<li class="tidypics-photo-item">';
$attachments .= elgg_view_entity_icon($image, 'tiny', array(
- 'link_class' => 'tidypics-lightbox elgg-lightbox',
+ 'link_class' => 'tidypics-lightbox elgg-lightbox-photo',
));
$attachments .= '</li>';
}