aboutsummaryrefslogtreecommitdiff
path: root/views/default/object
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2012-07-28 23:08:10 +0200
committerSem <sembrestels@riseup.net>2012-07-28 23:08:10 +0200
commit12a88208acec40e190b0729887e28c9d9add26c3 (patch)
tree3f141ee1ba6b8495280335b637e99bb376144139 /views/default/object
parent534c8b15a7c11035cf918e983c82efa3bea567a9 (diff)
downloadelgg-12a88208acec40e190b0729887e28c9d9add26c3.tar.gz
elgg-12a88208acec40e190b0729887e28c9d9add26c3.tar.bz2
Removed photo-tagging feature.
Diffstat (limited to 'views/default/object')
-rw-r--r--views/default/object/image.php20
-rw-r--r--views/default/object/image/full.php3
2 files changed, 0 insertions, 23 deletions
diff --git a/views/default/object/image.php b/views/default/object/image.php
index 2aa76d48f..fc8ea827e 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -175,26 +175,6 @@ if (get_context() == "search") {
<div class="clearfloat"></div>
</div>
<?php
- // image menu (start tagging, download, etc.)
-
- echo '<div id="tidypics_controls"><ul>';
- echo elgg_view('tidypics/image_menu', array(
- 'image_guid' => $image_guid,
- 'viewer' => $viewer,
- 'owner' => $owner,
- 'anytags' => $image->isPhotoTagged(),
- 'album' => $album, ) );
- echo '</ul></div>';
-
- // tagging code - photo tags on images, photo tag listing and hidden divs used in tagging
- if (get_plugin_setting('tagging', 'tidypics') != "disabled") {
- echo elgg_view('tidypics/tagging', array(
- 'image' => $image,
- 'viewer' => $viewer,
- 'owner' => $owner, ) );
- }
-
-
if (get_plugin_setting('exif', 'tidypics') == "enabled") {
echo elgg_view('tidypics/exif', array('guid'=> $image_guid));
}
diff --git a/views/default/object/image/full.php b/views/default/object/image/full.php
index 175519c16..4e2c02a9a 100644
--- a/views/default/object/image/full.php
+++ b/views/default/object/image/full.php
@@ -51,10 +51,7 @@ echo $summary;
echo '<div class="tidypics-photo-wrapper center">';
echo elgg_view('object/image/navigation', $vars);
-echo elgg_view('photos/tagging/help', $vars);
-echo elgg_view('photos/tagging/select', $vars);
echo $img;
-echo elgg_view('photos/tagging/tags', $vars);
echo '</div>';
if ($photo->description) {