fixed 2 display issues with the main image view

diff --git a/views/default/object/image.php b/views/default/object/image.php
index db39bb4fa4db38552bea6417ddbdcceea0f8d874..9c84a63f243a088ec7c5bfabaf3241c2d6319d7f 100644 (file)
--- 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 7062d942a7febe781f2af30c71751e0757a63f99..1d307df08c072219b31ceda80835a8b6a441b40b 100644 (file)
--- 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>\r
 <?php\r
 \r
-       if($viewer) {\r
+       if ($viewer) {\r
                $friends = get_entities_from_relationship('friend', $viewer->getGUID(), false, 'user', '', 0, 'time_created desc', 1000);\r
                \r
                if ($friends) {\r
@@ -60,12 +60,13 @@
                                $content .= "<li><a href='javascript:void(0)' onclick='selectUser({$friend_guid}, \"{$friend_name}\")'>{$friend_name}</a></li>";\r
                        }\r
                }\r
+               \r
+               $content .= "</ul></div>";\r
+               \r
+               $content .= "<div id='tidypics_tagmenu_right'><input type='submit' value='" . elgg_echo('tidypics:actiontag') . "' class='submit_button' /></div>";\r
+               \r
+               echo elgg_view('input/form', array('internalid' => 'quicksearch', 'internalname' => 'tidypics_phototag_form', 'class' => 'quicksearch', 'action' => "{$vars['url']}action/tidypics/addtag", 'method' => 'post', 'body' => $content));\r
        }\r
-       $content .= "</ul></div>";\r
-\r
-       $content .= "<div id='tidypics_tagmenu_right'><input type='submit' value='" . elgg_echo('tidypics:actiontag') . "' class='submit_button' /></div>";\r
-       \r
-       echo elgg_view('input/form', array('internalid' => 'quicksearch', 'internalname' => 'tidypics_phototag_form', 'class' => 'quicksearch', 'action' => "{$vars['url']}action/tidypics/addtag", 'method' => 'post', 'body' => $content));\r
 \r
 ?>\r
 </div>\r