From 12a88208acec40e190b0729887e28c9d9add26c3 Mon Sep 17 00:00:00 2001 From: Sem Date: Sat, 28 Jul 2012 23:08:10 +0200 Subject: Removed photo-tagging feature. --- actions/photos/image/tag.php | 109 -------------- actions/photos/image/untag.php | 24 ---- languages/da.php | 19 --- languages/de.php | 28 +--- languages/en.php | 28 +--- languages/es.php | 18 --- languages/fr.php | 15 -- languages/he.php | 11 -- languages/it.php | 2 - lib/tidypics.php | 45 ------ pages/photos/image/view.php | 5 - pages/tagged.php | 48 ------- start.php | 26 +--- views/default/forms/photos/admin/settings/main.php | 2 +- views/default/forms/photos/image/tag.php | 33 ----- views/default/js/photos/tagging.php | 159 --------------------- views/default/object/image.php | 20 --- views/default/object/image/full.php | 3 - views/default/photos/css.php | 79 ---------- views/default/photos/tagging/help.php | 19 --- views/default/photos/tagging/select.php | 16 --- views/default/photos/tagging/tag.php | 50 ------- views/default/photos/tagging/tags.php | 14 -- views/default/river/object/image/tag.php | 26 ---- 24 files changed, 4 insertions(+), 795 deletions(-) delete mode 100644 actions/photos/image/tag.php delete mode 100644 actions/photos/image/untag.php delete mode 100644 pages/tagged.php delete mode 100644 views/default/forms/photos/image/tag.php delete mode 100644 views/default/js/photos/tagging.php delete mode 100644 views/default/photos/tagging/help.php delete mode 100644 views/default/photos/tagging/select.php delete mode 100644 views/default/photos/tagging/tag.php delete mode 100644 views/default/photos/tagging/tags.php delete mode 100644 views/default/river/object/image/tag.php diff --git a/actions/photos/image/tag.php b/actions/photos/image/tag.php deleted file mode 100644 index e623bd546..000000000 --- a/actions/photos/image/tag.php +++ /dev/null @@ -1,109 +0,0 @@ -guid; -} - -/* // not adding as plain tag yet -$new_word_tag = false; -if ($user_id != 0) { - $relationships_type = 'user'; - $value = $user_id; -} else { - $relationships_type = 'word'; - $value = $word; - - // check to see if the photo has this tag and add if not - if (!is_array($image->tags)) { - if ($image->tags != $word) { - $new_word_tag = true; - $tagarray = $image->tags . ',' . $word; - $tagarray = string_to_tag_array($tagarray); - } - } else { - if (!in_array($word, $image->tags)) { - $new_word_tag = true; - $tagarray = $image->tags; - $tagarray[] = $word; - } - } -} - -// add new tag now so it is available in search -if ($new_word_tag) { - $image->clearMetadata('tags'); - $image->tags = $tagarray; -} -*/ - -$tag = new stdClass(); -$tag->coords = $coordinates_str; -$tag->type = $relationships_type; -$tag->value = $value; -$access_id = $image->getAccessID(); - -$annotation_id = $image->annotate('phototag', serialize($tag), $access_id); -if ($annotation_id) { - // if tag is a user id, add relationship for searching (find all images with user x) - if ($tag->type === 'user') { - if (!check_entity_relationship($tag->value, 'phototag', $image_guid)) { - add_entity_relationship($tag->value, 'phototag', $image_guid); -/* - // also add this to the river - subject is image, object is the tagged user - add_to_river('river/object/image/tag', 'tag', $tagger->guid, $user_id, $access_id, 0, $annotation_id); - - // notify user of tagging as long as not self - if ($owner_id != $user_id) { - notify_user( - $user_id, - $owner_id, - elgg_echo('tidypics:tag:subject'), - sprintf( - elgg_echo('tidypics:tag:body'), - $image->getTitle(), - $tagger->name, - $image->getURL() - ) - ); - } - * - */ - } - } - - system_message(elgg_echo("tidypics:phototagging:success")); -} - -forward(REFERER); diff --git a/actions/photos/image/untag.php b/actions/photos/image/untag.php deleted file mode 100644 index 11c433a61..000000000 --- a/actions/photos/image/untag.php +++ /dev/null @@ -1,24 +0,0 @@ -name != 'phototag') { - register_error(elgg_echo("tidypics:phototagging:delete:error")); - forward(REFERER); -} - -if (!$annotation->canEdit()) { - register_error(elgg_echo("tidypics:phototagging:delete:error")); - forward(REFERER); -} - -if ($annotation->delete()) { - system_message(elgg_echo("tidypics:phototagging:delete:success")); -} else { - system_message(elgg_echo("tidypics:phototagging:delete:error")); -} - -forward(REFERER); diff --git a/languages/da.php b/languages/da.php index 78113d467..eb75e86f2 100644 --- a/languages/da.php +++ b/languages/da.php @@ -56,7 +56,6 @@ $danish = array( 'tidypics:admin:instructions' => 'Dette er de centrale Tidypics indstillinger. Tilpas dem til din opsætning og klik derefter på Gem.', 'tidypics:settings:image_lib' => "Foto arkiv: ", 'tidypics:settings:download_link' => "Vis download-link", - 'tidypics:settings:tagging' => "Tillad fotolinks", 'tidypics:settings:photo_ratings' => "Tillad karakterergivning af foto (kræver plugin af Miguel Montes eller andet kompatibelt plugin)", 'tidypics:settings:exif' => "Vis EXIF data", 'tidypics:settings:view_count' => "Vis tæller", @@ -105,22 +104,6 @@ $danish = array( 'image:back' => "Forrige", 'image:next' => "Næste", - // tagging - 'tidypics:taginstruct' => 'Vælg et område på billedet, som du ønsker at linke', - 'tidypics:deltag_title' => 'Vælg at slette links', - 'tidypics:finish_tagging' => 'Annuller', - 'tidypics:tagthisphoto' => 'Tilføj link til foto', - 'tidypics:deletetag' => 'Slet foto link', - 'tidypics:actiontag' => 'Link', - 'tidypics:actiondelete' => 'Slet', - 'tidypics:actioncancel' => 'Annuller', - 'tidypics:inthisphoto' => 'Links i billedet', - 'tidypics:usertag' => "Foto links til medlem %s", - 'tidypics:phototagging:success' => 'Foto link tilføjet', - 'tidypics:phototagging:error' => 'Uventet fejl ved linket', - 'tidypics:deletetag:success' => 'Udvalgte links er blevet fjernet', - - //rss 'tidypics:posted' => 'Billedet indstilles individuelt:', @@ -138,8 +121,6 @@ $danish = array( 'image:river:created:multiple' => "%s added %u photos to album %s", 'image:river:item' => "et billede", 'image:river:annotate' => "en kommentar til billedet", - 'image:river:tagged' => "%s tagged %s in the photo %s", - 'image:river:tagged:unknown' => "%s tagged %s in a photo", 'album:river:created' => "%s har tilføjet et nyt album", 'album:river:group' => "i gruppen", 'album:river:item' => "et album", diff --git a/languages/de.php b/languages/de.php index 1f439e981..e7b70d9c3 100644 --- a/languages/de.php +++ b/languages/de.php @@ -64,7 +64,6 @@ $german = array( 'tidypics:settings:thumbnail' => "Erzeugung von Vorschaubildern", 'tidypics:settings:help' => "Hilfe", 'tidypics:settings:download_link' => "Zeige Download-Link", - 'tidypics:settings:tagging' => "Tagging von Bildern erlauben", 'tidypics:settings:photo_ratings' => "Bewerten von Bildern erlauben (benötigt das Elggx Fivestar-Plugin oder ein vergleichbares)", 'tidypics:settings:exif' => "EXIF-Daten anzeigen", 'tidypics:settings:view_count' => "Zugriffszähler anzeigen", @@ -102,7 +101,7 @@ $german = array( 'tidypics:server_info:max_input_time_desc' => 'Maximale erlaubte Dauer, in der das Hochladen von Daten auf den Server abgeschlossen sein muss.', 'tidypics:server_info:max_execution_time_desc' => 'Maximal erlaubte Ausführdauer für ein Skript auf dem Server.', 'tidypics:server_info:use_only_cookies_desc' => 'Cookie only sessions können den Flash-Uploader beeinträchtigen.', - + 'tidypics:server_info:php_version' => 'PHP-Version', 'tidypics:server_info:memory_limit' => 'Für PHP verfügbarer Speicher', 'tidypics:server_info:peak_usage' => 'Genutzer Speicher, um diese Seite zu laden', @@ -169,29 +168,6 @@ $german = array( 'image:next' => "Nächstes", 'image:index' => "%u von %u", - // tagging - 'tidypics:taginstruct' => 'Wähle den Bereich auf dem Bild, für das Du ein Tag setzen willst, oder %s.', - 'tidypics:finish_tagging' => 'Taggen beenden', - 'tidypics:deltag_title' => 'Wähle die Tags, die gelöscht werden sollen', - 'tidypics:finish_tagging' => 'Tagging abbrechen', - 'tidypics:tagthisphoto' => 'Bild taggen', - 'tidypics:actiontag' => 'Tag setzen', - 'tidypics:actioncancel' => 'Abbrechen', - 'tidypics:inthisphoto' => 'Tags in diesem Bild', - 'tidypics:usertag' => "Bilder mit Tags, die sich auf %s beziehen", - 'tidypics:phototagging:success' => 'Das Bild wurde getaggt.', - 'tidypics:phototagging:error' => 'Beim Hinzufügen des Tags ist ein Fehler aufgetreten.', - - 'tidypics:phototagging:delete:success' => 'Das Tag wurde entfernt.', - 'tidypics:phototagging:delete:error' => 'Beim Entfernen des Tags ist ein Fehler aufgetreten.', - 'tidypics:phototagging:delete:confirm' => 'Dieses Tag entfernen?', - - 'tidypics:tag:subject' => "Du wurdest in einem Bild getaggt", - 'tidypics:tag:body' => "Du wurdest im Bild %s von %s getaggt. - -Um das Bild zu sehen, folge diesem Link: %s", - - //rss 'tidypics:posted' => 'hat ein Bild hinzugefügt:', @@ -210,8 +186,6 @@ Um das Bild zu sehen, folge diesem Link: %s", 'image:river:created:multiple' => "%s hat %u Bilder zum Album %s hinzugefügt.", 'image:river:item' => "ein Bild", 'image:river:annotate' => "einen Kommentar zum Bild", - 'image:river:tagged' => "%s hat %s im Bild %s getaggt.", - 'image:river:tagged:unknown' => "%s hat %s in einem Bild getaggt.", 'river:create:object:album' => "%s hat das neue Bilderalbum %s hinzugefügt.", 'album:river:group' => "in der Gruppe", 'album:river:item' => "ein Album", diff --git a/languages/en.php b/languages/en.php index 62b43673d..b51987315 100644 --- a/languages/en.php +++ b/languages/en.php @@ -64,7 +64,6 @@ $english = array( 'tidypics:settings:thumbnail' => "Thumbnail Creation", 'tidypics:settings:help' => "Help", 'tidypics:settings:download_link' => "Show download link", - 'tidypics:settings:tagging' => "Enable photo tagging", 'tidypics:settings:photo_ratings' => "Enable photo ratings (requires rate plugin of Miguel Montes or compatible)", 'tidypics:settings:exif' => "Display EXIF data", 'tidypics:settings:view_count' => "Display view count", @@ -102,7 +101,7 @@ $english = array( 'tidypics:server_info:max_input_time_desc' => 'Time script waits for upload to finish', 'tidypics:server_info:max_execution_time_desc' => 'Max time a script will run', 'tidypics:server_info:use_only_cookies_desc' => 'Cookie only sessions may affect the Flash uploader', - + 'tidypics:server_info:php_version' => 'PHP Version', 'tidypics:server_info:memory_limit' => 'Memory Available to PHP', 'tidypics:server_info:peak_usage' => 'Memory Used to Load This Page', @@ -177,29 +176,6 @@ $english = array( 'image:next' => "Next", 'image:index' => "%u of %u", - // tagging - 'tidypics:taginstruct' => 'Select the area that you want to tag or %s', - 'tidypics:finish_tagging' => 'Stop tagging', - 'tidypics:tagthisphoto' => 'Tag this photo', - 'tidypics:actiontag' => 'Tag', - 'tidypics:actioncancel' => 'Cancel', - 'tidypics:inthisphoto' => 'In this photo', - 'tidypics:usertag' => "Photos tagged with user %s", - 'tidypics:phototagging:success' => 'Photo tag was successfully added', - 'tidypics:phototagging:error' => 'Unexpected error occurred during tagging', - - 'tidypics:phototagging:delete:success' => 'Photo tag was removed.', - 'tidypics:phototagging:delete:error' => 'Unexpceted error occurred when removing photo tag.', - 'tidypics:phototagging:delete:confirm' => 'Remove this tag?', - - - - 'tidypics:tag:subject' => "You have been tagged in a photo", - 'tidypics:tag:body' => "You have been tagged in the photo %s by %s. - -The photo can be viewed here: %s", - - //rss 'tidypics:posted' => 'posted a photo:', @@ -218,8 +194,6 @@ The photo can be viewed here: %s", 'image:river:created:multiple' => "%s added %u photos to the album %s", 'image:river:item' => "a photo", 'image:river:annotate' => "a comment on the photo", - 'image:river:tagged' => "%s tagged %s in the photo %s", - 'image:river:tagged:unknown' => "%s tagged %s in a photo", 'river:create:object:album' => "%s created a new photo album %s", 'album:river:group' => "in the group", 'album:river:item' => "an album", diff --git a/languages/es.php b/languages/es.php index 704f01979..7a2437889 100644 --- a/languages/es.php +++ b/languages/es.php @@ -52,7 +52,6 @@ $spanish = array( 'tidypics:admin:instructions' => 'Este es el corazón de las preferencias de Tidypics. Cambialas y luego guardalas.', 'tidypics:settings:image_lib' => "Libreria de Imagenes: ", 'tidypics:settings:download_link' => "Mostrar vinculo de descarga", - 'tidypics:settings:tagging' => "Habilitar etiquetas en las fotos", 'tidypics:settings:photo_ratings' => "Habilitar ratings de fotos(requiere instalar el e plugin de Miguel Montes o compatible)", 'tidypics:settings:exif' => "Mostrar data de EXIF", 'tidypics:settings:view_count' => "Ver contador", @@ -93,22 +92,6 @@ $spanish = array( 'image:back' => "Anterior", 'image:next' => "Siguiente", - // tagging - 'tidypics:taginstruct' => 'Seleccciona el área que deseas etiquetar', - 'tidypics:deltag_title' => 'Seleccionas las etiquetas a borrar', - 'tidypics:finish_tagging' => 'Detener etiquetado', - 'tidypics:tagthisphoto' => 'Etiquetar esta foto', - 'tidypics:deletetag' => 'Borrar etiqueta de la foto', - 'tidypics:actiontag' => 'Etiqueta', - 'tidypics:actiondelete' => 'Borrar', - 'tidypics:actioncancel' => 'Cancelar', - 'tidypics:inthisphoto' => 'En esta foto', - 'tidypics:usertag' => "Fotos etiquetadas con %s", - 'tidypics:phototagging:success' => 'La etiqueta de la foto fue añadida exitosamente', - 'tidypics:phototagging:error' => 'Ocurrió un error inesperado durante el etiquetado', - 'tidypics:deletetag:success' => 'Las etiquetas seleccionadas fueron borradas exitosamente', - - //rss 'tidypics:posted' => 'publicar una foto:', @@ -125,7 +108,6 @@ $spanish = array( 'image:river:created' => "%s añadio la foto %s al álbum %s", 'image:river:item' => "una foto", 'image:river:annotate' => "un comentario en la foto", - 'image:river:tagged' => "fue etiquetada en la foto", 'album:river:created' => "%s creo un nuevo álbum de fotos", 'album:river:group' => "en el grupo", 'album:river:item' => "un álbum", diff --git a/languages/fr.php b/languages/fr.php index 375159e0b..bb309c225 100644 --- a/languages/fr.php +++ b/languages/fr.php @@ -52,7 +52,6 @@ $french = array( 'tidypics:settings:image_lib' => "Librairie graphique" , 'tidypics:settings:thumbnail' => "Création des vignettes" , 'tidypics:settings:download_link' => "Voir le lien de download" , - 'tidypics:settings:tagging' => "Activer les tags sur les photos" , 'tidypics:settings:photo_ratings' => "Activer les notations des photos (nécessite le rate plugin de Miguel Montes ou compatible)" , 'tidypics:settings:exif' => "Voir les données EXIF" , 'tidypics:settings:view_count' => "Voir le compteur" , @@ -87,22 +86,9 @@ $french = array( 'image:none' => "Aucune image n'a encore été ajoutée" , 'image:back' => "Précédent" , 'image:next' => "Suivant" , - 'tidypics:taginstruct' => "Sélectionnez la zone que vous souhaitez tagger" , - 'tidypics:deltag_title' => "Sélectionnez le tag à supprimer" , - 'tidypics:finish_tagging' => "Arrêter de tagger" , - 'tidypics:tagthisphoto' => "Tagger cette photo" , - 'tidypics:deletetag' => "Supprimer le tag d'une photo" , - 'tidypics:actiontag' => "Tag" , 'tidypics:actiondelete' => "Supprimer" , 'tidypics:actioncancel' => "Annuler" , 'tidypics:inthisphoto' => "Dans cette photo" , - 'tidypics:usertag' => "Photo taggée par %s" , - 'tidypics:phototagging:success' => "La photo a été correctement taggée." , - 'tidypics:phototagging:error' => "Erreur innatendue durant le taggage" , - 'tidypics:deletetag:success' => "Les tags sélectionnés ont correctement été supprimés" , - 'tidypics:tag:subject' => "Vous avez été taggé dans une photo !!!" , - 'tidypics:tag:body' => "Vous avez été taggé dans la photo %s par %s !!! -La photo peut être consultée ici: %s" , 'tidypics:posted' => "a posté une photo" , 'tidypics:widget:albums' => "Albums photo" , 'tidypics:widget:album_descr' => "Échantillon de vos albums photo" , @@ -114,7 +100,6 @@ La photo peut être consultée ici: %s" , 'image:river:created' => "%s a ajouté la photo %s à l'album %s" , 'image:river:item' => "une photo" , 'image:river:annotate' => "commentaire sur la photo" , - 'image:river:tagged' => "a été taggé sur la photo" , 'album:river:created' => "%s a créé un nouvel album photo" , 'album:river:group' => "dans le groupe" , 'album:river:item' => "un album" , diff --git a/languages/he.php b/languages/he.php index 5f232daf6..af425ec49 100644 --- a/languages/he.php +++ b/languages/he.php @@ -47,7 +47,6 @@ $hebrew = array( 'tidypics:admin:instructions' => "אלה הגדרות הליבה של Tidypics. שנה אותן לפי הצורך ולחץ על שמור" , 'tidypics:settings:image_lib' => "ספריית תמונות:" , 'tidypics:settings:download_link' => "הצג לינק להורדה" , - 'tidypics:settings:tagging' => "אפשר תיוג תמונות" , 'tidypics:settings:photo_ratings' => "אפשר דירוג תמונות, דורש תוסף דירוג של Miguel Montes או דומה" , 'tidypics:settings:exif' => "הצג נתוני EXIF" , 'tidypics:settings:view_count' => "מונה צפיה" , @@ -81,19 +80,9 @@ $hebrew = array( 'image:none' => "טרם נוספו תמונות" , 'image:back' => "הקודם" , 'image:next' => "הבא" , - 'tidypics:taginstruct' => "בחר אזור להוספת תג" , - 'tidypics:deltag_title' => "בחר תגים למחיקה" , - 'tidypics:finish_tagging' => "הפסק לתייג" , - 'tidypics:tagthisphoto' => "תייג תמונה זו" , - 'tidypics:deletetag' => "מחק תג תמונה" , - 'tidypics:actiontag' => "תג" , 'tidypics:actiondelete' => "מחיקה" , 'tidypics:actioncancel' => "ביטול" , 'tidypics:inthisphoto' => "בתמונה זו" , - 'tidypics:usertag' => "תמונות המתוייגות במשתמש %s" , - 'tidypics:phototagging:success' => "התג נוסף בהצלחה" , - 'tidypics:phototagging:error' => "אירע שגיאה בתהליך התיוג" , - 'tidypics:deletetag:success' => "התגים נמחקו בהצלחה" , 'tidypics:posted' => "הוסיף/ה תמונה" , 'tidypics:widget:albums' => "אלבומי תמונות" , 'tidypics:widget:album_descr' => "הצג את האלבומים החדשים שלך" , diff --git a/languages/it.php b/languages/it.php index 764ecf5f7..dd10384fe 100644 --- a/languages/it.php +++ b/languages/it.php @@ -76,8 +76,6 @@ $italian = array( 'image:river:created:multiple' => "%s added %u photos to album %s", 'image:river:item' => "una immagine", 'image:river:annotate' => "a comment on the image", - 'image:river:tagged' => "%s tagged %s in the photo %s", - 'image:river:tagged:unknown' => "%s tagged %s in a photo", 'album:river:created' => "%s created a new photo album: ", 'album:river:item' => "an album", 'album:river:annotate' => "un commento nel foto album", diff --git a/lib/tidypics.php b/lib/tidypics.php index 9439bed39..953c68b76 100644 --- a/lib/tidypics.php +++ b/lib/tidypics.php @@ -351,51 +351,6 @@ function tp_is_person() { return false; } -/** - * get a list of people that can be tagged in an image - * - * @param $viewer entity - * @return array of guid->name for tagging - */ -function tp_get_tag_list($viewer) { - $friends = get_user_friends($viewer->getGUID(), '', 999, 0); - $friend_list = array(); - if ($friends) { - foreach($friends as $friend) { - //error_log("friend $friend->name"); - $friend_list[$friend->guid] = $friend->name; - } - } - - // is this a group - $is_group = tp_is_group_page(); - if ($is_group) { - $group_guid = page_owner(); - $viewer_guid = $viewer->guid; - $members = get_group_members($group_guid, 999); - if (is_array($members)) { - foreach ($members as $member) { - if ($viewer_guid != $member->guid) { - $group_list[$member->guid] = $member->name; - //error_log("group $member->name"); - } - } - - // combine group and friends list - $intersect = array_intersect_key($friend_list, $group_list); - $unique_friends = array_diff_key($friend_list, $group_list); - $unique_members = array_diff_key($group_list, $friend_list); - //$friend_list = array_merge($friend_list, $group_list); - //$friend_list = array_unique($friend_list); - $friend_list = $intersect + $unique_friends + $unique_members; - } - } - - asort($friend_list); - - return $friend_list; -} - /** * Convenience function for listing recent images * diff --git a/pages/photos/image/view.php b/pages/photos/image/view.php index fc4a01320..e30bed70a 100644 --- a/pages/photos/image/view.php +++ b/pages/photos/image/view.php @@ -19,11 +19,6 @@ if (!$photo) { $photo->addView(); -if (elgg_get_plugin_setting('tagging', 'tidypics')) { - elgg_load_js('tidypics:tagging'); - elgg_load_js('jquery.imgareaselect'); -} - // set page owner based on owner of photo album $album = $photo->getContainerEntity(); if ($album) { diff --git a/pages/tagged.php b/pages/tagged.php deleted file mode 100644 index 34ea8a709..000000000 --- a/pages/tagged.php +++ /dev/null @@ -1,48 +0,0 @@ -name); -} else { - $title = "User does not exist"; -} - - -// create main column -$body = elgg_view_title($title); - -set_context('search'); -set_input('search_viewtype', 'gallery'); // need to force gallery view -$body .= list_entities_from_relationship('phototag', $guid, false, 'object', 'image', 0, 10, false); - -// Set up submenus -if (isloggedin()) { - add_submenu_item( elgg_echo("album:yours"), - $CONFIG->wwwroot . "pg/photos/owned/" . $_SESSION['user']->username, - 'tidypics-b' ); -} -add_submenu_item( elgg_echo('album:all'), - $CONFIG->wwwroot . "pg/photos/world/", - 'tidypics-z'); -add_submenu_item( elgg_echo('tidypics:mostrecent'), - $CONFIG->wwwroot . 'pg/photos/mostrecent', - 'tidypics-z'); - - - -$body = elgg_view_layout('two_column_left_sidebar', '', $body); - - -page_draw($title, $body); diff --git a/start.php b/start.php index 1e851b8f3..8c3dcf7b2 100644 --- a/start.php +++ b/start.php @@ -38,9 +38,6 @@ function tidypics_init() { $js = elgg_get_simplecache_url('js', 'photos/tidypics'); elgg_register_simplecache_view('js/photos/tidypics'); elgg_register_js('tidypics', $js, 'footer'); - $js = elgg_get_simplecache_url('js', 'photos/tagging'); - elgg_register_simplecache_view('js/photos/tagging'); - elgg_register_js('tidypics:tagging', $js, 'footer'); $js = elgg_get_simplecache_url('js', 'photos/uploading'); elgg_register_simplecache_view('js/photos/uploading'); elgg_register_js('tidypics:uploading', $js, 'footer'); @@ -48,7 +45,7 @@ function tidypics_init() { elgg_register_js('tidypics:slideshow', 'mod/tidypics/vendors/PicLensLite/piclens_optimized.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'); - + // Add photos link to owner block/hover menus elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'tidypics_owner_block_menu'); @@ -99,8 +96,6 @@ function tidypics_init() { elgg_register_action("photos/image/save", "$base_dir/image/save.php"); elgg_register_action("photos/image/ajax_upload", "$base_dir/image/ajax_upload.php", 'logged_in'); elgg_register_action("photos/image/ajax_upload_complete", "$base_dir/image/ajax_upload_complete.php", 'logged_in'); - elgg_register_action("photos/image/tag", "$base_dir/image/tag.php"); - elgg_register_action("photos/image/untag", "$base_dir/image/untag.php"); elgg_register_action("photos/batch/edit", "$base_dir/batch/edit.php"); @@ -216,13 +211,6 @@ function tidypics_page_handler($page) { include "$base/image/download.php"; break; - case "tagged": // all photos tagged with user - if (isset($page[1])) { - set_input('guid', $page[1]); - } - include($CONFIG->pluginspath . "tidypics/pages/tagged.php"); - break; - case "mostviewed": // images with the most views if (isset($page[1])) { set_input('username', $page[1]); @@ -329,18 +317,6 @@ function tidypics_entity_menu_setup($hook, $type, $return, $params) { ); $return[] = ElggMenuItem::factory($options); } - - if (elgg_get_plugin_setting('tagging', 'tidypics')) { - $options = array( - 'name' => 'tagging', - 'text' => elgg_echo('tidypics:actiontag'), - 'href' => '#', - 'title' => elgg_echo('tidypics:tagthisphoto'), - 'rel' => 'photo-tagging', - 'priority' => 80, - ); - $return[] = ElggMenuItem::factory($options); - } } // only show these options if there are images diff --git a/views/default/forms/photos/admin/settings/main.php b/views/default/forms/photos/admin/settings/main.php index c99b9d688..ab5e7e24a 100644 --- a/views/default/forms/photos/admin/settings/main.php +++ b/views/default/forms/photos/admin/settings/main.php @@ -5,7 +5,7 @@ $plugin = $vars['plugin']; -$checkboxes = array('tagging', 'view_count', 'uploader', 'exif', 'download_link'); +$checkboxes = array('view_count', 'uploader', 'exif', 'download_link'); foreach ($checkboxes as $checkbox) { echo '
'; $checked = $plugin->$checkbox ? 'checked' : false; diff --git a/views/default/forms/photos/image/tag.php b/views/default/forms/photos/image/tag.php deleted file mode 100644 index 31869be9e..000000000 --- a/views/default/forms/photos/image/tag.php +++ /dev/null @@ -1,33 +0,0 @@ -'; - -echo elgg_view('input/autocomplete', array( - 'name' => 'username', - 'match_on' => 'friends', -)); - -echo elgg_view('input/hidden', array( - 'name' => 'guid', - 'value' => $vars['entity']->getGUID(), -)); - -echo elgg_view('input/hidden', array( - 'name' => 'coordinates', -)); - -echo '
'; - -echo '
'; -echo elgg_view('input/submit', array( - 'value' => elgg_echo('tidypics:actiontag'), -)); -echo '
'; diff --git a/views/default/js/photos/tagging.php b/views/default/js/photos/tagging.php deleted file mode 100644 index f444aa44c..000000000 --- a/views/default/js/photos/tagging.php +++ /dev/null @@ -1,159 +0,0 @@ - -//