aboutsummaryrefslogtreecommitdiff
path: root/views/default/river/object
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2012-08-02 21:15:33 +0200
committerSem <sembrestels@riseup.net>2012-08-02 21:15:33 +0200
commita7fd00b23708431d9875f1e7cd1743558ff25c5b (patch)
treeb4f0fad648a5c88875d6337b5ffd7dfad66b33f3 /views/default/river/object
parent71e6db3c3dff9c9ec7e8109fc990f0d960273c9f (diff)
parent3ef058394574c630726c955ba2a54a63df453d08 (diff)
downloadelgg-a7fd00b23708431d9875f1e7cd1743558ff25c5b.tar.gz
elgg-a7fd00b23708431d9875f1e7cd1743558ff25c5b.tar.bz2
Merge branch 'colorbox' of git://github.com/sembrestels/Tidypics
Conflicts: manifest.xml start.php
Diffstat (limited to 'views/default/river/object')
-rw-r--r--views/default/river/object/album/create.php10
-rw-r--r--views/default/river/object/image/create.php5
-rw-r--r--views/default/river/object/tidypics_batch/create.php10
3 files changed, 21 insertions, 4 deletions
diff --git a/views/default/river/object/album/create.php b/views/default/river/object/album/create.php
index c8c79f406..29620041f 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-photo',
+ ));
$attachments .= '</li>';
}
$attachments .= '</ul>';
diff --git a/views/default/river/object/image/create.php b/views/default/river/object/image/create.php
index 08cfdc550..6b68b4d68 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-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 dc47284d2..b97c853a3 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-photo',
+ ));
$attachments .= '</li>';
}
$attachments .= '</ul>';