diff options
| author | Sem <sembrestels@riseup.net> | 2012-08-02 21:15:33 +0200 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-08-02 21:15:33 +0200 |
| commit | a7fd00b23708431d9875f1e7cd1743558ff25c5b (patch) | |
| tree | b4f0fad648a5c88875d6337b5ffd7dfad66b33f3 /views/default/object/image | |
| parent | 71e6db3c3dff9c9ec7e8109fc990f0d960273c9f (diff) | |
| parent | 3ef058394574c630726c955ba2a54a63df453d08 (diff) | |
| download | elgg-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/object/image')
| -rw-r--r-- | views/default/object/image/full.php | 4 | ||||
| -rw-r--r-- | views/default/object/image/summary.php | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/views/default/object/image/full.php b/views/default/object/image/full.php index 4e2c02a9a..74436f500 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..0fa03cbe8 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-photo', )); /* |