aboutsummaryrefslogtreecommitdiff
path: root/views/default/photos/tagging
diff options
context:
space:
mode:
authorcash <cash.costello@gmail.com>2012-01-02 15:40:23 -0500
committercash <cash.costello@gmail.com>2012-01-02 15:40:23 -0500
commitad4f0fc6c003e0b3365f542795c1c6b3ee06749d (patch)
tree96b86a9d8f756500d7b9f1b25a084a99bfda34db /views/default/photos/tagging
parentfbdaf2a33386e6746be4de50a0b4aceb06ff5e68 (diff)
downloadelgg-ad4f0fc6c003e0b3365f542795c1c6b3ee06749d.tar.gz
elgg-ad4f0fc6c003e0b3365f542795c1c6b3ee06749d.tar.bz2
displaying the labels on tags now
Diffstat (limited to 'views/default/photos/tagging')
-rw-r--r--views/default/photos/tagging/tag.php18
-rw-r--r--views/default/photos/tagging/tags.php3
2 files changed, 18 insertions, 3 deletions
diff --git a/views/default/photos/tagging/tag.php b/views/default/photos/tagging/tag.php
index 4d3affeb6..93ea16218 100644
--- a/views/default/photos/tagging/tag.php
+++ b/views/default/photos/tagging/tag.php
@@ -3,6 +3,9 @@
* 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 . '}');
@@ -15,10 +18,19 @@ $attributes = elgg_format_attributes(array(
'data-height' => $coords->height,
));
-//var_dump($vars['tag']);
-//$text = "This is a something";
+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;
+}
echo <<<HTML
-<div $attributes>
+<div class="tidypics-tag-wrapper">
+ <div $attributes></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
index 7a4aa3a59..29c9d0efb 100644
--- a/views/default/photos/tagging/tags.php
+++ b/views/default/photos/tagging/tags.php
@@ -3,6 +3,9 @@
* 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();