aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/default/object/image.php2
-rw-r--r--views/default/tidypics/tagging.php13
2 files changed, 9 insertions, 6 deletions
diff --git a/views/default/object/image.php b/views/default/object/image.php
index db39bb4fa..9c84a63f2 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -196,6 +196,8 @@
<?php
echo elgg_view_comments($image);
+
+ echo '<div class="clearfloat"/>';
echo '</div>'; // content wrapper
diff --git a/views/default/tidypics/tagging.php b/views/default/tidypics/tagging.php
index 7062d942a..1d307df08 100644
--- a/views/default/tidypics/tagging.php
+++ b/views/default/tidypics/tagging.php
@@ -36,7 +36,7 @@
<div id='tidypics_popup_header'><h3><?php echo elgg_echo('tidypics:tagthisphoto'); ?></h3></div>
<?php
- if($viewer) {
+ if ($viewer) {
$friends = get_entities_from_relationship('friend', $viewer->getGUID(), false, 'user', '', 0, 'time_created desc', 1000);
if ($friends) {
@@ -60,12 +60,13 @@
$content .= "<li><a href='javascript:void(0)' onclick='selectUser({$friend_guid}, \"{$friend_name}\")'>{$friend_name}</a></li>";
}
}
+
+ $content .= "</ul></div>";
+
+ $content .= "<div id='tidypics_tagmenu_right'><input type='submit' value='" . elgg_echo('tidypics:actiontag') . "' class='submit_button' /></div>";
+
+ echo elgg_view('input/form', array('internalid' => 'quicksearch', 'internalname' => 'tidypics_phototag_form', 'class' => 'quicksearch', 'action' => "{$vars['url']}action/tidypics/addtag", 'method' => 'post', 'body' => $content));
}
- $content .= "</ul></div>";
-
- $content .= "<div id='tidypics_tagmenu_right'><input type='submit' value='" . elgg_echo('tidypics:actiontag') . "' class='submit_button' /></div>";
-
- echo elgg_view('input/form', array('internalid' => 'quicksearch', 'internalname' => 'tidypics_phototag_form', 'class' => 'quicksearch', 'action' => "{$vars['url']}action/tidypics/addtag", 'method' => 'post', 'body' => $content));
?>
</div>