diff options
author | Sem <sembrestels@riseup.net> | 2012-07-29 04:19:50 +0200 |
---|---|---|
committer | Sem <sembrestels@riseup.net> | 2012-07-29 04:19:50 +0200 |
commit | 55bb2b7ed2583683548e314ae13fadde61eb04d6 (patch) | |
tree | 18aa780112c293ef078b7651a0c7f08ffd6b13da /views/default/photos/tagging | |
parent | 7a9177c9df49d6fc02280df02d6e7f6d52531382 (diff) | |
parent | 12a88208acec40e190b0729887e28c9d9add26c3 (diff) | |
download | elgg-55bb2b7ed2583683548e314ae13fadde61eb04d6.tar.gz elgg-55bb2b7ed2583683548e314ae13fadde61eb04d6.tar.bz2 |
Merge branch 'no-tagging-photos' of git://github.com/sembrestels/Tidypics
Conflicts:
languages/de.php
languages/en.php
start.php
views/default/forms/photos/admin/settings/main.php
views/default/photos/css.php
Diffstat (limited to 'views/default/photos/tagging')
-rw-r--r-- | views/default/photos/tagging/help.php | 19 | ||||
-rw-r--r-- | views/default/photos/tagging/select.php | 16 | ||||
-rw-r--r-- | views/default/photos/tagging/tag.php | 50 | ||||
-rw-r--r-- | views/default/photos/tagging/tags.php | 14 |
4 files changed, 0 insertions, 99 deletions
diff --git a/views/default/photos/tagging/help.php b/views/default/photos/tagging/help.php deleted file mode 100644 index a7f437e51..000000000 --- a/views/default/photos/tagging/help.php +++ /dev/null @@ -1,19 +0,0 @@ -<?php -/** - * Instructions on how to peform photo tagging - * - * @author Cash Costello - * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2 - */ - -$button = elgg_view('output/url', array( - 'text' => elgg_echo('quit'), - 'href' => '#', - 'id' => 'tidypics-tagging-quit', -)); - -$instructions = elgg_echo('tidypics:taginstruct', array($button)); -?> -<div id="tidypics-tagging-help" class="elgg-module elgg-module-popup tidypics-tagging-help pam hidden"> - <?php echo $instructions; ?> -</div> diff --git a/views/default/photos/tagging/select.php b/views/default/photos/tagging/select.php deleted file mode 100644 index 8894af63a..000000000 --- a/views/default/photos/tagging/select.php +++ /dev/null @@ -1,16 +0,0 @@ -<?php -/** - * Tag select view - * - * @uses $vars['entity'] - * - * @author Cash Costello - * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2 - */ - -$body = elgg_view_form('photos/image/tag', array(), $vars); - -echo elgg_view_module('popup', elgg_echo('tidypics:tagthisphoto'), $body, array( - 'class' => 'tidypics-tagging-select pam hidden', - 'id' => 'tidypics-tagging-select', -)); diff --git a/views/default/photos/tagging/tag.php b/views/default/photos/tagging/tag.php deleted file mode 100644 index 6bdc0db02..000000000 --- a/views/default/photos/tagging/tag.php +++ /dev/null @@ -1,50 +0,0 @@ -<?php -/** - * Photo tag view - * - * @uses $vars['tag'] Tag object - * - * @author Cash Costello - * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2 - */ - -$coords = json_decode('{' . $vars['tag']->coords . '}'); - -$attributes = elgg_format_attributes(array( - 'class' => 'tidypics-tag', - 'data-x1' => $coords->x1, - 'data-y1' => $coords->y1, - 'data-width' => $coords->width, - 'data-height' => $coords->height, -)); - -if ($vars['tag']->type == 'user') { - $user = get_entity($vars['tag']->value); - $label = elgg_view('output/url', array( - 'text' => $user->name, - 'href' => $user->getURL(), - )); -} else { - $label = $vars['tag']->value; -} - -$delete = ''; -$annotation = elgg_get_annotation_from_id($vars['tag']->annotation_id); - -if ($annotation->canEdit()) { - $url = elgg_http_add_url_query_elements('action/photos/image/untag', array( - 'annotation_id' => $vars['tag']->annotation_id - )); - $delete = elgg_view('output/confirmlink', array( - 'href' => $url, - 'text' => elgg_view_icon('delete', 'float mas'), - 'confirm' => elgg_echo('tidypics:phototagging:delete:confirm') - )); -} - -echo <<<HTML -<div class="tidypics-tag-wrapper"> - <div $attributes>$delete</div> - <div class="elgg-module-popup tidypics-tag-label">$label</div> -</div> -HTML; diff --git a/views/default/photos/tagging/tags.php b/views/default/photos/tagging/tags.php deleted file mode 100644 index 29c9d0efb..000000000 --- a/views/default/photos/tagging/tags.php +++ /dev/null @@ -1,14 +0,0 @@ -<?php -/** - * View the tags for this image - * - * @uses $vars['entity'] - * - * @author Cash Costello - * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2 - */ - -$tags = $vars['entity']->getPhotoTags(); -foreach ($tags as $tag) { - echo elgg_view('photos/tagging/tag', array('tag' => $tag)); -} |